David S. Miller
e8ed77dfa9
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next ...
Pablo Neira Ayuso says:
====================
Netfilter updates for net-next
The following large patchset contains Netfilter updates for your
net-next tree. My initial intention was to send you this in two goes but
when I looked back twice I already had this burden on top of me.
Several updates for IPVS from Marco Angaroni:
1) Allow SIP connections originating from real-servers to be load
balanced by the SIP persistence engine as is already implemented
in the other direction.
2) Release connections immediately for One-packet-scheduling (OPS)
in IPVS, instead of making it via timer and rcu callback.
3) Skip deleting conntracks for each one packet in OPS, and don't call
nf_conntrack_alter_reply() since no reply is expected.
4) Enable drop on exhaustion for OPS + SIP persistence.
Miscelaneous conntrack updates from Florian Westphal, including fix for
hash resize:
5) Move conntrack generation counter out of conntrack pernet structure
since this is only used by the init_ns to allow hash resizing.
6) Use get_random_once() from packet path to collect hash random seed
instead of our compound.
7) Don't disable BH from ____nf_conntrack_find() for statistics,
use NF_CT_STAT_INC_ATOMIC() instead.
8) Fix lookup race during conntrack hash resizing.
9) Introduce clash resolution on conntrack insertion for connectionless
protocol.
Then, Florian's netns rework to get rid of per-netns conntrack table,
thus we use one single table for them all. There was consensus on this
change during the NFWS 2015 and, on top of that, it has recently been
pointed as a source of multiple problems from unpriviledged netns:
11) Use a single conntrack hashtable for all namespaces. Include netns
in object comparisons and make it part of the hash calculation.
Adapt early_drop() to consider netns.
12) Use single expectation and NAT hashtable for all namespaces.
13) Use a single slab cache for all namespaces for conntrack objects.
14) Skip full table scanning from nf_ct_iterate_cleanup() if the pernet
conntrack counter tells us the table is empty (ie. equals zero).
Fixes for nf_tables interval set element handling, support to set
conntrack connlabels and allow set names up to 32 bytes.
15) Parse element flags from element deletion path and pass it up to the
backend set implementation.
16) Allow adjacent intervals in the rbtree set type for dynamic interval
updates.
17) Add support to set connlabel from nf_tables, from Florian Westphal.
18) Allow set names up to 32 bytes in nf_tables.
Several x_tables fixes and updates:
19) Fix incorrect use of IS_ERR_VALUE() in x_tables, original patch
from Andrzej Hajda.
And finally, miscelaneous netfilter updates such as:
20) Disable automatic helper assignment by default. Note this proc knob
was introduced by a900689264
2016-05-09 15:02:58 -04:00
android: uapi: binder.h
2014-10-20 10:30:15 +08:00
include/uapi/linux/byteorder, swab: force inlining of some byteswap operations
2016-03-17 15:09:34 -07:00
can: avoid using timeval for uapi
2015-10-13 17:42:34 +02:00
[media] include/uapi/linux/dvb/video.h: remove stdint.h include
2015-11-19 08:18:38 -02:00
GenWQE: Update author information
2014-09-23 23:15:46 -07:00
HSI: cmt_speech: fix timestamp interface
2015-06-23 02:40:03 +02:00
iio: ph: add IIO_PH channel type
2016-01-30 16:27:17 +00:00
mmc: block: Add new ioctl to send multi commands
2015-10-26 16:00:00 +01:00
netfilter: nf_tables: allow set names up to 32 bytes
2016-05-05 16:39:51 +02:00
netfilter: fix include files for compilation
2015-11-23 17:54:38 +01:00
netfilter: fix include files for compilation
2015-11-23 17:54:38 +01:00
netfilter: fix include files for compilation
2015-11-23 17:54:38 +01:00
netfilter: fix include files for compilation
2015-11-23 17:54:38 +01:00
nfsd: eliminate NFSD_DEBUG
2015-04-21 16:16:02 -04:00
drivers: md: use ktime_get_real_seconds()
2016-01-06 11:39:53 +11:00
sched: align nlattr properly when needed
2016-04-26 12:00:49 -04:00
usb: ch9: Fix SSP Device Cap wFunctionalitySupport type
2016-03-29 13:26:04 +03:00
include/uapi/linux/agpgart.h: include stdlib.h in userspace
2015-12-10 12:33:23 +01:00
[media] am437x: include linux/videodev2.h for expanding BASE_VIDIOC_PRIVATE
2015-04-02 18:10:35 -03:00
atm: remove 'struct zatm_t_hist'
2015-10-05 03:16:46 -07:00
audit: stop an old auditd being starved out by a new auditd
2016-01-25 18:04:15 -05:00
autofs4: fix some white space errors
2016-03-15 16:55:16 -07:00
autofs4: fix some white space errors
2016-03-15 16:55:16 -07:00
mtd: provide proper 32/64-bit compat_ioctl() support for BLKPG
2015-09-29 13:37:04 -07:00
bpf: direct packet access
2016-05-06 16:01:53 -04:00
net: filter: move common defines into bpf_common.h
2014-10-14 16:06:45 -04:00
block SG_IO: add SG_FLAG_Q_AT_HEAD flag
2014-07-01 10:48:05 -06:00
btrfs: extend balance filter usage to take minimum and maximum
2015-10-26 19:38:30 -07:00
can.h: make padding given by gcc explicit
2015-05-06 08:03:19 +02:00
crypto: user - Add CRYPTO_MSG_DELRNG
2015-06-22 15:49:27 +08:00
dcb : Fix incorrect documentation for struct dcb_app
2015-06-23 07:00:41 -07:00
devlink: implement shared buffer occupancy monitoring interface
2016-04-14 16:22:03 -04:00
dlm: fix lvb copy for user locks
2015-08-25 14:41:50 -05:00
dlm: adopt orphan locks
2014-11-19 14:48:02 -06:00
dm: add support for passing through persistent reservations
2015-10-31 19:05:59 -04:00
dma-buf: Add ioctls to allow userspace to flush
2016-02-12 16:01:32 +01:00
quota: add new quotactl Q_XGETNEXTQUOTA
2016-02-08 11:21:50 +11:00
include/uapi/linux/elf-em.h: remove v850
2016-03-17 15:09:34 -07:00
arm64: ptrace: add NT_ARM_SYSTEM_CALL regset
2014-11-28 10:19:49 +00:00
net-timestamp: ACK timestamp for bytestreams
2014-08-05 16:35:54 -07:00
ethtool: minor doc update
2016-03-22 15:45:44 -04:00
epoll: add EPOLLEXCLUSIVE flag
2016-01-20 17:09:18 -08:00
fs: Add support FALLOC_FL_INSERT_RANGE for fallocate
2015-03-25 15:07:05 +11:00
shm: add sealing API
2014-08-08 15:57:31 -07:00
libnl: nla_put_be64(): align on a 64-bit area
2016-04-23 20:13:24 -04:00
bpf: fix bpf helpers to use skb->mac_header relative offsets
2015-04-16 14:08:49 -04:00
fou: implement FOU_CMD_GET
2015-04-12 21:25:13 -04:00
Merge tag 'for-f2fs-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs
2016-03-21 11:03:02 -07:00
fuse: add support for SEEK_HOLE and SEEK_DATA in lseek
2015-11-10 10:32:37 +01:00
sched: align nlattr properly when needed
2016-04-26 12:00:49 -04:00
openvswitch: allow management from inside user namespaces
2016-02-11 09:53:19 -05:00
gfs2: change gfs2 readdir cookie
2015-12-14 12:19:37 -06:00
gpio: uapi: use 0xB4 as ioctl() major
2016-03-10 16:02:52 +07:00
tty: linux/gsmmux.h needs linux/types.h
2015-07-23 17:48:43 -07:00
keys, trusted: select hash algorithm for TPM2 chips
2015-12-20 15:27:12 +02:00
tools: hv: report ENOSPC errors in hv_fcopy_daemon
2015-12-14 19:12:21 -08:00
i2c-dev: Fix typo in ioctl name reference
2015-10-23 23:26:43 +02:00
i2c: add FUNC flag for slave capabilities
2015-06-01 08:07:08 +09:00
i8k: uapi: Introduce define for new highest fan speed
2014-07-09 16:41:36 -07:00
net: fix a comment typo
2016-03-18 19:40:27 -04:00
ipv6: introduce IFA_F_STABLE_PRIVACY flag
2015-03-23 22:12:09 -04:00
crypto: af_alg - add user space interface for AEAD
2014-12-05 23:56:55 +08:00
arcnet: fix indentation of if_arcnet.h
2015-09-23 08:44:22 +02:00
bridge: netlink: export per-vlan stats
2016-05-02 22:27:06 -04:00
net/hsr: Added support for HSR v1
2016-04-15 17:06:48 -04:00
bridge: netlink: export per-vlan stats
2016-05-02 22:27:06 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-04-27 15:43:10 -04:00
packet: add extended BPF fanout mode
2015-08-17 14:22:48 -07:00
macvtap/tun: cross-endian support for little-endian hosts
2015-06-01 15:48:56 +02:00
ip_gre: Add support to collect tunnel metadata.
2015-08-10 14:03:54 -07:00
ila: add checksum neutral ILA translations
2016-04-26 01:27:07 -04:00
api: fix compatibility of linux/in.h with netinet/in.h
2015-06-29 18:56:21 -07:00
ipv6: add IPV6_HDRINCL option for raw sockets
2015-12-17 15:12:28 -05:00
sock_diag: align nlattr properly when needed
2016-04-26 12:00:48 -04:00
Input: add input-event-codes header file
2015-10-16 15:32:05 -07:00
Input: synaptics-rmi4 - add support for Synaptics RMI4 devices
2016-03-10 16:02:39 -08:00
ipv4: add option to drop gratuitous ARP packets
2016-02-11 04:27:35 -05:00
netfilter/ipvs: use nla_put_u64_64bit()
2016-04-25 15:09:11 -04:00
Revert "ipv6: Revert optional address flusing on ifdown."
2016-04-26 11:47:41 -04:00
ipv6: Create percpu rt6_info
2015-05-25 13:25:35 -04:00
devlink: add missing install of header
2016-04-11 21:33:44 -04:00
kcm: Kernel Connection Multiplexor module
2016-03-09 16:36:14 -05:00
kcmp: Move kcmp.h into uapi
2014-12-02 13:52:53 -07:00
kernel: add kcov code coverage
2016-03-22 15:36:02 -07:00
proc: export idle flag via kpageflags
2015-09-10 13:29:01 -07:00
uapi: define DIV_ROUND_UP for userland
2016-03-04 16:10:36 -05:00
kexec: Fix make headers_check
2015-02-17 14:34:51 -08:00
drm/amdkfd: add H/W debugger IOCTL set definitions
2015-06-03 11:32:07 +03:00
KVM/ARM updates for 4.6
2016-03-09 11:50:42 +01:00
l2tp: use nla_put_u64_64bit()
2016-04-25 15:09:10 -04:00
api: fix compatibility of linux/in.h with netinet/in.h
2015-06-29 18:56:21 -07:00
lightnvm: introduce factory reset
2016-01-12 08:21:18 -07:00
[media] bz#75751: Move internal header file lirc.h to uapi/
2015-11-17 06:47:43 -02:00
block: loop: introduce ioctl command of LOOP_SET_DIRECT_IO
2015-09-23 11:01:16 -06:00
libnl: nla_put_be64(): align on a 64-bit area
2016-04-23 20:13:24 -04:00
Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs
2016-01-21 12:20:46 -08:00
Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus
2015-04-21 09:44:55 -03:00
Merge commit ' 840f5b0572' into v4l_for_linus
2016-03-15 07:48:28 -03:00
mei: add async event notification ioctls
2015-08-03 17:30:00 -07:00
sys_membarrier(): system-wide memory barrier (generic, x86)
2015-09-11 15:21:34 -07:00
shm: add memfd_create() syscall
2014-08-08 15:57:31 -07:00
mm: convert p[te|md]_numa users to p[te|md]_protnone_numa
2015-02-12 18:54:08 -08:00
misc: mic: Update MIC host daemon with COSM changes
2015-10-04 12:54:54 +01:00
mpls: Use definition for reserved label checks
2015-08-03 22:35:00 -07:00
mpls: ip tunnel support
2015-07-21 10:39:05 -07:00
net: ipmr: fix code and comment style
2015-11-23 15:06:38 -05:00
uapi: define DIV_ROUND_UP for userland
2016-03-04 16:10:36 -05:00
msdos_fs.h: fix 'fields' in comment
2015-01-20 13:51:06 +01:00
ipc/msg: increase MSGMNI, remove scaling
2014-12-13 12:42:52 -08:00
nbd: stop using req->cmd
2015-05-05 13:40:44 -06:00
nfit, libnvdimm: clear poison command support
2016-03-05 18:06:14 -08:00
libnl: nla_put_msecs(): align on a 64-bit area
2016-04-23 20:13:24 -04:00
netns: add rtnl cmd to add and get peer netns ids
2015-01-19 14:21:18 -05:00
sock: accept SO_TIMESTAMPING flags in socket cmsg
2016-04-04 15:50:30 -04:00
netconf: add macro to represent all attributes
2016-03-13 21:54:44 -04:00
net: add name_assign_type netdev attribute
2014-07-15 16:12:01 -07:00
netfilter: don't pull include/linux/netfilter.h from netns headers
2015-06-18 21:14:31 +02:00
netfilter: fix include files for compilation
2015-11-23 17:54:38 +01:00
netlink: remove mmapped netlink support
2016-02-18 11:42:18 -05:00
netlink: remove mmapped netlink support
2016-02-18 11:42:18 -05:00
NFC: netlink: Add missing NFC_ATTR comments
2015-10-27 03:55:10 +01:00
nfs: use btrfs ioctl defintions for clone
2015-11-23 21:53:08 -05:00
NFS: Update NFS4_BITMAP_SIZE
2015-08-27 19:44:53 -04:00
NFS: Move nfs_idmap.h into fs/nfs/
2015-04-23 15:16:14 -04:00
nfsd: Add macro NFS_ACL_MASK for ACL
2015-07-20 14:58:46 -04:00
wireless: use nla_put_u64_64bit()
2016-04-25 15:09:11 -04:00
nvme: move hardware structures out of the uapi version of nvme.h
2015-10-09 10:40:37 -06:00
ovs: align nlattr properly when needed
2016-04-26 12:00:48 -04:00
PCI: Make Enhanced Allocation bitmasks more obvious
2015-10-29 17:35:40 -05:00
perf/x86: Add option to disable reading branch flags/cycles
2015-11-23 09:58:25 +01:00
sched: align nlattr properly when needed
2016-04-26 12:00:49 -04:00
fq_codel: add memory limitation per queue
2016-05-08 23:49:38 -04:00
block: add an API for Persistent Reservations
2015-10-21 14:46:56 -06:00
capabilities: ambient capabilities
2015-09-04 16:54:41 -07:00
drivers: firmware: psci: add system suspend support
2015-10-02 14:35:17 +01:00
ptp: Add PTP_SYS_OFFSET_PRECISE for driver crosstimestamping
2016-03-03 14:23:43 -08:00
seccomp, ptrace: add support for dumping seccomp filters
2015-10-27 19:55:13 -07:00
net: Add Qualcomm IPC router
2016-05-08 23:46:14 -04:00
fs/quota: use nla_put_u64_64bit()
2016-04-26 12:00:48 -04:00
random: introduce getrandom(2) system call
2014-08-05 16:41:22 -04:00
net/rds: Declare SO_RDS_TRANSPORT and RDS_TRANS_* constants in uapi/linux/rds.h
2015-05-31 21:47:23 -07:00
rfkill: Update userspace API documentation
2016-02-24 09:04:25 +01:00
sched: align nlattr properly when needed
2016-04-26 12:00:49 -04:00
sched: new clone flag CLONE_NEWCGROUP for cgroup namespace
2016-02-16 13:04:58 -05:00
misc: mic: SCIF RMA header file and IOCTL changes
2015-10-04 12:54:54 +01:00
efifb: Add support for 64-bit frame buffer addresses
2015-10-12 14:20:06 +01:00
net: sctp: implement rfc6458, 8.1.31. SCTP_DEFAULT_SNDINFO support
2014-07-16 14:40:04 -07:00
seccomp: implement SECCOMP_FILTER_FLAG_TSYNC
2014-07-18 12:13:40 -07:00
capabilities: add a securebit to disable PR_CAP_AMBIENT_RAISE
2015-09-04 16:54:41 -07:00
ipc/sem.c: increase SEMMSL, SEMMNI, SEMOPM
2014-12-13 12:42:52 -08:00
serial: support 16-bit register interface for console
2015-12-13 19:59:48 -08:00
serial: mvebu-uart: initial support for Armada-3700 serial port
2016-03-07 16:11:14 -08:00
ARM: OMAP1: Move UART defines to prepare for sparse IRQ
2015-05-20 09:01:20 -07:00
Input: add eGalaxTouch serial touchscreen driver
2015-12-16 11:31:33 -08:00
ipc,shm: document new limits in the uapi header
2014-06-06 16:08:14 -07:00
[media] smiapp: Add driver-specific test pattern menu item definitions
2014-08-21 15:25:11 -05:00
net: track success and failure of TCP PMTU probing
2015-07-21 22:36:33 -07:00
sock_diag: add SK_MEMINFO_DROPS
2016-04-04 22:11:20 -04:00
include/uapi/linux/sockios.h: mark SIOCRTMSG unused
2016-01-05 16:44:06 -05:00
uapi/linux/stddef.h: Provide __always_inline to userspace headers
2016-03-30 12:50:17 +02:00
stm class: Introduce an abstraction for System Trace Module devices
2015-10-04 20:28:58 +01:00
include/uapi/linux/byteorder, swab: force inlining of some byteswap operations
2016-03-17 15:09:34 -07:00
kernel: add panic_on_warn
2014-12-10 17:41:10 -08:00
target/user: Report capability of handling out-of-order completions to userspace
2016-03-10 21:49:09 -08:00
tcp: Add RFC4898 tcpEStatsPerfDataSegsOut/In
2016-03-14 14:55:26 -04:00
libnl: nla_put_msecs(): align on a 64-bit area
2016-04-23 20:13:24 -04:00
thermal: provide an UAPI header file
2014-12-09 14:10:41 +08:00
tipc: convert legacy nl link stat to nl compat
2015-02-09 13:20:47 -08:00
tipc: add ip/udp media type
2015-03-05 22:08:42 -05:00
toshiba_acpi: Add /dev/toshiba_acpi device
2015-07-24 14:15:10 -07:00
NFC: nci: add generic uart support
2015-06-11 23:37:37 +02:00
tty: fix comment of ASYNCB_SPD_HI
2015-05-24 12:49:16 -07:00
HID: uhid: report to user-space whether reports are numbered
2014-08-25 03:28:08 -05:00
Input: uinput - rework ABS validation
2015-12-18 17:48:51 -08:00
usb: devio: Add ioctl to disallow detaching kernel USB drivers.
2016-03-05 12:05:01 -08:00
usbip: move usbip kernel code out of staging
2014-08-25 10:40:06 -07:00
userfaultfd: remove kernel header include from uapi header
2015-10-01 21:42:35 -04:00
Input: add userio module
2015-10-27 18:55:31 -07:00
[media] media: v4l: Dual license v4l2-common.h under GPL v2 and BSD licenses
2016-02-01 08:47:05 -02:00
[media] v4l: add V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME
2016-02-19 08:10:35 -02:00
[media] v4l2-dv-timings.h: fix polarity for 4k formats
2016-04-25 10:19:56 -03:00
[media] videodev2.h: add support for transfer functions
2015-06-05 11:45:45 -03:00
[media] v4l2-subdev.h: add 'which' field for the enum structs
2015-03-23 11:44:35 -07:00
vfio/pci: Intel IGD host and LCP bridge config space access
2016-02-22 16:10:09 -07:00
vhost_net: basic polling support
2016-03-11 02:18:53 +02:00
[media] UVC: Add support for R200 depth camera
2016-03-03 06:49:20 -03:00
virtio_balloon: export 'available' memory to balloon statistics
2016-03-17 15:09:34 -07:00
virtio_blk: VIRTIO_BLK_F_WCE->VIRTIO_BLK_F_FLUSH
2016-03-02 17:01:59 +02:00
virtio: add VIRTIO_CONFIG_S_NEEDS_RESET device status bit
2016-04-07 15:16:41 +03:00
virtio_console: virtio 1.0 support
2014-12-09 12:06:32 +02:00
include/uapi/linux/virtio_gpu.h: use __u8 from <linux/types.h>
2015-12-10 12:33:23 +01:00
Revert "Merge branch 'vsock-virtio'"
2015-12-08 21:55:49 -05:00
Add virtio-input driver.
2015-03-29 12:13:52 +10:30
virtio_net: document VIRTIO_NET_CTRL_GUEST_OFFLOADS
2015-07-01 10:11:17 +02:00
virtio: define virtio_pci_cfg_cap in header.
2015-07-07 14:27:05 +03:00
virtio: Fix typecast of pointer in vring_init()
2015-07-07 14:27:04 +03:00
uapi/virtio_scsi: allow overriding CDB/SENSE size
2015-03-13 15:55:43 +10:30
virtio: memory access APIs
2014-12-09 12:05:24 +02:00
[media] media: uapi: vsp1: Use __u32 instead of u32
2015-07-06 08:25:50 -03:00
vt: Remove vt_get_kmsg_redirect() from uapi header
2014-11-05 20:18:30 -08:00
wil6210: atomic I/O for the card memory
2014-10-02 14:23:14 -04:00
xattr: fix check for simultaneous glibc header inclusion
2014-08-29 16:28:16 -07:00
xfrm: align nlattr properly when needed
2016-04-23 20:13:25 -04:00
[media] v4l: xilinx: Add Test Pattern Generator driver
2015-04-03 01:04:18 -03:00
e8ed77dfa9