Linux 4.14.93
Greg KH
maintainerI'm announcing the release of the 4.14.93 kernel.
All users of the 4.14 kernel series must upgrade.
The updated 4.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 29 - arch/arm/boot/dts/imx7d-nitrogen7.dts | 9 arch/arm/mach-imx/cpuidle-imx6sx.c | 2 arch/arm64/Makefile | 2 arch/arm64/kernel/image.h | 44 - arch/arm64/kernel/vmlinux.lds.S | 9 arch/powerpc/Makefile | 7 arch/powerpc/boot/Makefile | 5 arch/powerpc/boot/crt0.S | 4 arch/powerpc/kernel/Makefile | 3 arch/powerpc/kernel/signal_32.c | 20 arch/powerpc/kernel/signal_64.c | 44 + arch/powerpc/mm/dump_linuxpagetables.c | 1 arch/powerpc/xmon/Makefile | 5 arch/x86/include/asm/pgtable_64_types.h | 5 arch/x86/mm/dump_pagetables.c | 15 arch/x86/xen/mmu_pv.c | 11 drivers/block/zram/zram_drv.c | 4 drivers/gpio/gpio-mvebu.c | 6 drivers/gpu/drm/vc4/vc4_plane.c | 1 drivers/hid/hid-ids.h | 3 drivers/hid/hid-ite.c | 1 drivers/hv/Kconfig | 2 drivers/hwtracing/intel_th/msu.c | 3 drivers/infiniband/sw/rxe/rxe_resp.c | 13 drivers/input/keyboard/omap4-keypad.c | 16 drivers/input/mouse/synaptics.c | 2 drivers/iommu/intel-iommu.c | 4 drivers/md/dm-verity-target.c | 24 drivers/md/dm-zoned-target.c | 122 +--- drivers/md/raid10.c | 15 drivers/misc/genwqe/card_utils.c | 2 drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 3 drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 1 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 54 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 4 drivers/net/ethernet/cadence/macb_main.c | 14 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 3 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 14 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 15 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 503 ++++++++++++------- drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 13 drivers/net/ethernet/hisilicon/hns/hns_enet.c | 43 + drivers/net/ethernet/ibm/ibmvnic.c | 2 drivers/net/ethernet/intel/i40e/i40e_main.c | 14 drivers/net/ethernet/neterion/vxge/vxge-config.c | 2 drivers/net/ethernet/nuvoton/w90p910_ether.c | 2 drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 3 drivers/net/ethernet/qlogic/qed/qed_ll2.c | 1 drivers/net/ieee802154/ca8210.c | 4 drivers/net/usb/lan78xx.c | 4 drivers/net/usb/qmi_wwan.c | 15 drivers/net/wireless/broadcom/b43/phy_common.c | 2 drivers/pinctrl/meson/pinctrl-meson.c | 3 drivers/power/supply/olpc_battery.c | 4 drivers/s390/scsi/zfcp_aux.c | 6 drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 drivers/scsi/lpfc/lpfc_sli.c | 3 drivers/target/iscsi/cxgbit/cxgbit_cm.c | 5 drivers/target/iscsi/cxgbit/cxgbit_main.c | 1 drivers/tty/serial/sunsu.c | 31 - drivers/vhost/vsock.c | 2 fs/ceph/caps.c | 1 fs/dlm/lock.c | 17 fs/dlm/lockspace.c | 2 fs/gfs2/inode.c | 18 fs/gfs2/rgrp.c | 2 fs/lockd/clntproc.c | 2 fs/lockd/xdr.c | 4 fs/lockd/xdr4.c | 4 include/linux/hmm.h | 4 include/uapi/linux/input-event-codes.h | 9 kernel/fork.c | 13 kernel/irq/affinity.c | 15 kernel/memremap.c | 11 kernel/sched/fair.c | 43 - lib/raid6/Makefile | 15 lib/test_debug_virtual.c | 1 mm/hmm.c | 131 ---- mm/memory_hotplug.c | 16 mm/swapfile.c | 3 net/9p/client.c | 21 net/mac80211/status.c | 5 net/netfilter/ipset/ip_set_list_set.c | 2 net/netfilter/nf_conntrack_seqadj.c | 7 net/netfilter/nf_nat_core.c | 3 net/sunrpc/auth_gss/svcauth_gss.c | 8 net/sunrpc/cache.c | 10 net/sunrpc/xprtsock.c | 4 net/xfrm/xfrm_input.c | 7 net/xfrm/xfrm_output.c | 1 net/xfrm/xfrm_state.c | 2 scripts/Makefile.build | 2 scripts/checkstack.pl | 4 scripts/kallsyms.c | 1 security/selinux/ss/policydb.c | 51 + sound/pci/cs46xx/dsp_spos.c | 3 sound/usb/mixer.c | 10 sound/usb/quirks-table.h | 3 tools/cgroup/Makefile | 1 tools/gpio/Makefile | 2 tools/hv/Makefile | 1 tools/iio/Makefile | 2 tools/laptop/freefall/Makefile | 1 tools/leds/Makefile | 1 tools/perf/Makefile.perf | 6 tools/power/acpi/Makefile.config | 4 tools/scripts/Makefile.include | 18 tools/spi/Makefile | 2 tools/testing/nvdimm/test/iomap.c | 2 tools/usb/Makefile | 1 tools/virtio/linux/kernel.h | 4 tools/vm/Makefile | 1 113 files changed, 1042 insertions(+), 665 deletions(-)
Alexander Shishkin (1):
intel_th: msu: Fix an off-by-one in attribute store
Andreas Gruenbacher (2):
gfs2: Get rid of potential double-freeing in gfs2_create_inode
gfs2: Fix loop in gfs2_rbm_find
Anson Huang (1):
ARM: imx: update the cpu power up timing setting on i.mx6sx
Anssi Hannula (2):
net: macb: fix random memory corruption on RX with 64-bit DMA
net: macb: fix dropped RX frames due to a race
Ard Biesheuvel (3):
scripts/kallsyms: filter arm64's __efistub_ symbols
arm64: drop linker script hack to hide __efistub_ symbols
arm64: relocatable: fix inconsistencies in linker script and options
Arnd Bergmann (1):
w90p910_ether: remove incorrect __init annotation
Benjamin Coddington (1):
lockd: Show pid of lockd for remote locks
Benjamin Poirier (1):
xfrm: Fix bucket count reported to userspace
Boris Brezillon (1):
drm/vc4: Set ->is_yuv to false when num_planes == 1
Breno Leitao (1):
powerpc/tm: Set MSR[TS] just prior to recheckpoint
Christian Borntraeger (1):
genwqe: Fix size check
Christophe Leroy (1):
lib: fix build failure in CONFIG_DEBUG_VIRTUAL test
Colin Ian King (1):
vxge: ensure data0 is initialized in when fetching firmware version information
Damien Le Moal (1):
dm zoned: Fix target BIO completion handling
Dan Carpenter (3):
scsi: bnx2fc: Fix NULL dereference in error handling
qed: Fix an error code qed_ll2_start_xmit()
ALSA: cs46xx: Potential NULL dereference in probe
Dan Williams (4):
mm, devm_memremap_pages: mark devm_memremap_pages() EXPORT_SYMBOL_GPL mm, devm_memremap_pages: kill mapping "System RAM" support mm, hmm: use devm semantics for hmm_devmem_{add, remove} mm, hmm: mark hmm_devmem_{add, add_resource} EXPORT_SYMBOL_GPL
Daniele Palmas (1):
qmi_wwan: Fix qmap header retrieval in qmimux_rx_fixup
David Herrmann (1):
fork: record start_time late
Dominique Martinet (1):
9p/net: put a lower bound on msize
Ewan D. Milne (1):
scsi: lpfc: do not set queue->page_count to 0 if pc_sli4_params.wqpcnt is invalid
Fabio Estevam (1):
ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock
Florian Westphal (2):
netfilter: seqadj: re-load tcp header pointer after possible head reallocation
netfilter: nat: can't use dst_hold on noref dst
Greg Kroah-Hartman (1):
Linux 4.14.93
Hans de Goede (1):
HID: ite: Add USB id match for another ITE based keyboard rfkill key quirk
Huang Ying (1):
mm, swap: fix swapoff with KSM pages
Hui Peng (1):
ALSA: usb-audio: Fix an out-of-bound read in create_composite_quirks
Ivan Mironov (1):
bnx2x: Fix NULL pointer dereference in bnx2x_del_all_vlans() on some hw
Jason Martinsen (1):
lan78xx: Resolve issue with changing MAC address
Jerome Brunet (1):
pinctrl: meson: fix pull enable register calculation
Jiri Slaby (1):
tools: power/acpi, revert to LD = gcc
Joel Stanley (5):
powerpc: Disable -Wbuiltin-requires-header when setjmp is used
ftrace: Build with CPPFLAGS to get -Qunused-arguments
Makefile: Export clang toolchain variables powerpc/boot: Set target when cross-compiling for clang raid6/ppc: Fix build for clang
Kangjie Lu (1):
net: netxen: fix a missing check and an uninitialized use
Kirill A. Shutemov (2):
x86/mm: Fix guard hole handling x86/dump_pagetables: Fix LDT remap address marker
Larry Finger (1):
b43: Fix error in cordic routine
Linus Torvalds (1):
sched/fair: Fix infinite loop in update_blocked_averages() by reverting a9e7f6544b9c
Lubomir Rintel (1):
power: supply: olpc_battery: correct the temperature units
Mantas Mikulėnas (1):
Input: synaptics - enable SMBus for HP EliteBook 840 G4
Martin Kelly (1):
tools: fix cross-compile var clobbering
Masahiro Yamada (3):
kbuild: fix false positive warning/error about missing libelf
kbuild: add -no-integrated-as Clang option unconditionally
kbuild: consolidate Clang compiler flags
Matthias Kaehlcke (1):
md: raid10: remove VLAIS
Michael Ellerman (1):
powerpc/mm: Fix linux page tables build with some configs
Michael S. Tsirkin (1):
virtio: fix test build after uio.h change
Michal Hocko (1):
hwpoison, memory_hotplug: allow hwpoisoned pages to be offlined
Mikulas Patocka (1):
dm verity: fix crash on bufio buffer that was allocated with vmalloc
Minchan Kim (1):
zram: fix double free backing device
Nathan Chancellor (1):
drivers: net: xgene: Remove unnecessary forward declarations
Nicholas Piggin (1):
powerpc: avoid -mno-sched-epilog on GCC 4.9 and newer
Ondrej Mosnacek (1):
selinux: policydb - fix byte order and alignment issues
Pan Bian (1):
netfilter: ipset: do not call ipset_nest_end after nla_nest_cancel
Paul Mackerras (1):
powerpc: Fix COFF zImage booting on old powermacs
Peter Hutterer (1):
Input: restore EV_ABS ABS_RESERVED
Qian Cai (1):
checkstack.pl: fix for aarch64
Sagi Grimberg (1):
rxe: fix error completion wr_id and qp_num
Sara Sharon (1):
mac80211: free skb fraglist before freeing the skb
Sinan Kaya (1):
x86, hyperv: remove PCI dependency
Sohil Mehta (1):
iommu/vt-d: Handle domain agaw being less than iommu agaw
Stefan Assmann (1):
i40e: fix mac filter delete when setting mac address
Stefan Hajnoczi (1):
vhost/vsock: fix uninitialized vhost_vsock->guest_cid
Steffen Klassert (1):
xfrm: Fix NULL pointer dereference in xfrm_input when skb_dst_force clears the dst_entry.
Steffen Maier (1):
scsi: zfcp: fix posting too many status read buffers leading to adapter shutdown
Sudarsana Reddy Kalluru (3):
bnx2x: Clear fip MAC when fcoe offload support is disabled
bnx2x: Remove configured vlans as part of unload sequence.
bnx2x: Send update-svid ramrod with retry/poll flags enabled
Takashi Iwai (1):
ALSA: usb-audio: Avoid access before bLength check in build_audio_procunit()
Thomas Falcon (1):
ibmvnic: Fix non-atomic memory allocation in IRQ context
Thomas Gleixner (1):
genirq/affinity: Don't return with empty affinity masks on error
Tony Lindgren (1):
Input: omap-keypad - fix idle configuration to not block SoC idle states
Trond Myklebust (1):
SUNRPC: Fix a race with XPRT_CONNECTING
Uwe Kleine-König (1):
gpio: mvebu: only fail on missing clk if pwm is actually to be used
Varun Prakash (2):
scsi: target: iscsi: cxgbit: fix csk leak
scsi: target: iscsi: cxgbit: add missing spin_lock_init()
Vasily Averin (6):
sunrpc: fix cache_head leak due to queued request
sunrpc: use SVC_NET() in svcauth_gss_* functions
dlm: fixed memory leaks after failed ls_remove_names allocation
dlm: possible memory leak on error path in create_lkb()
dlm: lost put_lkb on error path in receive_convert() and receive_unlock()
dlm: memory leaks on error path in dlm_user_request()
Wei Yongjun (1):
xfrm: Fix error return code in xfrm_output_one()
Yan, Zheng (1):
ceph: don't update importing cap's mseq when handing cap export
Yangtao Li (1):
serial/sunsu: fix refcount leak
Yonglong Liu (10):
net: hns: Incorrect offset address used for some registers.
net: hns: All ports can not work when insmod hns ko after rmmod.
net: hns: Some registers use wrong address according to the datasheet.
net: hns: Fixed bug that netdev was opened twice
net: hns: Clean rx fbd when ae stopped.
net: hns: Free irq when exit from abnormal branch
net: hns: Avoid net reset caused by pause frames storm
net: hns: Fix ntuple-filters status error.
net: hns: Add mac pcs config when enable|disable mac
net: hns: Fix ping failed when use net bridge and send multicast
YueHaibing (1):
ieee802154: ca8210: fix possible u8 overflow in ca8210_rx_done
Yussuf Khalil (1):
Input: synaptics - enable RMI on ThinkPad T560
Greg KH
maintainerMakefile +16 -13
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 14 -SUBLEVEL = 92 +SUBLEVEL = 93 EXTRAVERSION = NAME = Petit Gorille
@@ -479,18 +479,18 @@ endif ifeq ($(cc-name),clang) ifneq ($(CROSS_COMPILE),) -CLANG_TARGET := --target=$(notdir $(CROSS_COMPILE:%-=%)) +CLANG_FLAGS := --target=$(notdir $(CROSS_COMPILE:%-=%)) GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD))) -CLANG_PREFIX := --prefix=$(GCC_TOOLCHAIN_DIR) +CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR) GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..) endif ifneq ($(GCC_TOOLCHAIN),) -CLANG_GCC_TC := --gcc-toolchain=$(GCC_TOOLCHAIN) +CLANG_FLAGS += --gcc-toolchain=$(GCC_TOOLCHAIN) endif -KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX) -KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX) -KBUILD_CFLAGS += $(call cc-option, -no-integrated-as) -KBUILD_AFLAGS += $(call cc-option, -no-integrated-as) +CLANG_FLAGS += -no-integrated-as +KBUILD_CFLAGS += $(CLANG_FLAGS) +KBUILD_AFLAGS += $(CLANG_FLAGS) +export CLANG_FLAGS endif RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register
@@ -954,11 +954,6 @@ ifdef CONFIG_STACK_VALIDATION ifeq ($(has_libelf),1) objtool_target := tools/objtool FORCE else - ifdef CONFIG_UNWINDER_ORC - $(error "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel") - else - $(warning "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel") - endif SKIP_STACK_VALIDATION := 1 export SKIP_STACK_VALIDATION endif
@@ -1102,6 +1097,14 @@ uapi-asm-generic: PHONY += prepare-objtool prepare-objtool: $(objtool_target) +ifeq ($(SKIP_STACK_VALIDATION),1) +ifdef CONFIG_UNWINDER_ORC + @echo "error: Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2 + @false +else + @echo "warning: Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2 +endif +endif # Check for CONFIG flags that require compiler support. Abort the build # after .config has been processed, but before the kernel build starts.
arch/arm/boot/dts/imx7d-nitrogen7.dts +7 -2
@@ -117,13 +117,17 @@ compatible = "regulator-fixed"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - clocks = <&clks IMX7D_CLKO2_ROOT_DIV>; - clock-names = "slow"; regulator-name = "reg_wlan"; startup-delay-us = <70000>; gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>; enable-active-high; }; + + usdhc2_pwrseq: usdhc2_pwrseq { + compatible = "mmc-pwrseq-simple"; + clocks = <&clks IMX7D_CLKO2_ROOT_DIV>; + clock-names = "ext_clock"; + }; }; &adc1 {
@@ -430,6 +434,7 @@ bus-width = <4>; non-removable; vmmc-supply = <®_wlan>; + mmc-pwrseq = <&usdhc2_pwrseq>; cap-power-off-card; keep-power-in-suspend; status = "okay";
arch/arm/mach-imx/cpuidle-imx6sx.c +1 -1
@@ -108,7 +108,7 @@ int __init imx6sx_cpuidle_init(void)* except for power up sw2iso which need to be * larger than LDO ramp up time. */ -imx_gpc_set_arm_power_up_timing (2 ,1 ); +imx_gpc_set_arm_power_up_timing (0xf ,1 );imx_gpc_set_arm_power_down_timing (1 ,1 );return cpuidle_register (&imx6sx_cpuidle_driver,NULL );
arch/arm64/Makefile +1 -1
@@ -18,7 +18,7 @@ ifeq ($(CONFIG_RELOCATABLE), y) # Pass --no-apply-dynamic-relocs to restore pre-binutils-2.27 behaviour # for relative relocs, since this leads to better Image compression # with the relocation offsets always being zero. -LDFLAGS_vmlinux += -pie -shared -Bsymbolic \ +LDFLAGS_vmlinux += -shared -Bsymbolic -z notext -z norelro \ $(call ld-option, --no-apply-dynamic-relocs) endif
arch/arm64/kernel/image.h +17 -27
60 lines not on this page · raw message
arch/arm64/kernel/vmlinux.lds.S +5 -4
@@ -99,7 +99,8 @@ SECTIONS *(.discard) *(.discard.*) *(.interp .dynamic) - *(.dynsym .dynstr .hash) + *(.dynsym .dynstr .hash .gnu.hash) + *(.eh_frame) } . = KIMAGE_VADDR + TEXT_OFFSET;
@@ -176,12 +177,12 @@ SECTIONS PERCPU_SECTION(L1_CACHE_BYTES) - .rela : ALIGN(8) { + .rela.dyn : ALIGN(8) { *(.rela .rela*) } - __rela_offset = ABSOLUTE(ADDR(.rela) - KIMAGE_VADDR); - __rela_size = SIZEOF(.rela); + __rela_offset = ABSOLUTE(ADDR(.rela.dyn) - KIMAGE_VADDR); + __rela_size = SIZEOF(.rela.dyn); . = ALIGN(SEGMENT_ALIGN); __initdata_end = .;
arch/powerpc/Makefile +6 -1
@@ -236,7 +236,12 @@ endif # Work around a gcc code-gen bug with -fno-omit-frame-pointer. ifeq ($(CONFIG_FUNCTION_TRACER),y) -KBUILD_CFLAGS += -mno-sched-epilog +# Work around gcc code-gen bugs with -pg / -fno-omit-frame-pointer in gcc <= 4.8 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=44199 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52828 +ifneq ($(cc-name),clang) +KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0409, -mno-sched-epilog) +endif endif cpu-as-$(CONFIG_4xx) += -Wa,-m405
arch/powerpc/boot/Makefile +5 -0
@@ -49,6 +49,11 @@ endif BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc +ifeq ($(cc-name),clang) +BOOTCFLAGS += $(CLANG_FLAGS) +BOOTAFLAGS += $(CLANG_FLAGS) +endif + ifdef CONFIG_DEBUG_INFO BOOTCFLAGS += -g endif
arch/powerpc/boot/crt0.S +3 -1
@@ -15,7 +15,7 @@ RELA = 7 RELACOUNT = 0x6ffffff9 - .text + .data /* A procedure descriptor used when booting this as a COFF file. * When making COFF, this comes first in the link and we're * linked at 0x500000.
@@ -23,6 +23,8 @@ RELACOUNT = 0x6ffffff9 .globl _zimage_start_opd _zimage_start_opd: .long 0x500000, 0, 0, 0 + .text + b _zimage_start #ifdef __powerpc64__ .balign 8
arch/powerpc/kernel/Makefile +3 -0
@@ -5,6 +5,9 @@ CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' +# Disable clang warning for using setjmp without setjmp.h header +CFLAGS_crash.o += $(call cc-disable-warning, builtin-requires-header) + subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror ifeq ($(CONFIG_PPC64),y)
arch/powerpc/kernel/signal_32.c +19 -1
@@ -866,7 +866,23 @@ static long restore_tm_user_regs(struct pt_regs *regs,/* If TM bits are set to the reserved value, it's an invalid context */ if (MSR_TM_RESV (msr_hi))return 1 ; -/* Pull in the MSR TM bits from the user context */ + +/* +* Disabling preemption, since it is unsafe to be preempted +* with MSR[TS] set without recheckpointing. +*/ +preempt_disable (); + +/* +* CAUTION: +* After regs->MSR[TS] being updated, make sure that get_user(), +* put_user() or similar functions are *not* called. These +* functions can generate page faults which will cause the process +* to be de-scheduled with MSR[TS] set but without calling +* tm_recheckpoint(). This can cause a bug. +* +* Pull in the MSR TM bits from the user context +*/ regs->msr = (regs->msr & ~MSR_TS_MASK ) | (msr_hi &MSR_TS_MASK );/* Now, recheckpoint. This loads up all of the checkpointed (older) * registers, including FP and V[S]Rs. After recheckpointing, the
@@ -891,6 +907,8 @@ static long restore_tm_user_regs(struct pt_regs *regs, }#endif +preempt_enable (); +return 0 ; }#endif
arch/powerpc/kernel/signal_64.c +30 -14
62 lines not on this page · raw message
arch/powerpc/mm/dump_linuxpagetables.c +1 -0
@@ -19,6 +19,7 @@#include <linux/hugetlb.h> #include <linux/io.h> #include <linux/mm.h> +#include <linux/highmem.h> #include <linux/sched.h> #include <linux/seq_file.h> #include <asm/fixmap.h>
arch/powerpc/xmon/Makefile +4 -1
@@ -1,7 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for xmon -subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror +# Disable clang warning for using setjmp without setjmp.h header +subdir-ccflags-y := $(call cc-disable-warning, builtin-requires-header) + +subdir-ccflags-$(CONFIG_PPC_WERROR) += -Werror GCOV_PROFILE := n UBSAN_SANITIZE := n
arch/x86/include/asm/pgtable_64_types.h +5 -0
@@ -94,6 +94,11 @@ typedef struct { pteval_t pte; } pte_t;# define __VMEMMAP_BASE _AC(0xffffea0000000000, UL)#endif +#define GUARD_HOLE_PGD_ENTRY -256UL +#define GUARD_HOLE_SIZE (16UL << PGDIR_SHIFT) +#define GUARD_HOLE_BASE_ADDR (GUARD_HOLE_PGD_ENTRY << PGDIR_SHIFT) +#define GUARD_HOLE_END_ADDR (GUARD_HOLE_BASE_ADDR + GUARD_HOLE_SIZE) +#define LDT_PGD_ENTRY -240UL#define LDT_BASE_ADDR (LDT_PGD_ENTRY << PGDIR_SHIFT)
arch/x86/mm/dump_pagetables.c +6 -9
@@ -51,10 +51,10 @@ struct addr_marker {enum address_markers_idx {USER_SPACE_NR =0 ,KERNEL_SPACE_NR , -LOW_KERNEL_NR , -#if defined(CONFIG_MODIFY_LDT_SYSCALL ) && defined(CONFIG_X86_5LEVEL ) +#ifdef CONFIG_MODIFY_LDT_SYSCALL LDT_NR ,#endif +LOW_KERNEL_NR ,VMALLOC_START_NR ,VMEMMAP_START_NR ,#ifdef CONFIG_KASAN
@@ -62,9 +62,6 @@ enum address_markers_idx { KASAN_SHADOW_END_NR, #endif CPU_ENTRY_AREA_NR, -#if defined(CONFIG_MODIFY_LDT_SYSCALL ) && !defined(CONFIG_X86_5LEVEL ) - LDT_NR, -#endif #ifdef CONFIG_X86_ESPFIX64 ESPFIX_START_NR,#endif
@@ -465,11 +462,11 @@ static inline bool is_hypervisor_range(int idx) {#ifdef CONFIG_X86_64 /* -* ffff800000000000 - ffff87ffffffffff is reserved for -* the hypervisor. +* A hole in the beginning of kernel address space reserved +* for a hypervisor. */ -return (idx >=pgd_index (__PAGE_OFFSET) -16 ) && - (idx <pgd_index (__PAGE_OFFSET)); +return (idx >=pgd_index (GUARD_HOLE_BASE_ADDR )) && + (idx <pgd_index (GUARD_HOLE_END_ADDR ));#else return false;#endif
arch/x86/xen/mmu_pv.c +6 -5
@@ -614,19 +614,20 @@ static int __xen_pgd_walk(struct mm_struct *mm, pgd_t *pgd, unsigned long limit) {int i, nr, flush =0 ; -unsigned hole_low, hole_high; +unsigned hole_low =0 , hole_high =0 ;/* The limit is the last byte to be touched */ limit--;BUG_ON (limit >=FIXADDR_TOP ); +#ifdef CONFIG_X86_64 /* * 64-bit has a great big hole in the middle of the address -* space, which contains the Xen mappings. On 32-bit these -* will end up making a zero-sized hole and so is a no-op. +* space, which contains the Xen mappings. */ - hole_low =pgd_index (USER_LIMIT ); - hole_high =pgd_index (PAGE_OFFSET ); + hole_low =pgd_index (GUARD_HOLE_BASE_ADDR ); + hole_high =pgd_index (GUARD_HOLE_END_ADDR ); +#endif nr =pgd_index (limit) +1 ;for (i =0 ; i < nr; i++) {
drivers/block/zram/zram_drv.c +3 -1
@@ -366,8 +366,10 @@ static ssize_t backing_dev_store(struct device *dev, bdev =bdgrab (I_BDEV (inode)); err =blkdev_get (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , zram); -if (err <0 ) +if (err <0 ) { + bdev =NULL ; goto out; + } nr_pages =i_size_read (inode) >>PAGE_SHIFT ; bitmap_sz =BITS_TO_LONGS (nr_pages) *sizeof (long );
drivers/gpio/gpio-mvebu.c +3 -3
@@ -777,9 +777,6 @@ static int mvebu_pwm_probe(struct platform_device *pdev, "marvell,armada-370-gpio"))return 0 ; -if (IS_ERR (mvchip->clk)) -return PTR_ERR (mvchip->clk); -/* * There are only two sets of PWM configuration registers for * all the GPIO lines on those SoCs which this driver reserves
@@ -790,6 +787,9 @@ static int mvebu_pwm_probe(struct platform_device *pdev,if (!res)return 0 ; +if (IS_ERR (mvchip->clk)) +return PTR_ERR (mvchip->clk); +/* * Use set A for lines of GPIO chip with id 0, B for GPIO chip * with id 1. Don't allow further GPIO chips to be used for PWM.
drivers/gpu/drm/vc4/vc4_plane.c +1 -0
@@ -354,6 +354,7 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state)if (vc4_state->is_unity) vc4_state->x_scaling[0 ] =VC4_SCALING_PPF ; }else { + vc4_state->is_yuv = false; vc4_state->x_scaling[1 ] =VC4_SCALING_NONE ; vc4_state->y_scaling[1 ] =VC4_SCALING_NONE ; }
drivers/hid/hid-ids.h +3 -0
@@ -17,6 +17,9 @@#ifndef HID_IDS_H_FILE #define HID_IDS_H_FILE +#define USB_VENDOR_ID_258A 0x258a +#define USB_DEVICE_ID_258A_6A88 0x6a88 +#define USB_VENDOR_ID_3M 0x0596#define USB_DEVICE_ID_3M1968 0x0500#define USB_DEVICE_ID_3M2256 0x0502
drivers/hid/hid-ite.c +1 -0
@@ -42,6 +42,7 @@ static int ite_event(struct hid_device *hdev, struct hid_field *field,static const struct hid_device_id ite_devices[] = { {HID_USB_DEVICE (USB_VENDOR_ID_ITE ,USB_DEVICE_ID_ITE8595 ) }, + {HID_USB_DEVICE (USB_VENDOR_ID_258A ,USB_DEVICE_ID_258A_6A88 ) }, { } };MODULE_DEVICE_TABLE (hid, ite_devices);
drivers/hv/Kconfig +1 -1
@@ -2,7 +2,7 @@ menu "Microsoft Hyper-V guest support" config HYPERV tristate "Microsoft Hyper-V client drivers" - depends on X86 && ACPI && PCI && X86_LOCAL_APIC && HYPERVISOR_GUEST + depends on X86 && ACPI && X86_LOCAL_APIC && HYPERVISOR_GUEST select PARAVIRT help Select this option to run Linux as a Hyper-V client operating
drivers/hwtracing/intel_th/msu.c +2 -1
@@ -1431,7 +1431,8 @@ nr_pages_store(struct device *dev, struct device_attribute *attr,if (!end)break ; - len -= end - p; +/* consume the number and the following comma, hence +1 */ + len -= end - p +1 ; p = end +1 ; }while (len);
drivers/infiniband/sw/rxe/rxe_resp.c +9 -4
@@ -845,11 +845,16 @@ static enum resp_states do_complete(struct rxe_qp *qp,memset (&cqe,0 ,sizeof (cqe)); - wc->wr_id = wqe->wr_id; - wc->status = qp->resp.status; - wc->qp = &qp->ibqp; +if (qp->rcq->is_user) { + uwc->status = qp->resp.status; + uwc->qp_num = qp->ibqp.qp_num; + uwc->wr_id = wqe->wr_id; + }else { + wc->status = qp->resp.status; + wc->qp = &qp->ibqp; + wc->wr_id = wqe->wr_id; + } -/* fields after status are not required for errors */ if (wc->status ==IB_WC_SUCCESS ) { wc->opcode = (pkt->mask &RXE_IMMDT_MASK && pkt->mask & RXE_WRITE_MASK) ?
drivers/input/keyboard/omap4-keypad.c +4 -12
@@ -126,12 +126,8 @@ static irqreturn_t omap4_keypad_irq_handler(int irq, void *dev_id) {struct omap4_keypad *keypad_data = dev_id; -if (kbd_read_irqreg (keypad_data,OMAP4_KBD_IRQSTATUS )) { -/* Disable interrupts */ -kbd_write_irqreg (keypad_data,OMAP4_KBD_IRQENABLE , -OMAP4_VAL_IRQDISABLE ); +if (kbd_read_irqreg (keypad_data,OMAP4_KBD_IRQSTATUS ))return IRQ_WAKE_THREAD ; - }return IRQ_NONE ; }
@@ -173,11 +169,6 @@ static irqreturn_t omap4_keypad_irq_thread_fn(int irq, void *dev_id)kbd_write_irqreg (keypad_data,OMAP4_KBD_IRQSTATUS ,kbd_read_irqreg (keypad_data,OMAP4_KBD_IRQSTATUS )); -/* enable interrupts */ -kbd_write_irqreg (keypad_data,OMAP4_KBD_IRQENABLE , -OMAP4_DEF_IRQENABLE_EVENTEN | -OMAP4_DEF_IRQENABLE_LONGKEY ); -return IRQ_HANDLED ; }
@@ -214,9 +205,10 @@ static void omap4_keypad_close(struct input_dev *input)disable_irq (keypad_data->irq); -/* Disable interrupts */ +/* Disable interrupts and wake-up events */ kbd_write_irqreg (keypad_data,OMAP4_KBD_IRQENABLE ,OMAP4_VAL_IRQDISABLE ); +kbd_writel (keypad_data,OMAP4_KBD_WAKEUPENABLE ,0 );/* clear pending interrupts */ kbd_write_irqreg(keypad_data, OMAP4_KBD_IRQSTATUS,
@@ -364,7 +356,7 @@ static int omap4_keypad_probe(struct platform_device *pdev) } error =request_threaded_irq (keypad_data->irq, omap4_keypad_irq_handler, - omap4_keypad_irq_thread_fn,0 , + omap4_keypad_irq_thread_fn,IRQF_ONESHOT ,"omap4-keypad" , keypad_data);if (error) {dev_err (&pdev->dev,"failed to register interrupt\n" );
drivers/input/mouse/synaptics.c +2 -0
@@ -171,6 +171,7 @@ static const char * const smbus_pnp_ids[] = {"LEN0046" ,/* X250 */ "LEN004a" ,/* W541 */ "LEN005b" ,/* P50 */ +"LEN005e" ,/* T560 */ "LEN0071" ,/* T480 */ "LEN0072" ,/* X1 Carbon Gen 5 (2017) - Elan/ALPS trackpoint */ "LEN0073", /* X1 Carbon G5 (Elantech) */
@@ -178,6 +179,7 @@ static const char * const smbus_pnp_ids[] = {"LEN0096" ,/* X280 */ "LEN0097" ,/* X280 -> ALPS trackpoint */ "LEN200f" ,/* T450s */ +"SYN3052" ,/* HP EliteBook 840 G4 */ "SYN3221" ,/* HP 15-ay000 */ NULL };
drivers/iommu/intel-iommu.c +2 -2
@@ -2093,7 +2093,7 @@ static int domain_context_mapping_one(struct dmar_domain *domain,* than default. Unnecessary for PT mode. */ if (translation !=CONTEXT_TT_PASS_THROUGH ) { -for (agaw = domain->agaw; agaw != iommu->agaw; agaw--) { +for (agaw = domain->agaw; agaw > iommu->agaw; agaw--) { ret = -ENOMEM ; pgd =phys_to_virt (dma_pte_addr (pgd));if (!dma_pte_present (pgd))
@@ -2107,7 +2107,7 @@ static int domain_context_mapping_one(struct dmar_domain *domain, translation =CONTEXT_TT_MULTI_LEVEL ;context_set_address_root (context,virt_to_phys (pgd)); -context_set_address_width (context, iommu->agaw); +context_set_address_width (context, agaw); }else {/* * In pass through mode, AW must be programmed to
drivers/md/dm-verity-target.c +20 -4
@@ -139,10 +139,26 @@ static int verity_hash_update(struct dm_verity *v, struct ahash_request *req, {struct scatterlist sg; -sg_init_one (&sg, data, len); -ahash_request_set_crypt (req, &sg,NULL , len); - -return verity_complete_op (res,crypto_ahash_update (req)); +if (likely (!is_vmalloc_addr (data))) { +sg_init_one (&sg, data, len); +ahash_request_set_crypt (req, &sg,NULL , len); +return verity_complete_op (res,crypto_ahash_update (req)); + }else { +do { +int r; +size_t this_step =min_t (size_t, len,PAGE_SIZE -offset_in_page (data)); +flush_kernel_vmap_range ((void *)data, this_step); +sg_init_table (&sg,1 ); +sg_set_page (&sg,vmalloc_to_page (data), this_step,offset_in_page (data)); +ahash_request_set_crypt (req, &sg,NULL , this_step); + r =verity_complete_op (res,crypto_ahash_update (req)); +if (unlikely (r)) +return r; + data += this_step; + len -= this_step; + }while (len); +return 0 ; + } }/*
drivers/md/dm-zoned-target.c +38 -84
205 lines not on this page · raw message
drivers/md/raid10.c +10 -5
@@ -4591,15 +4591,18 @@ static int handle_reshape_read_error(struct mddev *mddev,/* Use sync reads to get the blocks from somewhere else */ int sectors = r10_bio->sectors;struct r10conf *conf = mddev->private; -struct { -struct r10bio r10_bio; -struct r10dev devs[conf->copies]; - } on_stack; -struct r10bio *r10b = &on_stack.r10_bio; +struct r10bio *r10b;int slot =0 ;int idx =0 ;struct page **pages; + r10b =kmalloc (sizeof (*r10b) + +sizeof (struct r10dev ) * conf->copies,GFP_NOIO ); +if (!r10b) { +set_bit (MD_RECOVERY_INTR , &mddev->recovery); +return -ENOMEM ; + } +/* reshape IOs share pages from .devs[0].bio */ pages =get_resync_pages (r10_bio->devs[0 ].bio)->pages;
@@ -4648,11 +4651,13 @@ static int handle_reshape_read_error(struct mddev *mddev,/* couldn't read this block, must give up */ set_bit (MD_RECOVERY_INTR , &mddev->recovery); +kfree (r10b);return -EIO ; } sectors -= s; idx++; } +kfree (r10b);return 0 ; }
drivers/misc/genwqe/card_utils.c +1 -1
@@ -217,7 +217,7 @@ u32 genwqe_crc32(u8 *buff, size_t len, u32 init)void *__genwqe_alloc_consistent (struct genwqe_dev *cd,size_t size,dma_addr_t *dma_handle) { -if (get_order (size) >MAX_ORDER ) +if (get_order (size) >=MAX_ORDER )return NULL ; return dma_zalloc_coherent(&cd->pci_dev->dev, size, dma_handle,
drivers/net/ethernet/apm/xgene/xgene_enet_main.c +0 -3
@@ -29,9 +29,6 @@#define RES_RING_CSR 1#define RES_RING_CMD 2 -static const struct of_device_id xgene_enet_of_match[]; -static const struct acpi_device_id xgene_enet_acpi_match[]; -static void xgene_enet_init_bufpool (struct xgene_enet_desc_ring *buf_pool) {struct xgene_enet_raw_desc16 *raw_desc;
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +1 -0
@@ -1278,6 +1278,7 @@ enum sp_rtnl_flag {BNX2X_SP_RTNL_TX_STOP ,BNX2X_SP_RTNL_GET_DRV_VERSION ,BNX2X_SP_RTNL_CHANGE_UDP_PORT , + BNX2X_SP_RTNL_UPDATE_SVID, }; enum bnx2x_iov_flag {
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +45 -9
103 lines not on this page · raw message
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h +3 -1
@@ -265,6 +265,7 @@ enum {BNX2X_ETH_MAC ,BNX2X_ISCSI_ETH_MAC ,BNX2X_NETQ_ETH_MAC , +BNX2X_VLAN ,BNX2X_DONT_CONSUME_CAM_CREDIT , BNX2X_DONT_CONSUME_CAM_CREDIT_DEST, };
@@ -272,7 +273,8 @@ enum {#define BNX2X_VLAN_MAC_CMP_MASK (1 << BNX2X_UC_LIST_MAC | \ 1 << BNX2X_ETH_MAC | \ 1 << BNX2X_ISCSI_ETH_MAC | \ - 1 << BNX2X_NETQ_ETH_MAC) + 1 << BNX2X_NETQ_ETH_MAC | \ + 1 << BNX2X_VLAN)#define BNX2X_VLAN_MAC_CMP_FLAGS (flags) \ ((flags) & BNX2X_VLAN_MAC_CMP_MASK)
drivers/net/ethernet/cadence/macb_main.c +12 -2
@@ -675,6 +675,11 @@ static void macb_set_addr(struct macb *bp, struct macb_dma_desc *desc, dma_addr_if (bp->hw_dma_cap &HW_DMA_CAP_64B ) { desc_64 =macb_64b_desc (bp, desc); desc_64->addrh =upper_32_bits (addr); +/* The low bits of RX address contain the RX_USED bit, clearing +* of which allows packet RX. Make sure the high bits are also +* visible to HW at that point. +*/ +dma_wmb (); }#endif desc->addr =lower_32_bits (addr);
@@ -918,14 +923,19 @@ static void gem_rx_refill(struct macb *bp)if (entry == bp->rx_ring_size -1 ) paddr |=MACB_BIT (RX_WRAP ); -macb_set_addr (bp, desc, paddr); desc->ctrl =0 ; +/* Setting addr clears RX_USED and allows reception, +* make sure ctrl is cleared first to avoid a race. +*/ +dma_wmb (); +macb_set_addr (bp, desc, paddr);/* properly align Ethernet header */ skb_reserve (skb,NET_IP_ALIGN ); }else { - desc->addr &= ~MACB_BIT (RX_USED ); desc->ctrl =0 ; +dma_wmb (); + desc->addr &= ~MACB_BIT (RX_USED ); } }
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c +3 -0
@@ -379,6 +379,9 @@ void hns_ae_stop(struct hnae_handle *handle)hns_ae_ring_enable_all (handle,0 ); +/* clean rx fbd. */ +hns_rcb_wait_fbd_clean (handle->qs, handle->q_num,RCB_INT_FLAG_RX ); + (void )hns_mac_vm_config_bc_en (mac_cb,0 , false); }
drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c +10 -4
@@ -67,11 +67,14 @@ static void hns_gmac_enable(void *mac_drv, enum mac_commom_mode mode)struct mac_driver *drv = (struct mac_driver *)mac_drv;/*enable GE rX/tX */ -if ((mode ==MAC_COMM_MODE_TX ) || (mode ==MAC_COMM_MODE_RX_AND_TX )) +if (mode ==MAC_COMM_MODE_TX || mode ==MAC_COMM_MODE_RX_AND_TX )dsaf_set_dev_bit (drv,GMAC_PORT_EN_REG ,GMAC_PORT_TX_EN_B ,1 ); -if ((mode ==MAC_COMM_MODE_RX ) || (mode ==MAC_COMM_MODE_RX_AND_TX )) +if (mode ==MAC_COMM_MODE_RX || mode ==MAC_COMM_MODE_RX_AND_TX ) { +/* enable rx pcs */ +dsaf_set_dev_bit (drv,GMAC_PCS_RX_EN_REG ,0 ,0 );dsaf_set_dev_bit (drv,GMAC_PORT_EN_REG ,GMAC_PORT_RX_EN_B ,1 ); + } }static void hns_gmac_disable (void *mac_drv,enum mac_commom_mode mode)
@@ -79,11 +82,14 @@ static void hns_gmac_disable(void *mac_drv, enum mac_commom_mode mode)struct mac_driver *drv = (struct mac_driver *)mac_drv;/*disable GE rX/tX */ -if ((mode ==MAC_COMM_MODE_TX ) || (mode ==MAC_COMM_MODE_RX_AND_TX )) +if (mode ==MAC_COMM_MODE_TX || mode ==MAC_COMM_MODE_RX_AND_TX )dsaf_set_dev_bit (drv,GMAC_PORT_EN_REG ,GMAC_PORT_TX_EN_B ,0 ); -if ((mode ==MAC_COMM_MODE_RX ) || (mode ==MAC_COMM_MODE_RX_AND_TX )) +if (mode ==MAC_COMM_MODE_RX || mode ==MAC_COMM_MODE_RX_AND_TX ) { +/* disable rx pcs */ +dsaf_set_dev_bit (drv,GMAC_PCS_RX_EN_REG ,0 ,1 );dsaf_set_dev_bit (drv,GMAC_PORT_EN_REG ,GMAC_PORT_RX_EN_B ,0 ); + } }/* hns_gmac_get_en - get port enable
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c +15 -0
@@ -783,6 +783,17 @@ static int hns_mac_register_phy(struct hns_mac_cb *mac_cb)return rc; } +static void hns_mac_remove_phydev (struct hns_mac_cb *mac_cb) +{ +if (!to_acpi_device_node (mac_cb->fw_port) || !mac_cb->phy_dev) +return ; + +phy_device_remove (mac_cb->phy_dev); +phy_device_free (mac_cb->phy_dev); + + mac_cb->phy_dev =NULL ; +} +#define MAC_MEDIA_TYPE_MAX_LEN 16 static const struct {
@@ -1120,7 +1131,11 @@ void hns_mac_uninit(struct dsaf_device *dsaf_dev)int max_port_num =hns_mac_get_max_port_num (dsaf_dev);for (i =0 ; i < max_port_num; i++) { +if (!dsaf_dev->mac_cb[i]) +continue ; + dsaf_dev->misc_op->cpld_reset_led (dsaf_dev->mac_cb[i]); +hns_mac_remove_phydev (dsaf_dev->mac_cb[i]); dsaf_dev->mac_cb[i] =NULL ; } }
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c +339 -164
655 lines not on this page · raw message
drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h +7 -6
@@ -176,7 +176,7 @@#define DSAF_INODE_IN_DATA_STP_DISC_0_REG 0x1A50#define DSAF_INODE_GE_FC_EN_0_REG 0x1B00#define DSAF_INODE_VC0_IN_PKT_NUM_0_REG 0x1B50 -#define DSAF_INODE_VC1_IN_PKT_NUM_0_REG 0x1C00 +#define DSAF_INODE_VC1_IN_PKT_NUM_0_REG 0x103C#define DSAF_INODE_IN_PRIO_PAUSE_BASE_REG 0x1C00#define DSAF_INODE_IN_PRIO_PAUSE_BASE_OFFSET 0x100#define DSAF_INODE_IN_PRIO_PAUSE_OFFSET 0x50
@@ -404,11 +404,11 @@#define RCB_ECC_ERR_ADDR4_REG 0x460#define RCB_ECC_ERR_ADDR5_REG 0x464 -#define RCB_COM_SF_CFG_INTMASK_RING 0x480 -#define RCB_COM_SF_CFG_RING_STS 0x484 -#define RCB_COM_SF_CFG_RING 0x488 -#define RCB_COM_SF_CFG_INTMASK_BD 0x48C -#define RCB_COM_SF_CFG_BD_RINT_STS 0x470 +#define RCB_COM_SF_CFG_INTMASK_RING 0x470 +#define RCB_COM_SF_CFG_RING_STS 0x474 +#define RCB_COM_SF_CFG_RING 0x478 +#define RCB_COM_SF_CFG_INTMASK_BD 0x47C +#define RCB_COM_SF_CFG_BD_RINT_STS 0x480#define RCB_COM_RCB_RD_BD_BUSY 0x490#define RCB_COM_RCB_FBD_CRT_EN 0x494#define RCB_COM_AXI_WR_ERR_INTMASK 0x498
@@ -534,6 +534,7 @@#define GMAC_LD_LINK_COUNTER_REG 0x01D0UL#define GMAC_LOOP_REG 0x01DCUL#define GMAC_RECV_CONTROL_REG 0x01E0UL +#define GMAC_PCS_RX_EN_REG 0x01E4UL#define GMAC_VLAN_CODE_REG 0x01E8UL#define GMAC_RX_OVERRUN_CNT_REG 0x01ECUL#define GMAC_RX_LENGTHFIELD_ERR_CNT_REG 0x01F4UL
drivers/net/ethernet/hisilicon/hns/hns_enet.c +39 -4
105 lines not on this page · raw message
drivers/net/ethernet/ibm/ibmvnic.c +1 -1
@@ -1596,7 +1596,7 @@ static void ibmvnic_reset(struct ibmvnic_adapter *adapter, } } - rwi =kzalloc (sizeof (*rwi),GFP_KERNEL ); + rwi =kzalloc (sizeof (*rwi),GFP_ATOMIC );if (!rwi) {mutex_unlock (&adapter->rwi_lock);ibmvnic_close (netdev);
drivers/net/ethernet/intel/i40e/i40e_main.c +7 -7
@@ -1554,17 +1554,17 @@ static int i40e_set_mac(struct net_device *netdev, void *p)netdev_info (netdev,"set new mac address %pM\n" , addr->sa_data);/* Copy the address first, so that we avoid a possible race with -* .set_rx_mode(). If we copy after changing the address in the filter -* list, we might open ourselves to a narrow race window where -* .set_rx_mode could delete our dev_addr filter and prevent traffic -* from passing. +* .set_rx_mode(). +* - Remove old address from MAC filter +* - Copy new address +* - Add new address to MAC filter */ -ether_addr_copy (netdev->dev_addr, addr->sa_data); -spin_lock_bh (&vsi->mac_filter_hash_lock);i40e_del_mac_filter (vsi, netdev->dev_addr); -i40e_add_mac_filter (vsi, addr->sa_data); +ether_addr_copy (netdev->dev_addr, addr->sa_data); +i40e_add_mac_filter (vsi, netdev->dev_addr);spin_unlock_bh (&vsi->mac_filter_hash_lock); +if (vsi->type ==I40E_VSI_MAIN ) {i40e_status ret;
drivers/net/ethernet/neterion/vxge/vxge-config.c +1 -1
@@ -808,7 +808,7 @@ __vxge_hw_vpath_fw_ver_get(struct __vxge_hw_virtualpath *vpath,struct vxge_hw_device_date *fw_date = &hw_info->fw_date;struct vxge_hw_device_version *flash_version = &hw_info->flash_version;struct vxge_hw_device_date *flash_date = &hw_info->flash_date; -u64 data0, data1 =0 , steer_ctrl =0 ; +u64 data0 =0 , data1 =0 , steer_ctrl =0 ;enum vxge_hw_status status; status = vxge_hw_vpath_fw_api(vpath,
drivers/net/ethernet/nuvoton/w90p910_ether.c +1 -1
@@ -912,7 +912,7 @@ static const struct net_device_ops w90p910_ether_netdev_ops = { .ndo_validate_addr = eth_validate_addr, }; -static void __init get_mac_address (struct net_device *dev) +static void get_mac_address (struct net_device *dev) {struct w90p910_ether *ether =netdev_priv (dev);struct platform_device *pdev;
drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c +2 -1
@@ -1125,7 +1125,8 @@ netxen_validate_firmware(struct netxen_adapter *adapter)return -EINVAL ; } val =nx_get_bios_version (adapter); -netxen_rom_fast_read (adapter,NX_BIOS_VERSION_OFFSET , (int *)&bios); +if (netxen_rom_fast_read (adapter,NX_BIOS_VERSION_OFFSET , (int *)&bios)) +return -EIO ;if ((__force u32 )val != bios) {dev_err (&pdev->dev,"%s: firmware bios is incompatible\n" , fw_name[fw_type]);
drivers/net/ethernet/qlogic/qed/qed_ll2.c +1 -0
@@ -2351,6 +2351,7 @@ static int qed_ll2_start_xmit(struct qed_dev *cdev, struct sk_buff *skb)if (unlikely (dma_mapping_error (&cdev->pdev->dev, mapping))) {DP_NOTICE (cdev,"Unable to map frag - dropping packet\n" ); + rc = -ENOMEM ; goto err; }
drivers/net/ieee802154/ca8210.c +2 -2
@@ -722,7 +722,7 @@ static void ca8210_mlme_reset_worker(struct work_struct *work)static void ca8210_rx_done (struct cas_control *cas_ctl) {u8 *buf; -u8 len; +unsigned int len;struct work_priv_container *mlme_reset_wpc;struct ca8210_priv *priv = cas_ctl->priv;
@@ -731,7 +731,7 @@ static void ca8210_rx_done(struct cas_control *cas_ctl)if (len >CA8210_SPI_BUF_SIZE ) {dev_crit ( &priv->spi->dev, -"Received packet len (%d) erroneously long\n" , +"Received packet len (%u) erroneously long\n" , len ); goto finish;
drivers/net/usb/lan78xx.c +4 -0
@@ -2212,6 +2212,10 @@ static int lan78xx_set_mac_addr(struct net_device *netdev, void *p) ret =lan78xx_write_reg (dev,RX_ADDRL , addr_lo); ret =lan78xx_write_reg (dev,RX_ADDRH , addr_hi); +/* Added to support MAC address changes */ + ret =lan78xx_write_reg (dev,MAF_LO (0 ), addr_lo); + ret =lan78xx_write_reg (dev,MAF_HI (0 ), addr_hi |MAF_HI_VALID_ ); +return 0 ; }
drivers/net/usb/qmi_wwan.c +8 -7
@@ -151,17 +151,18 @@ static bool qmimux_has_slaves(struct usbnet *dev)static int qmimux_rx_fixup (struct usbnet *dev,struct sk_buff *skb) { -unsigned int len, offset =sizeof (struct qmimux_hdr ); +unsigned int len, offset =0 ;struct qmimux_hdr *hdr;struct net_device *net;struct sk_buff *skbn; +u8 qmimux_hdr_sz =sizeof (*hdr); -while (offset < skb->len) { - hdr = (struct qmimux_hdr *)skb->data; +while (offset + qmimux_hdr_sz < skb->len) { + hdr = (struct qmimux_hdr *)(skb->data + offset); len =be16_to_cpu (hdr->pkt_len);/* drop the packet, bogus length */ -if (offset + len > skb->len) +if (offset + len + qmimux_hdr_sz > skb->len)return 0 ;/* control packet, we do not know what to do */
@@ -176,7 +177,7 @@ static int qmimux_rx_fixup(struct usbnet *dev, struct sk_buff *skb)return 0 ; skbn->dev = net; -switch (skb->data[offset] &0xf0 ) { +switch (skb->data[offset + qmimux_hdr_sz] &0xf0 ) {case 0x40 : skbn->protocol =htons (ETH_P_IP );break ;
@@ -188,12 +189,12 @@ static int qmimux_rx_fixup(struct usbnet *dev, struct sk_buff *skb) goto skip; } -skb_put_data (skbn, skb->data + offset, len); +skb_put_data (skbn, skb->data + offset + qmimux_hdr_sz, len);if (netif_rx (skbn) !=NET_RX_SUCCESS )return 0 ; skip: - offset += len +sizeof (struct qmimux_hdr ); + offset += len + qmimux_hdr_sz; }return 1 ; }
drivers/net/wireless/broadcom/b43/phy_common.c +1 -1
@@ -616,7 +616,7 @@ struct b43_c32 b43_cordic(int theta)u8 i;s32 tmp;s8 signx =1 ; -u32 angle =0 ; +s32 angle =0 ;struct b43_c32 ret = { .i =39797 , .q =0 , };while (theta > (180 <<16 ))
drivers/pinctrl/meson/pinctrl-meson.c +2 -1
@@ -272,7 +272,8 @@ static int meson_pinconf_set(struct pinctrl_dev *pcdev, unsigned int pin,case PIN_CONFIG_BIAS_DISABLE :dev_dbg (pc->dev,"pin %u: disable bias\n" , pin); -meson_calc_reg_and_bit (bank, pin,REG_PULL , ®, &bit); +meson_calc_reg_and_bit (bank, pin,REG_PULLEN , ®, + &bit); ret =regmap_update_bits (pc->reg_pullen, reg,BIT (bit),0 );if (ret)
drivers/power/supply/olpc_battery.c +2 -2
@@ -427,14 +427,14 @@ static int olpc_bat_get_property(struct power_supply *psy,if (ret)return ret; - val->intval = (s16 )be16_to_cpu (ec_word) *100 /256 ; + val->intval = (s16 )be16_to_cpu (ec_word) *10 /256 ;break ;case POWER_SUPPLY_PROP_TEMP_AMBIENT : ret =olpc_ec_cmd (EC_AMB_TEMP ,NULL ,0 , (void *)&ec_word,2 );if (ret)return ret; - val->intval = (int )be16_to_cpu (ec_word) *100 /256 ; + val->intval = (int )be16_to_cpu (ec_word) *10 /256 ;break ;case POWER_SUPPLY_PROP_CHARGE_COUNTER : ret =olpc_ec_cmd (EC_BAT_ACR ,NULL ,0 , (void *)&ec_word,2 );
drivers/s390/scsi/zfcp_aux.c +3 -3
@@ -274,16 +274,16 @@ static void zfcp_free_low_mem_buffers(struct zfcp_adapter *adapter)*/ int zfcp_status_read_refill (struct zfcp_adapter *adapter) { -while (atomic_read (&adapter->stat_miss) >0 ) +while (atomic_add_unless (&adapter->stat_miss,-1 ,0 ))if (zfcp_fsf_status_read (adapter->qdio)) { +atomic_inc (&adapter->stat_miss);/* undo add -1 */ if (atomic_read (&adapter->stat_miss) >= adapter->stat_read_buf_num) {zfcp_erp_adapter_reopen (adapter,0 ,"axsref1" );return 1 ; }break ; - }else -atomic_dec (&adapter->stat_miss); + }return 0 ; }
drivers/scsi/bnx2fc/bnx2fc_fcoe.c +1 -1
@@ -2372,7 +2372,7 @@ static int _bnx2fc_create(struct net_device *netdev,if (!interface) { printk(KERN_ERR PFX "bnx2fc_interface_create failed\n"); rc = -ENOMEM ; - goto ifput_err; + goto netdev_err; }if (is_vlan_dev (netdev)) {
drivers/scsi/lpfc/lpfc_sli.c +2 -1
@@ -13941,7 +13941,8 @@ lpfc_sli4_queue_alloc(struct lpfc_hba *phba, uint32_t entry_size, hw_page_size))/hw_page_size;/* If needed, Adjust page count to match the max the adapter supports */ -if (queue->page_count > phba->sli4_hba.pc_sli4_params.wqpcnt) +if (phba->sli4_hba.pc_sli4_params.wqpcnt && + (queue->page_count > phba->sli4_hba.pc_sli4_params.wqpcnt)) queue->page_count = phba->sli4_hba.pc_sli4_params.wqpcnt;INIT_LIST_HEAD (&queue->list);
drivers/target/iscsi/cxgbit/cxgbit_cm.c +4 -1
@@ -631,8 +631,11 @@ static void cxgbit_send_halfclose(struct cxgbit_sock *csk)static void cxgbit_arp_failure_discard (void *handle,struct sk_buff *skb) { +struct cxgbit_sock *csk = handle; +pr_debug ("%s cxgbit_device %p\n" , __func__, handle);kfree_skb (skb); +cxgbit_put_csk (csk); }static void cxgbit_abort_arp_failure (void *handle,struct sk_buff *skb)
@@ -1147,7 +1150,7 @@ cxgbit_pass_accept_rpl(struct cxgbit_sock *csk, struct cpl_pass_accept_req *req) rpl5->opt0 =cpu_to_be64 (opt0); rpl5->opt2 =cpu_to_be32 (opt2);set_wr_txq (skb,CPL_PRIORITY_SETUP , csk->ctrlq_idx); -t4_set_arp_err_handler (skb,NULL , cxgbit_arp_failure_discard); +t4_set_arp_err_handler (skb, csk, cxgbit_arp_failure_discard);cxgbit_l2t_send (csk->com.cdev, skb, csk->l2t); }
drivers/target/iscsi/cxgbit/cxgbit_main.c +1 -0
@@ -58,6 +58,7 @@ static void *cxgbit_uld_add(const struct cxgb4_lld_info *lldi)return ERR_PTR (-ENOMEM );kref_init (&cdev->kref); +spin_lock_init (&cdev->np_lock); cdev->lldi = *lldi;
drivers/tty/serial/sunsu.c +26 -5
@@ -1393,22 +1393,43 @@ static inline struct console *SUNSU_CONSOLE(void)static enum su_type su_get_type (struct device_node *dp) {struct device_node *ap =of_find_node_by_path ("/aliases" ); +enum su_type rc =SU_PORT_PORT ;if (ap) {const char *keyb =of_get_property (ap,"keyboard" ,NULL );const char *ms =of_get_property (ap,"mouse" ,NULL ); +struct device_node *match;if (keyb) { -if (dp ==of_find_node_by_path (keyb)) -return SU_PORT_KBD ; + match =of_find_node_by_path (keyb); + +/* +* The pointer is used as an identifier not +* as a pointer, we can drop the refcount on +* the of__node immediately after getting it. +*/ +of_node_put (match); + +if (dp == match) { + rc =SU_PORT_KBD ; + goto out; + } }if (ms) { -if (dp ==of_find_node_by_path (ms)) -return SU_PORT_MS ; + match =of_find_node_by_path (ms); + +of_node_put (match); + +if (dp == match) { + rc =SU_PORT_MS ; + goto out; + } } } -return SU_PORT_PORT ; +out: +of_node_put (ap); +return rc; }static int su_probe (struct platform_device *op)
drivers/vhost/vsock.c +2 -0
@@ -522,6 +522,8 @@ static int vhost_vsock_dev_open(struct inode *inode, struct file *file) goto out; } + vsock->guest_cid =0 ;/* no CID assigned yet */ +atomic_set (&vsock->queued_replies,0 ); vqs[VSOCK_VQ_TX ] = &vsock->vqs[VSOCK_VQ_TX ];
fs/ceph/caps.c +0 -1
@@ -3438,7 +3438,6 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex, tcap->cap_id = t_cap_id; tcap->seq = t_seq -1 ; tcap->issue_seq = t_seq -1 ; - tcap->mseq = t_mseq; tcap->issued |= issued; tcap->implemented |= issued;if (cap == ci->i_auth_cap)
fs/dlm/lock.c +10 -7
@@ -1210,6 +1210,7 @@ static int create_lkb(struct dlm_ls *ls, struct dlm_lkb **lkb_ret)if (rv <0 ) {log_error (ls,"create_lkb idr error %d" , rv); +dlm_free_lkb (lkb);return rv; }
@@ -4176,6 +4177,7 @@ static int receive_convert(struct dlm_ls *ls, struct dlm_message *ms) (unsigned long long )lkb->lkb_recover_seq, ms->m_header.h_nodeid, ms->m_lkid); error = -ENOENT ; +dlm_put_lkb (lkb); goto fail; }
@@ -4229,6 +4231,7 @@ static int receive_unlock(struct dlm_ls *ls, struct dlm_message *ms) lkb->lkb_id, lkb->lkb_remid, ms->m_header.h_nodeid, ms->m_lkid); error = -ENOENT ; +dlm_put_lkb (lkb); goto fail; }
@@ -5789,20 +5792,20 @@ int dlm_user_request(struct dlm_ls *ls, struct dlm_user_args *ua, goto out; } } - -/* After ua is attached to lkb it will be freed by dlm_free_lkb(). -When DLM_IFL_USER is set, the dlm knows that this is a userspace -lock and that lkb_astparam is the dlm_user_args structure. */ - error =set_lock_args (mode, &ua->lksb, flags, namelen, timeout_cs, fake_astfn, ua, fake_bastfn, &args); - lkb->lkb_flags |=DLM_IFL_USER ; -if (error) { +kfree (ua->lksb.sb_lvbptr); + ua->lksb.sb_lvbptr =NULL ; +kfree (ua);__put_lkb (ls, lkb); goto out; } +/* After ua is attached to lkb it will be freed by dlm_free_lkb(). +When DLM_IFL_USER is set, the dlm knows that this is a userspace +lock and that lkb_astparam is the dlm_user_args structure. */ + lkb->lkb_flags |=DLM_IFL_USER ; error =request_lock (ls, lkb, name, namelen, &args);switch (error) {
fs/dlm/lockspace.c +1 -1
@@ -680,11 +680,11 @@ static int new_lockspace(const char *name, const char *cluster,kfree (ls->ls_recover_buf); out_lkbidr:idr_destroy (&ls->ls_lkbidr); + out_rsbtbl:for (i =0 ; i <DLM_REMOVE_NAMES_MAX ; i++) {if (ls->ls_remove_names[i])kfree (ls->ls_remove_names[i]); } - out_rsbtbl:vfree (ls->ls_rsbtbl); out_lsfree:if (do_unreg)
fs/gfs2/inode.c +9 -9
@@ -743,17 +743,19 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,the gfs2 structures. */ if (default_acl) { error =__gfs2_set_acl (inode, default_acl,ACL_TYPE_DEFAULT ); +if (error) + goto fail_gunlock3;posix_acl_release (default_acl); + default_acl =NULL ; }if (acl) { -if (!error) - error =__gfs2_set_acl (inode, acl,ACL_TYPE_ACCESS ); + error =__gfs2_set_acl (inode, acl,ACL_TYPE_ACCESS ); +if (error) + goto fail_gunlock3;posix_acl_release (acl); + acl =NULL ; } -if (error) - goto fail_gunlock3; - error =security_inode_init_security (&ip->i_inode, &dip->i_inode, name, &gfs2_initxattrs,NULL );if (error)
@@ -788,10 +790,8 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry, }gfs2_rsqa_delete (ip,NULL ); fail_free_acls: -if (default_acl) -posix_acl_release (default_acl); -if (acl) -posix_acl_release (acl); +posix_acl_release (default_acl); +posix_acl_release (acl); fail_gunlock:gfs2_dir_no_add (&da);gfs2_glock_dq_uninit (ghs);
fs/gfs2/rgrp.c +1 -1
@@ -1695,9 +1695,9 @@ static int gfs2_rbm_find(struct gfs2_rbm *rbm, u8 state, u32 *minext, goto next_iter; }if (ret == -E2BIG ) { + n += rbm->bii - initial_bii; rbm->bii =0 ; rbm->offset =0 ; - n += (rbm->bii - initial_bii); goto res_covered_end_of_rgrp; }return ret;
fs/lockd/clntproc.c +1 -1
@@ -442,7 +442,7 @@ nlmclnt_test(struct nlm_rqst *req, struct file_lock *fl) fl->fl_start = req->a_res.lock.fl.fl_start; fl->fl_end = req->a_res.lock.fl.fl_end; fl->fl_type = req->a_res.lock.fl.fl_type; - fl->fl_pid =0 ; + fl->fl_pid = -req->a_res.lock.fl.fl_pid;break ;default : status =nlm_stat_to_errno (req->a_res.status);
fs/lockd/xdr.c +2 -2
@@ -127,7 +127,7 @@ nlm_decode_lock(__be32 *p, struct nlm_lock *lock)locks_init_lock (fl); fl->fl_owner = current->files; - fl->fl_pid = (pid_t )lock->svid; + fl->fl_pid = current->tgid; fl->fl_flags =FL_POSIX ; fl->fl_type =F_RDLCK ;/* as good as anything else */ start =ntohl (*p++);
@@ -269,7 +269,7 @@ nlmsvc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p)memset (lock,0 ,sizeof (*lock));locks_init_lock (&lock->fl); lock->svid = ~(u32 )0 ; - lock->fl.fl_pid = (pid_t )lock->svid; + lock->fl.fl_pid = current->tgid; if (!(p = nlm_decode_cookie(p, &argp->cookie)) || !(p = xdr_decode_string_inplace(p, &lock->caller,
fs/lockd/xdr4.c +2 -2
@@ -119,7 +119,7 @@ nlm4_decode_lock(__be32 *p, struct nlm_lock *lock)locks_init_lock (fl); fl->fl_owner = current->files; - fl->fl_pid = (pid_t )lock->svid; + fl->fl_pid = current->tgid; fl->fl_flags =FL_POSIX ; fl->fl_type =F_RDLCK ;/* as good as anything else */ p =xdr_decode_hyper (p, &start);
@@ -266,7 +266,7 @@ nlm4svc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p)memset (lock,0 ,sizeof (*lock));locks_init_lock (&lock->fl); lock->svid = ~(u32 )0 ; - lock->fl.fl_pid = (pid_t )lock->svid; + lock->fl.fl_pid = current->tgid; if (!(p = nlm4_decode_cookie(p, &argp->cookie)) || !(p = xdr_decode_string_inplace(p, &lock->caller,
include/linux/hmm.h +1 -3
@@ -437,8 +437,7 @@ struct hmm_devmem {* enough and allocate struct page for it. * * The device driver can wrap the hmm_devmem struct inside a private device -* driver struct. The device driver must call hmm_devmem_remove() before the -* device goes away and before freeing the hmm_devmem struct memory. +* driver struct. */ struct hmm_devmem *hmm_devmem_add(const struct hmm_devmem_ops *ops, struct device *device,
@@ -446,7 +445,6 @@ struct hmm_devmem *hmm_devmem_add(const struct hmm_devmem_ops *ops,struct hmm_devmem *hmm_devmem_add_resource (const struct hmm_devmem_ops *ops,struct device *device,struct resource *res); -void hmm_devmem_remove (struct hmm_devmem *devmem);/* * hmm_devmem_page_set_drvdata - set per-page driver data field
include/uapi/linux/input-event-codes.h +9 -0
@@ -742,6 +742,15 @@#define ABS_MISC 0x28 +/* +* 0x2e is reserved and should not be used in input drivers. +* It was used by HID as ABS_MISC+6 and userspace needs to detect if +* the next ABS_* event is correct or is just ABS_MISC + n. +* We define here ABS_RESERVED so userspace can rely on it and detect +* the situation described above. +*/ +#define ABS_RESERVED 0x2e +#define ABS_MT_SLOT 0x2f/* MT slot being modified */ #define ABS_MT_TOUCH_MAJOR 0x30/* Major axis of touching ellipse */ #define ABS_MT_TOUCH_MINOR 0x31/* Minor axis (omit if circular) */
kernel/fork.c +11 -2
@@ -1672,8 +1672,6 @@ static __latent_entropy struct task_struct *copy_process(posix_cpu_timers_init (p); - p->start_time =ktime_get_ns (); - p->real_start_time =ktime_get_boot_ns (); p->io_context =NULL ; p->audit_context =NULL ;cgroup_fork (p);
@@ -1837,6 +1835,17 @@ static __latent_entropy struct task_struct *copy_process(if (retval) goto bad_fork_free_pid; +/* +* From this point on we must avoid any synchronous user-space +* communication until we take the tasklist-lock. In particular, we do +* not want user-space to be able to predict the process start-time by +* stalling fork(2) after we recorded the start_time but before it is +* visible to the system. +*/ + + p->start_time =ktime_get_ns (); + p->real_start_time =ktime_get_boot_ns (); +/* * Make it visible to the rest of the system, but dont wake it up yet. * Need tasklist lock for parent etc handling!
kernel/irq/affinity.c +8 -7
@@ -108,7 +108,7 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd)int affv = nvecs - affd->pre_vectors - affd->post_vectors;int last_affv = affv + affd->pre_vectors;nodemask_t nodemsk =NODE_MASK_NONE ; -struct cpumask *masks; +struct cpumask *masks =NULL ;cpumask_var_t nmsk, *node_to_possible_cpumask;/*
@@ -121,13 +121,13 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd)if (!zalloc_cpumask_var (&nmsk,GFP_KERNEL ))return NULL ; - masks =kcalloc (nvecs,sizeof (*masks),GFP_KERNEL ); -if (!masks) - goto out; - node_to_possible_cpumask =alloc_node_to_possible_cpumask ();if (!node_to_possible_cpumask) - goto out; + goto outcpumsk; + + masks =kcalloc (nvecs,sizeof (*masks),GFP_KERNEL ); +if (!masks) + goto outnodemsk;/* Fill out vectors at the beginning that don't need affinity */ for (curvec =0 ; curvec < affd->pre_vectors; curvec++)
@@ -192,8 +192,9 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd)/* Fill out vectors at the end that don't need affinity */ for (; curvec < nvecs; curvec++)cpumask_copy (masks + curvec, irq_default_affinity); +outnodemsk:free_node_to_possible_cpumask (node_to_possible_cpumask); -out: +outcpumsk:free_cpumask_var (nmsk);return masks; }
kernel/memremap.c +4 -7
@@ -379,15 +379,12 @@ void *devm_memremap_pages(struct device *dev, struct resource *res, is_ram =region_intersects (align_start, align_size,IORESOURCE_SYSTEM_RAM ,IORES_DESC_NONE ); -if (is_ram ==REGION_MIXED ) { -WARN_ONCE (1 ,"%s attempted on mixed region %pr\n" , - __func__, res); +if (is_ram !=REGION_DISJOINT ) { +WARN_ONCE (1 ,"%s attempted on %s region %pr\n" , __func__, + is_ram ==REGION_MIXED ?"mixed" :"ram" , res);return ERR_PTR (-ENXIO ); } -if (is_ram ==REGION_INTERSECTS ) -return __va (res->start); -if (!ref)return ERR_PTR (-EINVAL );
@@ -482,7 +479,7 @@ void *devm_memremap_pages(struct device *dev, struct resource *res,devres_free (page_map);return ERR_PTR (error); } -EXPORT_SYMBOL (devm_memremap_pages); +EXPORT_SYMBOL_GPL (devm_memremap_pages);unsigned long vmem_altmap_offset (struct vmem_altmap *altmap) {
kernel/sched/fair.c +9 -34
84 lines not on this page · raw message
lib/raid6/Makefile +15 -0
@@ -18,6 +18,21 @@ quiet_cmd_unroll = UNROLL $@ ifeq ($(CONFIG_ALTIVEC),y) altivec_flags := -maltivec $(call cc-option,-mabi=altivec) + +ifeq ($(cc-name),clang) +# clang ppc port does not yet support -maltivec when -msoft-float is +# enabled. A future release of clang will resolve this +# https://bugs.llvm.org/show_bug.cgi?id=31177 +CFLAGS_REMOVE_altivec1.o += -msoft-float +CFLAGS_REMOVE_altivec2.o += -msoft-float +CFLAGS_REMOVE_altivec4.o += -msoft-float +CFLAGS_REMOVE_altivec8.o += -msoft-float +CFLAGS_REMOVE_altivec8.o += -msoft-float +CFLAGS_REMOVE_vpermxor1.o += -msoft-float +CFLAGS_REMOVE_vpermxor2.o += -msoft-float +CFLAGS_REMOVE_vpermxor4.o += -msoft-float +CFLAGS_REMOVE_vpermxor8.o += -msoft-float +endif endif # The GCC option -ffreestanding is required in order to compile code containing
lib/test_debug_virtual.c +1 -0
@@ -5,6 +5,7 @@#include <linux/vmalloc.h> #include <linux/slab.h> #include <linux/sizes.h> +#include <linux/io.h> #include <asm/page.h> #ifdef CONFIG_MIPS
mm/hmm.c +26 -105
220 lines not on this page · raw message
mm/memory_hotplug.c +16 -0
@@ -35,6 +35,7 @@#include <linux/memblock.h> #include <linux/bootmem.h> #include <linux/compaction.h> +#include <linux/rmap.h> #include <asm/tlbflush.h>
@@ -1391,6 +1392,21 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) pfn =page_to_pfn (compound_head (page)) +hpage_nr_pages (page) -1 ; +/* +* HWPoison pages have elevated reference counts so the migration would +* fail on them. It also doesn't make any sense to migrate them in the +* first place. Still try to unmap such a page in case it is still mapped +* (e.g. current hwpoison implementation doesn't unmap KSM pages but keep +* the unmap as the catch all safety net). +*/ +if (PageHWPoison (page)) { +if (WARN_ON (PageLRU (page))) +isolate_lru_page (page); +if (page_mapped (page)) +try_to_unmap (page,TTU_IGNORE_MLOCK |TTU_IGNORE_ACCESS ); +continue ; + } +if (!get_page_unless_zero (page))continue ;/*
mm/swapfile.c +2 -1
@@ -2218,7 +2218,8 @@ int try_to_unuse(unsigned int type, bool frontswap,*/ if (PageSwapCache (page) &&likely (page_private (page) == entry.val) && - !page_swapped (page)) + (!PageTransCompound (page) || + !swap_page_trans_huge_swapped (si, entry)))delete_from_swap_cache (compound_head (page));/*
net/9p/client.c +21 -0
@@ -181,6 +181,12 @@ static int parse_opts(char *opts, struct p9_client *clnt) ret = r;continue ; } +if (option <4096 ) { +p9_debug (P9_DEBUG_ERROR , +"msize should be at least 4k\n" ); + ret = -EINVAL ; +continue ; + } clnt->msize = option;break ;case Opt_trans:
@@ -996,10 +1002,18 @@ static int p9_client_version(struct p9_client *c)else if (!strncmp (version,"9P2000" ,6 )) c->proto_version = p9_proto_legacy;else { +p9_debug (P9_DEBUG_ERROR , +"server returned an unknown version: %s\n" , version); err = -EREMOTEIO ; goto error; } +if (msize <4096 ) { +p9_debug (P9_DEBUG_ERROR , +"server returned a msize < 4096: %d\n" , msize); + err = -EREMOTEIO ; + goto error; + }if (msize < c->msize) c->msize = msize;
@@ -1064,6 +1078,13 @@ struct p9_client *p9_client_create(const char *dev_name, char *options)if (clnt->msize > clnt->trans_mod->maxsize) clnt->msize = clnt->trans_mod->maxsize; +if (clnt->msize <4096 ) { +p9_debug (P9_DEBUG_ERROR , +"Please specify a msize of at least 4k\n" ); + err = -EINVAL ; + goto free_client; + } + err =p9_client_version (clnt);if (err) goto close_trans;
net/mac80211/status.c +5 -0
@@ -545,6 +545,11 @@ static void ieee80211_report_used_skb(struct ieee80211_local *local, }ieee80211_led_tx (local); + +if (skb_has_frag_list (skb)) { +kfree_skb_list (skb_shinfo (skb)->frag_list); +skb_shinfo (skb)->frag_list =NULL ; + } }/*
net/netfilter/ipset/ip_set_list_set.c +1 -1
@@ -542,8 +542,8 @@ list_set_list(const struct ip_set *set, ret = -EMSGSIZE ; }else { cb->args[IPSET_CB_ARG0 ] = i; +ipset_nest_end (skb, atd); } -ipset_nest_end (skb, atd); out:rcu_read_unlock ();return ret;
net/netfilter/nf_conntrack_seqadj.c +4 -3
@@ -115,12 +115,12 @@ static void nf_ct_sack_block_adjust(struct sk_buff *skb,/* TCP SACK sequence number adjustment */ static unsigned int nf_ct_sack_adjust (struct sk_buff *skb,unsigned int protoff, -struct tcphdr *tcph,struct nf_conn *ct,enum ip_conntrack_info ctinfo) { -unsigned int dir, optoff, optend; +struct tcphdr *tcph = (void *)skb->data + protoff;struct nf_conn_seqadj *seqadj =nfct_seqadj (ct); +unsigned int dir, optoff, optend; optoff = protoff +sizeof (struct tcphdr ); optend = protoff + tcph->doff *4 ;
@@ -128,6 +128,7 @@ static unsigned int nf_ct_sack_adjust(struct sk_buff *skb,if (!skb_make_writable (skb, optend))return 0 ; + tcph = (void *)skb->data + protoff; dir =CTINFO2DIR (ctinfo);while (optoff < optend) {
@@ -207,7 +208,7 @@ int nf_ct_seq_adjust(struct sk_buff *skb, ntohl(newack)); tcph->ack_seq = newack; - res =nf_ct_sack_adjust (skb, protoff, tcph, ct, ctinfo); + res =nf_ct_sack_adjust (skb, protoff, ct, ctinfo); out:spin_unlock_bh (&ct->lock);
net/netfilter/nf_nat_core.c +2 -1
@@ -97,7 +97,8 @@ int nf_xfrm_me_harder(struct net *net, struct sk_buff *skb, unsigned int family) dst =skb_dst (skb);if (dst->xfrm) dst = ((struct xfrm_dst *)dst)->route; -dst_hold (dst); +if (!dst_hold_safe (dst)) +return -EHOSTUNREACH ; dst =xfrm_lookup (net, dst, &fl, skb->sk,0 );if (IS_ERR (dst))
net/sunrpc/auth_gss/svcauth_gss.c +4 -4
@@ -1120,7 +1120,7 @@ static int svcauth_gss_legacy_init(struct svc_rqst *rqstp,struct kvec *resv = &rqstp->rq_res.head[0 ];struct rsi *rsip, rsikey;int ret; -struct sunrpc_net *sn =net_generic (rqstp->rq_xprt->xpt_net, sunrpc_net_id); +struct sunrpc_net *sn =net_generic (SVC_NET (rqstp), sunrpc_net_id);memset (&rsikey,0 ,sizeof (rsikey)); ret = gss_read_verf(gc, argv, authp,
@@ -1231,7 +1231,7 @@ static int svcauth_gss_proxy_init(struct svc_rqst *rqstp,uint64_t handle;int status;int ret; -struct net *net = rqstp->rq_xprt->xpt_net; +struct net *net =SVC_NET (rqstp);struct sunrpc_net *sn =net_generic (net, sunrpc_net_id);memset (&ud,0 ,sizeof (ud));
@@ -1422,7 +1422,7 @@ svcauth_gss_accept(struct svc_rqst *rqstp, __be32 *authp)__be32 *rpcstart;__be32 *reject_stat = resv->iov_base + resv->iov_len;int ret; -struct sunrpc_net *sn =net_generic (rqstp->rq_xprt->xpt_net, sunrpc_net_id); +struct sunrpc_net *sn =net_generic (SVC_NET (rqstp), sunrpc_net_id);dprintk ("RPC: svcauth_gss: argv->iov_len = %zd\n" , argv->iov_len);
@@ -1710,7 +1710,7 @@ svcauth_gss_release(struct svc_rqst *rqstp)struct rpc_gss_wire_cred *gc = &gsd->clcred;struct xdr_buf *resbuf = &rqstp->rq_res;int stat = -EINVAL ; -struct sunrpc_net *sn =net_generic (rqstp->rq_xprt->xpt_net, sunrpc_net_id); +struct sunrpc_net *sn =net_generic (SVC_NET (rqstp), sunrpc_net_id);if (gc->gc_proc !=RPC_GSS_PROC_DATA ) goto out;
net/sunrpc/cache.c +9 -1
@@ -54,6 +54,11 @@ static void cache_init(struct cache_head *h, struct cache_detail *detail) h->last_refresh = now; } +static void cache_fresh_locked (struct cache_head *head,time_t expiry, +struct cache_detail *detail); +static void cache_fresh_unlocked (struct cache_head *head, +struct cache_detail *detail); +struct cache_head *sunrpc_cache_lookup (struct cache_detail *detail,struct cache_head *key,int hash) {
@@ -95,6 +100,7 @@ struct cache_head *sunrpc_cache_lookup(struct cache_detail *detail,if (cache_is_expired (detail, tmp)) {hlist_del_init (&tmp->cache_list); detail->entries --; +cache_fresh_locked (tmp,0 , detail); freeme = tmp;break ; }
@@ -110,8 +116,10 @@ struct cache_head *sunrpc_cache_lookup(struct cache_detail *detail,cache_get (new);write_unlock (&detail->hash_lock); -if (freeme) +if (freeme) { +cache_fresh_unlocked (freeme, detail);cache_put (freeme, detail); + }return new; }EXPORT_SYMBOL_GPL (sunrpc_cache_lookup);
net/sunrpc/xprtsock.c +2 -2
@@ -2223,8 +2223,8 @@ static void xs_udp_setup_socket(struct work_struct *work)trace_rpc_socket_connect (xprt, sock,0 ); status =0 ; out: -xprt_unlock_connect (xprt, transport);xprt_clear_connecting (xprt); +xprt_unlock_connect (xprt, transport);xprt_wake_pending_tasks (xprt, status); }
@@ -2451,8 +2451,8 @@ static void xs_tcp_setup_socket(struct work_struct *work) } status = -EAGAIN ; out: -xprt_unlock_connect (xprt, transport);xprt_clear_connecting (xprt); +xprt_unlock_connect (xprt, transport);xprt_wake_pending_tasks (xprt, status); }
net/xfrm/xfrm_input.c +6 -1
@@ -341,6 +341,12 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) skb->sp->xvec[skb->sp->len++] = x; +skb_dst_force (skb); +if (!skb_dst (skb)) { +XFRM_INC_STATS (net,LINUX_MIB_XFRMINERROR ); + goto drop; + } + lock:
Lines of this file are not shown. View the raw message.
security/selinux/ss/policydb.c +36 -15
51 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.