Peter Zijlstra 0ccf831cbe
lockdep: annotate epoll ...
On Sat, 2008-01-05 at 13:35 -0800, Davide Libenzi wrote:
> I remember I talked with Arjan about this time ago. Basically, since 1)
> you can drop an epoll fd inside another epoll fd 2) callback-based wakeups
> are used, you can see a wake_up() from inside another wake_up(), but they
> will never refer to the same lock instance.
> Think about:
>
> dfd = socket(...);
> efd1 = epoll_create();
> efd2 = epoll_create();
> epoll_ctl(efd1, EPOLL_CTL_ADD, dfd, ...);
> epoll_ctl(efd2, EPOLL_CTL_ADD, efd1, ...);
>
> When a packet arrives to the device underneath "dfd", the net code will
> issue a wake_up() on its poll wake list. Epoll (efd1) has installed a
> callback wakeup entry on that queue, and the wake_up() performed by the
> "dfd" net code will end up in ep_poll_callback(). At this point epoll
> (efd1) notices that it may have some event ready, so it needs to wake up
> the waiters on its poll wait list (efd2). So it calls ep_poll_safewake()
> that ends up in another wake_up(), after having checked about the
> recursion constraints. That are, no more than EP_MAX_POLLWAKE_NESTS, to
> avoid stack blasting. Never hit the same queue, to avoid loops like:
>
> epoll_ctl(efd2, EPOLL_CTL_ADD, efd1, ...);
> epoll_ctl(efd3, EPOLL_CTL_ADD, efd2, ...);
> epoll_ctl(efd4, EPOLL_CTL_ADD, efd3, ...);
> epoll_ctl(efd1, EPOLL_CTL_ADD, efd4, ...);
>
> The code "if (tncur->wq == wq || ..." prevents re-entering the same
> queue/lock.
Since the epoll code is very careful to not nest same instance locks
allow the recursion.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl >
Tested-by: Stefan Richter <stefanr@s5r6.in-berlin.de >
Acked-by: Davide Libenzi <davidel@xmailserver.org >
Cc: <stable@kernel.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-02-05 09:44:07 -08:00
2008-01-28 14:54:13 -08:00
2007-07-30 16:26:27 -03:00
2008-01-27 18:14:49 +01:00
2008-02-01 16:42:02 -05:00
2007-10-14 20:17:39 -07:00
2007-12-12 20:01:01 +01:00
2007-10-13 14:36:18 +01:00
2008-01-31 19:28:09 -08:00
2008-01-31 19:27:40 -08:00
2007-10-15 12:26:29 -07:00
2008-01-31 19:27:36 -08:00
2008-01-31 19:27:39 -08:00
2008-02-01 16:42:06 -05:00
2007-10-17 08:43:03 -07:00
2007-10-16 10:13:38 -07:00
2008-01-28 15:09:52 -08:00
2008-02-01 16:42:15 -05:00
2007-12-26 19:36:35 -08:00
2008-02-01 14:35:07 -08:00
2008-01-30 13:30:18 +01:00
2008-01-23 21:26:15 -05:00
2007-09-11 04:22:16 -07:00
2007-10-14 12:41:51 -07:00
2007-10-18 14:37:20 -07:00
2007-12-17 19:28:16 -08:00
2007-10-10 16:51:59 -07:00
2008-01-23 05:24:15 -05:00
2008-01-28 15:00:14 -08:00
2008-01-28 15:00:12 -08:00
2008-02-04 13:16:39 +00:00
2007-10-17 08:42:47 -07:00
2008-01-23 11:29:17 -06:00
2008-02-01 14:23:55 -05:00
2007-10-17 08:43:00 -07:00
2007-10-17 08:42:45 -07:00
2007-10-11 22:24:13 +01:00
2007-10-17 08:43:07 -07:00
2007-10-16 11:03:56 +02:00
2007-10-18 14:37:29 -07:00
2007-10-19 11:53:42 -07:00
2007-10-19 11:53:42 -07:00
2008-02-01 11:34:49 +01:00
2008-01-29 21:55:15 +01:00
2007-10-29 14:05:37 -07:00
2007-07-31 10:43:05 -05:00
2008-01-28 23:58:26 -05:00
2008-01-28 14:54:10 -08:00
2007-10-22 08:13:18 -07:00
2008-02-01 23:09:24 +01:00
2007-12-02 20:04:49 +01:00
2007-10-19 11:53:36 -07:00
2007-10-19 11:53:36 -07:00
2008-02-03 17:45:46 +02:00
2007-10-14 22:57:45 +02:00
2008-01-30 13:30:02 +01:00
2008-01-30 13:31:48 +01:00
2008-01-28 23:21:18 +01:00
2008-01-28 23:21:18 +01:00
2007-10-18 14:37:32 -07:00
2007-10-17 08:42:47 -07:00
2008-01-28 23:21:18 +01:00
2007-12-06 17:40:19 -05:00
2008-01-28 15:00:40 -08:00
2007-10-16 09:43:20 -07:00
2007-10-18 14:37:19 -07:00
2007-10-17 08:42:52 -07:00
2008-01-30 13:32:42 +01:00
2008-01-25 21:08:02 +01:00
2007-10-04 18:40:57 -04:00
2007-11-19 21:43:22 -05:00
2008-01-30 13:31:10 +01:00
2007-10-19 11:53:44 -07:00
2007-10-17 08:42:53 -07:00
2008-01-11 08:17:01 +11:00
2008-02-03 17:45:46 +02:00
2008-02-03 15:42:53 +02:00
2007-10-16 09:43:09 -07:00
2007-10-21 02:37:45 -04:00
2008-02-03 04:28:53 -08:00
2008-01-25 21:08:02 +01:00
2007-10-12 14:51:03 -07:00
2007-10-19 11:53:36 -07:00
2007-12-20 17:32:12 +00:00
2008-02-02 15:14:48 -08:00
2008-01-25 14:46:04 -08:00
2008-01-25 14:46:04 -08:00
2007-10-20 02:00:58 +01:00
2008-02-03 15:06:26 +02:00
2008-02-03 17:45:46 +02:00
2007-10-22 08:13:19 -07:00
2008-01-23 21:23:13 -05:00
2007-10-23 15:49:47 +10:00
2007-10-10 16:53:56 -07:00
2007-10-22 08:13:19 -07:00
2007-10-22 08:13:20 -07:00
2007-12-18 08:29:28 +01:00
2008-01-30 13:31:56 +01:00
2007-10-17 08:42:51 -07:00
2008-01-28 23:21:18 +01:00
2007-10-10 16:52:52 -07:00
2008-02-03 17:45:46 +02:00
2007-10-29 07:41:32 -07:00
2007-10-22 08:13:21 -07:00
2007-10-17 08:43:02 -07:00
2007-11-29 09:24:53 -08:00
2007-10-17 08:42:48 -07:00
2007-11-14 18:45:43 -08:00
2008-01-28 23:58:27 -05:00
2008-01-29 00:19:52 -05:00
2008-01-29 00:19:52 -05:00
2008-01-29 00:19:52 -05:00
2007-10-17 18:49:58 -04:00
2007-11-08 08:42:46 -05:00
2007-10-16 09:43:22 -07:00
2007-10-17 08:43:01 -07:00
2007-10-17 08:43:04 -07:00
2007-10-17 21:21:26 -07:00
2007-10-17 00:00:08 +02:00
2007-10-18 14:37:19 -07:00
2007-10-10 16:54:03 -07:00
2008-02-04 07:58:52 -08:00
2007-10-21 02:37:18 -04:00
2007-11-29 09:24:54 -08:00
2008-02-01 17:45:14 +01:00
2008-01-24 20:40:36 -08:00
2007-10-16 09:43:00 -07:00
2007-10-10 08:55:27 +01:00
2007-09-26 00:01:17 -04:00
2008-01-25 21:08:33 +01:00
2007-10-14 12:41:51 -07:00
2008-02-03 15:42:53 +02:00
2008-02-01 23:09:34 +01:00
2008-01-28 14:51:22 +01:00
2007-10-15 08:12:00 -07:00
2008-01-30 13:30:27 +01:00
2008-02-03 16:20:13 +02:00
2007-12-17 19:28:17 -08:00
2008-01-11 08:16:16 +11:00
2007-10-09 22:56:30 -04:00
2007-10-13 23:56:32 +02:00
2008-01-27 18:14:50 +01:00
2008-01-27 18:14:52 +01:00
2007-10-16 11:21:00 +02:00
2007-10-22 00:56:52 -04:00
2008-02-02 19:56:47 +01:00
2008-02-01 16:13:16 -05:00
2008-01-28 14:53:58 -08:00
2007-10-10 16:51:59 -07:00
2008-01-28 14:54:09 -08:00
2007-12-07 15:00:32 -05:00
2007-10-15 12:26:29 -07:00
2007-10-10 16:51:16 -07:00
2008-01-28 15:08:27 -08:00
2007-10-17 08:42:52 -07:00
2008-01-28 15:07:58 -08:00
2007-10-10 16:49:13 -07:00
2007-08-26 18:35:42 -07:00
2007-10-10 16:52:04 -07:00
2008-01-28 14:56:28 -08:00
2008-01-28 15:07:57 -08:00
2008-01-28 14:55:09 -08:00
2008-01-28 15:08:32 -08:00
2008-01-28 14:55:09 -08:00
2008-01-28 15:08:44 -08:00
2007-12-05 05:37:32 -08:00
2008-01-31 19:28:31 -08:00
2008-01-30 13:34:11 +01:00
2008-02-01 14:06:51 -05:00
2008-02-03 08:58:07 +01:00
2007-10-21 02:37:38 -04:00
2008-01-31 19:26:46 -08:00
2008-01-25 21:08:23 +01:00
2008-01-28 10:50:33 +01:00
2008-01-30 13:30:32 +01:00
2008-01-28 10:50:29 +01:00
2007-10-19 11:53:48 -07:00
2007-10-30 08:06:55 -07:00
2007-10-18 14:37:32 -07:00
2008-01-31 19:28:20 -08:00
2007-12-18 18:05:58 +01:00
2007-09-16 21:13:58 -07:00
2007-10-16 09:43:10 -07:00
2007-10-09 22:07:28 -03:00
2007-10-09 22:07:23 -03:00
2008-01-28 23:58:27 -05:00
2007-12-05 09:21:20 -08:00
2008-01-25 21:08:34 +01:00
2007-11-05 15:12:32 -08:00
2007-10-17 08:42:52 -07:00
2007-08-22 19:52:45 -07:00
2008-02-01 18:30:53 -05:00
2007-11-29 09:24:52 -08:00
2007-07-31 15:39:40 -07:00
2007-10-18 14:37:28 -07:00
2008-01-30 13:33:06 +01:00
2007-10-19 11:53:49 -07:00
2007-10-17 08:42:57 -07:00
2008-01-08 16:10:35 -08:00
2007-10-19 11:53:33 -07:00
2008-01-24 21:27:06 -08:00
2008-01-30 13:32:53 +01:00
2008-01-24 20:40:05 -08:00
2007-10-10 16:48:12 -07:00
2008-01-30 18:01:22 +02:00
2008-01-30 18:01:22 +02:00
2008-01-30 18:01:18 +02:00
2008-01-30 18:01:22 +02:00
2008-01-25 21:08:34 +01:00
2007-12-07 09:06:53 +00:00
2008-02-04 23:49:57 +11:00
2007-10-25 15:02:50 +10:00
2008-01-23 05:24:16 -05:00
2008-01-30 13:33:13 +01:00
2007-10-19 11:53:35 -07:00
2008-02-03 17:45:46 +02:00
2007-10-19 11:53:38 -07:00
2007-10-17 08:42:56 -07:00
2007-10-19 11:53:36 -07:00
2007-09-21 15:55:55 +09:00
2007-10-19 11:53:55 -07:00
2007-11-14 18:45:41 -08:00
2007-10-10 16:54:03 -07:00
2007-10-16 09:43:02 -07:00
2007-10-22 08:13:17 -07:00
2007-10-19 11:53:36 -07:00
2007-10-17 08:43:00 -07:00
2008-01-30 13:33:58 +01:00
2007-10-17 08:42:46 -07:00
2007-10-23 15:49:54 +10:00
2008-01-29 22:46:14 +11:00
2008-01-28 23:21:18 +01:00
2007-11-07 04:08:55 -08:00
2007-10-19 11:53:44 -07:00
2007-12-06 17:37:59 -05:00
2007-10-30 14:32:16 -04:00
2008-01-26 15:04:01 +00:00
2008-01-26 15:03:59 +00:00
2007-10-17 08:42:44 -07:00
2007-10-17 08:42:55 -07:00
2008-01-28 14:56:29 -08:00
2008-01-31 19:28:24 -08:00
2007-12-14 13:54:39 -08:00
2008-01-28 14:53:55 -08:00
2008-01-28 14:53:55 -08:00
2008-01-28 15:02:22 -08:00
2008-01-31 19:28:23 -08:00
2008-01-28 14:54:18 -08:00
2008-01-30 02:06:07 -05:00
2008-02-01 11:45:47 +11:00
2007-12-06 17:40:25 -05:00
2008-01-30 02:05:24 -05:00
2008-01-30 02:06:08 -05:00
2008-02-01 16:42:05 -05:00
2008-01-28 14:59:52 -08:00
2007-10-17 08:42:58 -07:00
2007-10-16 09:42:58 -07:00
2008-02-01 18:30:53 -05:00
2007-10-19 11:53:37 -07:00
2008-01-17 14:53:22 +11:00
2007-10-17 21:17:42 -07:00
2008-01-17 14:53:22 +11:00
2007-10-17 08:42:46 -07:00
2007-10-16 09:43:02 -07:00
2007-10-16 09:43:02 -07:00
2007-12-06 17:35:41 -05:00
2007-10-23 19:53:16 -04:00
2008-01-15 10:23:41 -06:00
2008-01-24 20:40:14 -08:00
2008-01-30 13:33:36 +01:00
2008-02-02 11:32:01 -08:00
2008-02-01 15:04:29 -08:00
2008-02-02 11:32:01 -08:00
2008-01-28 15:00:35 -08:00
2008-02-02 02:44:34 +03:00
2007-10-17 08:42:44 -07:00
2008-01-30 23:27:58 +01:00
2008-01-31 19:27:03 -08:00
2007-10-19 11:53:41 -07:00
2008-01-23 19:33:58 -06:00
2008-02-03 04:28:41 -08:00
2007-11-14 18:45:43 -08:00
2007-10-19 11:53:41 -07:00
2008-01-31 19:28:36 -08:00
2008-01-31 19:28:35 -08:00
2008-01-24 20:40:06 -08:00
2008-01-24 20:40:43 -08:00
2008-01-11 12:26:47 -05:00
2008-02-03 17:45:46 +02:00
2007-12-21 22:14:07 +11:00
2008-02-03 17:45:46 +02:00
2007-07-26 11:35:21 -07:00
2007-10-17 18:49:58 -04:00
2007-09-11 17:21:20 -07:00
2008-02-02 02:43:00 +03:00
2007-07-26 13:40:43 +02:00
2007-10-19 20:35:04 +02:00
2007-10-19 11:53:41 -07:00
2008-01-28 15:01:36 -08:00
2007-10-17 08:42:55 -07:00
2007-10-17 08:42:45 -07:00
2008-01-30 13:30:53 +01:00
2007-12-23 12:54:36 -08:00
2007-10-17 08:42:56 -07:00
2008-02-03 16:12:47 +02:00
2008-01-25 21:08:24 +01:00
2008-01-25 21:08:24 +01:00
2008-01-25 21:08:24 +01:00
2008-01-25 21:08:24 +01:00
2008-01-30 13:31:47 +01:00
2008-02-03 15:42:53 +02:00
2007-10-22 08:13:20 -07:00
2008-01-31 19:26:46 -08:00
2007-11-29 09:24:54 -08:00
2008-01-28 14:54:25 -08:00
2008-01-28 10:54:49 +01:00
2008-02-01 14:06:51 -05:00
2007-11-29 09:24:54 -08:00
2007-10-10 16:51:28 -07:00
2007-10-14 12:41:51 -07:00
2008-01-25 11:29:54 +11:00
2007-10-16 09:43:17 -07:00
2008-01-30 08:17:26 +11:00
2007-10-19 11:53:44 -07:00
2008-01-28 14:54:28 -08:00
2007-11-29 09:24:53 -08:00
2007-08-22 19:52:44 -07:00
2007-10-19 11:53:44 -07:00
2008-02-03 15:12:15 +02:00
2008-02-04 23:49:56 +11:00
2008-01-02 13:04:48 -08:00
2008-01-02 13:04:48 -08:00
2008-02-04 10:56:03 -08:00
2008-02-03 17:45:46 +02:00
2008-01-25 21:08:33 +01:00
2008-01-30 13:33:17 +01:00
2008-01-31 19:28:30 -08:00
2008-01-28 14:56:57 -08:00
2008-02-03 17:45:46 +02:00
2008-01-30 13:31:20 +01:00
2008-01-30 13:31:20 +01:00
2008-01-30 13:31:20 +01:00
2008-01-28 14:53:30 -08:00
2008-01-25 21:08:34 +01:00
2007-10-14 12:41:51 -07:00
2007-10-30 21:44:00 -07:00
2008-02-01 18:30:53 -05:00
2008-02-01 18:30:58 -05:00
2008-01-31 22:05:48 +01:00
2008-01-31 19:28:27 -08:00
2008-01-24 20:40:40 -08:00
2008-01-23 11:29:18 -06:00
2007-10-18 14:37:28 -07:00
2008-01-28 14:54:07 -08:00
2008-02-01 17:45:14 +01:00
2008-02-01 17:45:14 +01:00
2008-01-24 20:40:06 -08:00
2008-02-01 17:45:13 +01:00
2008-01-30 13:30:00 +01:00
2007-11-26 20:42:19 +01:00
2008-01-25 21:08:20 +01:00
2008-01-28 14:54:09 -08:00
2008-01-31 19:27:30 -08:00
2007-10-17 08:42:51 -07:00
2007-10-19 11:53:42 -07:00
2008-01-24 20:40:26 -08:00
2008-02-01 14:34:49 -08:00
2008-02-01 14:35:07 -08:00
2008-02-01 14:34:58 -08:00
2007-09-19 11:24:18 -07:00
2007-12-26 19:36:35 -08:00
2007-10-12 14:51:04 -07:00
2007-10-22 12:01:30 -02:00
2007-10-22 12:01:24 -02:00
2007-10-23 13:47:31 -05:00
2008-02-04 23:50:13 +11:00
2008-02-04 23:50:01 +11:00
2008-02-04 23:50:03 +11:00
2007-10-23 15:49:55 +10:00
2008-02-04 23:50:02 +11:00
2008-02-04 23:50:12 +11:00
2008-02-04 23:50:00 +11:00
2008-02-04 23:50:03 +11:00
2007-10-17 08:42:56 -07:00
2007-10-19 11:53:34 -07:00
2008-02-05 09:44:07 -08:00
2008-02-03 15:42:53 +02:00
2008-01-16 09:51:58 +01:00
2008-01-14 21:21:29 -08:00
2008-01-31 19:27:03 -08:00
2007-10-12 14:05:17 +10:00
2007-10-10 16:53:57 -07:00
0ccf831cbe