Linux 5.0.12
Greg KH
maintainerI'm announcing the release of the 5.0.12 kernel.
All users of the 5.0 kernel series must upgrade.
The updated 5.0.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.0.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
------------
Documentation/i2c/busses/i2c-i801 | 1 Makefile | 10 + arch/arm/Kconfig | 1 arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 2 arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 4 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 1 arch/arm/include/asm/kvm_mmu.h | 11 + arch/arm/include/asm/stage2_pgtable.h | 2 arch/arm/mach-imx/mach-imx51.c | 1 arch/arm64/boot/dts/renesas/r8a77990.dtsi | 7 - arch/arm64/include/asm/kvm_mmu.h | 11 + arch/arm64/kvm/reset.c | 6 - arch/s390/include/asm/elf.h | 11 + arch/x86/include/asm/kvm_host.h | 2 arch/x86/kvm/hyperv.c | 9 + arch/x86/kvm/mmu.c | 21 ++- arch/x86/kvm/svm.c | 32 +++++ arch/x86/kvm/vmx/vmx.c | 6 + arch/x86/kvm/x86.c | 3 arch/x86/mm/mmap.c | 2 arch/x86/realmode/init.c | 2 drivers/acpi/acpica/evgpe.c | 6 - drivers/ata/libata-zpodd.c | 34 ++++- drivers/gpio/gpio-aspeed.c | 2 drivers/gpio/gpiolib-of.c | 17 ++ drivers/gpu/drm/drm_drv.c | 6 - drivers/gpu/drm/drm_file.c | 6 - drivers/gpu/drm/i915/intel_dp.c | 6 - drivers/gpu/drm/meson/meson_drv.c | 9 + drivers/gpu/drm/tegra/hub.c | 4 drivers/i2c/busses/Kconfig | 1 drivers/i2c/busses/i2c-i801.c | 4 drivers/iommu/amd_iommu.c | 9 + drivers/iommu/amd_iommu_init.c | 7 - drivers/iommu/amd_iommu_types.h | 2 drivers/leds/leds-pca9532.c | 8 + drivers/leds/trigger/ledtrig-netdev.c | 16 +- drivers/net/ethernet/cadence/macb_main.c | 10 + drivers/net/ethernet/ibm/ehea/ehea_main.c | 1 drivers/net/ethernet/micrel/ks8851.c | 36 +++--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 2 drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 8 - drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 14 +- drivers/net/ethernet/ti/netcp_ethss.c | 8 + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 drivers/net/ieee802154/adf7242.c | 4 drivers/net/ieee802154/mac802154_hwsim.c | 2 drivers/net/phy/dp83822.c | 34 +++-- drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c | 3 drivers/net/wireless/mediatek/mt76/mt76x2/phy.c | 30 +++-- drivers/nvme/host/multipath.c | 5 drivers/nvme/target/core.c | 4 drivers/nvme/target/io-cmd-file.c | 20 +-- drivers/s390/net/qeth_l3_main.c | 4 drivers/s390/scsi/zfcp_fc.c | 21 ++- drivers/scsi/aacraid/aacraid.h | 7 + drivers/scsi/aacraid/commsup.c | 4 drivers/scsi/mpt3sas/mpt3sas_base.c | 6 + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 12 ++ drivers/scsi/qla4xxx/ql4_os.c | 2 drivers/staging/axis-fifo/Kconfig | 1 drivers/staging/mt7621-pci/Kconfig | 1 drivers/staging/rtl8188eu/core/rtw_xmit.c | 9 + drivers/staging/rtl8188eu/include/rtw_xmit.h | 2 drivers/staging/rtl8712/rtl8712_cmd.c | 10 - drivers/staging/rtl8712/rtl8712_cmd.h | 2 drivers/staging/rtl8723bs/core/rtw_xmit.c | 14 +- drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 drivers/staging/rtlwifi/phydm/rtl_phydm.c | 2 drivers/staging/rtlwifi/rtl8822be/fw.c | 2 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 8 + drivers/tty/serial/ar933x_uart.c | 24 +--- drivers/tty/serial/sc16is7xx.c | 12 +- drivers/usb/dwc3/dwc3-pci.c | 4 drivers/usb/gadget/udc/net2272.c | 1 drivers/usb/gadget/udc/net2280.c | 8 - drivers/usb/host/u132-hcd.c | 3 drivers/usb/misc/usb251xb.c | 2 fs/afs/fsclient.c | 6 - fs/afs/yfsclient.c | 2 fs/btrfs/transaction.c | 49 +++++++- fs/ceph/inode.c | 2 fs/fuse/dev.c | 12 +- fs/nfs/client.c | 2 fs/pipe.c | 4 fs/splice.c | 12 +- include/linux/mm.h | 15 ++ include/linux/pipe_fs_i.h | 10 + include/linux/sched/signal.h | 18 +++ include/net/tc_act/tc_gact.h | 2 include/net/xdp_sock.h | 1 kernel/ptrace.c | 15 ++ kernel/trace/trace.c | 6 - lib/sbitmap.c | 11 + mm/gup.c | 48 ++++++-- mm/hugetlb.c | 13 ++ mm/kasan/kasan.h | 5 net/bridge/br_netfilter_hooks.c | 1 net/bridge/br_netfilter_ipv6.c | 2 net/ipv6/netfilter/ip6t_srh.c | 6 + net/netfilter/Kconfig | 1 net/netfilter/nft_set_rbtree.c | 7 - net/sunrpc/xprtsock.c | 4 net/xdp/xdp_umem.c | 19 --- scripts/kconfig/lxdialog/inputbox.c | 3 scripts/kconfig/nconf.c | 2 scripts/kconfig/nconf.gui.c | 3 scripts/selinux/genheaders/genheaders.c | 1 scripts/selinux/mdp/mdp.c | 1 security/selinux/include/classmap.h | 1 tools/build/feature/test-libopencsd.c | 4 tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 1 tools/perf/util/machine.c | 32 +++-- tools/testing/selftests/kvm/Makefile | 4 tools/testing/selftests/kvm/include/kvm_util.h | 1 tools/testing/selftests/kvm/lib/kvm_util.c | 16 ++ tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c | 35 +++-- tools/testing/selftests/kvm/x86_64/state_test.c | 18 ++- virt/kvm/arm/hyp/vgic-v3-sr.c | 4 virt/kvm/arm/mmu.c | 59 +++++++--- virt/kvm/arm/vgic/vgic-its.c | 21 ++- virt/kvm/arm/vgic/vgic-v3.c | 4 virt/kvm/arm/vgic/vgic.c | 14 +- 123 files changed, 776 insertions(+), 349 deletions(-)
Aaro Koskinen (2):
net: stmmac: don't set own bit too early for jumbo frames
net: stmmac: fix jumbo frame sending with non-linear skbs
Aditya Pakki (5):
qlcnic: Avoid potential NULL pointer dereference
staging: rtl8188eu: Fix potential NULL pointer dereference of kcalloc
staging: rtlwifi: rtl8822b: fix to avoid potential NULL pointer dereference
staging: rtlwifi: Fix potential NULL pointer dereference of kzalloc
usb: usb251xb: fix to avoid potential NULL pointer dereference
Al Viro (1):
ceph: fix use-after-free on symlink traversal
Alakesh Haloi (1):
SUNRPC: fix uninitialized variable warning
Andrei Vagin (1):
ptrace: take into account saved_sigmask in PTRACE{GET,SET}SIGMASK
Andrey Smirnov (2):
gpio: of: Check propname before applying "cs-gpios" quirks
gpio: of: Check for "spi-cs-high" in child instead of parent node
Arnd Bergmann (2):
staging: axis-fifo: add CONFIG_OF dependency
netfilter: fix NETFILTER_XT_TARGET_TEE dependencies
Björn Töpel (1):
xsk: fix umem memory leak on cleanup
Changbin Du (1):
kconfig/[mn]conf: handle backspace (^H) key
Dan Carpenter (2):
staging: rtl8712: uninitialized memory in read_bbreg_hdl()
staging: vc04_services: Fix an error code in vchiq_probe()
Dan Murphy (1):
net: phy: Add DP83825I to the DP83822 driver
Dave Carroll (1):
scsi: aacraid: Insure we don't access PCIe space during AER/EEH
David Howells (1):
afs: Fix StoreData op marshalling
Davide Caratti (1):
net/sched: don't dereference a->goto_chain to read the chain index
Felipe Balbi (1):
usb: dwc3: pci: add support for Comet Lake PCH ID
Felix Fietkau (2):
mt76: mt76x2: fix external LNA gain settings
mt76: mt76x2: fix 2.4 GHz channel gain settings
Filipe Manana (1):
Btrfs: fix file corruption after snapshotting due to mix of buffered/DIO writes
Geert Uytterhoeven (1):
gpio: of: Fix of_gpiochip_add() error path
Greg Kroah-Hartman (1):
Linux 5.0.12
Guido Kiener (3):
usb: gadget: net2280: Fix overrun of OUT messages
usb: gadget: net2280: Fix net2280_dequeue()
usb: gadget: net2272: Fix net2272_dequeue()Harini Katakam (1):
net: macb: Add null check for PCLK and HCLK
Helen Koike (1):
ARM: dts: bcm283x: Fix hdmi hpd gpio pull
Jarkko Nikula (1):
i2c: i801: Add support for Intel Comet Lake
Jean-Philippe Brucker (2):
drm/meson: Fix invalid pointer in meson_drv_unbind() drm/meson: Uninstall IRQ handler
Joerg Roedel (1):
iommu/amd: Reserve exclusion range in iova-domain
Julian Wiedmann (1):
s390/qeth: fix race when initializing the IP address table
Kangjie Lu (5):
net: ieee802154: fix a potential NULL pointer dereference
netfilter: ip6t_srh: fix NULL pointer dereferences
gpio: aspeed: fix a potential NULL pointer dereference
scsi: qla4xxx: fix a potential NULL pointer dereference
leds: pca9532: fix a potential NULL pointer dereference
Li RongQing (1):
ieee802154: hwsim: propagate genlmsg_reply return code
Linus Torvalds (3):
mm: make page ref count overflow check tighter and more explicit
mm: add 'try_get_page()' helper function
mm: prevent get_user_pages() from overflowing page refcount
Lukas Wunner (4):
net: ks8851: Dequeue RX packets explicitly
net: ks8851: Reassert reset pin if chip ID check fails
net: ks8851: Delay requesting IRQ until opened
net: ks8851: Set initial carrier state to down
Mao Wenan (1):
sc16is7xx: missing unregister/delete driver on error in sc16is7xx_init()
Marc Zyngier (4):
KVM: arm64: Reset the PMU in preemptible context
arm64: KVM: Always set ICH_HCR_EL2.EN if GICv4 is enabled
KVM: arm/arm64: vgic-its: Take the srcu lock when writing to guest memory
KVM: arm/arm64: vgic-its: Take the srcu lock when parsing the memslots
Marco Felsch (1):
ARM: dts: pfla02: increase phy reset duration
Martin George (1):
nvme-multipath: relax ANA state check
Martin Schwidefsky (1):
s390: limit brk randomization to 32MB
Masahiro Yamada (1):
kbuild: skip parsing pre sub-make code for recursion
Masanari Iida (1):
ARM: dts: imx6qdl: Fix typo in imx6qdl-icore-rqs.dtsi
Matteo Croce (1):
x86/realmode: Don't leak the trampoline kernel address
Matthew Wilcox (1):
fs: prevent page refcount overflow in pipe_buf_get
Max Gurtovoy (1):
nvmet: fix error flow during ns enable
Maxim Zhukov (1):
staging, mt7621-pci: fix build without pci support
Ming Lei (2):
sbitmap: order READ/WRITE freed instance and setting clear bit
nvmet: fix building bvec from sg list
Mukesh Ojha (1):
usb: u132-hcd: fix resource leak
Noralf Trønnes (1):
drm: Fix drm_release() and device unplug
Pablo Neira Ayuso (1):
netfilter: nft_set_rbtree: check for inactive element after flag mismatch
Paulo Alcantara (1):
selinux: use kernel linux/socket.h for genheaders and mdp
Petr Štetiar (1):
serial: ar933x_uart: Fix build failure with disabled console
Qian Cai (1):
kasan: fix variable 'tag' set but not used warning
Rafael J. Wysocki (1):
Revert "ACPICA: Clear status of GPEs before enabling them"
Rafał Miłecki (1):
leds: trigger: netdev: fix refcnt leak on interface rename
Ralph Campbell (1):
x86/mm: Don't exceed the valid physical address space
Rasmus Villemoes (1):
leds: trigger: netdev: use memcpy in device_name_store
Sean Christopherson (5):
KVM: nVMX: Do not inherit quadrant and invalid for the root shadow EPT
KVM: selftests: assert on exit reason in CR4/cpuid sync test
KVM: selftests: explicitly disable PIE for tests
KVM: selftests: disable stack protector for all KVM tests
KVM: selftests: complete IO before migrating guest state
Sekhar Nori (1):
ARM: davinci: fix build failure with allnoconfig
Singh, Brijesh (1):
KVM: SVM: Workaround errata#1096 (insn_len maybe zero on SMAP violation)
Solomon Tan (1):
perf cs-etm: Add missing case value
Sreekanth Reddy (1):
scsi: mpt3sas: Fix kernel panic during expander reset
Stanislaw Gruszka (1):
mt76x02: fix hdr pointer in write txwi for USB
Steffen Maier (1):
scsi: zfcp: reduce flood of fcrscn1 trace records on multi-element RSCN
Suzuki K Poulose (1):
KVM: arm/arm64: Fix handling of stage2 huge mappings
Takeshi Kihara (1):
arm64: dts: renesas: r8a77990: Fix SCIF5 DMA channels
Thierry Reding (1):
drm/tegra: hub: Fix dereference before check
Trond Myklebust (1):
NFS: Fix a typo in nfs_init_timeout_values()
Ville Syrjälä (1):
drm/i915: Do not enable FEC without DSC
Vitaly Kuznetsov (1):
x86/kvm/hyper-v: avoid spurious pending stimer on vCPU init
Wei Li (1):
perf machine: Update kernel map address and re-order properly
Wen Yang (4):
ARM: imx51: fix a leaked reference by adding missing of_node_put
net: xilinx: fix possible object reference leak
net: ibm: fix possible object reference leak
net: ethernet: ti: fix possible object reference leak
Xiaoyao Li (1):
kvm/x86: Move MSR_IA32_ARCH_CAPABILITIES to array emulated_msrs
Xin Long (1):
netfilter: bridge: set skb transport_header before entering NF_INET_PRE_ROUTING
raymond pang (1):
libata: fix using DMA buffers on stack
Greg KH
maintainerDocumentation/i2c/busses/i2c-i801 +1 -0
@@ -36,6 +36,7 @@ Supported adapters: * Intel Cannon Lake (PCH) * Intel Cedar Fork (PCH) * Intel Ice Lake (PCH) + * Intel Comet Lake (PCH) Datasheets: Publicly available at the Intel website On Intel Patsburg and later chipsets, both the normal host SMBus controller
Makefile +6 -4
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 0 -SUBLEVEL = 11 +SUBLEVEL = 12 EXTRAVERSION = NAME = Shy Crocodile
@@ -31,7 +31,7 @@ _all: # descending is started. They are now explicitly listed as the # prepare rule. -ifneq ($(sub-make-done),1) +ifneq ($(sub_make_done),1) # Do not use make's built-in rules and variables # (this increases performance and avoids hard-to-debug behaviour)
@@ -159,6 +159,8 @@ need-sub-make := 1 $(lastword $(MAKEFILE_LIST)): ; endif +export sub_make_done := 1 + ifeq ($(need-sub-make),1) PHONY += $(MAKECMDGOALS) sub-make
@@ -168,12 +170,12 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make # Invoke a second make in the output directory, passing relevant variables sub-make: - $(Q)$(MAKE) sub-make-done=1 \ + $(Q)$(MAKE) \ $(if $(KBUILD_OUTPUT),-C $(KBUILD_OUTPUT) KBUILD_SRC=$(CURDIR)) \ -f $(CURDIR)/Makefile $(filter-out _all sub-make,$(MAKECMDGOALS)) endif # need-sub-make -endif # sub-make-done +endif # sub_make_done # We process the rest of the Makefile if this is the final invocation of make ifeq ($(need-sub-make),)
arch/arm/Kconfig +1 -0
@@ -593,6 +593,7 @@ config ARCH_DAVINCI select HAVE_IDE select PM_GENERIC_DOMAINS if PM select PM_GENERIC_DOMAINS_OF if PM && OF + select REGMAP_MMIO select RESET_CONTROLLER select USE_OF select ZONE_DMA
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +1 -1
@@ -93,7 +93,7 @@ }; &hdmi { - hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; + hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>; }; &pwm {
arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi +2 -2
@@ -264,7 +264,7 @@ pinctrl-2 = <&pinctrl_usdhc3_200mhz>; vmcc-supply = <®_sd3_vmmc>; cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; - bus-witdh = <4>; + bus-width = <4>; no-1-8-v; status = "okay"; };
@@ -275,7 +275,7 @@ pinctrl-1 = <&pinctrl_usdhc4_100mhz>; pinctrl-2 = <&pinctrl_usdhc4_200mhz>; vmcc-supply = <®_sd4_vmmc>; - bus-witdh = <8>; + bus-width = <8>; no-1-8-v; non-removable; status = "okay";
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi +1 -0
@@ -90,6 +90,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; phy-mode = "rgmii"; + phy-reset-duration = <10>; /* in msecs */ phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>; phy-supply = <&vdd_eth_io_reg>; status = "disabled";
arch/arm/include/asm/kvm_mmu.h +11 -0
@@ -381,6 +381,17 @@ static inline int kvm_read_guest_lock(struct kvm *kvm,return ret; } +static inline int kvm_write_guest_lock (struct kvm *kvm,gpa_t gpa, +const void *data,unsigned long len) +{ +int srcu_idx =srcu_read_lock (&kvm->srcu); +int ret =kvm_write_guest (kvm, gpa, data, len); + +srcu_read_unlock (&kvm->srcu, srcu_idx); + +return ret; +} +static inline void *kvm_get_hyp_vector (void ) {switch (read_cpuid_part ()) {
arch/arm/include/asm/stage2_pgtable.h +2 -0
@@ -75,6 +75,8 @@ static inline bool kvm_stage2_has_pud(struct kvm *kvm)#define S2_PMD_MASK PMD_MASK#define S2_PMD_SIZE PMD_SIZE +#define S2_PUD_MASK PUD_MASK +#define S2_PUD_SIZE PUD_SIZEstatic inline bool kvm_stage2_has_pmd (struct kvm *kvm) {
arch/arm/mach-imx/mach-imx51.c +1 -0
@@ -59,6 +59,7 @@ static void __init imx51_m4if_setup(void)return ; m4if_base =of_iomap (np,0 ); +of_node_put (np);if (!m4if_base) {pr_err ("Unable to map M4IF registers\n" );return ;
arch/arm64/boot/dts/renesas/r8a77990.dtsi +3 -4
@@ -2,7 +2,7 @@ /* * Device Tree Source for the R-Car E3 (R8A77990) SoC * - * Copyright (C) 2018 Renesas Electronics Corp. + * Copyright (C) 2018-2019 Renesas Electronics Corp. */ #include <dt-bindings/clock/r8a77990-cpg-mssr.h>
@@ -1040,9 +1040,8 @@ <&cpg CPG_CORE R8A77990_CLK_S3D1C>, <&scif_clk>; clock-names = "fck", "brg_int", "scif_clk"; - dmas = <&dmac1 0x5b>, <&dmac1 0x5a>, - <&dmac2 0x5b>, <&dmac2 0x5a>; - dma-names = "tx", "rx", "tx", "rx"; + dmas = <&dmac0 0x5b>, <&dmac0 0x5a>; + dma-names = "tx", "rx"; power-domains = <&sysc R8A77990_PD_ALWAYS_ON>; resets = <&cpg 202>; status = "disabled";
arch/arm64/include/asm/kvm_mmu.h +11 -0
@@ -444,6 +444,17 @@ static inline int kvm_read_guest_lock(struct kvm *kvm,return ret; } +static inline int kvm_write_guest_lock (struct kvm *kvm,gpa_t gpa, +const void *data,unsigned long len) +{ +int srcu_idx =srcu_read_lock (&kvm->srcu); +int ret =kvm_write_guest (kvm, gpa, data, len); + +srcu_read_unlock (&kvm->srcu, srcu_idx); + +return ret; +} +#ifdef CONFIG_KVM_INDIRECT_VECTORS /* * EL2 vectors can be mapped and rerouted in a number of ways,
arch/arm64/kvm/reset.c +3 -3
@@ -123,6 +123,9 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)int ret = -EINVAL ;bool loaded; +/* Reset PMU outside of the non-preemptible section */ +kvm_pmu_vcpu_reset (vcpu); +preempt_disable (); loaded = (vcpu->cpu !=-1 );if (loaded)
@@ -170,9 +173,6 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) vcpu->arch.reset_state.reset = false; } -/* Reset PMU */ -kvm_pmu_vcpu_reset (vcpu); -/* Default workaround setup is enabled (if supported) */ if (kvm_arm_have_ssbd () ==KVM_SSBD_KERNEL ) vcpu->arch.workaround_flags |=VCPU_WORKAROUND_2_FLAG ;
arch/s390/include/asm/elf.h +7 -4
@@ -252,11 +252,14 @@ do { \/* * Cache aliasing on the latest machines calls for a mapping granularity -* of 512KB. For 64-bit processes use a 512KB alignment and a randomization -* of up to 1GB. For 31-bit processes the virtual address space is limited, -* use no alignment and limit the randomization to 8MB. +* of 512KB for the anonymous mapping base. For 64-bit processes use a +* 512KB alignment and a randomization of up to 1GB. For 31-bit processes +* the virtual address space is limited, use no alignment and limit the +* randomization to 8MB. +* For the additional randomization of the program break use 32MB for +* 64-bit and 8MB for 31-bit. */ -#define BRK_RND_MASK (is_compat_task() ? 0x7ffUL : 0x3ffffUL) +#define BRK_RND_MASK (is_compat_task() ? 0x7ffUL : 0x1fffUL)#define MMAP_RND_MASK (is_compat_task() ? 0x7ffUL : 0x3ff80UL)#define MMAP_ALIGN_MASK (is_compat_task() ? 0 : 0x7fUL)#define STACK_RND_MASK MMAP_RND_MASK
arch/x86/include/asm/kvm_host.h +2 -0
@@ -1198,6 +1198,8 @@ struct kvm_x86_ops {int (*nested_enable_evmcs)(struct kvm_vcpu *vcpu,uint16_t *vmcs_version);uint16_t (*nested_get_evmcs_version)(struct kvm_vcpu *vcpu); + +bool (*need_emulation_on_page_fault)(struct kvm_vcpu *vcpu); };struct kvm_arch_async_pf {
arch/x86/kvm/hyperv.c +7 -2
@@ -526,7 +526,9 @@ static int stimer_set_config(struct kvm_vcpu_hv_stimer *stimer, u64 config, new_config.enable =0 ; stimer->config.as_uint64 = new_config.as_uint64; -stimer_mark_pending (stimer, false); +if (stimer->config.enable) +stimer_mark_pending (stimer, false); +return 0 ; }
@@ -542,7 +544,10 @@ static int stimer_set_count(struct kvm_vcpu_hv_stimer *stimer, u64 count, stimer->config.enable =0 ; else if (stimer->config.auto_enable) stimer->config.enable = 1; -stimer_mark_pending (stimer, false); + +if (stimer->config.enable) +stimer_mark_pending (stimer, false); +return 0 ; }
arch/x86/kvm/mmu.c +14 -7
@@ -4915,11 +4915,15 @@ static union kvm_mmu_role kvm_calc_shadow_ept_root_page_role(struct kvm_vcpu *vcpu, bool accessed_dirty, bool execonly) { - union kvm_mmu_role role; + union kvm_mmu_role role = {0}; +union kvm_mmu_page_role root_base = vcpu->arch.root_mmu.mmu_role.base; -/* Base role is inherited from root_mmu */ - role.base.word = vcpu->arch.root_mmu.mmu_role.base.word; - role.ext =kvm_calc_mmu_role_ext (vcpu); +/* Legacy paging and SMM flags are inherited from root_mmu */ + role.base.smm = root_base.smm; + role.base.nxe = root_base.nxe; + role.base.cr0_wp = root_base.cr0_wp; + role.base.smep_andnot_wp = root_base.smep_andnot_wp; + role.base.smap_andnot_wp = root_base.smap_andnot_wp; role.base.level =PT64_ROOT_4LEVEL ; role.base.direct = false;
@@ -4927,6 +4931,7 @@ kvm_calc_shadow_ept_root_page_role(struct kvm_vcpu *vcpu, bool accessed_dirty, role.base.guest_mode = true; role.base.access =ACC_ALL ; + role.ext =kvm_calc_mmu_role_ext (vcpu); role.ext.execonly = execonly;return role;
@@ -5390,10 +5395,12 @@ int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t cr2, u64 error_code,* This can happen if a guest gets a page-fault on data access but the HW * table walker is not able to read the instruction page (e.g instruction * page is not present in memory). In those cases we simply restart the -* guest. +* guest, with the exception of AMD Erratum 1096 which is unrecoverable. */ -if (unlikely (insn && !insn_len)) -return 1 ; +if (unlikely (insn && !insn_len)) { +if (!kvm_x86_ops->need_emulation_on_page_fault (vcpu)) +return 1 ; + } er =x86_emulate_instruction (vcpu, cr2, emulation_type, insn, insn_len);
arch/x86/kvm/svm.c +32 -0
@@ -7114,6 +7114,36 @@ static int nested_enable_evmcs(struct kvm_vcpu *vcpu,return -ENODEV ; } +static bool svm_need_emulation_on_page_fault (struct kvm_vcpu *vcpu) +{ +bool is_user, smap; + + is_user =svm_get_cpl (vcpu) ==3 ; + smap = !kvm_read_cr4_bits (vcpu,X86_CR4_SMAP ); + +/* +* Detect and workaround Errata 1096 Fam_17h_00_0Fh +* +* In non SEV guest, hypervisor will be able to read the guest +* memory to decode the instruction pointer when insn_len is zero +* so we return true to indicate that decoding is possible. +* +* But in the SEV guest, the guest memory is encrypted with the +* guest specific key and hypervisor will not be able to decode the +* instruction pointer so we will not able to workaround it. Lets +* print the error and request to kill the guest. +*/ +if (is_user && smap) { +if (!sev_guest (vcpu->kvm)) +return true; + +pr_err_ratelimited ("KVM: Guest triggered AMD Erratum 1096\n" ); +kvm_make_request (KVM_REQ_TRIPLE_FAULT , vcpu); + } + +return false; +} +static struct kvm_x86_ops svm_x86_ops__ro_after_init = { .cpu_has_kvm_support = has_svm, .disabled_by_bios = is_disabled,
@@ -7247,6 +7277,8 @@ static struct kvm_x86_ops svm_x86_ops __ro_after_init = { .nested_enable_evmcs = nested_enable_evmcs, .nested_get_evmcs_version = nested_get_evmcs_version, + + .need_emulation_on_page_fault = svm_need_emulation_on_page_fault, };static int __init svm_init (void )
arch/x86/kvm/vmx/vmx.c +6 -0
@@ -7526,6 +7526,11 @@ static int enable_smi_window(struct kvm_vcpu *vcpu)return 0 ; } +static bool vmx_need_emulation_on_page_fault (struct kvm_vcpu *vcpu) +{ +return 0 ; +} +static __init int hardware_setup (void ) {unsigned long host_bndcfgs;
@@ -7828,6 +7833,7 @@ static struct kvm_x86_ops vmx_x86_ops __ro_after_init = { .set_nested_state = NULL, .get_vmcs12_pages = NULL, .nested_enable_evmcs = NULL, + .need_emulation_on_page_fault = vmx_need_emulation_on_page_fault, };static void vmx_cleanup_l1d_flush (void )
arch/x86/kvm/x86.c +2 -1
@@ -1127,7 +1127,7 @@ static u32 msrs_to_save[] = {#endif MSR_IA32_TSC ,MSR_IA32_CR_PAT ,MSR_VM_HSAVE_PA ,MSR_IA32_FEATURE_CONTROL ,MSR_IA32_BNDCFGS ,MSR_TSC_AUX , -MSR_IA32_SPEC_CTRL ,MSR_IA32_ARCH_CAPABILITIES , +MSR_IA32_SPEC_CTRL ,MSR_IA32_RTIT_CTL ,MSR_IA32_RTIT_STATUS ,MSR_IA32_RTIT_CR3_MATCH ,MSR_IA32_RTIT_OUTPUT_BASE ,MSR_IA32_RTIT_OUTPUT_MASK , MSR_IA32_RTIT_ADDR0_A, MSR_IA32_RTIT_ADDR0_B,
@@ -1160,6 +1160,7 @@ static u32 emulated_msrs[] = {MSR_IA32_TSC_ADJUST ,MSR_IA32_TSCDEADLINE , +MSR_IA32_ARCH_CAPABILITIES ,MSR_IA32_MISC_ENABLE ,MSR_IA32_MCG_STATUS , MSR_IA32_MCG_CTL,
arch/x86/mm/mmap.c +1 -1
@@ -230,7 +230,7 @@ bool mmap_address_hint_valid(unsigned long addr, unsigned long len)/* Can we access it for direct reading/writing? Must be RAM: */ int valid_phys_addr_range (phys_addr_t addr,size_t count) { -return addr + count <=__pa (high_memory); +return addr + count -1 <=__pa (high_memory -1 ); }/* Can we access it through mmap? Must be a valid physical address: */
arch/x86/realmode/init.c +0 -2
@@ -20,8 +20,6 @@ void __init set_real_mode_mem(phys_addr_t mem, size_t size)void *base =__va (mem); real_mode_header = (struct real_mode_header *) base; -printk (KERN_DEBUG "Base memory trampoline at [%p] %llx size %zu\n" , - base, (unsigned long long )mem, size); }void __init reserve_real_mode (void )
drivers/acpi/acpica/evgpe.c +1 -5
@@ -81,12 +81,8 @@ acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)ACPI_FUNCTION_TRACE (ev_enable_gpe); -/* Clear the GPE status */ - status =acpi_hw_clear_gpe (gpe_event_info); -if (ACPI_FAILURE (status)) -return_ACPI_STATUS (status); -/* Enable the requested GPE */ + status =acpi_hw_low_set_gpe (gpe_event_info,ACPI_GPE_ENABLE );return_ACPI_STATUS (status); }
drivers/ata/libata-zpodd.c +24 -10
@@ -52,38 +52,52 @@ static int eject_tray(struct ata_device *dev)/* Per the spec, only slot type and drawer type ODD can be supported */ static enum odd_mech_type zpodd_get_mech_type (struct ata_device *dev) { -char buf[16 ]; +char *buf;unsigned int ret; -struct rm_feature_desc *desc = (void *)(buf +8 ); +struct rm_feature_desc *desc;struct ata_taskfile tf;static const char cdb[] = {GPCMD_GET_CONFIGURATION ,2 ,/* only 1 feature descriptor requested */ 0 ,3 ,/* 3, removable medium feature */ 0 ,0 ,0 ,/* reserved */ -0 ,sizeof (buf), +0 ,16 ,0 ,0 ,0 , }; + buf =kzalloc (16 ,GFP_KERNEL ); +if (!buf) +return ODD_MECH_TYPE_UNSUPPORTED ; + desc = (void *)(buf +8 ); +ata_tf_init (dev, &tf); tf.flags =ATA_TFLAG_ISADDR |ATA_TFLAG_DEVICE ; tf.command =ATA_CMD_PACKET ; tf.protocol =ATAPI_PROT_PIO ; - tf.lbam =sizeof (buf); + tf.lbam =16 ; ret =ata_exec_internal (dev, &tf, cdb,DMA_FROM_DEVICE , - buf,sizeof (buf),0 ); -if (ret) + buf,16 ,0 ); +if (ret) { +kfree (buf);return ODD_MECH_TYPE_UNSUPPORTED ; + } -if (be16_to_cpu (desc->feature_code) !=3 ) +if (be16_to_cpu (desc->feature_code) !=3 ) { +kfree (buf);return ODD_MECH_TYPE_UNSUPPORTED ; + } -if (desc->mech_type ==0 && desc->load ==0 && desc->eject ==1 ) +if (desc->mech_type ==0 && desc->load ==0 && desc->eject ==1 ) { +kfree (buf);return ODD_MECH_TYPE_SLOT ; -else if (desc->mech_type ==1 && desc->load ==0 && desc->eject ==1 ) + }else if (desc->mech_type ==1 && desc->load ==0 && + desc->eject ==1 ) { +kfree (buf);return ODD_MECH_TYPE_DRAWER ; -else + }else { +kfree (buf);return ODD_MECH_TYPE_UNSUPPORTED ; + } }/* Test if ODD is zero power ready by sense code */
drivers/gpio/gpio-aspeed.c +2 -0
@@ -1224,6 +1224,8 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev) gpio->offset_timer =devm_kzalloc (&pdev->dev, gpio->chip.ngpio,GFP_KERNEL ); +if (!gpio->offset_timer) +return -ENOMEM ;return aspeed_gpio_setup_irqs (gpio, pdev); }
drivers/gpio/gpiolib-of.c +12 -5
@@ -119,7 +119,8 @@ static void of_gpio_flags_quirks(struct device_node *np,* to determine if the flags should have inverted semantics. */ if (IS_ENABLED (CONFIG_SPI_MASTER ) && -of_property_read_bool (np,"cs-gpios" )) { +of_property_read_bool (np,"cs-gpios" ) && + !strcmp (propname,"cs-gpios" )) {struct device_node *child;u32 cs;int ret;
@@ -141,16 +142,16 @@ static void of_gpio_flags_quirks(struct device_node *np,* conflict and the "spi-cs-high" flag will * take precedence. */ -if (of_property_read_bool (np,"spi-cs-high" )) { +if (of_property_read_bool (child,"spi-cs-high" )) {if (*flags &OF_GPIO_ACTIVE_LOW ) {pr_warn ("%s GPIO handle specifies active low - ignored\n" , -of_node_full_name (np)); +of_node_full_name (child)); *flags &= ~OF_GPIO_ACTIVE_LOW ; } }else {if (!(*flags &OF_GPIO_ACTIVE_LOW ))pr_info ("%s enforce active low on chipselect handle\n" , -of_node_full_name (np)); +of_node_full_name (child)); *flags |=OF_GPIO_ACTIVE_LOW ; }break ;
@@ -711,7 +712,13 @@ int of_gpiochip_add(struct gpio_chip *chip)of_node_get (chip->of_node); -return of_gpiochip_scan_gpios (chip); + status =of_gpiochip_scan_gpios (chip); +if (status) { +of_node_put (chip->of_node); +gpiochip_remove_pin_ranges (chip); + } + +return status; }void of_gpiochip_remove (struct gpio_chip *chip)
drivers/gpu/drm/drm_drv.c +1 -5
@@ -381,11 +381,7 @@ void drm_dev_unplug(struct drm_device *dev)synchronize_srcu (&drm_unplug_srcu);drm_dev_unregister (dev); - -mutex_lock (&drm_global_mutex); -if (dev->open_count ==0 ) -drm_dev_put (dev); -mutex_unlock (&drm_global_mutex); +drm_dev_put (dev); }EXPORT_SYMBOL (drm_dev_unplug);
drivers/gpu/drm/drm_file.c +2 -4
@@ -479,11 +479,9 @@ int drm_release(struct inode *inode, struct file *filp)drm_file_free (file_priv); -if (!--dev->open_count) { +if (!--dev->open_count)drm_lastclose (dev); -if (drm_dev_is_unplugged (dev)) -drm_put_dev (dev); - } +mutex_unlock (&drm_global_mutex);drm_minor_release (minor);
drivers/gpu/drm/i915/intel_dp.c +3 -3
@@ -1871,6 +1871,9 @@ static bool intel_dp_dsc_compute_config(struct intel_dp *intel_dp,u8 dsc_max_bpc;int pipe_bpp; + pipe_config->fec_enable = !intel_dp_is_edp (intel_dp) && +intel_dp_supports_fec (intel_dp, pipe_config); +if (!intel_dp_supports_dsc (intel_dp, pipe_config))return false;
@@ -2097,9 +2100,6 @@ intel_dp_compute_config(struct intel_encoder *encoder,if (adjusted_mode->flags &DRM_MODE_FLAG_DBLCLK )return false; - pipe_config->fec_enable = !intel_dp_is_edp (intel_dp) && -intel_dp_supports_fec (intel_dp, pipe_config); -if (!intel_dp_compute_link_config (encoder, pipe_config, conn_state))return false;
drivers/gpu/drm/meson/meson_drv.c +6 -3
@@ -317,12 +317,14 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) ret =drm_dev_register (drm,0 );if (ret) - goto free_drm; + goto uninstall_irq;drm_fbdev_generic_setup (drm,32 );return 0 ; +uninstall_irq: +drm_irq_uninstall (drm); free_drm:drm_dev_put (drm);
@@ -336,8 +338,8 @@ static int meson_drv_bind(struct device *dev)static void meson_drv_unbind (struct device *dev) { -struct drm_device *drm =dev_get_drvdata (dev); -struct meson_drm *priv = drm->dev_private; +struct meson_drm *priv =dev_get_drvdata (dev); +struct drm_device *drm = priv->drm;if (priv->canvas) {meson_canvas_free (priv->canvas, priv->canvas_id_osd1);
@@ -347,6 +349,7 @@ static void meson_drv_unbind(struct device *dev) }drm_dev_unregister (drm); +drm_irq_uninstall (drm);drm_kms_helper_poll_fini (drm);drm_mode_config_cleanup (drm);drm_dev_put (drm);
drivers/gpu/drm/tegra/hub.c +3 -1
@@ -378,14 +378,16 @@ static int tegra_shared_plane_atomic_check(struct drm_plane *plane,static void tegra_shared_plane_atomic_disable (struct drm_plane *plane,struct drm_plane_state *old_state) { -struct tegra_dc *dc =to_tegra_dc (old_state->crtc);struct tegra_plane *p =to_tegra_plane (plane); +struct tegra_dc *dc;u32 value;/* rien ne va plus */ if (!old_state || !old_state->crtc)return ; + dc =to_tegra_dc (old_state->crtc); +/* * XXX Legacy helpers seem to sometimes call ->atomic_disable() even * on planes that are already disabled. Make sure we fallback to the
drivers/i2c/busses/Kconfig +1 -0
@@ -131,6 +131,7 @@ config I2C_I801 Cannon Lake (PCH) Cedar Fork (PCH) Ice Lake (PCH) + Comet Lake (PCH) This driver can also be built as a module. If so, the module will be called i2c-i801.
drivers/i2c/busses/i2c-i801.c +4 -0
@@ -71,6 +71,7 @@* Cannon Lake-LP (PCH) 0x9da3 32 hard yes yes yes * Cedar Fork (PCH) 0x18df 32 hard yes yes yes * Ice Lake-LP (PCH) 0x34a3 32 hard yes yes yes +* Comet Lake (PCH) 0x02a3 32 hard yes yes yes * * Features supported by this driver: * Software PEC no
@@ -240,6 +241,7 @@#define PCI_DEVICE_ID_INTEL_LEWISBURG_SSKU_SMBUS 0xa223#define PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS 0xa2a3#define PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS 0xa323 +#define PCI_DEVICE_ID_INTEL_COMETLAKE_SMBUS 0x02a3struct i801_mux_config {char *gpio_chip;
@@ -1038,6 +1040,7 @@ static const struct pci_device_id i801_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CANNONLAKE_LP_SMBUS) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICELAKE_LP_SMBUS) }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COMETLAKE_SMBUS) }, { 0, } };
@@ -1534,6 +1537,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)case PCI_DEVICE_ID_INTEL_DNV_SMBUS :case PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS :case PCI_DEVICE_ID_INTEL_ICELAKE_LP_SMBUS : +case PCI_DEVICE_ID_INTEL_COMETLAKE_SMBUS : priv->features |=FEATURE_I2C_BLOCK_READ ; priv->features |=FEATURE_IRQ ; priv->features |=FEATURE_SMBUS_PEC ;
drivers/iommu/amd_iommu.c +6 -3
@@ -3166,21 +3166,24 @@ static void amd_iommu_get_resv_regions(struct device *dev,return ;list_for_each_entry (entry, &amd_iommu_unity_map, list) { +int type, prot =0 ;size_t length; -int prot =0 ;if (devid < entry->devid_start || devid > entry->devid_end)continue ; + type =IOMMU_RESV_DIRECT ; length = entry->address_end - entry->address_start;if (entry->prot &IOMMU_PROT_IR ) prot |=IOMMU_READ ;if (entry->prot &IOMMU_PROT_IW ) prot |=IOMMU_WRITE ; +if (entry->prot &IOMMU_UNITY_MAP_FLAG_EXCL_RANGE ) +/* Exclusion range */ + type =IOMMU_RESV_RESERVED ; region =iommu_alloc_resv_region (entry->address_start, - length, prot, -IOMMU_RESV_DIRECT ); + length, prot, type);if (!region) {pr_err ("Out of memory allocating dm-regions for %s\n" ,dev_name (dev));
drivers/iommu/amd_iommu_init.c +4 -3
@@ -2013,6 +2013,9 @@ static int __init init_unity_map_range(struct ivmd_header *m)if (e ==NULL )return -ENOMEM ; +if (m->flags &IVMD_FLAG_EXCL_RANGE ) +init_exclusion_range (m); +switch (m->type) {default :kfree (e);
@@ -2059,9 +2062,7 @@ static int __init init_memory_definitions(struct acpi_table_header *table)while (p < end) { m = (struct ivmd_header *)p; -if (m->flags &IVMD_FLAG_EXCL_RANGE ) -init_exclusion_range (m); -else if (m->flags &IVMD_FLAG_UNITY_MAP ) +if (m->flags & (IVMD_FLAG_UNITY_MAP |IVMD_FLAG_EXCL_RANGE ))init_unity_map_range (m); p += m->length;
drivers/iommu/amd_iommu_types.h +2 -0
@@ -374,6 +374,8 @@#define IOMMU_PROT_IR 0x01#define IOMMU_PROT_IW 0x02 +#define IOMMU_UNITY_MAP_FLAG_EXCL_RANGE (1 << 2) +/* IOMMU capabilities */ #define IOMMU_CAP_IOTLB 24#define IOMMU_CAP_NPCACHE 26
drivers/leds/leds-pca9532.c +6 -2
@@ -513,6 +513,7 @@ static int pca9532_probe(struct i2c_client *client, const struct i2c_device_id *id) {int devid; +const struct of_device_id *of_id;struct pca9532_data *data =i2c_get_clientdata (client);struct pca9532_platform_data *pca9532_pdata =dev_get_platdata (&client->dev);
@@ -528,8 +529,11 @@ static int pca9532_probe(struct i2c_client *client,dev_err (&client->dev,"no platform data\n" );return -EINVAL ; } - devid = (int )(uintptr_t )of_match_device ( - of_pca9532_leds_match, &client->dev)->data; + of_id =of_match_device (of_pca9532_leds_match, + &client->dev); +if (unlikely (!of_id)) +return -EINVAL ; + devid = (int )(uintptr_t ) of_id->data; }else { devid = id->driver_data; }
drivers/leds/trigger/ledtrig-netdev.c +7 -9
@@ -122,7 +122,8 @@ static ssize_t device_name_store(struct device *dev, trigger_data->net_dev =NULL ; } -strncpy (trigger_data->device_name, buf, size); +memcpy (trigger_data->device_name, buf, size); + trigger_data->device_name[size] =0 ;if (size >0 && trigger_data->device_name[size -1 ] =='\n' ) trigger_data->device_name[size -1 ] =0 ;
@@ -301,11 +302,11 @@ static int netdev_trig_notify(struct notifier_block *nb, container_of(nb, struct led_netdev_data, notifier);if (evt !=NETDEV_UP && evt !=NETDEV_DOWN && evt !=NETDEV_CHANGE - && evt !=NETDEV_REGISTER && evt !=NETDEV_UNREGISTER - && evt !=NETDEV_CHANGENAME ) + && evt !=NETDEV_REGISTER && evt !=NETDEV_UNREGISTER )return NOTIFY_DONE ; -if (strcmp (dev->name, trigger_data->device_name)) +if (!(dev == trigger_data->net_dev || + (evt ==NETDEV_REGISTER && !strcmp (dev->name, trigger_data->device_name))))return NOTIFY_DONE ;cancel_delayed_work_sync (&trigger_data->work);
@@ -320,12 +321,9 @@ static int netdev_trig_notify(struct notifier_block *nb,dev_hold (dev); trigger_data->net_dev = dev;break ; -case NETDEV_CHANGENAME :case NETDEV_UNREGISTER : -if (trigger_data->net_dev) { -dev_put (trigger_data->net_dev); - trigger_data->net_dev =NULL ; - } +dev_put (trigger_data->net_dev); + trigger_data->net_dev =NULL ;break ;case NETDEV_UP :case NETDEV_CHANGE :
drivers/net/ethernet/cadence/macb_main.c +8 -2
@@ -3318,14 +3318,20 @@ static int macb_clk_init(struct platform_device *pdev, struct clk **pclk, *hclk =devm_clk_get (&pdev->dev,"hclk" ); } -if (IS_ERR (*pclk)) { +if (IS_ERR_OR_NULL (*pclk)) { err =PTR_ERR (*pclk); +if (!err) + err = -ENODEV ; +dev_err (&pdev->dev,"failed to get macb_clk (%u)\n" , err);return err; } -if (IS_ERR (*hclk)) { +if (IS_ERR_OR_NULL (*hclk)) { err =PTR_ERR (*hclk); +if (!err) + err = -ENODEV ; +dev_err (&pdev->dev,"failed to get hclk (%u)\n" , err);return err; }
drivers/net/ethernet/ibm/ehea/ehea_main.c +1 -0
@@ -3160,6 +3160,7 @@ static ssize_t ehea_probe_port(struct device *dev,if (ehea_add_adapter_mr (adapter)) {pr_err ("creating MR failed\n" ); +of_node_put (eth_dn);return -EIO ; }
drivers/net/ethernet/micrel/ks8851.c +18 -18
@@ -535,9 +535,8 @@ static void ks8851_rx_pkts(struct ks8851_net *ks)/* set dma read address */ ks8851_wrreg16 (ks,KS_RXFDPR ,RXFDPR_RXFPAI |0x00 ); -/* start the packet dma process, and set auto-dequeue rx */ -ks8851_wrreg16 (ks,KS_RXQCR , - ks->rc_rxqcr |RXQCR_SDA |RXQCR_ADRFE ); +/* start DMA access */ +ks8851_wrreg16 (ks,KS_RXQCR , ks->rc_rxqcr |RXQCR_SDA );if (rxlen >4 ) {unsigned int rxalign;
@@ -568,7 +567,8 @@ static void ks8851_rx_pkts(struct ks8851_net *ks) } } -ks8851_wrreg16 (ks,KS_RXQCR , ks->rc_rxqcr); +/* end DMA access and dequeue packet */ +ks8851_wrreg16 (ks,KS_RXQCR , ks->rc_rxqcr |RXQCR_RRXEF ); } }
@@ -785,6 +785,15 @@ static void ks8851_tx_work(struct work_struct *work)static int ks8851_net_open (struct net_device *dev) {struct ks8851_net *ks =netdev_priv (dev); +int ret; + + ret =request_threaded_irq (dev->irq,NULL , ks8851_irq, +IRQF_TRIGGER_LOW |IRQF_ONESHOT , + dev->name, ks); +if (ret <0 ) { +netdev_err (dev,"failed to get irq\n" ); +return ret; + }/* lock the card, even if we may not actually be doing anything * else at the moment */
@@ -849,6 +858,7 @@ static int ks8851_net_open(struct net_device *dev)netif_dbg (ks, ifup, ks->netdev,"network device up\n" );mutex_unlock (&ks->lock); +mii_check_link (&ks->mii);return 0 ; }
@@ -899,6 +909,8 @@ static int ks8851_net_stop(struct net_device *dev)dev_kfree_skb (txb); } +free_irq (dev->irq, ks); +return 0 ; }
@@ -1508,6 +1520,7 @@ static int ks8851_probe(struct spi_device *spi)spi_set_drvdata (spi, ks); +netif_carrier_off (ks->netdev); ndev->if_port =IF_PORT_100BASET ; ndev->netdev_ops = &ks8851_netdev_ops; ndev->irq = spi->irq;
@@ -1529,14 +1542,6 @@ static int ks8851_probe(struct spi_device *spi)ks8851_read_selftest (ks);ks8851_init_mac (ks); - ret =request_threaded_irq (spi->irq,NULL , ks8851_irq, -IRQF_TRIGGER_LOW |IRQF_ONESHOT , - ndev->name, ks); -if (ret <0 ) { -dev_err (&spi->dev,"failed to get irq\n" ); - goto err_irq; - } - ret =register_netdev (ndev);if (ret) {dev_err (&spi->dev,"failed to register network device\n" );
@@ -1549,14 +1554,10 @@ static int ks8851_probe(struct spi_device *spi)return 0 ; - err_netdev: -free_irq (ndev->irq, ks); - -err_irq: +err_id:if (gpio_is_valid (gpio))gpio_set_value (gpio,0 ); -err_id:regulator_disable (ks->vdd_reg); err_reg:regulator_disable (ks->vdd_io);
@@ -1574,7 +1575,6 @@ static int ks8851_remove(struct spi_device *spi)dev_info (&spi->dev,"remove\n" );unregister_netdev (priv->netdev); -free_irq (spi->irq, priv);if (gpio_is_valid (priv->gpio))gpio_set_value (priv->gpio,0 );regulator_disable (priv->vdd_reg);
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +2 -0
@@ -1048,6 +1048,8 @@ int qlcnic_do_lb_test(struct qlcnic_adapter *adapter, u8 mode)for (i =0 ; i <QLCNIC_NUM_ILB_PKT ; i++) { skb =netdev_alloc_skb (adapter->netdev,QLCNIC_ILB_PKT_SIZE ); +if (!skb) +break ;qlcnic_create_loopback_buff (skb->data, adapter->mac_addr);skb_put (skb,QLCNIC_ILB_PKT_SIZE ); adapter->ahw->diag_cnt =0 ;
drivers/net/ethernet/stmicro/stmmac/ring_mode.c +5 -3
@@ -59,7 +59,7 @@ static int jumbo_frm(void *p, struct sk_buff *skb, int csum) desc->des3 =cpu_to_le32 (des2 + BUF_SIZE_4KiB);stmmac_prepare_tx_desc (priv, desc,1 , bmax, csum, -STMMAC_RING_MODE ,1 , false, skb->len); +STMMAC_RING_MODE ,0 , false, skb->len); tx_q->tx_skbuff[entry] =NULL ; entry =STMMAC_GET_ENTRY (entry,DMA_TX_SIZE );
@@ -79,7 +79,8 @@ static int jumbo_frm(void *p, struct sk_buff *skb, int csum) desc->des3 =cpu_to_le32 (des2 + BUF_SIZE_4KiB);stmmac_prepare_tx_desc (priv, desc,0 , len, csum, -STMMAC_RING_MODE ,1 , true, skb->len); +STMMAC_RING_MODE ,1 , !skb_is_nonlinear (skb), + skb->len); }else { des2 =dma_map_single (priv->device, skb->data, nopaged_len,DMA_TO_DEVICE );
@@ -91,7 +92,8 @@ static int jumbo_frm(void *p, struct sk_buff *skb, int csum) tx_q->tx_skbuff_dma[entry].is_jumbo = true; desc->des3 =cpu_to_le32 (des2 + BUF_SIZE_4KiB);stmmac_prepare_tx_desc (priv, desc,1 , nopaged_len, csum, -STMMAC_RING_MODE ,1 , true, skb->len); +STMMAC_RING_MODE ,0 , !skb_is_nonlinear (skb), + skb->len); } tx_q->cur_tx = entry;
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +8 -6
@@ -3190,14 +3190,16 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)stmmac_prepare_tx_desc (priv, first,1 , nopaged_len, csum_insertion, priv->mode,1 , last_segment, skb->len); - -/* The own bit must be the latest setting done when prepare the -* descriptor and then barrier is needed to make sure that -* all is coherent before granting the DMA engine. -*/ -wmb (); + }else { +stmmac_set_tx_owner (priv, first); } +/* The own bit must be the latest setting done when prepare the +* descriptor and then barrier is needed to make sure that +* all is coherent before granting the DMA engine. +*/ +wmb (); +netdev_tx_sent_queue (netdev_get_tx_queue (dev, queue), skb->len);stmmac_enable_dma_transmission (priv, priv->ioaddr);
drivers/net/ethernet/ti/netcp_ethss.c +6 -2
@@ -3657,12 +3657,16 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev, ret =netcp_txpipe_init (&gbe_dev->tx_pipe, netcp_device, gbe_dev->dma_chan_name, gbe_dev->tx_queue_id); -if (ret) +if (ret) { +of_node_put (interfaces);return ret; + } ret =netcp_txpipe_open (&gbe_dev->tx_pipe); -if (ret) +if (ret) { +of_node_put (interfaces);return ret; + }/* Create network interfaces */ INIT_LIST_HEAD (&gbe_dev->gbe_intf_head);
drivers/net/ethernet/xilinx/xilinx_axienet_main.c +2 -0
@@ -1575,12 +1575,14 @@ static int axienet_probe(struct platform_device *pdev) ret =of_address_to_resource (np,0 , &dmares);if (ret) {dev_err (&pdev->dev,"unable to get DMA resource\n" ); +of_node_put (np); goto free_netdev; } lp->dma_regs =devm_ioremap_resource (&pdev->dev, &dmares);if (IS_ERR (lp->dma_regs)) {dev_err (&pdev->dev,"could not map DMA regs\n" ); ret =PTR_ERR (lp->dma_regs); +of_node_put (np); goto free_netdev; } lp->rx_irq =irq_of_parse_and_map (np,1 );
drivers/net/ieee802154/adf7242.c +4 -0
@@ -1268,6 +1268,10 @@ static int adf7242_probe(struct spi_device *spi)INIT_DELAYED_WORK (&lp->work, adf7242_rx_cal_work); lp->wqueue =alloc_ordered_workqueue (dev_name (&spi->dev),WQ_MEM_RECLAIM ); +if (unlikely (!lp->wqueue)) { + ret = -ENOMEM ; + goto err_hw_init; + } ret =adf7242_hw_init (lp);if (ret)
drivers/net/ieee802154/mac802154_hwsim.c +1 -1
@@ -324,7 +324,7 @@ static int hwsim_get_radio_nl(struct sk_buff *msg, struct genl_info *info) goto out_err; } -genlmsg_reply (skb, info); + res =genlmsg_reply (skb, info);break ; }
drivers/net/phy/dp83822.c +20 -14
@@ -23,6 +23,8 @@#include <linux/netdevice.h> #define DP83822_PHY_ID 0x2000a240 +#define DP83825I_PHY_ID 0x2000a150 +#define DP83822_DEVADDR 0x1f#define MII_DP83822_PHYSCR 0x11
@@ -312,26 +314,30 @@ static int dp83822_resume(struct phy_device *phydev)return 0 ; } +#define DP83822_PHY_DRIVER (_id, _name) \ + { \ + PHY_ID_MATCH_MODEL(_id), \ + .name = (_name), \ + .features = PHY_BASIC_FEATURES, \ + .soft_reset = dp83822_phy_reset, \ + .config_init = dp83822_config_init, \ + .get_wol = dp83822_get_wol, \ + .set_wol = dp83822_set_wol, \ + .ack_interrupt = dp83822_ack_interrupt, \ + .config_intr = dp83822_config_intr, \ + .suspend = dp83822_suspend, \ + .resume = dp83822_resume, \ + } +static struct phy_driver dp83822_driver[] = { - { - .phy_id =DP83822_PHY_ID , - .phy_id_mask =0xfffffff0 , - .name ="TI DP83822" , - .features =PHY_BASIC_FEATURES , - .config_init = dp83822_config_init, - .soft_reset = dp83822_phy_reset, - .get_wol = dp83822_get_wol, - .set_wol = dp83822_set_wol, - .ack_interrupt = dp83822_ack_interrupt, - .config_intr = dp83822_config_intr, - .suspend = dp83822_suspend, - .resume = dp83822_resume, - }, +DP83822_PHY_DRIVER (DP83822_PHY_ID ,"TI DP83822" ), +DP83822_PHY_DRIVER (DP83825I_PHY_ID ,"TI DP83825I" ), };module_phy_driver (dp83822_driver);static struct mdio_device_id __maybe_unused dp83822_tbl[] = { {DP83822_PHY_ID ,0xfffffff0 }, + {DP83825I_PHY_ID ,0xfffffff0 }, { }, };MODULE_DEVICE_TABLE (mdio, dp83822_tbl);
drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c +2 -1
@@ -81,8 +81,9 @@ int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data,mt76x02_insert_hdr_pad (skb); - txwi =skb_push (skb,sizeof (struct mt76x02_txwi )); + txwi = (struct mt76x02_txwi *)(skb->data -sizeof (struct mt76x02_txwi ));mt76x02_mac_write_txwi (dev, txwi, skb, wcid, sta, len); +skb_push (skb,sizeof (struct mt76x02_txwi )); pid =mt76_tx_status_skb_add (mdev, wcid, skb); txwi->pktid = pid;
drivers/net/wireless/mediatek/mt76/mt76x2/phy.c +22 -8
@@ -260,10 +260,15 @@ mt76x2_phy_set_gain_val(struct mt76x02_dev *dev) gain_val[0 ] = dev->cal.agc_gain_cur[0 ] - dev->cal.agc_gain_adjust; gain_val[1 ] = dev->cal.agc_gain_cur[1 ] - dev->cal.agc_gain_adjust; -if (dev->mt76.chandef.width >=NL80211_CHAN_WIDTH_40 ) + val =0x1836 <<16 ; +if (!mt76x2_has_ext_lna (dev) && + dev->mt76.chandef.width >=NL80211_CHAN_WIDTH_40 ) val =0x1e42 <<16 ; -else - val =0x1836 <<16 ; + +if (mt76x2_has_ext_lna (dev) && + dev->mt76.chandef.chan->band ==NL80211_BAND_2GHZ && + dev->mt76.chandef.width <NL80211_CHAN_WIDTH_40 ) + val =0x0f36 <<16 ; val |=0xf8 ;
@@ -280,6 +285,7 @@ void mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev) {u8 *gain = dev->cal.agc_gain_init;u8 low_gain_delta, gain_delta; +u32 agc_35, agc_37;bool gain_change;int low_gain;u32 val;
@@ -316,6 +322,16 @@ void mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev)else low_gain_delta =14 ; + agc_37 =0x2121262c ; +if (dev->mt76.chandef.chan->band ==NL80211_BAND_2GHZ ) + agc_35 =0x11111516 ; +else if (low_gain ==2 ) + agc_35 = agc_37 =0x08080808 ; +else if (dev->mt76.chandef.width ==NL80211_CHAN_WIDTH_80 ) + agc_35 =0x10101014 ; +else + agc_35 =0x11111116 ; +if (low_gain ==2 ) {mt76_wr (dev,MT_BBP (RXO ,18 ),0xf000a990 );mt76_wr (dev,MT_BBP (AGC ,35 ),0x08080808 );
@@ -324,15 +340,13 @@ void mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev) dev->cal.agc_gain_adjust =0 ; }else {mt76_wr (dev,MT_BBP (RXO ,18 ),0xf000a991 ); -if (dev->mt76.chandef.width ==NL80211_CHAN_WIDTH_80 ) -mt76_wr (dev,MT_BBP (AGC ,35 ),0x10101014 ); -else -mt76_wr (dev,MT_BBP (AGC ,35 ),0x11111116 ); -mt76_wr (dev,MT_BBP (AGC ,37 ),0x2121262C ); gain_delta =0 ; dev->cal.agc_gain_adjust = low_gain_delta; } +mt76_wr (dev,MT_BBP (AGC ,35 ), agc_35); +mt76_wr (dev,MT_BBP (AGC ,37 ), agc_37); + dev->cal.agc_gain_cur[0 ] = gain[0 ] - gain_delta; dev->cal.agc_gain_cur[1 ] = gain[1 ] - gain_delta;mt76x2_phy_set_gain_val (dev);
drivers/nvme/host/multipath.c +1 -4
@@ -366,15 +366,12 @@ static inline bool nvme_state_is_live(enum nvme_ana_state state)static void nvme_update_ns_ana_state (struct nvme_ana_group_desc *desc,struct nvme_ns *ns) { -enum nvme_ana_state old; -mutex_lock (&ns->head->lock); - old = ns->ana_state; ns->ana_grpid =le32_to_cpu (desc->grpid); ns->ana_state = desc->state;clear_bit (NVME_NS_ANA_PENDING , &ns->flags); -if (nvme_state_is_live (ns->ana_state) && !nvme_state_is_live (old)) +if (nvme_state_is_live (ns->ana_state))nvme_mpath_set_live (ns);mutex_unlock (&ns->head->lock); }
drivers/nvme/target/core.c +2 -2
@@ -517,7 +517,7 @@ int nvmet_ns_enable(struct nvmet_ns *ns) ret =nvmet_p2pmem_ns_enable (ns);if (ret) - goto out_unlock; + goto out_dev_disable;list_for_each_entry (ctrl, &subsys->ctrls, subsys_entry)nvmet_p2pmem_ns_add_p2p (ctrl, ns);
@@ -558,7 +558,7 @@ int nvmet_ns_enable(struct nvmet_ns *ns) out_dev_put:list_for_each_entry (ctrl, &subsys->ctrls, subsys_entry)pci_dev_put (radix_tree_delete (&ctrl->p2p_ns_map, ns->nsid)); - +out_dev_disable:nvmet_ns_dev_disable (ns); goto out_unlock; }
drivers/nvme/target/io-cmd-file.c +10 -10
@@ -75,11 +75,11 @@ int nvmet_file_ns_enable(struct nvmet_ns *ns)return ret; } -static void nvmet_file_init_bvec (struct bio_vec *bv,struct sg_page_iter *iter) +static void nvmet_file_init_bvec (struct bio_vec *bv,struct scatterlist *sg) { - bv->bv_page =sg_page_iter_page (iter); - bv->bv_offset = iter->sg->offset; - bv->bv_len =PAGE_SIZE - iter->sg->offset; + bv->bv_page =sg_page (sg); + bv->bv_offset = sg->offset; + bv->bv_len = sg->length; } static ssize_t nvmet_file_submit_bvec(struct nvmet_req *req, loff_t pos,
@@ -128,14 +128,14 @@ static void nvmet_file_io_done(struct kiocb *iocb, long ret, long ret2)static bool nvmet_file_execute_io (struct nvmet_req *req,int ki_flags) { -ssize_t nr_bvec =DIV_ROUND_UP (req->data_len,PAGE_SIZE ); -struct sg_page_iter sg_pg_iter; +ssize_t nr_bvec = req->sg_cnt;unsigned long bv_cnt =0 ;bool is_sync = false;size_t len =0 , total_len =0 ;ssize_t ret =0 ;loff_t pos; - +int i; +struct scatterlist *sg;if (req->f.mpool_alloc && nr_bvec >NVMET_MAX_MPOOL_BVEC ) is_sync = true;
@@ -147,8 +147,8 @@ static bool nvmet_file_execute_io(struct nvmet_req *req, int ki_flags) }memset (&req->f.iocb,0 ,sizeof (struct kiocb )); -for_each_sg_page (req->sg, &sg_pg_iter, req->sg_cnt,0 ) { -nvmet_file_init_bvec (&req->f.bvec[bv_cnt], &sg_pg_iter); +for_each_sg (req->sg, sg, req->sg_cnt, i) { +nvmet_file_init_bvec (&req->f.bvec[bv_cnt], sg); len += req->f.bvec[bv_cnt].bv_len; total_len += req->f.bvec[bv_cnt].bv_len; bv_cnt++;
@@ -225,7 +225,7 @@ static void nvmet_file_submit_buffered_io(struct nvmet_req *req)static void nvmet_file_execute_rw (struct nvmet_req *req) { -ssize_t nr_bvec =DIV_ROUND_UP (req->data_len,PAGE_SIZE ); +ssize_t nr_bvec = req->sg_cnt;if (!req->sg_cnt || !nr_bvec) {nvmet_req_complete (req,0 );
drivers/s390/net/qeth_l3_main.c +3 -1
@@ -2316,12 +2316,14 @@ static int qeth_l3_probe_device(struct ccwgroup_device *gdev)struct qeth_card *card =dev_get_drvdata (&gdev->dev);int rc; +hash_init (card->ip_htable); +if (gdev->dev.type == &qeth_generic_devtype) { rc =qeth_l3_create_device_attributes (&gdev->dev);if (rc)return rc; } -hash_init (card->ip_htable); +hash_init (card->ip_mc_htable); card->info.hwtrap =0 ;return 0 ;
drivers/s390/scsi/zfcp_fc.c +17 -4
@@ -239,10 +239,6 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range,list_for_each_entry (port, &adapter->port_list, list) {if ((port->d_id & range) == (ntoh24 (page->rscn_fid) & range))zfcp_fc_test_link (port); -if (!port->d_id) -zfcp_erp_port_reopen (port, -ZFCP_STATUS_COMMON_ERP_FAILED , -"fcrscn1" ); }read_unlock_irqrestore (&adapter->port_list_lock, flags); }
@@ -250,6 +246,7 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range,static void zfcp_fc_incoming_rscn (struct zfcp_fsf_req *fsf_req) {struct fsf_status_read_buffer *status_buffer = (void *)fsf_req->data; +struct zfcp_adapter *adapter = fsf_req->adapter;struct fc_els_rscn *head;struct fc_els_rscn_page *page;u16 i;
@@ -263,6 +260,22 @@ static void zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req) no_entries =be16_to_cpu (head->rscn_plen) /sizeof (struct fc_els_rscn_page ); +if (no_entries >1 ) { +/* handle failed ports */ +unsigned long flags; +struct zfcp_port *port; + +read_lock_irqsave (&adapter->port_list_lock, flags); +list_for_each_entry (port, &adapter->port_list, list) { +if (port->d_id) +continue ; +zfcp_erp_port_reopen (port, +ZFCP_STATUS_COMMON_ERP_FAILED , +"fcrscn1" ); + } +read_unlock_irqrestore (&adapter->port_list_lock, flags); + } +for (i =1 ; i < no_entries; i++) {/* skip head and start with 1st element */ page++;
drivers/scsi/aacraid/aacraid.h +6 -1
@@ -2640,9 +2640,14 @@ static inline unsigned int cap_to_cyls(sector_t capacity, unsigned divisor)return capacity; } +static inline int aac_pci_offline (struct aac_dev *dev) +{ +return pci_channel_offline (dev->pdev) || dev->handle_pci_error; +} +static inline int aac_adapter_check_health (struct aac_dev *dev) { -if (unlikely (pci_channel_offline (dev->pdev))) +if (unlikely (aac_pci_offline (dev)))return -1 ;return (dev)->a_ops.adapter_check_health (dev);
drivers/scsi/aacraid/commsup.c +2 -2
@@ -672,7 +672,7 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,return -ETIMEDOUT ; } -if (unlikely (pci_channel_offline (dev->pdev))) +if (unlikely (aac_pci_offline (dev)))return -EFAULT ;if ((blink =aac_adapter_check_health (dev)) >0 ) {
@@ -772,7 +772,7 @@ int aac_hba_send(u8 command, struct fib *fibptr, fib_callback callback,spin_unlock_irqrestore (&fibptr->event_lock, flags); -if (unlikely (pci_channel_offline (dev->pdev))) +if (unlikely (aac_pci_offline (dev)))return -EFAULT ; fibptr->flags |=FIB_CONTEXT_FLAG_WAIT ;
drivers/scsi/mpt3sas/mpt3sas_base.c +6 -0
@@ -3281,12 +3281,18 @@ mpt3sas_base_free_smid(struct MPT3SAS_ADAPTER *ioc, u16 smid)if (smid < ioc->hi_priority_smid) {struct scsiio_tracker *st; +void *request; st =_get_st_from_smid (ioc, smid);if (!st) {_base_recovery_check (ioc);return ; } + +/* Clear MPI request frame */ + request =mpt3sas_base_get_msg_frame (ioc, smid); +memset (request,0 , ioc->request_sz); +mpt3sas_base_clear_st (ioc, st);_base_recovery_check (ioc);return ;
drivers/scsi/mpt3sas/mpt3sas_scsih.c +12 -0
@@ -1462,11 +1462,23 @@ mpt3sas_scsih_scsi_lookup_get(struct MPT3SAS_ADAPTER *ioc, u16 smid) {struct scsi_cmnd *scmd =NULL ;struct scsiio_tracker *st; +Mpi25SCSIIORequest_t *mpi_request;if (smid >0 && smid <= ioc->scsiio_depth -INTERNAL_SCSIIO_CMDS_COUNT ) {u32 unique_tag = smid -1 ; + mpi_request =mpt3sas_base_get_msg_frame (ioc, smid); + +/* +* If SCSI IO request is outstanding at driver level then +* DevHandle filed must be non-zero. If DevHandle is zero +* then it means that this smid is free at driver level, +* so return NULL. +*/ +if (!mpi_request->DevHandle) +return scmd; + scmd =scsi_host_find_tag (ioc->shost, unique_tag);if (scmd) { st =scsi_cmd_priv (scmd);
drivers/scsi/qla4xxx/ql4_os.c +2 -0
@@ -3203,6 +3203,8 @@ static int qla4xxx_conn_bind(struct iscsi_cls_session *cls_session,if (iscsi_conn_bind (cls_session, cls_conn, is_leading))return -EINVAL ; ep =iscsi_lookup_endpoint (transport_fd); +if (!ep) +return -EINVAL ; conn = cls_conn->dd_data; qla_conn = conn->dd_data; qla_conn->qla_ep = ep->dd_data;
drivers/staging/axis-fifo/Kconfig +1 -0
@@ -3,6 +3,7 @@ # config XIL_AXIS_FIFO tristate "Xilinx AXI-Stream FIFO IP core driver" + depends on OF default n help This adds support for the Xilinx AXI-Stream
drivers/staging/mt7621-pci/Kconfig +1 -0
@@ -1,6 +1,7 @@ config PCI_MT7621 tristate "MediaTek MT7621 PCI Controller" depends on RALINK + depends on PCI select PCI_DRIVERS_GENERIC help This selects a driver for the MediaTek MT7621 PCI Controller.
drivers/staging/rtl8188eu/core/rtw_xmit.c +7 -2
@@ -174,7 +174,9 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitpriv->free_xmit_extbuf_cnt = num_xmit_extbuf; -rtw_alloc_hwxmits (padapter); + res =rtw_alloc_hwxmits (padapter); +if (res == _FAIL) + goto exit;rtw_init_hwxmits (pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry);for (i =0 ; i <4 ; i++)
@@ -1503,7 +1505,7 @@ s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe)return res; } -void rtw_alloc_hwxmits (struct adapter *padapter) +s32 rtw_alloc_hwxmits (struct adapter *padapter) {struct hw_xmit *hwxmits;struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@@ -1512,6 +1514,8 @@ void rtw_alloc_hwxmits(struct adapter *padapter) pxmitpriv->hwxmits =kcalloc (pxmitpriv->hwxmit_entry,sizeof (struct hw_xmit ),GFP_KERNEL ); +if (!pxmitpriv->hwxmits) +return _FAIL; hwxmits = pxmitpriv->hwxmits;
@@ -1519,6 +1523,7 @@ void rtw_alloc_hwxmits(struct adapter *padapter) hwxmits[1 ] .sta_queue = &pxmitpriv->vi_pending; hwxmits[2 ] .sta_queue = &pxmitpriv->be_pending; hwxmits[3 ] .sta_queue = &pxmitpriv->bk_pending; +return _SUCCESS; }void rtw_free_hwxmits (struct adapter *padapter)
drivers/staging/rtl8188eu/include/rtw_xmit.h +1 -1
@@ -336,7 +336,7 @@ s32 rtw_txframes_sta_ac_pending(struct adapter *padapter,void rtw_init_hwxmits (struct hw_xmit *phwxmit,int entry);s32 _rtw_init_xmit_priv (struct xmit_priv *pxmitpriv,struct adapter *padapter);void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv); -void rtw_alloc_hwxmits (struct adapter *padapter); +s32 rtw_alloc_hwxmits (struct adapter *padapter);void rtw_free_hwxmits (struct adapter *padapter);s32 rtw_xmit (struct adapter *padapter,struct sk_buff **pkt);
drivers/staging/rtl8712/rtl8712_cmd.c +1 -9
@@ -147,17 +147,9 @@ static u8 write_macreg_hdl(struct _adapter *padapter, u8 *pbuf)static u8 read_bbreg_hdl (struct _adapter *padapter,u8 *pbuf) { -u32 val; -void (*pcmd_callback)(struct _adapter *dev,struct cmd_obj *pcmd);struct cmd_obj *pcmd = (struct cmd_obj *)pbuf; -if (pcmd->rsp && pcmd->rspsz >0 ) -memcpy (pcmd->rsp, (u8 *)&val, pcmd->rspsz); - pcmd_callback = cmd_callback[pcmd->cmdcode].callback; -if (!pcmd_callback) -r8712_free_cmd_obj (pcmd); -else -pcmd_callback (padapter, pcmd); +r8712_free_cmd_obj (pcmd);return H2C_SUCCESS ; }
drivers/staging/rtl8712/rtl8712_cmd.h +1 -1
@@ -140,7 +140,7 @@ enum rtl8712_h2c_cmd {static struct _cmd_callback cmd_callback[] = { {GEN_CMD_CODE (_Read_MACREG),NULL },/*0*/ {GEN_CMD_CODE (_Write_MACREG),NULL }, - {GEN_CMD_CODE (_Read_BBREG), &r8712_getbbrfreg_cmdrsp_callback}, + {GEN_CMD_CODE (_Read_BBREG),NULL }, {GEN_CMD_CODE (_Write_BBREG),NULL }, {GEN_CMD_CODE (_Read_RFREG), &r8712_getbbrfreg_cmdrsp_callback}, {GEN_CMD_CODE (_Write_RFREG),NULL },/*5*/
drivers/staging/rtl8723bs/core/rtw_xmit.c +7 -7
@@ -260,7 +260,9 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) } } -rtw_alloc_hwxmits (padapter); + res =rtw_alloc_hwxmits (padapter); +if (res == _FAIL) + goto exit;rtw_init_hwxmits (pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry);for (i =0 ; i <4 ; i++) {
@@ -2144,7 +2146,7 @@ s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe)return res; } -void rtw_alloc_hwxmits (struct adapter *padapter) +s32 rtw_alloc_hwxmits (struct adapter *padapter) {struct hw_xmit *hwxmits;struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@@ -2155,10 +2157,8 @@ void rtw_alloc_hwxmits(struct adapter *padapter) pxmitpriv->hwxmits =rtw_zmalloc (sizeof (struct hw_xmit ) * pxmitpriv->hwxmit_entry); -if (pxmitpriv->hwxmits ==NULL ) { -DBG_871X ("alloc hwxmits fail!...\n" ); -return ; - } +if (!pxmitpriv->hwxmits) +return _FAIL; hwxmits = pxmitpriv->hwxmits;
@@ -2204,7 +2204,7 @@ void rtw_alloc_hwxmits(struct adapter *padapter) } - +return _SUCCESS; }void rtw_free_hwxmits (struct adapter *padapter)
drivers/staging/rtl8723bs/include/rtw_xmit.h +1 -1
@@ -487,7 +487,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter);void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv); -void rtw_alloc_hwxmits (struct adapter *padapter); +s32 rtw_alloc_hwxmits (struct adapter *padapter);void rtw_free_hwxmits (struct adapter *padapter);
drivers/staging/rtlwifi/phydm/rtl_phydm.c +2 -0
@@ -180,6 +180,8 @@ static int rtl_phydm_init_priv(struct rtl_priv *rtlpriv, rtlpriv->phydm.internal =kzalloc (sizeof (struct phy_dm_struct ),GFP_KERNEL ); +if (!rtlpriv->phydm.internal) +return 0 ;_rtl_phydm_init_com_info (rtlpriv, ic, params);
drivers/staging/rtlwifi/rtl8822be/fw.c +2 -0
@@ -741,6 +741,8 @@ void rtl8822be_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished) u1_rsvd_page_loc, 3); skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;memcpy ((u8 *)skb_put (skb, totalpacketlen), &reserved_page_packet, totalpacketlen);
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +6 -2
@@ -3513,6 +3513,7 @@ static int vchiq_probe(struct platform_device *pdev)struct device_node *fw_node;const struct of_device_id *of_id;struct vchiq_drvdata *drvdata; +struct device *vchiq_dev;int err; of_id =of_match_node (vchiq_of_match, pdev->dev.of_node);
@@ -3547,9 +3548,12 @@ static int vchiq_probe(struct platform_device *pdev) goto failed_platform_init; } -if (IS_ERR (device_create (vchiq_class, &pdev->dev, vchiq_devid, -NULL ,"vchiq" ))) + vchiq_dev =device_create (vchiq_class, &pdev->dev, vchiq_devid,NULL , +"vchiq" ); +if (IS_ERR (vchiq_dev)) { + err =PTR_ERR (vchiq_dev); goto failed_device_create; + }vchiq_debugfs_init ();
drivers/tty/serial/ar933x_uart.c +8 -16
@@ -49,11 +49,6 @@ struct ar933x_uart_port {struct clk *clk; }; -static inline bool ar933x_uart_console_enabled (void ) -{ -return IS_ENABLED (CONFIG_SERIAL_AR933X_CONSOLE ); -} -static inline unsigned int ar933x_uart_read (struct ar933x_uart_port *up,int offset) {
@@ -508,6 +503,7 @@ static const struct uart_ops ar933x_uart_ops = { .verify_port = ar933x_uart_verify_port, }; +#ifdef CONFIG_SERIAL_AR933X_CONSOLE static struct ar933x_uart_port * ar933x_console_ports[CONFIG_SERIAL_AR933X_NR_UARTS ];
@@ -604,14 +600,7 @@ static struct console ar933x_uart_console = { .index = -1, .data = &ar933x_uart_driver, }; - -static void ar933x_uart_add_console_port (struct ar933x_uart_port *up) -{ -if (!ar933x_uart_console_enabled ()) -return ; - - ar933x_console_ports[up->port.line] = up; -} +#endif /* CONFIG_SERIAL_AR933X_CONSOLE */ static struct uart_driver ar933x_uart_driver = { .owner =THIS_MODULE ,
@@ -700,7 +689,9 @@ static int ar933x_uart_probe(struct platform_device *pdev) baud =ar933x_uart_get_baud (port->uartclk,0 ,AR933X_UART_MAX_STEP ); up->max_baud = min_t(unsigned int, baud, AR933X_UART_MAX_BAUD); -ar933x_uart_add_console_port (up); +#ifdef CONFIG_SERIAL_AR933X_CONSOLE + ar933x_console_ports[up->port.line] = up; +#endif ret =uart_add_one_port (&ar933x_uart_driver, &up->port);if (ret)
@@ -749,8 +740,9 @@ static int __init ar933x_uart_init(void) {int ret; -if (ar933x_uart_console_enabled ()) - ar933x_uart_driver.cons = &ar933x_uart_console; +#ifdef CONFIG_SERIAL_AR933X_CONSOLE + ar933x_uart_driver.cons = &ar933x_uart_console; +#endif ret =uart_register_driver (&ar933x_uart_driver);if (ret)
drivers/tty/serial/sc16is7xx.c +10 -2
@@ -1509,7 +1509,7 @@ static int __init sc16is7xx_init(void) ret =i2c_add_driver (&sc16is7xx_i2c_uart_driver);if (ret <0 ) {pr_err ("failed to init sc16is7xx i2c --> %d\n" , ret); -return ret; + goto err_i2c; }#endif
@@ -1517,10 +1517,18 @@ static int __init sc16is7xx_init(void) ret =spi_register_driver (&sc16is7xx_spi_uart_driver);if (ret <0 ) {pr_err ("failed to init sc16is7xx spi --> %d\n" , ret); -return ret; + goto err_spi; }#endif return ret; + +err_spi: +#ifdef CONFIG_SERIAL_SC16IS7XX_I2C +i2c_del_driver (&sc16is7xx_i2c_uart_driver); +#endif +err_i2c: +uart_unregister_driver (&sc16is7xx_uart); +return ret; }module_init (sc16is7xx_init);
drivers/usb/dwc3/dwc3-pci.c +4 -0
@@ -29,6 +29,7 @@#define PCI_DEVICE_ID_INTEL_BXT_M 0x1aaa#define PCI_DEVICE_ID_INTEL_APL 0x5aaa#define PCI_DEVICE_ID_INTEL_KBP 0xa2b0 +#define PCI_DEVICE_ID_INTEL_CMLH 0x02ee#define PCI_DEVICE_ID_INTEL_GLK 0x31aa#define PCI_DEVICE_ID_INTEL_CNPLP 0x9dee#define PCI_DEVICE_ID_INTEL_CNPH 0xa36e
@@ -305,6 +306,9 @@ static const struct pci_device_id dwc3_pci_id_table[] = { {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_MRFLD ), (kernel_ulong_t) &dwc3_pci_mrfld_properties, }, + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CMLH), + (kernel_ulong_t) &dwc3_pci_intel_properties, }, + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_SPTLP), (kernel_ulong_t) &dwc3_pci_intel_properties, },
drivers/usb/gadget/udc/net2272.c +1 -0
@@ -945,6 +945,7 @@ net2272_dequeue(struct usb_ep *_ep, struct usb_request *_req)break ; }if (&req->req != _req) { + ep->stopped = stopped;spin_unlock_irqrestore (&ep->dev->lock, flags);return -EINVAL ; }
drivers/usb/gadget/udc/net2280.c +3 -5
@@ -866,9 +866,6 @@ static void start_queue(struct net2280_ep *ep, u32 dmactl, u32 td_dma) (void )readl (&ep->dev->pci->pcimstctl);writel (BIT (DMA_START ), &dma->dmastat); - -if (!ep->is_in) -stop_out_naking (ep); }static void start_dma (struct net2280_ep *ep,struct net2280_request *req)
@@ -907,6 +904,7 @@ static void start_dma(struct net2280_ep *ep, struct net2280_request *req)writel (BIT (DMA_START ), &dma->dmastat);return ; } +stop_out_naking (ep); } tmp = dmactl_default;
@@ -1275,9 +1273,9 @@ static int net2280_dequeue(struct usb_ep *_ep, struct usb_request *_req)break ; }if (&req->req != _req) { + ep->stopped = stopped;spin_unlock_irqrestore (&ep->dev->lock, flags); -dev_err (&ep->dev->pdev->dev,"%s: Request mismatch\n" , - __func__); +ep_dbg (ep->dev,"%s: Request mismatch\n" , __func__);return -EINVAL ; }
drivers/usb/host/u132-hcd.c +3 -0
@@ -3202,6 +3202,9 @@ static int __init u132_hcd_init(void)printk (KERN_INFO "driver %s\n" , hcd_name); workqueue =create_singlethread_workqueue ("u132" ); retval =platform_driver_register (&u132_platform_driver); +if (retval) +destroy_workqueue (workqueue); +return retval; }
drivers/usb/misc/usb251xb.c +1 -1
@@ -601,7 +601,7 @@ static int usb251xb_probe(struct usb251xb *hub) dev);int err; -if (np) { +if (np && of_id) { err =usb251xb_get_ofdata (hub, (struct usb251xb_data *)of_id->data);if (err) {
fs/afs/fsclient.c +3 -3
@@ -1515,8 +1515,8 @@ static int afs_fs_setattr_size64(struct afs_fs_cursor *fc, struct iattr *attr)xdr_encode_AFS_StoreStatus (&bp, attr); - *bp++ =0 ;/* position of start of write */ - *bp++ =0 ; + *bp++ =htonl (attr->ia_size >>32 );/* position of start of write */ + *bp++ =htonl ((u32 ) attr->ia_size); *bp++ =0 ;/* size of write */ *bp++ =0 ; *bp++ =htonl (attr->ia_size >>32 );/* new file length */
@@ -1564,7 +1564,7 @@ static int afs_fs_setattr_size(struct afs_fs_cursor *fc, struct iattr *attr)xdr_encode_AFS_StoreStatus (&bp, attr); - *bp++ =0 ;/* position of start of write */ + *bp++ =htonl (attr->ia_size);/* position of start of write */ *bp++ =0 ;/* size of write */ *bp++ =htonl (attr->ia_size);/* new file length */
fs/afs/yfsclient.c +1 -1
@@ -1514,7 +1514,7 @@ static int yfs_fs_setattr_size(struct afs_fs_cursor *fc, struct iattr *attr) bp =xdr_encode_u32 (bp,0 );/* RPC flags */ bp =xdr_encode_YFSFid (bp, &vnode->fid); bp =xdr_encode_YFS_StoreStatus (bp, attr); - bp =xdr_encode_u64 (bp,0 );/* position of start of write */ + bp =xdr_encode_u64 (bp, attr->ia_size);/* position of start of write */ bp =xdr_encode_u64 (bp,0 );/* size of write */ bp =xdr_encode_u64 (bp, attr->ia_size);/* new file length */ yfs_check_req (call, bp);
fs/btrfs/transaction.c +43 -6
80 lines not on this page · raw message
fs/ceph/inode.c +1 -1
@@ -524,6 +524,7 @@ static void ceph_i_callback(struct rcu_head *head) struct inode *inode = container_of(head, struct inode, i_rcu);struct ceph_inode_info *ci =ceph_inode (inode); +kfree (ci->i_symlink);kmem_cache_free (ceph_inode_cachep, ci); }
@@ -561,7 +562,6 @@ void ceph_destroy_inode(struct inode *inode)ceph_put_snap_realm (mdsc, realm); } -kfree (ci->i_symlink);while ((n =rb_first (&ci->i_fragtree)) !=NULL ) { frag = rb_entry(n, struct ceph_inode_frag, node);rb_erase (n, &ci->i_fragtree);
fs/fuse/dev.c +6 -6
@@ -2034,10 +2034,8 @@ static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe, rem += pipe->bufs[(pipe->curbuf + idx) & (pipe->buffers -1 )].len; ret = -EINVAL ; -if (rem < len) { -pipe_unlock (pipe); - goto out; - } +if (rem < len) + goto out_free; rem = len;while (rem) {
@@ -2055,7 +2053,9 @@ static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe, pipe->curbuf = (pipe->curbuf +1 ) & (pipe->buffers -1 ); pipe->nrbufs--; }else { -pipe_buf_get (pipe, ibuf); +if (!pipe_buf_get (pipe, ibuf)) + goto out_free; + *obuf = *ibuf; obuf->flags &= ~PIPE_BUF_FLAG_GIFT ; obuf->len = rem;
@@ -2078,11 +2078,11 @@ static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe, ret =fuse_dev_do_write (fud, &cs, len);pipe_lock (pipe); +out_free:for (idx =0 ; idx < nbuf; idx++)pipe_buf_release (pipe, &bufs[idx]);pipe_unlock (pipe); -out:kvfree (bufs);return ret; }
fs/nfs/client.c +1 -1
@@ -453,7 +453,7 @@ void nfs_init_timeout_values(struct rpc_timeout *to, int proto,case XPRT_TRANSPORT_RDMA :if (retrans ==NFS_UNSPEC_RETRANS ) to->to_retries =NFS_DEF_TCP_RETRANS ; -if (timeo ==NFS_UNSPEC_TIMEO || to->to_retries ==0 ) +if (timeo ==NFS_UNSPEC_TIMEO || to->to_initval ==0 ) to->to_initval =NFS_DEF_TCP_TIMEO *HZ /10 ;if (to->to_initval >NFS_MAX_TCP_TIMEOUT ) to->to_initval =NFS_MAX_TCP_TIMEOUT ;
fs/pipe.c +2 -2
@@ -189,9 +189,9 @@ EXPORT_SYMBOL(generic_pipe_buf_steal);* in the tee() system call, when we duplicate the buffers in one * pipe into another. */ -void generic_pipe_buf_get (struct pipe_inode_info *pipe,struct pipe_buffer *buf) +bool generic_pipe_buf_get (struct pipe_inode_info *pipe,struct pipe_buffer *buf) { -get_page (buf->page); +return try_get_page (buf->page); }EXPORT_SYMBOL (generic_pipe_buf_get);
fs/splice.c +10 -2
@@ -1588,7 +1588,11 @@ static int splice_pipe_to_pipe(struct pipe_inode_info *ipipe,* Get a reference to this pipe buffer, * so we can copy the contents over. */ -pipe_buf_get (ipipe, ibuf); +if (!pipe_buf_get (ipipe, ibuf)) { +if (ret ==0 ) + ret = -EFAULT ; +break ; + } *obuf = *ibuf;/*
@@ -1662,7 +1666,11 @@ static int link_pipe(struct pipe_inode_info *ipipe,* Get a reference to this pipe buffer, * so we can copy the contents over. */ -pipe_buf_get (ipipe, ibuf); +if (!pipe_buf_get (ipipe, ibuf)) { +if (ret ==0 ) + ret = -EFAULT ; +break ; + } obuf = opipe->bufs + nbuf; *obuf = *ibuf;
include/linux/mm.h +14 -1
@@ -965,6 +965,10 @@ static inline bool is_pci_p2pdma_page(const struct page *page) }#endif /* CONFIG_DEV_PAGEMAP_OPS */ +/* 127: arbitrary random number, small enough to assemble well */ +#define page_ref_zero_or_close_to_overflow (page) \ + ((unsigned int) page_ref_count(page) + 127u <= 127u) +static inline void get_page (struct page *page) { page =compound_head (page);
@@ -972,8 +976,17 @@ static inline void get_page(struct page *page)* Getting a normal page or the head of a compound page * requires to already have an elevated page->_refcount. */ -VM_BUG_ON_PAGE (page_ref_count (page) <=0 , page); +VM_BUG_ON_PAGE (page_ref_zero_or_close_to_overflow (page), page); +page_ref_inc (page); +} + +static inline __must_check bool try_get_page (struct page *page) +{ + page =compound_head (page); +if (WARN_ON_ONCE (page_ref_count (page) <=0 )) +return false;page_ref_inc (page); +return true; }static inline void put_page (struct page *page)
include/linux/pipe_fs_i.h +6 -4
@@ -108,18 +108,20 @@ struct pipe_buf_operations {/* * Get a reference to the pipe buffer. */ -void (*get)(struct pipe_inode_info *,struct pipe_buffer *); +bool (*get)(struct pipe_inode_info *,struct pipe_buffer *); };/** * pipe_buf_get - get a reference to a pipe_buffer * @pipe: the pipe that the buffer belongs to * @buf: the buffer to get a reference to +* +* Return: %true if the reference was successfully obtained. */ -static inline void pipe_buf_get (struct pipe_inode_info *pipe, +static inline __must_check bool pipe_buf_get (struct pipe_inode_info *pipe,struct pipe_buffer *buf) { - buf->ops->get (pipe, buf); +return buf->ops->get (pipe, buf); }/**
@@ -178,7 +180,7 @@ struct pipe_inode_info *alloc_pipe_info(void);void free_pipe_info (struct pipe_inode_info *);/* Generic pipe buffer ops functions */ -void generic_pipe_buf_get (struct pipe_inode_info *,struct pipe_buffer *); +bool generic_pipe_buf_get (struct pipe_inode_info *,struct pipe_buffer *);int generic_pipe_buf_confirm (struct pipe_inode_info *,struct pipe_buffer *);int generic_pipe_buf_steal (struct pipe_inode_info *,struct pipe_buffer *);int generic_pipe_buf_nosteal (struct pipe_inode_info *,struct pipe_buffer *);
include/linux/sched/signal.h +18 -0
@@ -417,10 +417,20 @@ static inline void set_restore_sigmask(void)set_thread_flag (TIF_RESTORE_SIGMASK );WARN_ON (!test_thread_flag (TIF_SIGPENDING )); } + +static inline void clear_tsk_restore_sigmask (struct task_struct *tsk) +{ +clear_tsk_thread_flag (tsk,TIF_RESTORE_SIGMASK ); +} +static inline void clear_restore_sigmask (void ) {clear_thread_flag (TIF_RESTORE_SIGMASK ); } +static inline bool test_tsk_restore_sigmask (struct task_struct *tsk) +{ +return test_tsk_thread_flag (tsk,TIF_RESTORE_SIGMASK ); +}static inline bool test_restore_sigmask (void ) {return test_thread_flag (TIF_RESTORE_SIGMASK );
@@ -438,6 +448,10 @@ static inline void set_restore_sigmask(void) current->restore_sigmask = true;WARN_ON (!test_thread_flag (TIF_SIGPENDING )); } +static inline void clear_tsk_restore_sigmask (struct task_struct *tsk) +{ + tsk->restore_sigmask = false; +}static inline void clear_restore_sigmask (void ) { current->restore_sigmask = false;
@@ -446,6 +460,10 @@ static inline bool test_restore_sigmask(void) {return current->restore_sigmask; } +static inline bool test_tsk_restore_sigmask (struct task_struct *tsk) +{ +return tsk->restore_sigmask; +}static inline bool test_and_clear_restore_sigmask (void ) {if (!current->restore_sigmask)
include/net/tc_act/tc_gact.h +1 -1
@@ -56,7 +56,7 @@ static inline bool is_tcf_gact_goto_chain(const struct tc_action *a)static inline u32 tcf_gact_goto_chain_index (const struct tc_action *a) { -return a->goto_chain->index; +return READ_ONCE (a->tcfa_action) &TC_ACT_EXT_VAL_MASK ; }#endif /* __NET_TC_GACT_H */
include/net/xdp_sock.h +0 -1
@@ -36,7 +36,6 @@ struct xdp_umem {u32 headroom;u32 chunk_size_nohr;struct user_struct *user; -struct pid *pid;unsigned long address;refcount_t users;struct work_struct work;
kernel/ptrace.c +13 -2
@@ -29,6 +29,7 @@#include <linux/hw_breakpoint.h> #include <linux/cn_proc.h> #include <linux/compat.h> +#include <linux/sched/signal.h> /* * Access another process' address space via ptrace.
@@ -924,18 +925,26 @@ int ptrace_request(struct task_struct *child, long request, ret =ptrace_setsiginfo (child, &siginfo);break ; -case PTRACE_GETSIGMASK : +case PTRACE_GETSIGMASK : { +sigset_t *mask; +if (addr !=sizeof (sigset_t)) { ret = -EINVAL ;break ; } -if (copy_to_user (datavp, &child->blocked,sizeof (sigset_t))) +if (test_tsk_restore_sigmask (child)) + mask = &child->saved_sigmask; +else + mask = &child->blocked; + +if (copy_to_user (datavp, mask,sizeof (sigset_t))) ret = -EFAULT ;else ret =0 ;break ; + }case PTRACE_SETSIGMASK : {sigset_t new_set;
@@ -961,6 +970,8 @@ int ptrace_request(struct task_struct *child, long request, child->blocked = new_set;spin_unlock_irq (&child->sighand->siglock); +clear_tsk_restore_sigmask (child); + ret =0 ;break ; }
kernel/trace/trace.c +5 -1
@@ -6843,12 +6843,16 @@ static void buffer_pipe_buf_release(struct pipe_inode_info *pipe, buf->private =0 ; } -static void buffer_pipe_buf_get (struct pipe_inode_info *pipe, +static bool buffer_pipe_buf_get (struct pipe_inode_info *pipe,struct pipe_buffer *buf) {struct buffer_ref *ref = (struct buffer_ref *)buf->private; +if (refcount_read (&ref->refcount) >INT_MAX /2 ) +return false; +refcount_inc (&ref->refcount); +return true; }/* Pipe buffer operations for a buffer. */
lib/sbitmap.c +11 -0
@@ -591,6 +591,17 @@ EXPORT_SYMBOL_GPL(sbitmap_queue_wake_up);void sbitmap_queue_clear (struct sbitmap_queue *sbq,unsigned int nr,unsigned int cpu) { +/* +* Once the clear bit is set, the bit may be allocated out. +* +* Orders READ/WRITE on the asssociated instance(such as request +* of blk_mq) by this bit for avoiding race with re-allocation, +* and its pair is the memory barrier implied in __sbitmap_get_word. +* +* One invariant is that the clear bit has to be zero when the bit +* is in use. +*/ +smp_mb__before_atomic ();sbitmap_deferred_clear_bit (&sbq->sb, nr);/*
mm/gup.c +36 -12
97 lines not on this page · raw message
mm/hugetlb.c +13 -0
@@ -4298,6 +4298,19 @@ long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma, pfn_offset = (vaddr & ~huge_page_mask (h)) >>PAGE_SHIFT ; page =pte_page (huge_ptep_get (pte)); + +/* +* Instead of doing 'try_get_page()' below in the same_page +* loop, just check the count once here. +*/ +if (unlikely (page_count (page) <=0 )) { +if (pages) { +spin_unlock (ptl); + remainder =0 ; + err = -ENOMEM ; +break ; + } + } same_page:if (pages) { pages[i] =mem_map_offset (page, pfn_offset);
mm/kasan/kasan.h +4 -1
@@ -164,7 +164,10 @@ static inline u8 random_tag(void)#endif #ifndef arch_kasan_set_tag -#define arch_kasan_set_tag (addr, tag) ((void *)(addr)) +static inline const void *arch_kasan_set_tag (const void *addr,u8 tag) +{ +return addr; +}#endif #ifndef arch_kasan_reset_tag#define arch_kasan_reset_tag (addr) ((void *)(addr))
net/bridge/br_netfilter_hooks.c +1 -0
@@ -502,6 +502,7 @@ static unsigned int br_nf_pre_routing(void *priv, nf_bridge->ipv4_daddr =ip_hdr (skb)->daddr; skb->protocol =htons (ETH_P_IP ); + skb->transport_header = skb->network_header +ip_hdr (skb)->ihl *4 ; NF_HOOK(NFPROTO_IPV4, NF_INET_PRE_ROUTING, state->net, state->sk, skb, skb->dev, NULL,
net/bridge/br_netfilter_ipv6.c +2 -0
@@ -235,6 +235,8 @@ unsigned int br_nf_pre_routing_ipv6(void *priv, nf_bridge->ipv6_daddr =ipv6_hdr (skb)->daddr; skb->protocol =htons (ETH_P_IPV6 ); + skb->transport_header = skb->network_header +sizeof (struct ipv6hdr ); +NF_HOOK (NFPROTO_IPV6 ,NF_INET_PRE_ROUTING , state->net, state->sk, skb, skb->dev,NULL , br_nf_pre_routing_finish_ipv6);
net/ipv6/netfilter/ip6t_srh.c +6 -0
@@ -210,6 +210,8 @@ static bool srh1_mt6(const struct sk_buff *skb, struct xt_action_param *par) psidoff = srhoff +sizeof (struct ipv6_sr_hdr ) + ((srh->segments_left +1 ) *sizeof (struct in6_addr )); psid =skb_header_pointer (skb, psidoff,sizeof (_psid), &_psid); +if (!psid) +return false;if (NF_SRH_INVF (srhinfo,IP6T_SRH_INV_PSID ,ipv6_masked_addr_cmp (psid, &srhinfo->psid_msk, &srhinfo->psid_addr)))
@@ -223,6 +225,8 @@ static bool srh1_mt6(const struct sk_buff *skb, struct xt_action_param *par) nsidoff = srhoff +sizeof (struct ipv6_sr_hdr ) + ((srh->segments_left -1 ) *sizeof (struct in6_addr )); nsid =skb_header_pointer (skb, nsidoff,sizeof (_nsid), &_nsid); +if (!nsid) +return false;if (NF_SRH_INVF (srhinfo,IP6T_SRH_INV_NSID ,ipv6_masked_addr_cmp (nsid, &srhinfo->nsid_msk, &srhinfo->nsid_addr)))
@@ -233,6 +237,8 @@ static bool srh1_mt6(const struct sk_buff *skb, struct xt_action_param *par)if (srhinfo->mt_flags &IP6T_SRH_LSID ) { lsidoff = srhoff +sizeof (struct ipv6_sr_hdr ); lsid =skb_header_pointer (skb, lsidoff,sizeof (_lsid), &_lsid); +if (!lsid) +return false;if (NF_SRH_INVF (srhinfo,IP6T_SRH_INV_LSID ,ipv6_masked_addr_cmp (lsid, &srhinfo->lsid_msk, &srhinfo->lsid_addr)))
net/netfilter/Kconfig +1 -0
@@ -995,6 +995,7 @@ config NETFILTER_XT_TARGET_TEE depends on NETFILTER_ADVANCED depends on IPV6 || IPV6=n depends on !NF_CONNTRACK || NF_CONNTRACK + depends on IP6_NF_IPTABLES || !IP6_NF_IPTABLES select NF_DUP_IPV4 select NF_DUP_IPV6 if IP6_NF_IPTABLES ---help---
net/netfilter/nft_set_rbtree.c +3 -4
@@ -308,10 +308,6 @@ static void *nft_rbtree_deactivate(const struct net *net,else if (d >0 ) parent = parent->rb_right;else { -if (!nft_set_elem_active (&rbe->ext, genmask)) { - parent = parent->rb_left; -continue ; - }if (nft_rbtree_interval_end (rbe) && !nft_rbtree_interval_end (this)) { parent = parent->rb_left;
@@ -320,6 +316,9 @@ static void *nft_rbtree_deactivate(const struct net *net, nft_rbtree_interval_end(this)) { parent = parent->rb_right;continue ; + } else if (!nft_set_elem_active(&rbe->ext, genmask)) { + parent = parent->rb_left; +continue ; }nft_rbtree_flush (net, set, rbe);return rbe;
net/sunrpc/xprtsock.c +2 -2
@@ -486,8 +486,8 @@ xs_read_stream_request(struct sock_xprt *transport, struct msghdr *msg, int flags, struct rpc_rqst *req) { struct xdr_buf *buf = &req->rq_private_buf; -size_t want, read; -ssize_t ret; +size_t want,uninitialized_var (read ); +ssize_t uninitialized_var (ret );xs_read_header (transport, buf);
net/xdp/xdp_umem.c +1 -18
@@ -189,9 +189,6 @@ static void xdp_umem_unaccount_pages(struct xdp_umem *umem)static void xdp_umem_release (struct xdp_umem *umem) { -struct task_struct *task; -struct mm_struct *mm; -xdp_umem_clear_dev (umem);if (umem->fq) {
@@ -208,21 +205,10 @@ static void xdp_umem_release(struct xdp_umem *umem)xdp_umem_unpin_pages (umem); - task =get_pid_task (umem->pid,PIDTYPE_PID ); -put_pid (umem->pid); -if (!task) - goto out; - mm =get_task_mm (task); -put_task_struct (task); -if (!mm) - goto out; - -mmput (mm);kfree (umem->pages); umem->pages =NULL ;xdp_umem_unaccount_pages (umem); -out:kfree (umem); }
@@ -351,7 +337,6 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr)if (size_chk <0 )return -EINVAL ; - umem->pid =get_task_pid (current,PIDTYPE_PID ); umem->address = (unsigned long )addr; umem->chunk_mask = ~((u64 )chunk_size -1 ); umem->size = size;
@@ -367,7 +352,7 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr) err =xdp_umem_account_pages (umem);if (err) - goto out; +return err; err =xdp_umem_pin_pages (umem);if (err)
@@ -386,8 +371,6 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr) out_account:xdp_umem_unaccount_pages (umem); -out: -put_pid (umem->pid);return err; }
scripts/kconfig/lxdialog/inputbox.c +2 -1
@@ -113,7 +113,8 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int widthcase KEY_DOWN :break ;case KEY_BACKSPACE : -case 127 : +case 8 :/* ^H */ +case 127 :/* ^? */ if (pos) {wattrset (dialog, dlg.inputbox.atr);if (input_x ==0 ) {
scripts/kconfig/nconf.c +1 -1
@@ -1048,7 +1048,7 @@ static int do_match(int key, struct match_state *state, int *ans) state->match_direction =FIND_NEXT_MATCH_UP ; *ans =get_mext_match (state->pattern, state->match_direction); - }else if (key ==KEY_BACKSPACE || key ==127 ) { + }else if (key ==KEY_BACKSPACE || key ==8 || key ==127 ) { state->pattern[strlen (state->pattern)-1 ] ='\0' ;adj_match_dir (&state->match_direction); }else
scripts/kconfig/nconf.gui.c +2 -1
@@ -439,7 +439,8 @@ int dialog_inputbox(WINDOW *main_window,case KEY_F (F_EXIT ):case KEY_F (F_BACK ):break ; -case 127 : +case 8 :/* ^H */ +case 127 :/* ^? */ case KEY_BACKSPACE :if (cursor_position >0 ) { memmove(&result[cursor_position-1],
scripts/selinux/genheaders/genheaders.c +0 -1
@@ -9,7 +9,6 @@#include <string.h> #include <errno.h> #include <ctype.h> -#include <sys/socket.h> struct security_class_mapping {const char *name;
scripts/selinux/mdp/mdp.c +0 -1
@@ -32,7 +32,6 @@#include <stdlib.h> #include <unistd.h> #include <string.h> -#include <sys/socket.h> static void usage (char *name) {
security/selinux/include/classmap.h +1 -0
@@ -1,5 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 */ #include <linux/capability.h> +#include <linux/socket.h> #define COMMON_FILE_SOCK_PERMS "ioctl", "read", "write", "create", \ "getattr", "setattr", "lock", "relabelfrom", "relabelto", "append", "map"
tools/build/feature/test-libopencsd.c +2 -2
@@ -4,9 +4,9 @@/* * Check OpenCSD library version is sufficient to provide required features */ -#define OCSD_MIN_VER ((0 << 16) | (10 << 8) | (0)) +#define OCSD_MIN_VER ((0 << 16) | (11 << 8) | (0))#if !defined(OCSD_VER_NUM ) || (OCSD_VER_NUM <OCSD_MIN_VER ) -#error "OpenCSD >= 0.10.0 is required" +#error "OpenCSD >= 0.11.0 is required"#endif int main (void )
tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +1 -0
@@ -374,6 +374,7 @@ cs_etm_decoder__buffer_range(struct cs_etm_decoder *decoder,break ;case OCSD_INSTR_ISB :case OCSD_INSTR_DSB_DMB : +case OCSD_INSTR_WFI_WFE :case OCSD_INSTR_OTHER :default : packet->last_instr_taken_branch = false;
tools/perf/util/machine.c +20 -12
@@ -1358,6 +1358,20 @@ static void machine__set_kernel_mmap(struct machine *machine, machine->vmlinux_map->end = ~0ULL ; } +static void machine__update_kernel_mmap (struct machine *machine, +u64 start,u64 end) +{ +struct map *map =machine__kernel_map (machine); + +map__get (map); +map_groups__remove (&machine->kmaps, map); + +machine__set_kernel_mmap (machine, start, end); + +map_groups__insert (&machine->kmaps, map); +map__put (map); +} +int machine__create_kernel_maps (struct machine *machine) {struct dso *kernel =machine__get_kernel (machine);
@@ -1390,17 +1404,11 @@ int machine__create_kernel_maps(struct machine *machine) goto out_put; } -/* we have a real start address now, so re-order the kmaps */ - map =machine__kernel_map (machine); - -map__get (map); -map_groups__remove (&machine->kmaps, map); - -/* assume it's the last in the kmaps */ -machine__set_kernel_mmap (machine, addr, ~0ULL ); - -map_groups__insert (&machine->kmaps, map); -map__put (map); +/* +* we have a real start address now, so re-order the kmaps +* assume it's the last in the kmaps +*/ +machine__update_kernel_mmap (machine, addr, ~0ULL ); }if (machine__create_extra_kernel_maps (machine, kernel))
@@ -1536,7 +1544,7 @@ static int machine__process_kernel_mmap_event(struct machine *machine,if (strstr (kernel->long_name,"vmlinux" ))dso__set_short_name (kernel,"[kernel.vmlinux]" , false); -machine__set_kernel_mmap (machine, event->mmap.start, +machine__update_kernel_mmap (machine, event->mmap.start, event->mmap.start + event->mmap.len);/*
tools/testing/selftests/kvm/Makefile +2 -2
@@ -28,8 +28,8 @@ LIBKVM += $(LIBKVM_$(UNAME_M)) INSTALL_HDR_PATH = $(top_srcdir)/usr LINUX_HDR_PATH = $(INSTALL_HDR_PATH)/include/ LINUX_TOOL_INCLUDE = $(top_srcdir)/tools/include -CFLAGS += -O2 -g -std=gnu99 -I$(LINUX_TOOL_INCLUDE) -I$(LINUX_HDR_PATH) -Iinclude -I$(<D) -Iinclude/$(UNAME_M) -I.. -LDFLAGS += -pthread +CFLAGS += -O2 -g -std=gnu99 -fno-stack-protector -fno-PIE -I$(LINUX_TOOL_INCLUDE) -I$(LINUX_HDR_PATH) -Iinclude -I$(<D) -Iinclude/$(UNAME_M) -I.. +LDFLAGS += -pthread -no-pie # After inclusion, $(OUTPUT) is defined and # $(TEST_GEN_PROGS) starts with $(OUTPUT)/
tools/testing/selftests/kvm/include/kvm_util.h +1 -0
@@ -102,6 +102,7 @@ vm_paddr_t addr_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva);struct kvm_run *vcpu_state (struct kvm_vm *vm,uint32_t vcpuid);void vcpu_run (struct kvm_vm *vm,uint32_t vcpuid);int _vcpu_run (struct kvm_vm *vm,uint32_t vcpuid); +void vcpu_run_complete_io (struct kvm_vm *vm,uint32_t vcpuid);void vcpu_set_mp_state (struct kvm_vm *vm,uint32_t vcpuid,struct kvm_mp_state *mp_state);void vcpu_regs_get (struct kvm_vm *vm,uint32_t vcpuid,struct kvm_regs *regs);
tools/testing/selftests/kvm/lib/kvm_util.c +16 -0
@@ -1121,6 +1121,22 @@ int _vcpu_run(struct kvm_vm *vm, uint32_t vcpuid)return rc; } +void vcpu_run_complete_io (struct kvm_vm *vm,uint32_t vcpuid) +{ +struct vcpu *vcpu =vcpu_find (vm, vcpuid); +int ret; + +TEST_ASSERT (vcpu !=NULL ,"vcpu not found, vcpuid: %u" , vcpuid); + + vcpu->state->immediate_exit =1 ; + ret =ioctl (vcpu->fd,KVM_RUN ,NULL ); + vcpu->state->immediate_exit =0 ; + +TEST_ASSERT (ret ==-1 && errno ==EINTR , +"KVM_RUN IOCTL didn't exit immediately, rc: %i, errno: %i" , + ret, errno); +} +/* * VM VCPU Set MP State *
tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c +19 -16
@@ -87,22 +87,25 @@ int main(int argc, char *argv[])while (1 ) { rc =_vcpu_run (vm,VCPU_ID ); -if (run->exit_reason ==KVM_EXIT_IO ) { -switch (get_ucall (vm,VCPU_ID , &uc)) { -case UCALL_SYNC : -/* emulate hypervisor clearing CR4.OSXSAVE */ -vcpu_sregs_get (vm,VCPU_ID , &sregs); - sregs.cr4 &= ~X86_CR4_OSXSAVE ; -vcpu_sregs_set (vm,VCPU_ID , &sregs); -break ; -case UCALL_ABORT : -TEST_ASSERT (false,"Guest CR4 bit (OSXSAVE) unsynchronized with CPUID bit." ); -break ; -case UCALL_DONE : - goto done; -default : -TEST_ASSERT (false,"Unknown ucall 0x%x." , uc.cmd); - } +TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , +"Unexpected exit reason: %u (%s),\n" , + run->exit_reason, +exit_reason_str (run->exit_reason)); + +switch (get_ucall (vm,VCPU_ID , &uc)) { +case UCALL_SYNC : +/* emulate hypervisor clearing CR4.OSXSAVE */ +vcpu_sregs_get (vm,VCPU_ID , &sregs); + sregs.cr4 &= ~X86_CR4_OSXSAVE ; +vcpu_sregs_set (vm,VCPU_ID , &sregs); +break ; +case UCALL_ABORT : +TEST_ASSERT (false,"Guest CR4 bit (OSXSAVE) unsynchronized with CPUID bit." ); +break ; +case UCALL_DONE : + goto done; +default : +TEST_ASSERT (false,"Unknown ucall 0x%x." , uc.cmd); } }
tools/testing/selftests/kvm/x86_64/state_test.c +16 -2
@@ -134,6 +134,11 @@ int main(int argc, char *argv[])struct kvm_cpuid_entry2 *entry =kvm_get_supported_cpuid_entry (1 ); +if (!kvm_check_cap (KVM_CAP_IMMEDIATE_EXIT )) { +fprintf (stderr,"immediate_exit not available, skipping test\n" ); +exit (KSFT_SKIP ); + } +/* Create VM */ vm =vm_create_default (VCPU_ID ,0 , guest_code);vcpu_set_cpuid (vm,VCPU_ID ,kvm_get_supported_cpuid ());
@@ -156,8 +161,6 @@ int main(int argc, char *argv[]) stage, run->exit_reason, exit_reason_str(run->exit_reason)); -memset (®s1,0 ,sizeof (regs1)); -vcpu_regs_get (vm,VCPU_ID , ®s1);switch (get_ucall (vm,VCPU_ID , &uc)) {case UCALL_ABORT : TEST_ASSERT(false, "%s at %s:%d", (const char *)uc.args[0],
@@ -176,6 +179,17 @@ int main(int argc, char *argv[]) uc.args[1 ] == stage,"Unexpected register values vmexit #%lx, got %lx" , stage, (ulong)uc.args[1]); +/* +* When KVM exits to userspace with KVM_EXIT_IO, KVM guarantees +* guest state is consistent only after userspace re-enters the +* kernel with KVM_RUN. Complete IO prior to migrating state +* to a new VM. +*/ +vcpu_run_complete_io (vm,VCPU_ID ); + +memset (®s1,0 ,sizeof (regs1)); +vcpu_regs_get (vm,VCPU_ID , ®s1); + state =vcpu_save_state (vm,VCPU_ID );kvm_vm_release (vm);
virt/kvm/arm/hyp/vgic-v3-sr.c +2 -2
@@ -222,7 +222,7 @@ void __hyp_text __vgic_v3_save_state(struct kvm_vcpu *vcpu) } } -if (used_lrs) { +if (used_lrs || cpu_if->its_vpe.its_vm) {int i;u32 elrsr;
@@ -247,7 +247,7 @@ void __hyp_text __vgic_v3_restore_state(struct kvm_vcpu *vcpu)u64 used_lrs = vcpu->arch.vgic_cpu.used_lrs;int i; -if (used_lrs) { +if (used_lrs || cpu_if->its_vpe.its_vm) {write_gicreg (cpu_if->vgic_hcr,ICH_HCR_EL2 );for (i =0 ; i < used_lrs; i++)
virt/kvm/arm/mmu.c +43 -16
96 lines not on this page · raw message
virt/kvm/arm/vgic/vgic-its.c +14 -7
@@ -754,8 +754,9 @@ static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id,u64 indirect_ptr, type =GITS_BASER_TYPE (baser);phys_addr_t base =GITS_BASER_ADDR_48_to_52 (baser);int esz =GITS_BASER_ENTRY_SIZE (baser); -int index; +int index, idx;gfn_t gfn; +bool ret;switch (type) {case GITS_BASER_TYPE_DEVICE :
@@ -782,7 +783,8 @@ static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id,if (eaddr) *eaddr = addr; -return kvm_is_visible_gfn (its->dev->kvm, gfn); + + goto out; }/* calculate and check the index into the 1st level */
@@ -812,7 +814,12 @@ static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id,if (eaddr) *eaddr = indirect_ptr; -return kvm_is_visible_gfn (its->dev->kvm, gfn); + +out: + idx =srcu_read_lock (&its->dev->kvm->srcu); + ret =kvm_is_visible_gfn (its->dev->kvm, gfn); +srcu_read_unlock (&its->dev->kvm->srcu, idx); +return ret; } static int vgic_its_alloc_collection(struct vgic_its *its,
@@ -1919,7 +1926,7 @@ static int vgic_its_save_ite(struct vgic_its *its, struct its_device *dev, ((u64 )ite->irq->intid <<KVM_ITS_ITE_PINTID_SHIFT ) | ite->collection->collection_id; val =cpu_to_le64 (val); -return kvm_write_guest (kvm, gpa, &val, ite_esz); +return kvm_write_guest_lock (kvm, gpa, &val, ite_esz); }/**
@@ -2066,7 +2073,7 @@ static int vgic_its_save_dte(struct vgic_its *its, struct its_device *dev, (itt_addr_field <<KVM_ITS_DTE_ITTADDR_SHIFT ) | (dev->num_eventid_bits - 1)); val =cpu_to_le64 (val); -return kvm_write_guest (kvm, ptr, &val, dte_esz); +return kvm_write_guest_lock (kvm, ptr, &val, dte_esz); }/**
@@ -2246,7 +2253,7 @@ static int vgic_its_save_cte(struct vgic_its *its, ((u64 )collection->target_addr <<KVM_ITS_CTE_RDBASE_SHIFT ) | collection->collection_id); val =cpu_to_le64 (val); -return kvm_write_guest (its->dev->kvm, gpa, &val, esz); +return kvm_write_guest_lock (its->dev->kvm, gpa, &val, esz); }static int vgic_its_restore_cte (struct vgic_its *its,gpa_t gpa,int esz)
@@ -2317,7 +2324,7 @@ static int vgic_its_save_collection_table(struct vgic_its *its)*/ val =0 ;BUG_ON (cte_esz >sizeof (val)); - ret =kvm_write_guest (its->dev->kvm, gpa, &val, cte_esz); + ret =kvm_write_guest_lock (its->dev->kvm, gpa, &val, cte_esz);return ret; }
virt/kvm/arm/vgic/vgic-v3.c +2 -2
@@ -358,7 +358,7 @@ int vgic_v3_lpi_sync_pending_status(struct kvm *kvm, struct vgic_irq *irq)if (status) {/* clear consumed data */ val &= ~(1 << bit_nr); - ret =kvm_write_guest (kvm, ptr, &val,1 ); + ret =kvm_write_guest_lock (kvm, ptr, &val,1 );if (ret)return ret; }
@@ -409,7 +409,7 @@ int vgic_v3_save_pending_tables(struct kvm *kvm)else val &= ~(1 << bit_nr); - ret =kvm_write_guest (kvm, ptr, &val,1 ); + ret =kvm_write_guest_lock (kvm, ptr, &val,1 );if (ret)return ret; }
virt/kvm/arm/vgic/vgic.c +10 -4
@@ -867,15 +867,21 @@ void kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu)* either observe the new interrupt before or after doing this check, * and introducing additional synchronization mechanism doesn't change * this. +* +* Note that we still need to go through the whole thing if anything +* can be directly injected (GICv4). */ -if (list_empty (&vcpu->arch.vgic_cpu.ap_list_head)) +if (list_empty (&vcpu->arch.vgic_cpu.ap_list_head) && + !vgic_supports_direct_msis (vcpu->kvm))return ;DEBUG_SPINLOCK_BUG_ON (!irqs_disabled ()); -raw_spin_lock (&vcpu->arch.vgic_cpu.ap_list_lock); -vgic_flush_lr_state (vcpu); -raw_spin_unlock (&vcpu->arch.vgic_cpu.ap_list_lock); +if (!list_empty (&vcpu->arch.vgic_cpu.ap_list_head)) { +raw_spin_lock (&vcpu->arch.vgic_cpu.ap_list_lock); +vgic_flush_lr_state (vcpu); +raw_spin_unlock (&vcpu->arch.vgic_cpu.ap_list_lock); + }if (can_access_vgic_from_kernel ())vgic_restore_state (vcpu);
Thanks, a bunch Greg!
Quoted 382 lines · Greg KH
I'm announcing the release of the 5.0.12 kernel.
All users of the 5.0 kernel series must upgrade.
The updated 5.0.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.gitlinux-5.0.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=summarythanks,
greg k-h
------------
Documentation/i2c/busses/i2c-i801 | 1 Makefile | 10 + arch/arm/Kconfig | 1 arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 2 arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 4 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 1 arch/arm/include/asm/kvm_mmu.h | 11 + arch/arm/include/asm/stage2_pgtable.h | 2 arch/arm/mach-imx/mach-imx51.c | 1 arch/arm64/boot/dts/renesas/r8a77990.dtsi | 7 - arch/arm64/include/asm/kvm_mmu.h | 11 + arch/arm64/kvm/reset.c | 6 - arch/s390/include/asm/elf.h | 11 + arch/x86/include/asm/kvm_host.h | 2 arch/x86/kvm/hyperv.c | 9 + arch/x86/kvm/mmu.c | 21 ++- arch/x86/kvm/svm.c | 32 +++++ arch/x86/kvm/vmx/vmx.c | 6 + arch/x86/kvm/x86.c | 3 arch/x86/mm/mmap.c | 2 arch/x86/realmode/init.c | 2 drivers/acpi/acpica/evgpe.c | 6 - drivers/ata/libata-zpodd.c | 34 ++++- drivers/gpio/gpio-aspeed.c | 2 drivers/gpio/gpiolib-of.c | 17 ++ drivers/gpu/drm/drm_drv.c | 6 - drivers/gpu/drm/drm_file.c | 6 - drivers/gpu/drm/i915/intel_dp.c | 6 - drivers/gpu/drm/meson/meson_drv.c | 9 + drivers/gpu/drm/tegra/hub.c | 4 drivers/i2c/busses/Kconfig | 1 drivers/i2c/busses/i2c-i801.c | 4 drivers/iommu/amd_iommu.c | 9 + drivers/iommu/amd_iommu_init.c | 7 - drivers/iommu/amd_iommu_types.h | 2 drivers/leds/leds-pca9532.c | 8 + drivers/leds/trigger/ledtrig-netdev.c | 16 +- drivers/net/ethernet/cadence/macb_main.c | 10 + drivers/net/ethernet/ibm/ehea/ehea_main.c | 1 drivers/net/ethernet/micrel/ks8851.c | 36 +++--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 2 drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 8 - drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 14 +- drivers/net/ethernet/ti/netcp_ethss.c | 8 + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 drivers/net/ieee802154/adf7242.c | 4 drivers/net/ieee802154/mac802154_hwsim.c | 2 drivers/net/phy/dp83822.c | 34 +++-- drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c | 3 drivers/net/wireless/mediatek/mt76/mt76x2/phy.c | 30 +++-- drivers/nvme/host/multipath.c | 5 drivers/nvme/target/core.c | 4 drivers/nvme/target/io-cmd-file.c | 20 +-- drivers/s390/net/qeth_l3_main.c | 4 drivers/s390/scsi/zfcp_fc.c | 21 ++- drivers/scsi/aacraid/aacraid.h | 7 + drivers/scsi/aacraid/commsup.c | 4 drivers/scsi/mpt3sas/mpt3sas_base.c | 6 + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 12 ++ drivers/scsi/qla4xxx/ql4_os.c | 2 drivers/staging/axis-fifo/Kconfig | 1 drivers/staging/mt7621-pci/Kconfig | 1 drivers/staging/rtl8188eu/core/rtw_xmit.c | 9 + drivers/staging/rtl8188eu/include/rtw_xmit.h | 2 drivers/staging/rtl8712/rtl8712_cmd.c | 10 - drivers/staging/rtl8712/rtl8712_cmd.h | 2 drivers/staging/rtl8723bs/core/rtw_xmit.c | 14 +- drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 drivers/staging/rtlwifi/phydm/rtl_phydm.c | 2 drivers/staging/rtlwifi/rtl8822be/fw.c | 2 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 8 + drivers/tty/serial/ar933x_uart.c | 24 +--- drivers/tty/serial/sc16is7xx.c | 12 +- drivers/usb/dwc3/dwc3-pci.c | 4 drivers/usb/gadget/udc/net2272.c | 1 drivers/usb/gadget/udc/net2280.c | 8 - drivers/usb/host/u132-hcd.c | 3 drivers/usb/misc/usb251xb.c | 2 fs/afs/fsclient.c | 6 - fs/afs/yfsclient.c | 2 fs/btrfs/transaction.c | 49 +++++++- fs/ceph/inode.c | 2 fs/fuse/dev.c | 12 +- fs/nfs/client.c | 2 fs/pipe.c | 4 fs/splice.c | 12 +- include/linux/mm.h | 15 ++ include/linux/pipe_fs_i.h | 10 + include/linux/sched/signal.h | 18 +++ include/net/tc_act/tc_gact.h | 2 include/net/xdp_sock.h | 1 kernel/ptrace.c | 15 ++ kernel/trace/trace.c | 6 - lib/sbitmap.c | 11 + mm/gup.c | 48 ++++++-- mm/hugetlb.c | 13 ++ mm/kasan/kasan.h | 5 net/bridge/br_netfilter_hooks.c | 1 net/bridge/br_netfilter_ipv6.c | 2 net/ipv6/netfilter/ip6t_srh.c | 6 + net/netfilter/Kconfig | 1 net/netfilter/nft_set_rbtree.c | 7 - net/sunrpc/xprtsock.c | 4 net/xdp/xdp_umem.c | 19 --- scripts/kconfig/lxdialog/inputbox.c | 3 scripts/kconfig/nconf.c | 2 scripts/kconfig/nconf.gui.c | 3 scripts/selinux/genheaders/genheaders.c | 1 scripts/selinux/mdp/mdp.c | 1 security/selinux/include/classmap.h | 1 tools/build/feature/test-libopencsd.c | 4 tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 1 tools/perf/util/machine.c | 32 +++-- tools/testing/selftests/kvm/Makefile | 4 tools/testing/selftests/kvm/include/kvm_util.h | 1 tools/testing/selftests/kvm/lib/kvm_util.c | 16 ++ tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c | 35 +++-- tools/testing/selftests/kvm/x86_64/state_test.c | 18 ++- virt/kvm/arm/hyp/vgic-v3-sr.c | 4 virt/kvm/arm/mmu.c | 59 +++++++--- virt/kvm/arm/vgic/vgic-its.c | 21 ++- virt/kvm/arm/vgic/vgic-v3.c | 4 virt/kvm/arm/vgic/vgic.c | 14 +- 123 files changed, 776 insertions(+), 349 deletions(-)Aaro Koskinen (2):
net: stmmac: don't set own bit too early for jumbo frames
net: stmmac: fix jumbo frame sending with non-linear skbsAditya Pakki (5):
qlcnic: Avoid potential NULL pointer dereference
staging: rtl8188eu: Fix potential NULL pointer dereference of kcalloc
staging: rtlwifi: rtl8822b: fix to avoid potential NULL pointer dereference
staging: rtlwifi: Fix potential NULL pointer dereference of kzalloc
usb: usb251xb: fix to avoid potential NULL pointer dereferenceAl Viro (1):
ceph: fix use-after-free on symlink traversalAlakesh Haloi (1):
SUNRPC: fix uninitialized variable warningAndrei Vagin (1):
ptrace: take into accountsaved_sigmaskin PTRACE{GET,SET}SIGMASKAndrey Smirnov (2):
gpio: of: Check propname before applying "cs-gpios" quirks
gpio: of: Check for "spi-cs-high" in child instead of parent nodeArnd Bergmann (2):
staging: axis-fifo: addCONFIG_OFdependency
netfilter: fixNETFILTER_XT_TARGET_TEEdependenciesBjörn Töpel (1):
xsk: fix umem memory leak on cleanupChangbin Du (1):
kconfig/[mn]conf: handle backspace (^H) keyDan Carpenter (2):
staging: rtl8712: uninitialized memory inread_bbreg_hdl()
staging:vc04_services: Fix an error code invchiq_probe()Dan Murphy (1):
net: phy: Add DP83825I to the DP83822 driverDave Carroll (1):
scsi: aacraid: Insure we don't access PCIe space during AER/EEHDavid Howells (1):
afs: Fix StoreData op marshallingDavide Caratti (1):
net/sched: don't dereference a->goto_chain to read the chain indexFelipe Balbi (1):
usb: dwc3: pci: add support for Comet Lake PCH IDFelix Fietkau (2):
mt76: mt76x2: fix external LNA gain settings
mt76: mt76x2: fix 2.4 GHz channel gain settingsFilipe Manana (1):
Btrfs: fix file corruption after snapshotting due to mix of buffered/DIO writesGeert Uytterhoeven (1):
gpio: of: Fixof_gpiochip_add()error pathGreg Kroah-Hartman (1):
Linux 5.0.12Guido Kiener (3):
usb: gadget: net2280: Fix overrun of OUT messages usb: gadget: net2280: Fix net2280_dequeue() usb: gadget: net2272: Fix net2272_dequeue()Harini Katakam (1):
net: macb: Add null check for PCLK and HCLKHelen Koike (1):
ARM: dts: bcm283x: Fix hdmi hpd gpio pullJarkko Nikula (1):
i2c: i801: Add support for Intel Comet LakeJean-Philippe Brucker (2):
drm/meson: Fix invalid pointer inmeson_drv_unbind()drm/meson: Uninstall IRQ handlerJoerg Roedel (1):
iommu/amd: Reserve exclusion range in iova-domainJulian Wiedmann (1):
s390/qeth: fix race when initializing the IP address tableKangjie Lu (5):
net: ieee802154: fix a potential NULL pointer dereference
netfilter:ip6t_srh: fix NULL pointer dereferences
gpio: aspeed: fix a potential NULL pointer dereference
scsi: qla4xxx: fix a potential NULL pointer dereference
leds: pca9532: fix a potential NULL pointer dereferenceLi RongQing (1):
ieee802154: hwsim: propagategenlmsg_replyreturn codeLinus Torvalds (3):
mm: make page ref count overflow check tighter and more explicit
mm: add 'try_get_page()' helper function
mm: preventget_user_pages()from overflowing page refcountLukas Wunner (4):
net: ks8851: Dequeue RX packets explicitly
net: ks8851: Reassert reset pin if chip ID check fails
net: ks8851: Delay requesting IRQ until opened
net: ks8851: Set initial carrier state to downMao Wenan (1):
sc16is7xx: missing unregister/delete driver on error insc16is7xx_init()Marc Zyngier (4):
KVM: arm64: Reset the PMU in preemptible context
arm64: KVM: Always set ICH_HCR_EL2.EN if GICv4 is enabled
KVM: arm/arm64: vgic-its: Take the srcu lock when writing to guest memory
KVM: arm/arm64: vgic-its: Take the srcu lock when parsing the memslotsMarco Felsch (1):
ARM: dts: pfla02: increase phy reset durationMartin George (1):
nvme-multipath: relax ANA state checkMartin Schwidefsky (1):
s390: limit brk randomization to 32MBMasahiro Yamada (1):
kbuild: skip parsing pre sub-make code for recursionMasanari Iida (1):
ARM: dts: imx6qdl: Fix typo inimx6qdl-icore-rqs.dtsiMatteo Croce (1):
x86/realmode: Don't leak the trampoline kernel addressMatthew Wilcox (1):
fs: prevent page refcount overflow inpipe_buf_getMax Gurtovoy (1):
nvmet: fix error flow during ns enableMaxim Zhukov (1):
staging, mt7621-pci: fix build without pci supportMing Lei (2):
sbitmap: order READ/WRITE freed instance and setting clear bit
nvmet: fix building bvec from sg listMukesh Ojha (1):
usb: u132-hcd: fix resource leakNoralf Trønnes (1):
drm: Fixdrm_release()and device unplugPablo Neira Ayuso (1):
netfilter:nft_set_rbtree: check for inactive element after flag mismatchPaulo Alcantara (1):
selinux: use kernellinux/socket.hfor genheaders and mdpPetr Štetiar (1):
serial:ar933x_uart: Fix build failure with disabled consoleQian Cai (1):
kasan: fix variable 'tag' set but not used warningRafael J. Wysocki (1):
Revert "ACPICA: Clear status of GPEs before enabling them"Rafał Miłecki (1):
leds: trigger: netdev: fix refcnt leak on interface renameRalph Campbell (1):
x86/mm: Don't exceed the valid physical address spaceRasmus Villemoes (1):
leds: trigger: netdev: use memcpy indevice_name_storeSean Christopherson (5):
KVM: nVMX: Do not inherit quadrant and invalid for the root shadow EPT
KVM: selftests: assert on exit reason in CR4/cpuid sync test
KVM: selftests: explicitly disable PIE for tests
KVM: selftests: disable stack protector for all KVM tests
KVM: selftests: complete IO before migrating guest stateSekhar Nori (1):
ARM: davinci: fix build failure with allnoconfigSingh, Brijesh (1):
KVM: SVM: Workaround errata#1096 (insn_lenmaybe zero on SMAP violation)Solomon Tan (1):
perf cs-etm: Add missing case valueSreekanth Reddy (1):
scsi: mpt3sas: Fix kernel panic during expander resetStanislaw Gruszka (1):
mt76x02: fix hdr pointer in write txwi for USBSteffen Maier (1):
scsi: zfcp: reduce flood of fcrscn1 trace records on multi-element RSCNSuzuki K Poulose (1):
KVM: arm/arm64: Fix handling of stage2 huge mappingsTakeshi Kihara (1):
arm64: dts: renesas: r8a77990: Fix SCIF5 DMA channelsThierry Reding (1):
drm/tegra: hub: Fix dereference before checkTrond Myklebust (1):
NFS: Fix a typo innfs_init_timeout_values()Ville Syrjälä (1):
drm/i915: Do not enable FEC without DSCVitaly Kuznetsov (1):
x86/kvm/hyper-v: avoid spurious pending stimer on vCPU initWei Li (1):
perf machine: Update kernel map address and re-order properlyWen Yang (4):
ARM: imx51: fix a leaked reference by adding missingof_node_put
net: xilinx: fix possible object reference leak
net: ibm: fix possible object reference leak
net: ethernet: ti: fix possible object reference leakXiaoyao Li (1):
kvm/x86: MoveMSR_IA32_ARCH_CAPABILITIESto arrayemulated_msrsXin Long (1):
netfilter: bridge: set skbtransport_headerbefore enteringNF_INET_PRE_ROUTINGraymond pang (1):
libata: fix using DMA buffers on stack