Commit 168fe32a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'misc.poll' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull poll annotations from Al Viro:
 "This introduces a __bitwise type for POLL### bitmap, and propagates
  the annotations through the tree. Most of that stuff is as simple as
  'make ->poll() instances return __poll_t and do the same to local
  variables used to hold the future return value'.

  Some of the obvious brainos found in process are fixed (e.g. POLLIN
  misspelled as POLL_IN). At that point the amount of sparse warnings is
  low and most of them are for genuine bugs - e.g. ->poll() instance
  deciding to return -EINVAL instead of a bitmap. I hadn't touched those
  in this series - it's large enough as it is.

  Another problem it has caught was eventpoll() ABI mess; select.c and
  eventpoll.c assumed that corresponding POLL### and EPOLL### were
  equal. That's true for some, but not all of them - EPOLL### are
  arch-independent, but POLL### are not.

  The last commit in this series separates userland POLL### values from
  the (now arch-independent) kernel-side ones, converting between them
  in the few places where they are copied to/from userland. AFAICS, this
  is the least disruptive fix preserving poll(2) ABI and making epoll()
  work on all architectures.

  As it is, it's simply broken on sparc - try to give it EPOLLWRNORM and
  it will trigger only on what would've triggered EPOLLWRBAND on other
  architectures. EPOLLWRBAND and EPOLLRDHUP, OTOH, are never triggered
  at all on sparc. With this patch they should work consistently on all
  architectures"

* 'misc.poll' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (37 commits)
  make kernel-side POLL... arch-independent
  eventpoll: no need to mask the result of epi_item_poll() again
  eventpoll: constify struct epoll_event pointers
  debugging printk in sg_poll() uses %x to print POLL... bitmap
  annotate poll(2) guts
  9p: untangle ->poll() mess
  ->si_band gets POLL... bitmap stored into a user-visible long field
  ring_buffer_poll_wait() return value used as return value of ->poll()
  the rest of drivers/*: annotate ->poll() instances
  media: annotate ->poll() instances
  fs: annotate ->poll() instances
  ipc, kernel, mm: annotate ->poll() instances
  net: annotate ->poll() instances
  apparmor: annotate ->poll() instances
  tomoyo: annotate ->poll() instances
  sound: annotate ->poll() instances
  acpi: annotate ->poll() instances
  crypto: annotate ->poll() instances
  block: annotate ->poll() instances
  x86: annotate ->poll() instances
  ...
parents 13ddd166 c71d227f

arch/alpha/include/uapi/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ 
include include/uapi/asm-generic/Kbuild.asm



generic-y += bpf_perf_event.h

generic-y += poll.h

arch/alpha/include/uapi/asm/poll.h

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#include <asm-generic/poll.h>

arch/blackfin/include/uapi/asm/poll.h

+19 −2
Original line number Diff line number Diff line
@@ -9,8 +9,25 @@ 
#ifndef _UAPI__BFIN_POLL_H

#define _UAPI__BFIN_POLL_H



#define POLLWRNORM	4 /* POLLOUT */

#define POLLWRBAND	256

#ifndef __KERNEL__

#define POLLWRNORM	POLLOUT

#define POLLWRBAND	(__force __poll_t)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>

arch/cris/arch-v10/drivers/gpio.c

+3 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static ssize_t gpio_write(struct file *file, const char __user *buf, 
	size_t count, loff_t *off);

static int gpio_open(struct inode *inode, struct file *filp);

static int gpio_release(struct inode *inode, struct file *filp);

static unsigned int gpio_poll(struct file *filp, struct poll_table_struct *wait);

static __poll_t gpio_poll(struct file *filp, struct poll_table_struct *wait);



/* private data per open() of this driver */
@@ -141,9 +141,9 @@ static unsigned long dir_g_shadow; /* 1=output */ 
#define USE_PORTS(priv) ((priv)->minor <= GPIO_MINOR_B)





static unsigned int gpio_poll(struct file *file, poll_table *wait)

static __poll_t gpio_poll(struct file *file, poll_table *wait)

{

	unsigned int mask = 0;

	__poll_t mask = 0;

	struct gpio_private *priv = file->private_data;

	unsigned long data;

	unsigned long flags;

arch/cris/arch-v10/drivers/sync_serial.c

+4 −4
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static inline int sync_data_avail(struct sync_port *port); 


static int sync_serial_open(struct inode *inode, struct file *file);

static int sync_serial_release(struct inode *inode, struct file *file);

static unsigned int sync_serial_poll(struct file *filp, poll_table *wait);

static __poll_t sync_serial_poll(struct file *filp, poll_table *wait);



static long sync_serial_ioctl(struct file *file,

	unsigned int cmd, unsigned long arg);
@@ -654,12 +654,12 @@ static int sync_serial_release(struct inode *inode, struct file *file) 






static unsigned int sync_serial_poll(struct file *file, poll_table *wait)

static __poll_t sync_serial_poll(struct file *file, poll_table *wait)

{

	int dev = MINOR(file_inode(file)->i_rdev);

	unsigned int mask = 0;

	__poll_t mask = 0;

	struct sync_port *port;

	DEBUGPOLL(static unsigned int prev_mask = 0);

	DEBUGPOLL(static __poll_t prev_mask = 0);



	port = &ports[dev];

	poll_wait(file, &port->out_wait_q, wait);

CRA Git | Maintained and supported by SUSTech CRA and CCSE