diff options
author | Masami Hiramatsu <mhiramat@redhat.com> | 2009-11-24 16:56:58 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-11-26 04:55:38 -0500 |
commit | ba005e1f417295d28cd1563ab82bc33af07fb16a (patch) | |
tree | d771659edc46c1bd5467578a6616657c8cf26db5 | |
parent | f9d4257e01d266e67420cc99d456b6d4c8464f54 (diff) |
tracepoint: Add signal loss events
Add signal_overflow_fail and signal_lose_info tracepoints
for signal-lost events.
Changes in v3:
- Add docbook style comments
Changes in v2:
- Use siginfo string macro
Suggested-by: Roland McGrath <roland@redhat.com>
Reviewed-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Roland McGrath <roland@redhat.com>
Cc: systemtap <systemtap@sources.redhat.com>
Cc: DLE <dle-develop@lists.sourceforge.net>
Cc: Oleg Nesterov <oleg@redhat.com>
LKML-Reference: <20091124215658.30449.9934.stgit@dhcp-100-2-132.bos.redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | include/trace/events/signal.h | 68 | ||||
-rw-r--r-- | kernel/signal.c | 19 |
2 files changed, 82 insertions, 5 deletions
diff --git a/include/trace/events/signal.h b/include/trace/events/signal.h index a6d71de0dc0d..a510b75ac304 100644 --- a/include/trace/events/signal.h +++ b/include/trace/events/signal.h | |||
@@ -99,6 +99,74 @@ TRACE_EVENT(signal_deliver, | |||
99 | __entry->sig, __entry->errno, __entry->code, | 99 | __entry->sig, __entry->errno, __entry->code, |
100 | __entry->sa_handler, __entry->sa_flags) | 100 | __entry->sa_handler, __entry->sa_flags) |
101 | ); | 101 | ); |
102 | |||
103 | /** | ||
104 | * signal_overflow_fail - called when signal queue is overflow | ||
105 | * @sig: signal number | ||
106 | * @group: signal to process group or not (bool) | ||
107 | * @info: pointer to struct siginfo | ||
108 | * | ||
109 | * Kernel fails to generate 'sig' signal with 'info' siginfo, because | ||
110 | * siginfo queue is overflow, and the signal is dropped. | ||
111 | * 'group' is not 0 if the signal will be sent to a process group. | ||
112 | * 'sig' is always one of RT signals. | ||
113 | */ | ||
114 | TRACE_EVENT(signal_overflow_fail, | ||
115 | |||
116 | TP_PROTO(int sig, int group, struct siginfo *info), | ||
117 | |||
118 | TP_ARGS(sig, group, info), | ||
119 | |||
120 | TP_STRUCT__entry( | ||
121 | __field( int, sig ) | ||
122 | __field( int, group ) | ||
123 | __field( int, errno ) | ||
124 | __field( int, code ) | ||
125 | ), | ||
126 | |||
127 | TP_fast_assign( | ||
128 | __entry->sig = sig; | ||
129 | __entry->group = group; | ||
130 | TP_STORE_SIGINFO(__entry, info); | ||
131 | ), | ||
132 | |||
133 | TP_printk("sig=%d group=%d errno=%d code=%d", | ||
134 | __entry->sig, __entry->group, __entry->errno, __entry->code) | ||
135 | ); | ||
136 | |||
137 | /** | ||
138 | * signal_lose_info - called when siginfo is lost | ||
139 | * @sig: signal number | ||
140 | * @group: signal to process group or not (bool) | ||
141 | * @info: pointer to struct siginfo | ||
142 | * | ||
143 | * Kernel generates 'sig' signal but loses 'info' siginfo, because siginfo | ||
144 | * queue is overflow. | ||
145 | * 'group' is not 0 if the signal will be sent to a process group. | ||
146 | * 'sig' is always one of non-RT signals. | ||
147 | */ | ||
148 | TRACE_EVENT(signal_lose_info, | ||
149 | |||
150 | TP_PROTO(int sig, int group, struct siginfo *info), | ||
151 | |||
152 | TP_ARGS(sig, group, info), | ||
153 | |||
154 | TP_STRUCT__entry( | ||
155 | __field( int, sig ) | ||
156 | __field( int, group ) | ||
157 | __field( int, errno ) | ||
158 | __field( int, code ) | ||
159 | ), | ||
160 | |||
161 | TP_fast_assign( | ||
162 | __entry->sig = sig; | ||
163 | __entry->group = group; | ||
164 | TP_STORE_SIGINFO(__entry, info); | ||
165 | ), | ||
166 | |||
167 | TP_printk("sig=%d group=%d errno=%d code=%d", | ||
168 | __entry->sig, __entry->group, __entry->errno, __entry->code) | ||
169 | ); | ||
102 | #endif /* _TRACE_SIGNAL_H */ | 170 | #endif /* _TRACE_SIGNAL_H */ |
103 | 171 | ||
104 | /* This part must be outside protection */ | 172 | /* This part must be outside protection */ |
diff --git a/kernel/signal.c b/kernel/signal.c index 349d44937406..93e72e5feae6 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -897,12 +897,21 @@ static int __send_signal(int sig, struct siginfo *info, struct task_struct *t, | |||
897 | break; | 897 | break; |
898 | } | 898 | } |
899 | } else if (!is_si_special(info)) { | 899 | } else if (!is_si_special(info)) { |
900 | if (sig >= SIGRTMIN && info->si_code != SI_USER) | 900 | if (sig >= SIGRTMIN && info->si_code != SI_USER) { |
901 | /* | 901 | /* |
902 | * Queue overflow, abort. We may abort if the signal was rt | 902 | * Queue overflow, abort. We may abort if the |
903 | * and sent by user using something other than kill(). | 903 | * signal was rt and sent by user using something |
904 | */ | 904 | * other than kill(). |
905 | */ | ||
906 | trace_signal_overflow_fail(sig, group, info); | ||
905 | return -EAGAIN; | 907 | return -EAGAIN; |
908 | } else { | ||
909 | /* | ||
910 | * This is a silent loss of information. We still | ||
911 | * send the signal, but the *info bits are lost. | ||
912 | */ | ||
913 | trace_signal_lose_info(sig, group, info); | ||
914 | } | ||
906 | } | 915 | } |
907 | 916 | ||
908 | out_set: | 917 | out_set: |