From: "Kirill A. Shutemov" <kirill(a)shutemov.name>
Subject: mm/shmem.c: thp, shmem: fix conflict of above-47bit hint address and PMD alignment
Shmem/tmpfs tries to provide THP-friendly mappings if huge pages are
enabled. But it doesn't work well with above-47bit hint address.
Normally, the kernel doesn't create userspace mappings above 47-bit, even
if the machine allows this (such as with 5-level paging on x86-64). Not
all user space is ready to handle wide addresses. It's known that at
least some JIT compilers use higher bits in pointers to encode their
information.
Userspace can ask for allocation from full address space by specifying
hint address (with or without MAP_FIXED) above 47-bits. If the
application doesn't need a particular address, but wants to allocate from
whole address space it can specify -1 as a hint address.
Unfortunately, this trick breaks THP alignment in shmem/tmp:
shmem_get_unmapped_area() would not try to allocate PMD-aligned area if
*any* hint address specified.
This can be fixed by requesting the aligned area if the we failed to
allocated at user-specified hint address. The request with inflated
length will also take the user-specified hint address. This way we will
not lose an allocation request from the full address space.
[kirill(a)shutemov.name: fold in a fixup]
Link: http://lkml.kernel.org/r/20191223231309.t6bh5hkbmokihpfu@box
Link: http://lkml.kernel.org/r/20191220142548.7118-3-kirill.shutemov@linux.intel.…
Fixes: b569bab78d8d ("x86/mm: Prepare to expose larger address space to userspace")
Signed-off-by: Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com>
Cc: "Willhalm, Thomas" <thomas.willhalm(a)intel.com>
Cc: Dan Williams <dan.j.williams(a)intel.com>
Cc: "Bruggeman, Otto G" <otto.g.bruggeman(a)intel.com>
Cc: "Aneesh Kumar K . V" <aneesh.kumar(a)linux.vnet.ibm.com>
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
---
mm/shmem.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
--- a/mm/shmem.c~thp-shmem-fix-conflict-of-above-47bit-hint-address-and-pmd-alignment
+++ a/mm/shmem.c
@@ -2107,9 +2107,10 @@ unsigned long shmem_get_unmapped_area(st
/*
* Our priority is to support MAP_SHARED mapped hugely;
* and support MAP_PRIVATE mapped hugely too, until it is COWed.
- * But if caller specified an address hint, respect that as before.
+ * But if caller specified an address hint and we allocated area there
+ * successfully, respect that as before.
*/
- if (uaddr)
+ if (uaddr == addr)
return addr;
if (shmem_huge != SHMEM_HUGE_FORCE) {
@@ -2143,7 +2144,7 @@ unsigned long shmem_get_unmapped_area(st
if (inflated_len < len)
return addr;
- inflated_addr = get_area(NULL, 0, inflated_len, 0, flags);
+ inflated_addr = get_area(NULL, uaddr, inflated_len, 0, flags);
if (IS_ERR_VALUE(inflated_addr))
return addr;
if (inflated_addr & ~PAGE_MASK)
_
From: "Kirill A. Shutemov" <kirill(a)shutemov.name>
Subject: mm/huge_memory.c: thp: fix conflict of above-47bit hint address and PMD alignment
Patch series "Fix two above-47bit hint address vs. THP bugs".
The two get_unmapped_area() implementations have to be fixed to provide
THP-friendly mappings if above-47bit hint address is specified.
This patch (of 2):
Filesystems use thp_get_unmapped_area() to provide THP-friendly mappings.
For DAX in particular.
Normally, the kernel doesn't create userspace mappings above 47-bit, even
if the machine allows this (such as with 5-level paging on x86-64). Not
all user space is ready to handle wide addresses. It's known that at
least some JIT compilers use higher bits in pointers to encode their
information.
Userspace can ask for allocation from full address space by specifying
hint address (with or without MAP_FIXED) above 47-bits. If the
application doesn't need a particular address, but wants to allocate from
whole address space it can specify -1 as a hint address.
Unfortunately, this trick breaks thp_get_unmapped_area(): the function
would not try to allocate PMD-aligned area if *any* hint address
specified.
Modify the routine to handle it correctly:
- Try to allocate the space at the specified hint address with length
padding required for PMD alignment.
- If failed, retry without length padding (but with the same hint
address);
- If the returned address matches the hint address return it.
- Otherwise, align the address as required for THP and return.
The user specified hint address is passed down to get_unmapped_area() so
above-47bit hint address will be taken into account without breaking
alignment requirements.
Link: http://lkml.kernel.org/r/20191220142548.7118-2-kirill.shutemov@linux.intel.…
Fixes: b569bab78d8d ("x86/mm: Prepare to expose larger address space to userspace")
Signed-off-by: Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com>
Reported-by: Thomas Willhalm <thomas.willhalm(a)intel.com>
Tested-by: Dan Williams <dan.j.williams(a)intel.com>
Cc: "Aneesh Kumar K . V" <aneesh.kumar(a)linux.vnet.ibm.com>
Cc: "Bruggeman, Otto G" <otto.g.bruggeman(a)intel.com>
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
---
mm/huge_memory.c | 38 ++++++++++++++++++++++++--------------
1 file changed, 24 insertions(+), 14 deletions(-)
--- a/mm/huge_memory.c~thp-fix-conflict-of-above-47bit-hint-address-and-pmd-alignment
+++ a/mm/huge_memory.c
@@ -527,13 +527,13 @@ void prep_transhuge_page(struct page *pa
set_compound_page_dtor(page, TRANSHUGE_PAGE_DTOR);
}
-static unsigned long __thp_get_unmapped_area(struct file *filp, unsigned long len,
+static unsigned long __thp_get_unmapped_area(struct file *filp,
+ unsigned long addr, unsigned long len,
loff_t off, unsigned long flags, unsigned long size)
{
- unsigned long addr;
loff_t off_end = off + len;
loff_t off_align = round_up(off, size);
- unsigned long len_pad;
+ unsigned long len_pad, ret;
if (off_end <= off_align || (off_end - off_align) < size)
return 0;
@@ -542,30 +542,40 @@ static unsigned long __thp_get_unmapped_
if (len_pad < len || (off + len_pad) < off)
return 0;
- addr = current->mm->get_unmapped_area(filp, 0, len_pad,
+ ret = current->mm->get_unmapped_area(filp, addr, len_pad,
off >> PAGE_SHIFT, flags);
- if (IS_ERR_VALUE(addr))
+
+ /*
+ * The failure might be due to length padding. The caller will retry
+ * without the padding.
+ */
+ if (IS_ERR_VALUE(ret))
return 0;
- addr += (off - addr) & (size - 1);
- return addr;
+ /*
+ * Do not try to align to THP boundary if allocation at the address
+ * hint succeeds.
+ */
+ if (ret == addr)
+ return addr;
+
+ ret += (off - ret) & (size - 1);
+ return ret;
}
unsigned long thp_get_unmapped_area(struct file *filp, unsigned long addr,
unsigned long len, unsigned long pgoff, unsigned long flags)
{
+ unsigned long ret;
loff_t off = (loff_t)pgoff << PAGE_SHIFT;
- if (addr)
- goto out;
if (!IS_DAX(filp->f_mapping->host) || !IS_ENABLED(CONFIG_FS_DAX_PMD))
goto out;
- addr = __thp_get_unmapped_area(filp, len, off, flags, PMD_SIZE);
- if (addr)
- return addr;
-
- out:
+ ret = __thp_get_unmapped_area(filp, addr, len, off, flags, PMD_SIZE);
+ if (ret)
+ return ret;
+out:
return current->mm->get_unmapped_area(filp, addr, len, pgoff, flags);
}
EXPORT_SYMBOL_GPL(thp_get_unmapped_area);
_
The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 103309977589fe6be0f4314de4925737cdfc146f Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris(a)chris-wilson.co.uk>
Date: Sun, 29 Dec 2019 18:31:50 +0000
Subject: [PATCH] drm/i915/gt: Do not restore invalid RS state
Only restore valid resource streamer state from the context image, i.e.
avoid restoring if we know the image is invalid.
Closes: https://gitlab.freedesktop.org/drm/intel/issues/446
Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld(a)intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191229183153.3719869-4-chri…
Cc: stable(a)vger.kernel.org
(cherry picked from commit ecfcd2da335816516dc27434a65899a77886d80a)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen(a)linux.intel.com>
diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
index a47d5a7c32c9..93026217c121 100644
--- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
@@ -1413,14 +1413,6 @@ static inline int mi_set_context(struct i915_request *rq, u32 flags)
int len;
u32 *cs;
- flags |= MI_MM_SPACE_GTT;
- if (IS_HASWELL(i915))
- /* These flags are for resource streamer on HSW+ */
- flags |= HSW_MI_RS_SAVE_STATE_EN | HSW_MI_RS_RESTORE_STATE_EN;
- else
- /* We need to save the extended state for powersaving modes */
- flags |= MI_SAVE_EXT_STATE_EN | MI_RESTORE_EXT_STATE_EN;
-
len = 4;
if (IS_GEN(i915, 7))
len += 2 + (num_engines ? 4 * num_engines + 6 : 0);
@@ -1589,22 +1581,21 @@ static int switch_context(struct i915_request *rq)
}
if (ce->state) {
- u32 hw_flags;
+ u32 flags;
GEM_BUG_ON(rq->engine->id != RCS0);
- /*
- * The kernel context(s) is treated as pure scratch and is not
- * expected to retain any state (as we sacrifice it during
- * suspend and on resume it may be corrupted). This is ok,
- * as nothing actually executes using the kernel context; it
- * is purely used for flushing user contexts.
- */
- hw_flags = 0;
- if (i915_gem_context_is_kernel(rq->gem_context))
- hw_flags = MI_RESTORE_INHIBIT;
+ /* For resource streamer on HSW+ and power context elsewhere */
+ BUILD_BUG_ON(HSW_MI_RS_SAVE_STATE_EN != MI_SAVE_EXT_STATE_EN);
+ BUILD_BUG_ON(HSW_MI_RS_RESTORE_STATE_EN != MI_RESTORE_EXT_STATE_EN);
+
+ flags = MI_SAVE_EXT_STATE_EN | MI_MM_SPACE_GTT;
+ if (!i915_gem_context_is_kernel(rq->gem_context))
+ flags |= MI_RESTORE_EXT_STATE_EN;
+ else
+ flags |= MI_RESTORE_INHIBIT;
- ret = mi_set_context(rq, hw_flags);
+ ret = mi_set_context(rq, flags);
if (ret)
return ret;
}
Hi Greg, hi Sasha
As per https://bugzilla.kernel.org/show_bug.cgi?id=194569 applying the
commit 0b9aefea8600 ("tcp: minimize false-positives on TCP/GRO check")
would reduce the false-positives. dcb17d22e1c2 was introduced in v4.9.
Thoughs? Can you consider applying it for 4.9.y?
Regards,
Salvatore
The driver was issuing synchronous uninterruptible control requests
without using a timeout. This could lead to the driver hanging on probe
due to a malfunctioning (or malicious) device until the device is
physically disconnected. While sleeping in probe the driver prevents
other devices connected to the same hub from being added to (or removed
from) the bus.
The USB upper limit of five seconds per request should be more than
enough.
Fixes: 99f83c9c9ac9 ("[PATCH] USB: add driver for Keyspan Digital Remote")
Cc: stable <stable(a)vger.kernel.org> # 2.6.13
Signed-off-by: Johan Hovold <johan(a)kernel.org>
---
drivers/input/misc/keyspan_remote.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/input/misc/keyspan_remote.c b/drivers/input/misc/keyspan_remote.c
index 83368f1e7c4e..4650f4a94989 100644
--- a/drivers/input/misc/keyspan_remote.c
+++ b/drivers/input/misc/keyspan_remote.c
@@ -336,7 +336,8 @@ static int keyspan_setup(struct usb_device* dev)
int retval = 0;
retval = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
- 0x11, 0x40, 0x5601, 0x0, NULL, 0, 0);
+ 0x11, 0x40, 0x5601, 0x0, NULL, 0,
+ USB_CTRL_SET_TIMEOUT);
if (retval) {
dev_dbg(&dev->dev, "%s - failed to set bit rate due to error: %d\n",
__func__, retval);
@@ -344,7 +345,8 @@ static int keyspan_setup(struct usb_device* dev)
}
retval = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
- 0x44, 0x40, 0x0, 0x0, NULL, 0, 0);
+ 0x44, 0x40, 0x0, 0x0, NULL, 0,
+ USB_CTRL_SET_TIMEOUT);
if (retval) {
dev_dbg(&dev->dev, "%s - failed to set resume sensitivity due to error: %d\n",
__func__, retval);
@@ -352,7 +354,8 @@ static int keyspan_setup(struct usb_device* dev)
}
retval = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
- 0x22, 0x40, 0x0, 0x0, NULL, 0, 0);
+ 0x22, 0x40, 0x0, 0x0, NULL, 0,
+ USB_CTRL_SET_TIMEOUT);
if (retval) {
dev_dbg(&dev->dev, "%s - failed to turn receive on due to error: %d\n",
__func__, retval);
--
2.24.1
This is the start of the stable review cycle for the 4.14.164 release.
There are 62 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Mon, 13 Jan 2020 09:46:17 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.164-r…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 4.14.164-rc1
Eric Dumazet <edumazet(a)google.com>
vlan: fix memory leak in vlan_dev_set_egress_priority
Petr Machata <petrm(a)mellanox.com>
net: sch_prio: When ungrafting, replace with FIFO
Eric Dumazet <edumazet(a)google.com>
vlan: vlan_changelink() should propagate errors
Hangbin Liu <liuhangbin(a)gmail.com>
vxlan: fix tos value before xmit
Pengcheng Yang <yangpc(a)wangsu.com>
tcp: fix "old stuff" D-SACK causing SACK to be treated as D-SACK
Xin Long <lucien.xin(a)gmail.com>
sctp: free cmd->obj.chunk for the unprocessed SCTP_CMD_REPLY
Daniele Palmas <dnlplm(a)gmail.com>
USB: serial: option: add Telit ME910G1 0x110a composition
Johan Hovold <johan(a)kernel.org>
USB: core: fix check for duplicate endpoints
Eric Dumazet <edumazet(a)google.com>
pkt_sched: fq: do not accept silly TCA_FQ_QUANTUM
Eric Dumazet <edumazet(a)google.com>
net: usb: lan78xx: fix possible skb leak
Chen-Yu Tsai <wens(a)csie.org>
net: stmmac: dwmac-sunxi: Allow all RGMII modes
Chen-Yu Tsai <wens(a)csie.org>
net: stmmac: dwmac-sun8i: Allow all RGMII modes
Andrew Lunn <andrew(a)lunn.ch>
net: dsa: mv88e6xxx: Preserve priority when setting CPU port.
Eric Dumazet <edumazet(a)google.com>
macvlan: do not assume mac_header is set in macvlan_broadcast()
Eric Dumazet <edumazet(a)google.com>
gtp: fix bad unlock balance in gtp_encap_enable_socket
Mathieu Malaterre <malat(a)debian.org>
mmc: block: propagate correct returned value in mmc_rpmb_ioctl
Alexander Kappner <agk(a)godking.net>
mmc: core: Prevent bus reference leak in mmc_blk_init()
Linus Walleij <linus.walleij(a)linaro.org>
mmc: block: Fix bug when removing RPMB chardev
Linus Walleij <linus.walleij(a)linaro.org>
mmc: block: Delete mmc_access_rpmb()
Linus Walleij <linus.walleij(a)linaro.org>
mmc: block: Convert RPMB to a character device
Logan Gunthorpe <logang(a)deltatee.com>
PCI/switchtec: Read all 64 bits of part_event_bitmap
Daniel Borkmann <daniel(a)iogearbox.net>
bpf: Fix passing modified ctx to ld/abs/ind instruction
Daniel Borkmann <daniel(a)iogearbox.net>
bpf: reject passing modified ctx to helper functions
Haiyang Zhang <haiyangz(a)microsoft.com>
hv_netvsc: Fix unwanted rx_table reset
Chan Shu Tak, Alex <alexchan(a)task.com.hk>
llc2: Fix return statement of llc_stat_ev_rx_null_dsap_xid_c (and _test_c)
Helge Deller <deller(a)gmx.de>
parisc: Fix compiler warnings in debug_core.c
Yang Yingliang <yangyingliang(a)huawei.com>
block: fix memleak when __blk_rq_map_user_iov() is failed
Stefan Haberland <sth(a)linux.ibm.com>
s390/dasd: fix memleak in path handling error case
Jan Höppner <hoeppner(a)linux.ibm.com>
s390/dasd/cio: Interpret ccw_device_get_mdc return value correctly
Jose Abreu <Jose.Abreu(a)synopsys.com>
net: stmmac: RX buffer size must be 16 byte aligned
Jose Abreu <Jose.Abreu(a)synopsys.com>
net: stmmac: Do not accept invalid MTU values
Eric Sandeen <sandeen(a)redhat.com>
fs: avoid softlockups in s_inodes iterators
Alexander Shishkin <alexander.shishkin(a)linux.intel.com>
perf/x86/intel: Fix PT PMI handling
Thomas Hebb <tommyhebb(a)gmail.com>
kconfig: don't crash on NULL expressions in expr_eq()
Andreas Kemnade <andreas(a)kemnade.info>
regulator: rn5t618: fix module aliases
Shengjiu Wang <shengjiu.wang(a)nxp.com>
ASoC: wm8962: fix lambda value
Aditya Pakki <pakki001(a)umn.edu>
rfkill: Fix incorrect check to avoid NULL pointer dereference
Cristian Birsan <cristian.birsan(a)microchip.com>
net: usb: lan78xx: Fix error message format specifier
Manish Chopra <manishc(a)marvell.com>
bnx2x: Fix logic to get total no. of PFs per engine
Manish Chopra <manishc(a)marvell.com>
bnx2x: Do not handle requests from VFs after parity
Mike Rapoport <rppt(a)linux.ibm.com>
powerpc: Ensure that swiotlb buffer is allocated from low memory
Daniel T. Lee <danieltimlee(a)gmail.com>
samples: bpf: fix syscall_tp due to unused syscall
Daniel T. Lee <danieltimlee(a)gmail.com>
samples: bpf: Replace symbol compare of trace_event
Tomi Valkeinen <tomi.valkeinen(a)ti.com>
ARM: dts: am437x-gp/epos-evm: fix panel compatible
Paul Chaignon <paul.chaignon(a)orange.com>
bpf, mips: Limit to 33 tail calls
Stefan Wahren <wahrenst(a)gmx.net>
ARM: dts: bcm283x: Fix critical trip point
Dragos Tarcatu <dragos_tarcatu(a)mentor.com>
ASoC: topology: Check return value for soc_tplg_pcm_create()
Chuhong Yuan <hslester96(a)gmail.com>
spi: spi-cavium-thunderx: Add missing pci_release_regions()
Florian Fainelli <f.fainelli(a)gmail.com>
ARM: dts: Cygnus: Fix MDIO node address/size cells
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: validate NFT_SET_ELEM_INTERVAL_END
Phil Sutter <phil(a)nwl.cc>
netfilter: uapi: Avoid undefined left-shift in xt_sctp.h
Sudeep Holla <sudeep.holla(a)arm.com>
ARM: vexpress: Set-up shared OPP table instead of individual for each CPU
Arvind Sankar <nivedita(a)alum.mit.edu>
efi/gop: Fix memory leak in __gop_query32/64()
Arvind Sankar <nivedita(a)alum.mit.edu>
efi/gop: Return EFI_SUCCESS if a usable GOP was found
Arvind Sankar <nivedita(a)alum.mit.edu>
efi/gop: Return EFI_NOT_FOUND if there are no usable GOPs
Dave Young <dyoung(a)redhat.com>
x86/efi: Update e820 with reserved EFI boot services data to fix kexec breakage
Sudip Mukherjee <sudipm.mukherjee(a)gmail.com>
libtraceevent: Fix lib installation with O=
qize wang <wangqize888888888(a)gmail.com>
mwifiex: Fix heap overflow in mmwifiex_process_tdls_action_frame()
Florian Westphal <fw(a)strlen.de>
netfilter: ctnetlink: netns exit must wait for callbacks
Marco Elver <elver(a)google.com>
locking/spinlock/debug: Fix various data races
Andrey Konovalov <andreyknvl(a)google.com>
USB: dummy-hcd: increase max number of devices to 32
Andrey Konovalov <andreyknvl(a)google.com>
USB: dummy-hcd: use usb_urb_dir_in instead of usb_pipein
-------------
Diffstat:
Makefile | 4 +-
arch/arm/boot/dts/am437x-gp-evm.dts | 2 +-
arch/arm/boot/dts/am43x-epos-evm.dts | 2 +-
arch/arm/boot/dts/bcm-cygnus.dtsi | 4 +-
arch/arm/boot/dts/bcm283x.dtsi | 2 +-
arch/arm/mach-vexpress/spc.c | 12 +-
arch/mips/net/ebpf_jit.c | 9 +-
arch/parisc/include/asm/cmpxchg.h | 10 +-
arch/powerpc/mm/mem.c | 8 +
arch/x86/events/core.c | 9 +-
arch/x86/platform/efi/quirks.c | 6 +-
block/blk-map.c | 2 +-
drivers/firmware/efi/libstub/gop.c | 80 ++----
drivers/mmc/core/block.c | 300 +++++++++++++++++++---
drivers/mmc/core/queue.c | 2 +-
drivers/mmc/core/queue.h | 4 +-
drivers/net/dsa/mv88e6xxx/global1.c | 5 +
drivers/net/dsa/mv88e6xxx/global1.h | 1 +
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 2 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 12 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 1 +
drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 12 +
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 3 +
drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 2 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 14 +-
drivers/net/gtp.c | 5 +-
drivers/net/hyperv/hyperv_net.h | 3 +-
drivers/net/hyperv/netvsc_drv.c | 4 +-
drivers/net/hyperv/rndis_filter.c | 10 +-
drivers/net/macvlan.c | 2 +-
drivers/net/usb/lan78xx.c | 11 +-
drivers/net/vxlan.c | 4 +-
drivers/net/wireless/marvell/mwifiex/tdls.c | 70 ++++-
drivers/pci/switch/switchtec.c | 4 +-
drivers/regulator/rn5t618-regulator.c | 1 +
drivers/s390/block/dasd_eckd.c | 28 +-
drivers/s390/cio/device_ops.c | 2 +-
drivers/spi/spi-cavium-thunderx.c | 2 +
drivers/usb/core/config.c | 70 ++++-
drivers/usb/gadget/udc/dummy_hcd.c | 10 +-
drivers/usb/serial/option.c | 2 +
fs/drop_caches.c | 2 +-
fs/inode.c | 7 +
fs/notify/fsnotify.c | 1 +
fs/quota/dquot.c | 1 +
include/linux/if_ether.h | 8 +
include/uapi/linux/netfilter/xt_sctp.h | 6 +-
kernel/bpf/verifier.c | 54 ++--
kernel/locking/spinlock_debug.c | 32 +--
net/8021q/vlan.h | 1 +
net/8021q/vlan_dev.c | 3 +-
net/8021q/vlan_netlink.c | 19 +-
net/ipv4/tcp_input.c | 5 +-
net/llc/llc_station.c | 4 +-
net/netfilter/nf_conntrack_netlink.c | 3 +
net/netfilter/nf_tables_api.c | 12 +-
net/rfkill/core.c | 7 +-
net/sched/sch_fq.c | 2 +-
net/sched/sch_prio.c | 10 +-
net/sctp/sm_sideeffect.c | 28 +-
samples/bpf/syscall_tp_kern.c | 18 +-
samples/bpf/trace_event_user.c | 4 +-
scripts/kconfig/expr.c | 7 +
sound/soc/codecs/wm8962.c | 4 +-
sound/soc/soc-topology.c | 8 +-
tools/lib/traceevent/Makefile | 1 +
tools/testing/selftests/bpf/test_verifier.c | 58 ++++-
67 files changed, 778 insertions(+), 263 deletions(-)