leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unify {de,}mangle_poll(), get rid of kernel-side POLL...

Browse Source 
except, again, POLLFREE and POLL_BUSY_LOOP.

With this, we finally get to the promised end result:

 - POLL{IN,OUT,...} are plain integers and *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).

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro 2018-02-01 15:13:18 -05:00 committed by Linus Torvalds
parent a9a08845e9
commit 7a163b2195
8 changed files with 47 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/blackfin/include/uapi/asm/poll.h
View File

@ -9,25 +9,8 @@
#ifndef _UAPI__BFIN_POLL_H #ifndef _UAPI__BFIN_POLL_H
#define _UAPI__BFIN_POLL_H #define _UAPI__BFIN_POLL_H
#ifndef __KERNEL__
#define POLLWRNORM POLLOUT #define POLLWRNORM POLLOUT
#define POLLWRBAND (__force __poll_t)256 #define POLLWRBAND 256
#else
#define __ARCH_HAS_MANGLED_POLL
static inline __u16 mangle_poll(__poll_t val)
{
__u16 v = (__force __u16)val;
/* bit 9 -> bit 8, bit 8 -> bit 2 */
return (v & ~0x300) | ((v & 0x200) >> 1) | ((v & 0x100) >> 6);
}
static inline __poll_t demangle_poll(__u16 v)
{
/* bit 8 -> bit 9, bit 2 -> bits 2 and 8 */
return (__force __poll_t)((v & ~0x100) | ((v & 0x100) << 1) |
((v & 4) << 6));
}
#endif
#include <asm-generic/poll.h> #include <asm-generic/poll.h>

19
arch/frv/include/uapi/asm/poll.h
View File

@ -2,25 +2,8 @@
#ifndef _ASM_POLL_H #ifndef _ASM_POLL_H
#define _ASM_POLL_H #define _ASM_POLL_H
#ifndef __KERNEL__
#define POLLWRNORM POLLOUT #define POLLWRNORM POLLOUT
#define POLLWRBAND (__force __poll_t)256 #define POLLWRBAND 256
#else
#define __ARCH_HAS_MANGLED_POLL
static inline __u16 mangle_poll(__poll_t val)
{
__u16 v = (__force __u16)val;
/* bit 9 -> bit 8, bit 8 -> bit 2 */
return (v & ~0x300) | ((v & 0x200) >> 1) | ((v & 0x100) >> 6);
}
static inline __poll_t demangle_poll(__u16 v)
{
/* bit 8 -> bit 9, bit 2 -> bits 2 and 8 */
return (__force __poll_t)((v & ~0x100) | ((v & 0x100) << 1) |
((v & 4) << 6));
}
#endif
#include <asm-generic/poll.h> #include <asm-generic/poll.h>
#undef POLLREMOVE #undef POLLREMOVE

19
arch/m68k/include/uapi/asm/poll.h
View File

@ -2,25 +2,8 @@
#ifndef __m68k_POLL_H #ifndef __m68k_POLL_H
#define __m68k_POLL_H #define __m68k_POLL_H
#ifndef __KERNEL__
#define POLLWRNORM POLLOUT #define POLLWRNORM POLLOUT
#define POLLWRBAND (__force __poll_t)256 #define POLLWRBAND 256
#else
#define __ARCH_HAS_MANGLED_POLL
static inline __u16 mangle_poll(__poll_t val)
{
__u16 v = (__force __u16)val;
/* bit 9 -> bit 8, bit 8 -> bit 2 */
return (v & ~0x300) | ((v & 0x200) >> 1) | ((v & 0x100) >> 6);
}
static inline __poll_t demangle_poll(__u16 v)
{
/* bit 8 -> bit 9, bit 2 -> bits 2 and 8 */
return (__force __poll_t)((v & ~0x100) | ((v & 0x100) << 1) |
((v & 4) << 6));
}
#endif
#include <asm-generic/poll.h> #include <asm-generic/poll.h>

19
arch/mips/include/uapi/asm/poll.h
View File

@ -2,25 +2,8 @@
#ifndef __ASM_POLL_H #ifndef __ASM_POLL_H
#define __ASM_POLL_H #define __ASM_POLL_H
#ifndef __KERNEL__
#define POLLWRNORM POLLOUT #define POLLWRNORM POLLOUT
#define POLLWRBAND (__force __poll_t)0x0100 #define POLLWRBAND 0x0100
#else
#define __ARCH_HAS_MANGLED_POLL
static inline __u16 mangle_poll(__poll_t val)
{
__u16 v = (__force __u16)val;
/* bit 9 -> bit 8, bit 8 -> bit 2 */
return (v & ~0x300) | ((v & 0x200) >> 1) | ((v & 0x100) >> 6);
}
static inline __poll_t demangle_poll(__u16 v)
{
/* bit 8 -> bit 9, bit 2 -> bits 2 and 8 */
return (__force __poll_t)((v & ~0x100) | ((v & 0x100) << 1) |
((v & 4) << 6));
}
#endif
#include <asm-generic/poll.h> #include <asm-generic/poll.h>

28
arch/sparc/include/uapi/asm/poll.h
View File

@ -2,31 +2,11 @@
#ifndef __SPARC_POLL_H #ifndef __SPARC_POLL_H
#define __SPARC_POLL_H #define __SPARC_POLL_H
#ifndef __KERNEL__
#define POLLWRNORM POLLOUT #define POLLWRNORM POLLOUT
#define POLLWRBAND (__force __poll_t)256 #define POLLWRBAND 256
#define POLLMSG (__force __poll_t)512 #define POLLMSG 512
#define POLLREMOVE (__force __poll_t)1024 #define POLLREMOVE 1024
#define POLLRDHUP (__force __poll_t)2048 #define POLLRDHUP 2048
#else
#define __ARCH_HAS_MANGLED_POLL
static inline __u16 mangle_poll(__poll_t val)
{
__u16 v = (__force __u16)val;
/* bit 9 -> bit 8, bit 8 -> bit 2, bit 13 -> bit 11 */
return (v & ~0x300) | ((v & 0x200) >> 1) | ((v & 0x100) >> 6) |
((v & 0x2000) >> 2);
}
static inline __poll_t demangle_poll(__u16 v)
{
/* bit 8 -> bit 9, bit 2 -> bits 2 and 8 */
return (__force __poll_t)((v & ~0x100) | ((v & 0x100) << 1) |
((v & 4) << 6) | ((v & 0x800) << 2));
}
#endif
#include <asm-generic/poll.h> #include <asm-generic/poll.h>

21
arch/xtensa/include/uapi/asm/poll.h
View File

@ -12,26 +12,9 @@
#ifndef _XTENSA_POLL_H #ifndef _XTENSA_POLL_H
#define _XTENSA_POLL_H #define _XTENSA_POLL_H
#ifndef __KERNEL__
#define POLLWRNORM POLLOUT #define POLLWRNORM POLLOUT
#define POLLWRBAND (__force __poll_t)0x0100 #define POLLWRBAND 0x0100
#define POLLREMOVE (__force __poll_t)0x0800 #define POLLREMOVE 0x0800
#else
#define __ARCH_HAS_MANGLED_POLL
static inline __u16 mangle_poll(__poll_t val)
{
__u16 v = (__force __u16)val;
/* bit 9 -> bit 8, bit 8 -> bit 2 */
return (v & ~0x300) | ((v & 0x200) >> 1) | ((v & 0x100) >> 6);
}
static inline __poll_t demangle_poll(__u16 v)
{
/* bit 8 -> bit 9, bit 2 -> bits 2 and 8 */
return (__force __poll_t)((v & ~0x100) | ((v & 0x100) << 1) |
((v & 4) << 6));
}
#endif
#include <asm-generic/poll.h> #include <asm-generic/poll.h>

24
include/linux/poll.h
View File

@ -108,4 +108,28 @@ extern int core_sys_select(int n, fd_set __user *inp, fd_set __user *outp,
extern int poll_select_set_timeout(struct timespec64 *to, time64_t sec, extern int poll_select_set_timeout(struct timespec64 *to, time64_t sec,
long nsec); long nsec);
#define __MAP(v, from, to) \
(from < to ? (v & from) * (to/from) : (v & from) / (from/to))
static inline __u16 mangle_poll(__poll_t val)
{
__u16 v = (__force __u16)val;
#define M(X) __MAP(v, (__force __u16)EPOLL##X, POLL##X)
return M(IN) | M(OUT) | M(PRI) | M(ERR) | M(NVAL) |
M(RDNORM) | M(RDBAND) | M(WRNORM) | M(WRBAND) |
M(HUP) | M(RDHUP) | M(MSG);
#undef M
}
static inline __poll_t demangle_poll(u16 val)
{
#define M(X) (__force __poll_t)__MAP(val, POLL##X, (__force __u16)EPOLL##X)
return M(IN) | M(OUT) | M(PRI) | M(ERR) | M(NVAL) |
M(RDNORM) | M(RDBAND) | M(WRNORM) | M(WRBAND) |
M(HUP) | M(RDHUP) | M(MSG);
#undef M
}
#undef __MAP
#endif /* _LINUX_POLL_H */ #endif /* _LINUX_POLL_H */

40
include/uapi/asm-generic/poll.h
View File

@ -3,50 +3,36 @@
#define __ASM_GENERIC_POLL_H #define __ASM_GENERIC_POLL_H
/* These are specified by iBCS2 */ /* These are specified by iBCS2 */
#define POLLIN (__force __poll_t)0x0001 #define POLLIN 0x0001
#define POLLPRI (__force __poll_t)0x0002 #define POLLPRI 0x0002
#define POLLOUT (__force __poll_t)0x0004 #define POLLOUT 0x0004
#define POLLERR (__force __poll_t)0x0008 #define POLLERR 0x0008
#define POLLHUP (__force __poll_t)0x0010 #define POLLHUP 0x0010
#define POLLNVAL (__force __poll_t)0x0020 #define POLLNVAL 0x0020
/* The rest seem to be more-or-less nonstandard. Check them! */ /* The rest seem to be more-or-less nonstandard. Check them! */
#define POLLRDNORM (__force __poll_t)0x0040 #define POLLRDNORM 0x0040
#define POLLRDBAND (__force __poll_t)0x0080 #define POLLRDBAND 0x0080
#ifndef POLLWRNORM #ifndef POLLWRNORM
#define POLLWRNORM (__force __poll_t)0x0100 #define POLLWRNORM 0x0100
#endif #endif
#ifndef POLLWRBAND #ifndef POLLWRBAND
#define POLLWRBAND (__force __poll_t)0x0200 #define POLLWRBAND 0x0200
#endif #endif
#ifndef POLLMSG #ifndef POLLMSG
#define POLLMSG (__force __poll_t)0x0400 #define POLLMSG 0x0400
#endif #endif
#ifndef POLLREMOVE #ifndef POLLREMOVE
#define POLLREMOVE (__force __poll_t)0x1000 #define POLLREMOVE 0x1000
#endif #endif
#ifndef POLLRDHUP #ifndef POLLRDHUP
#define POLLRDHUP (__force __poll_t)0x2000 #define POLLRDHUP 0x2000
#endif #endif
#define POLLFREE (__force __poll_t)0x4000 /* currently only for epoll */ #define POLLFREE (__force __poll_t)0x4000 /* currently only for epoll */
#define POLL_BUSY_LOOP (__force __poll_t)0x8000 #define POLL_BUSY_LOOP (__force __poll_t)0x8000
#ifdef __KERNEL__
#ifndef __ARCH_HAS_MANGLED_POLL
static inline __u16 mangle_poll(__poll_t val)
{
return (__force __u16)val;
}
static inline __poll_t demangle_poll(__u16 v)
{
return (__force __poll_t)v;
}
#endif
#endif
struct pollfd { struct pollfd {
int fd; int fd;
short events; short events;