Pull more poll annotation updates from Al Viro: "This is preparation to solving the problems you've mentioned in the original poll series. After this series, the kernel is ready for running for V in IN OUT PRI ERR RDNORM RDBAND WRNORM WRBAND HUP RDHUP NVAL MSG; do L=`git grep -l -w POLL$V | grep -v '^t' | grep -v /um/ | grep -v '^sa' | grep -v '/poll.h$'|grep -v '^D'` for f in $L; do sed -i "-es/^\([^\"]*\)\(\<POLL$V\>\)/\\1E\\2/" $f; done done as a for bulk search-and-replace. After that, the kernel is ready to apply the patch to unify {de,}mangle_poll(), and then get rid of kernel-side POLL... uses entirely, and we should be all done with that stuff. Basically, that's what you suggested wrt KPOLL..., except that we can use EPOLL... instead - they already are arch-independent (and equal to what is currently kernel-side POLL...). After the preparations (in this series) switch to returning EPOLL... from ->poll() instances is completely mechanical and kernel-side POLL... can go away. The last step (killing kernel-side POLL... and unifying {de,}mangle_poll() has to be done after the search-and-replace job, since we need userland-side POLL... for unified {de,}mangle_poll(), thus the cherry-pick at the last step. After that we will have: - POLL{IN,OUT,...} *not* in __poll_t, so any stray instances of ->poll() still using those will be caught by sparse. - eventpoll.c and select.c warning-free wrt __poll_t - no more kernel-side definitions of POLL... - userland ones are visible through the entire kernel (and used pretty much only for mangle/demangle) - same behavior as after the first series (i.e. sparc et.al. epoll(2) working correctly)" * 'work.poll2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: annotate ep_scan_ready_list() ep_send_events_proc(): return result via esed->res preparation to switching ->poll() to returning EPOLL... add EPOLLNVAL, annotate EPOLL... and event_poll->event use linux/poll.h instead of asm/poll.h xen: fix poll misannotation smc: missing poll annotations
Showing the changes to include/uapi/linux (1 of 8 files). Show all
Unified · Split
| @@ -28,20 +28,21 @@ · 27 unmodified lines | |||
| 28 | #define EPOLL_CTL_MOD 3 | 28 | #define EPOLL_CTL_MOD 3 |
| 29 | 29 | ||
| 30 | /* Epoll event masks */ | 30 | /* Epoll event masks */ |
| 31 | #define EPOLLIN 0x00000001 | 31 | #define EPOLLIN (__force __poll_t)0x00000001 |
| 32 | #define EPOLLPRI 0x00000002 | 32 | #define EPOLLPRI (__force __poll_t)0x00000002 |
| 33 | #define EPOLLOUT 0x00000004 | 33 | #define EPOLLOUT (__force __poll_t)0x00000004 |
| 34 | #define EPOLLERR 0x00000008 | 34 | #define EPOLLERR (__force __poll_t)0x00000008 |
| 35 | #define EPOLLHUP 0x00000010 | 35 | #define EPOLLHUP (__force __poll_t)0x00000010 |
| 36 | #define EPOLLRDNORM 0x00000040 | 36 | #define EPOLLNVAL (__force __poll_t)0x00000020 |
| 37 | #define EPOLLRDBAND 0x00000080 | 37 | #define EPOLLRDNORM (__force __poll_t)0x00000040 |
| 38 | #define EPOLLWRNORM 0x00000100 | 38 | #define EPOLLRDBAND (__force __poll_t)0x00000080 |
| 39 | #define EPOLLWRBAND 0x00000200 | 39 | #define EPOLLWRNORM (__force __poll_t)0x00000100 |
| 40 | #define EPOLLMSG 0x00000400 | 40 | #define EPOLLWRBAND (__force __poll_t)0x00000200 |
| 41 | #define EPOLLRDHUP 0x00002000 | 41 | #define EPOLLMSG (__force __poll_t)0x00000400 |
| 42 | #define EPOLLRDHUP (__force __poll_t)0x00002000 | ||
| 42 | 43 | ||
| 43 | /* Set exclusive wakeup mode for the target file descriptor */ | 44 | /* Set exclusive wakeup mode for the target file descriptor */ |
| 44 | #define EPOLLEXCLUSIVE (1U << 28) | 45 | #define EPOLLEXCLUSIVE (__force __poll_t)(1U << 28) |
| 45 | 46 | ||
| 46 | /* | 47 | /* |
| 47 | * Request the handling of system wakeup events so as to prevent system suspends | 48 | * Request the handling of system wakeup events so as to prevent system suspends |
| @@ -53,13 +54,13 @@ · 5 unmodified lines | |||
| 53 | * | 54 | * |
| 54 | * Requires CAP_BLOCK_SUSPEND | 55 | * Requires CAP_BLOCK_SUSPEND |
| 55 | */ | 56 | */ |
| 56 | #define EPOLLWAKEUP (1U << 29) | 57 | #define EPOLLWAKEUP (__force __poll_t)(1U << 29) |
| 57 | 58 | ||
| 58 | /* Set the One Shot behaviour for the target file descriptor */ | 59 | /* Set the One Shot behaviour for the target file descriptor */ |
| 59 | #define EPOLLONESHOT (1U << 30) | 60 | #define EPOLLONESHOT (__force __poll_t)(1U << 30) |
| 60 | 61 | ||
| 61 | /* Set the Edge Triggered behaviour for the target file descriptor */ | 62 | /* Set the Edge Triggered behaviour for the target file descriptor */ |
| 62 | #define EPOLLET (1U << 31) | 63 | #define EPOLLET (__force __poll_t)(1U << 31) |
| 63 | 64 | ||
| 64 | /* | 65 | /* |
| 65 | * On x86-64 make the 64bit structure have the same alignment as the | 66 | * On x86-64 make the 64bit structure have the same alignment as the |
| @@ -74,7 +75,7 @@ · 8 unmodified lines | |||
| 74 | #endif | 75 | #endif |
| 75 | 76 | ||
| 76 | struct epoll_event { | 77 | struct epoll_event { |
| 77 | __u32 events; | 78 | __poll_t events; |
| 78 | __u64 data; | 79 | __u64 data; |
| 79 | } EPOLL_PACKED; | 80 | } EPOLL_PACKED; |
| 80 | 81 | ||