Linux 4.14.57
Greg KH
maintainerI'm announcing the release of the 4.14.57 kernel.
All users of the 4.14 kernel series must upgrade.
The updated 4.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/admin-guide/kernel-parameters.txt | 17 + Makefile | 2 arch/arm/include/asm/kvm_host.h | 12 arch/arm/include/asm/kvm_mmu.h | 12 arch/arm64/Kconfig | 9 arch/arm64/include/asm/alternative.h | 43 ++- arch/arm64/include/asm/assembler.h | 8 arch/arm64/include/asm/cpucaps.h | 3 arch/arm64/include/asm/cpufeature.h | 22 + arch/arm64/include/asm/kvm_asm.h | 41 ++ arch/arm64/include/asm/kvm_host.h | 43 +++ arch/arm64/include/asm/kvm_mmu.h | 44 +++ arch/arm64/include/asm/percpu.h | 11 arch/arm64/include/asm/thread_info.h | 1 arch/arm64/kernel/Makefile | 1 arch/arm64/kernel/alternative.c | 52 ++- arch/arm64/kernel/asm-offsets.c | 2 arch/arm64/kernel/cpu_errata.c | 180 +++++++++++++ arch/arm64/kernel/cpufeature.c | 17 + arch/arm64/kernel/entry.S | 30 ++ arch/arm64/kernel/hibernate.c | 11 arch/arm64/kernel/ssbd.c | 108 +++++++ arch/arm64/kernel/suspend.c | 8 arch/arm64/kvm/hyp-init.S | 4 arch/arm64/kvm/hyp/entry.S | 12 arch/arm64/kvm/hyp/hyp-entry.S | 62 +++- arch/arm64/kvm/hyp/switch.c | 64 +++- arch/arm64/kvm/hyp/sysreg-sr.c | 21 - arch/arm64/kvm/reset.c | 4 arch/arm64/mm/proc.S | 8 arch/x86/include/asm/asm.h | 59 ++++ arch/x86/include/asm/irqflags.h | 2 arch/x86/kernel/Makefile | 1 arch/x86/kernel/irqflags.S | 26 + block/blk-core.c | 9 crypto/af_alg.c | 4 drivers/atm/zatm.c | 2 drivers/cpufreq/cppc_cpufreq.c | 46 +++ drivers/crypto/amcc/crypto4xx_core.c | 23 - drivers/media/rc/rc-main.c | 4 drivers/mtd/nand/denali_dt.c | 6 drivers/net/ethernet/atheros/alx/main.c | 8 drivers/net/ethernet/broadcom/bcm63xx_enet.c | 34 +- drivers/net/ethernet/cadence/macb_ptp.c | 5 drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 24 + drivers/net/ethernet/marvell/mvneta.c | 2 drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 8 drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 12 drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 8 drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 2 drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 2 drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 4 drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 3 drivers/net/ethernet/mellanox/mlx5/core/fw.c | 5 drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c | 9 drivers/net/ethernet/mellanox/mlx5/core/port.c | 4 drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 7 drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 8 drivers/net/ethernet/qlogic/qed/qed_dev.c | 2 drivers/net/ethernet/qlogic/qed/qed_main.c | 8 drivers/net/ethernet/qlogic/qed/qed_sriov.c | 19 + drivers/net/ethernet/qlogic/qede/qede_ptp.c | 10 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 drivers/net/ethernet/sun/sungem.c | 22 - drivers/net/geneve.c | 2 drivers/net/hyperv/hyperv_net.h | 2 drivers/net/hyperv/netvsc.c | 37 ++ drivers/net/hyperv/netvsc_drv.c | 17 + drivers/net/hyperv/rndis_filter.c | 61 ---- drivers/net/ipvlan/ipvlan_main.c | 3 drivers/net/usb/lan78xx.c | 5 drivers/net/usb/qmi_wwan.c | 1 drivers/net/usb/r8152.c | 3 drivers/net/vxlan.c | 4 drivers/net/wireless/realtek/rtlwifi/base.c | 17 - drivers/net/wireless/realtek/rtlwifi/base.h | 2 drivers/net/wireless/realtek/rtlwifi/core.c | 3 drivers/net/wireless/realtek/rtlwifi/pci.c | 2 drivers/net/wireless/realtek/rtlwifi/ps.c | 4 drivers/net/wireless/realtek/rtlwifi/usb.c | 2 drivers/pci/dwc/pci-exynos.c | 3 drivers/pci/host/pci-hyperv.c | 8 drivers/usb/host/xhci-hub.c | 2 drivers/vhost/net.c | 3 fs/autofs4/dev-ioctl.c | 22 - fs/btrfs/tree-log.c | 137 ++++++++- fs/ocfs2/aops.c | 26 + fs/ocfs2/cluster/nodemanager.c | 63 +++- fs/reiserfs/prints.c | 141 +++++----- include/linux/arm-smccc.h | 10 include/linux/atmdev.h | 15 + include/linux/backing-dev-defs.h | 2 include/linux/compiler-gcc.h | 29 +- include/linux/mlx5/mlx5_ifc.h | 2 include/linux/netdevice.h | 20 + include/linux/string.h | 2 kernel/time/clocksource.c | 2 mm/backing-dev.c | 20 - net/8021q/vlan.c | 2 net/atm/br2684.c | 3 net/atm/clip.c | 3 net/atm/common.c | 3 net/atm/lec.c | 3 net/atm/mpc.c | 3 net/atm/pppoatm.c | 3 net/atm/raw.c | 4 net/bridge/netfilter/ebtables.c | 13 net/dccp/ccids/ccid3.c | 16 - net/dns_resolver/dns_key.c | 28 +- net/ipv4/fou.c | 4 net/ipv4/gre_offload.c | 2 net/ipv4/inet_hashtables.c | 4 net/ipv4/sysctl_net_ipv4.c | 18 - net/ipv4/tcp_input.c | 9 net/ipv4/udp_offload.c | 2 net/ipv6/inet6_hashtables.c | 4 net/ipv6/netfilter/nf_conntrack_reasm.c | 2 net/ipv6/seg6_hmac.c | 2 net/nfc/llcp_commands.c | 9 net/nsh/nsh.c | 2 net/packet/af_packet.c | 16 - net/rds/loop.c | 1 net/rds/rds.h | 5 net/rds/recv.c | 5 net/sched/sch_blackhole.c | 2 net/strparser/strparser.c | 17 - net/sunrpc/xprtrdma/verbs.c | 13 net/tls/tls_sw.c | 2 net/vmw_vsock/virtio_transport.c | 2 virt/kvm/arm/arm.c | 22 - virt/kvm/arm/hyp/vgic-v2-sr.c | 2 virt/kvm/arm/psci.c | 18 + 133 files changed, 1697 insertions(+), 471 deletions(-)
Alan Jenkins (1):
block: do not use interruptible wait anywhere
Aleksander Morgado (1):
qmi_wwan: add support for the Dell Wireless 5821e module
Alex Vesker (2):
net/mlx5: Fix command interface race in polling mode net/mlx5: Fix incorrect raw command length parsing
Antoine Tenart (1):
net: mvneta: fix the Rx desc DMA address in the Rx path
Bhadram Varka (1):
stmmac: fix DMA channel hang in half-duplex mode
Christian Lamparter (2):
crypto: crypto4xx - remove bad list_del
crypto: crypto4xx - fix crypto4xx_build_pdr, crypto4xx_build_sdr leak
Christoffer Dall (1):
KVM: arm64: Avoid storing the vcpu pointer on the stack
Chuck Lever (1):
xprtrdma: Fix corner cases when handling device removal
Claudio Imbrenda (1):
VSOCK: fix loopback on big-endian systems
Dave Watson (1):
tls: Stricter error checking in zerocopy sendmsg path
David Ahern (1):
net/tcp: Fix socket lookups with SO_BINDTODEVICE
David Woodhouse (1):
atm: Preserve value of skb->truesize when accounting to vcc
Dexuan Cui (1):
PCI: hv: Disable/enable IRQs rather than BH in hv_compose_msi_msg()
Doron Roberts-Kedes (1):
strparser: Remove early eaten to fix full tcp receive buffer stall
Eli Cohen (1):
net/mlx5: Fix required capability for manipulating MPFS
Eric Biggers (3):
ipv6: sr: fix passing wrong flags to crypto_alloc_shash()
reiserfs: fix buffer overflow with long warning messages
KEYS: DNS: fix parsing multiple options
Eric Dumazet (4):
net: dccp: avoid crash in ccid3_hc_rx_send_feedback()
net: dccp: switch rx_tstamp_last_feedback to monotonic clock net/packet: fix use-after-free
net: sungem: fix rx checksum support
Filipe Manana (1):
Btrfs: fix duplicate extents after fsync of file with prealloc extents
Florian Westphal (2):
netfilter: ebtables: reject non-bridge targets
netfilter: ipv6: nf_defrag: drop skb dst before queueing
Greg Kroah-Hartman (1):
Linux 4.14.57
Gustavo A. R. Silva (2):
atm: zatm: Fix potential Spectre v1
net: cxgb3_main: fix potential Spectre v1
H. Peter Anvin (1):
x86/asm: Add _ASM_ARG* constants for argument registers to <asm/asm.h>
Harini Katakam (1):
net: macb: Fix ptp time adjustment for large negative delta
Ilpo Järvinen (1):
tcp: prevent bogus FRTO undos with non-SACK flows
Jaehoon Chung (1):
PCI: exynos: Fix a potential init_clk_resources NULL pointer dereference
James Morse (5):
KVM: arm64: Store vcpu on the stack during __guest_enter()
KVM: arm/arm64: Convert kvm_host_cpu_state to a static per-cpu allocation
KVM: arm64: Change hyp_panic()s dependency on tpidr_el2
arm64: alternatives: use tpidr_el2 on VHE hosts
KVM: arm64: Stop save/restoring host tpidr_el1 on VHE
Jan Kara (1):
bdi: Fix another oops in wb_workfn()
Jason Wang (1):
vhost_net: validate sock before trying to put its fd
Jesper Dangaard Brouer (1):
ixgbe: split XDP_TX tail and XDP_REDIRECT map flushing
Jiri Slaby (1):
r8152: napi hangup fix after disconnect
Jonas Gorski (2):
bcm63xx_enet: correct clock usage
bcm63xx_enet: do not write to random DMA channel on BCM6345
Konstantin Khlebnikov (1):
net_sched: blackhole: tell upper qdisc about dropped packets
Marc Zyngier (16):
arm64: alternatives: Add dynamic patching feature
KVM: arm/arm64: Do not use kern_hyp_va() with kvm_vgic_global_state arm/arm64: smccc: Add SMCCC-specific return codes
arm64: Call ARCH_WORKAROUND_2 on transitions between EL0 and EL1
arm64: Add per-cpu infrastructure to call ARCH_WORKAROUND_2
arm64: Add ARCH_WORKAROUND_2 probing
arm64: Add 'ssbd' command-line option
arm64: ssbd: Add global mitigation state accessor
arm64: ssbd: Skip apply_ssbd if not using dynamic mitigation
arm64: ssbd: Restore mitigation status on CPU resume
arm64: ssbd: Introduce thread flag to control userspace mitigation
arm64: ssbd: Add prctl interface for per-thread mitigation
arm64: KVM: Add HYP per-cpu accessors
arm64: KVM: Add ARCH_WORKAROUND_2 support for guests
arm64: KVM: Handle guest's ARCH_WORKAROUND_2 requests
arm64: KVM: Add ARCH_WORKAROUND_2 discovery through ARCH_FEATURES_FUNC_ID
Masahiro Yamada (1):
mtd: rawnand: denali_dt: set clk_x_rate to 200 MHz unconditionally
Mathias Nyman (1):
xhci: Fix USB3 NULL pointer dereference at logical disconnect.
Nick Desaulniers (2):
compiler-gcc.h: Add __attribute__((gnu_inline)) to all inline declarations x86/paravirt: Make native_save_fl() extern inline
Or Gerlitz (3):
net/mlx5e: Avoid dealing with vport representors if not being e-switch manager net/mlx5e: Don't attempt to dereference the ppriv struct if not being eswitch manager net/mlx5: E-Switch, Avoid setup attempt if not being e-switch manager
Peter Zijlstra (1):
clocksource: Initialize cs->wd_list
Ping-Ke Shih (2):
rtlwifi: Fix kernel Oops "Fw download fail!!"
rtlwifi: rtl8821ae: fix firmware is not ready to run
Prashanth Prakash (1):
cpufreq / CPPC: Set platform specific transition_delay_us
Sabrina Dubroca (2):
alx: take rtnl before calling __alx_open from resume
net: fix use-after-free in GRO with ESP
Santosh Shilimkar (1):
rds: avoid unenecessary cong_update in loop transport
Sean Young (1):
media: rc: oops in ir_timer_keyup after device unplug
Shay Agroskin (1):
net/mlx5: Fix wrong size allocation for QoS ETC TC regitster
Stefan Wahren (1):
net: lan78xx: Fix race in tx pending skb size calculation
Stephan Mueller (1):
crypto: af_alg - Initialize sg_num_bytes in error code path
Stephen Hemminger (1):
hv_netvsc: split sub-channel setup into async and sync
Sudarsana Reddy Kalluru (4):
qede: Adverstise software timestamp caps when PHC is not available.
qed: Fix setting of incorrect eswitch mode.
qed: Fix use of incorrect size in memcpy call.
qed: Limit msix vectors in kdump kernel to the minimum required count.
Tejun Heo (1):
string: drop __must_check from strscpy() and restore strscpy() usages in cgroup
Tetsuo Handa (1):
net/nfc: Avoid stalls when nfc_alloc_send_skb() returned NULL.
Tomas Bortoli (1):
autofs: fix slab out of bounds read in getname_kernel()
Willem de Bruijn (1):
nsh: set mac len based on inner packet
Xin Long (1):
ipvlan: fix IFLA_MTU ignored on NEWLINK
Yuchung Cheng (1):
tcp: fix Fast Open key endianness
alex chen (2):
ocfs2: subsystem.su_mutex is required while accessing the item->ci_parent
ocfs2: ip_alloc_sem should be taken in ocfs2_get_block()
Greg KH
maintainerDocumentation/admin-guide/kernel-parameters.txt +17 -0
@@ -3997,6 +3997,23 @@ expediting. Set to zero to disable automatic expediting. + ssbd= [ARM64,HW] + Speculative Store Bypass Disable control + + On CPUs that are vulnerable to the Speculative + Store Bypass vulnerability and offer a + firmware based mitigation, this parameter + indicates how the mitigation should be used: + + force-on: Unconditionally enable mitigation for + for both kernel and userspace + force-off: Unconditionally disable mitigation for + for both kernel and userspace + kernel: Always enable mitigation in the + kernel, and offer a prctl interface + to allow userspace to register its + interest in being mitigated too. + stack_guard_gap= [MM] override the default stack gap protection. The value is in page units and it defines how many pages prior
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 14 -SUBLEVEL = 56 +SUBLEVEL = 57 EXTRAVERSION = NAME = Petit Gorille
arch/arm/include/asm/kvm_host.h +12 -0
@@ -302,4 +302,16 @@ static inline bool kvm_arm_harden_branch_predictor(void) return false; } +#define KVM_SSBD_UNKNOWN -1 +#define KVM_SSBD_FORCE_DISABLE 0 +#define KVM_SSBD_KERNEL 1 +#define KVM_SSBD_FORCE_ENABLE 2 +#define KVM_SSBD_MITIGATED 3 + +static inline int kvm_arm_have_ssbd (void ) +{ +/* No way to detect it yet, pretend it is not there. */ +return KVM_SSBD_UNKNOWN ; +} +#endif /* __ARM_KVM_HOST_H__ */
arch/arm/include/asm/kvm_mmu.h +12 -0
@@ -28,6 +28,13 @@*/ #define kern_hyp_va (kva) (kva) +/* Contrary to arm64, there is no need to generate a PC-relative address */ +#define hyp_symbol_addr (s) \ + ({ \ + typeof(s) *addr = &(s); \ + addr; \ + }) +/* * KVM_MMU_CACHE_MIN_PAGES is the number of stage2 page table translation levels. */
@@ -247,6 +254,11 @@ static inline int kvm_map_vectors(void)return 0 ; } +static inline int hyp_map_aux_data (void ) +{ +return 0 ; +} +#endif /* !__ASSEMBLY__ */ #endif /* __ARM_KVM_MMU_H__ */
arch/arm64/Kconfig +9 -0
@@ -849,6 +849,15 @@ config HARDEN_BRANCH_PREDICTOR If unsure, say Y. +config ARM64_SSBD + bool "Speculative Store Bypass Disable" if EXPERT + default y + help + This enables mitigation of the bypassing of previous stores + by speculative loads. + + If unsure, say Y. + menuconfig ARMV8_DEPRECATED bool "Emulate deprecated/obsolete ARMv8 instructions" depends on COMPAT
arch/arm64/include/asm/alternative.h +39 -4
101 lines not on this page · raw message
arch/arm64/include/asm/assembler.h +8 -0
@@ -260,7 +260,11 @@ lr .req x30 // link register#else adr_l \dst, \sym #endif +alternative_if_not ARM64_HAS_VIRT_HOST_EXTN mrs \tmp, tpidr_el1 +alternative_else + mrs \tmp, tpidr_el2 +alternative_endif add \dst, \dst, \tmp .endm
@@ -271,7 +275,11 @@ lr .req x30 // link register*/ .macro ldr_this_cpu dst, sym, tmp adr_l \dst, \sym +alternative_if_not ARM64_HAS_VIRT_HOST_EXTN mrs \tmp, tpidr_el1 +alternative_else + mrs \tmp, tpidr_el2 +alternative_endif ldr \dst, [\dst, \tmp] .endm
arch/arm64/include/asm/cpucaps.h +2 -1
@@ -43,7 +43,8 @@#define ARM64_UNMAP_KERNEL_AT_EL0 23#define ARM64_HARDEN_BRANCH_PREDICTOR 24#define ARM64_HARDEN_BP_POST_GUEST_EXIT 25 +#define ARM64_SSBD 26 -#define ARM64_NCAPS 26 +#define ARM64_NCAPS 27#endif /* __ASM_CPUCAPS_H */
arch/arm64/include/asm/cpufeature.h +22 -0
@@ -262,6 +262,28 @@ static inline bool system_uses_ttbr0_pan(void) !cpus_have_const_cap (ARM64_HAS_PAN ); } +#define ARM64_SSBD_UNKNOWN -1 +#define ARM64_SSBD_FORCE_DISABLE 0 +#define ARM64_SSBD_KERNEL 1 +#define ARM64_SSBD_FORCE_ENABLE 2 +#define ARM64_SSBD_MITIGATED 3 + +static inline int arm64_get_ssbd_state (void ) +{ +#ifdef CONFIG_ARM64_SSBD +extern int ssbd_state; +return ssbd_state; +#else +return ARM64_SSBD_UNKNOWN ; +#endif +} + +#ifdef CONFIG_ARM64_SSBD +void arm64_set_ssbd_mitigation (bool state); +#else +static inline void arm64_set_ssbd_mitigation (bool state) {} +#endif +#endif /* __ASSEMBLY__ */ #endif
arch/arm64/include/asm/kvm_asm.h +41 -0
53 lines not on this page · raw message
arch/arm64/include/asm/kvm_host.h +43 -0
75 lines not on this page · raw message
arch/arm64/include/asm/kvm_mmu.h +44 -0
55 lines not on this page · raw message
arch/arm64/include/asm/percpu.h +9 -2
@@ -16,11 +16,15 @@#ifndef __ASM_PERCPU_H#define __ASM_PERCPU_H +#include <asm/alternative.h> #include <asm/stack_pointer.h> static inline void set_my_cpu_offset (unsigned long off) { - asmvolatile ("msr tpidr_el1, %0" ::"r" (off) :"memory" ); + asm volatile(ALTERNATIVE("msr tpidr_el1, %0", + "msr tpidr_el2, %0", + ARM64_HAS_VIRT_HOST_EXTN) + :: "r" (off) : "memory"); }static inline unsigned long __my_cpu_offset (void )
@@ -31,7 +35,10 @@ static inline unsigned long __my_cpu_offset(void)* We want to allow caching the value, so avoid using volatile and * instead use a fake stack read to hazard against barrier(). */ - asm("mrs %0, tpidr_el1" :"=r" (off) : + asm(ALTERNATIVE("mrs %0, tpidr_el1", + "mrs %0, tpidr_el2", + ARM64_HAS_VIRT_HOST_EXTN) + : "=r" (off) : "Q" (*(const unsigned long *)current_stack_pointer));return off;
arch/arm64/include/asm/thread_info.h +1 -0
@@ -92,6 +92,7 @@ void arch_setup_new_exec(void);#define TIF_RESTORE_SIGMASK 20#define TIF_SINGLESTEP 21#define TIF_32BIT 22/* 32bit process */ +#define TIF_SSBD 23/* Wants SSB mitigation */ #define _TIF_SIGPENDING (1 << TIF_SIGPENDING)#define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
arch/arm64/kernel/Makefile +1 -0
@@ -54,6 +54,7 @@ arm64-obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o \ arm64-obj-$(CONFIG_ARM64_RELOC_TEST) += arm64-reloc-test.o arm64-reloc-test-y := reloc_test_core.o reloc_test_syms.o arm64-obj-$(CONFIG_CRASH_DUMP) += crash_dump.o +arm64-obj-$(CONFIG_ARM64_SSBD) += ssbd.o ifeq ($(CONFIG_KVM),y) arm64-obj-$(CONFIG_HARDEN_BRANCH_PREDICTOR) += bpi.o
arch/arm64/kernel/alternative.c +37 -15
96 lines not on this page · raw message
arch/arm64/kernel/asm-offsets.c +2 -0
@@ -131,11 +131,13 @@ int main(void)BLANK ();#ifdef CONFIG_KVM_ARM_HOST DEFINE(VCPU_CONTEXT, offsetof(struct kvm_vcpu, arch.ctxt)); + DEFINE(VCPU_WORKAROUND_FLAGS, offsetof(struct kvm_vcpu, arch.workaround_flags));DEFINE (CPU_GP_REGS , offsetof(struct kvm_cpu_context , gp_regs));DEFINE (CPU_USER_PT_REGS , offsetof(struct kvm_regs , regs));DEFINE (CPU_FP_REGS , offsetof(struct kvm_regs , fp_regs)); DEFINE(VCPU_FPEXC32_EL2, offsetof(struct kvm_vcpu, arch.ctxt.sys_regs[FPEXC32_EL2])); DEFINE(VCPU_HOST_CONTEXT, offsetof(struct kvm_vcpu, arch.host_cpu_context)); +DEFINE (HOST_CONTEXT_VCPU , offsetof(struct kvm_cpu_context , __hyp_running_vcpu));#endif #ifdef CONFIG_CPU_PM DEFINE (CPU_SUSPEND_SZ ,sizeof (struct cpu_suspend_ctx ));
arch/arm64/kernel/cpu_errata.c +180 -0
192 lines not on this page · raw message
arch/arm64/kernel/cpufeature.c +17 -0
@@ -880,6 +880,22 @@ static int __init parse_kpti(char *str)early_param ("kpti" , parse_kpti);#endif /* CONFIG_UNMAP_KERNEL_AT_EL0 */ +static int cpu_copy_el2regs (void *__unused) +{ +/* +* Copy register values that aren't redirected by hardware. +* +* Before code patching, we only set tpidr_el1, all CPUs need to copy +* this value to tpidr_el2 before we patch the code. Once we've done +* that, freshly-onlined CPUs will set tpidr_el2, so we don't need to +* do anything here. +*/ +if (!alternatives_applied) +write_sysreg (read_sysreg (tpidr_el1), tpidr_el2); + +return 0 ; +} +static const struct arm64_cpu_capabilities arm64_features[] = { { .desc ="GIC system register CPU interface" ,
@@ -949,6 +965,7 @@ static const struct arm64_cpu_capabilities arm64_features[] = { .capability = ARM64_HAS_VIRT_HOST_EXTN, .def_scope = SCOPE_SYSTEM, .matches = runs_at_el2, + .enable = cpu_copy_el2regs, }, { .desc = "32-bit EL0 Support",
arch/arm64/kernel/entry.S +30 -0
@@ -18,6 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/arm-smccc.h> #include <linux/init.h> #include <linux/linkage.h>
@@ -137,6 +138,25 @@ alternative_else_nop_endif add \dst, \dst, #(\sym - .entry.tramp.text) .endm + // This macro corrupts x0-x3. It is the caller's duty + // to save/restore them if required. + .macro apply_ssbd, state, targ, tmp1, tmp2 +#ifdef CONFIG_ARM64_SSBD +alternative_cb arm64_enable_wa2_handling + b \targ +alternative_cb_end + ldr_this_cpu \tmp2, arm64_ssbd_callback_required, \tmp1 + cbz \tmp2, \targ + ldr \tmp2, [tsk, #TSK_TI_FLAGS] + tbnz \tmp2, #TIF_SSBD, \targ + mov w0, #ARM_SMCCC_ARCH_WORKAROUND_2 + mov w1, #\state +alternative_cb arm64_update_smccc_conduit + nop // Patched to SMC/HVC #0 +alternative_cb_end +#endif + .endm + .macro kernel_entry, el, regsize = 64 .if \regsize == 32 mov w0, w0 // zero upper 32 bits of x0
@@ -163,6 +183,14 @@ alternative_else_nop_endif ldr x19, [tsk, #TSK_TI_FLAGS] // since we can unmask debug disable_step_tsk x19, x20 // exceptions when scheduling. + apply_ssbd 1, 1f, x22, x23 + +#ifdef CONFIG_ARM64_SSBD + ldp x0, x1, [sp, #16 * 0] + ldp x2, x3, [sp, #16 * 1] +#endif +1: + mov x29, xzr // fp pointed to user-space .else add x21, sp, #S_FRAME_SIZE
@@ -301,6 +329,8 @@ alternative_if ARM64_WORKAROUND_845719 alternative_else_nop_endif #endif 3: + apply_ssbd 0, 5f, x0, x1 +5: .endif msr elr_el1, x21 // set up the return data
arch/arm64/kernel/hibernate.c +11 -0
@@ -313,6 +313,17 @@ int swsusp_arch_suspend(void) sleep_cpu = -EINVAL ;__cpu_suspend_exit (); + +/* +* Just in case the boot kernel did turn the SSBD +* mitigation off behind our back, let's set the state +* to what we expect it to be. +*/ +switch (arm64_get_ssbd_state ()) { +case ARM64_SSBD_FORCE_ENABLE : +case ARM64_SSBD_KERNEL : +arm64_set_ssbd_mitigation (true); + } }local_dbg_restore (flags);
arch/arm64/kernel/ssbd.c new file +108 -0
108 lines not on this page · raw message
arch/arm64/kernel/suspend.c +8 -0
@@ -62,6 +62,14 @@ void notrace __cpu_suspend_exit(void)*/ if (hw_breakpoint_restore)hw_breakpoint_restore (cpu); + +/* +* On resume, firmware implementing dynamic mitigation will +* have turned the mitigation on. If the user has forcefully +* disabled it, make sure their wishes are obeyed. +*/ +if (arm64_get_ssbd_state () ==ARM64_SSBD_FORCE_DISABLE ) +arm64_set_ssbd_mitigation (false); }/*
arch/arm64/kvm/hyp-init.S +4 -0
@@ -122,6 +122,10 @@ CPU_BE( orr x4, x4, #SCTLR_ELx_EE) kern_hyp_va x2 msr vbar_el2, x2 + /* copy tpidr_el1 into tpidr_el2 for use by HYP */ + mrs x1, tpidr_el1 + msr tpidr_el2, x1 + /* Hello, World! */ eret ENDPROC(__kvm_hyp_init)
arch/arm64/kvm/hyp/entry.S +6 -6
@@ -62,9 +62,6 @@ ENTRY(__guest_enter) // Store the host regs save_callee_saved_regs x1 - // Store the host_ctxt for use at exit time - str x1, [sp, #-16]! - add x18, x0, #VCPU_CONTEXT // Restore guest regs x0-x17
@@ -118,8 +115,7 @@ ENTRY(__guest_exit) // Store the guest regs x19-x29, lr save_callee_saved_regs x1 - // Restore the host_ctxt from the stack - ldr x2, [sp], #16 + get_host_ctxt x2, x3 // Now restore the host regs restore_callee_saved_regs x2
@@ -159,6 +155,10 @@ abort_guest_exit_end: ENDPROC(__guest_exit) ENTRY(__fpsimd_guest_restore) + // x0: esr + // x1: vcpu + // x2-x29,lr: vcpu regs + // vcpu x0-x1 on the stack stp x2, x3, [sp, #-16]! stp x4, lr, [sp, #-16]!
@@ -173,7 +173,7 @@ alternative_else alternative_endif isb - mrs x3, tpidr_el2 + mov x3, x1 ldr x0, [x3, #VCPU_HOST_CONTEXT] kern_hyp_va x0
arch/arm64/kvm/hyp/hyp-entry.S +51 -11
103 lines not on this page · raw message
arch/arm64/kvm/hyp/switch.c +50 -14
132 lines not on this page · raw message
arch/arm64/kvm/hyp/sysreg-sr.c +13 -8
@@ -27,8 +27,8 @@ static void __hyp_text __sysreg_do_nothing(struct kvm_cpu_context *ctxt) { }/* * Non-VHE: Both host and guest must save everything. * -* VHE: Host must save tpidr*_el[01], actlr_el1, mdscr_el1, sp0, pc, -* pstate, and guest must save everything. +* VHE: Host must save tpidr*_el0, actlr_el1, mdscr_el1, sp_el0, +* and guest must save everything. */ static void __hyp_text __sysreg_save_common_state(struct kvm_cpu_context *ctxt)
@@ -36,11 +36,8 @@ static void __hyp_text __sysreg_save_common_state(struct kvm_cpu_context *ctxt) ctxt->sys_regs[ACTLR_EL1 ] =read_sysreg (actlr_el1); ctxt->sys_regs[TPIDR_EL0 ] =read_sysreg (tpidr_el0); ctxt->sys_regs[TPIDRRO_EL0 ] =read_sysreg (tpidrro_el0); - ctxt->sys_regs[TPIDR_EL1 ] =read_sysreg (tpidr_el1); ctxt->sys_regs[MDSCR_EL1 ] =read_sysreg (mdscr_el1); ctxt->gp_regs.regs.sp =read_sysreg (sp_el0); - ctxt->gp_regs.regs.pc =read_sysreg_el2 (elr); - ctxt->gp_regs.regs.pstate =read_sysreg_el2 (spsr); } static void __hyp_text __sysreg_save_state(struct kvm_cpu_context *ctxt)
@@ -62,10 +59,13 @@ static void __hyp_text __sysreg_save_state(struct kvm_cpu_context *ctxt) ctxt->sys_regs[AMAIR_EL1 ] =read_sysreg_el1 (amair); ctxt->sys_regs[CNTKCTL_EL1 ] =read_sysreg_el1 (cntkctl); ctxt->sys_regs[PAR_EL1 ] =read_sysreg (par_el1); + ctxt->sys_regs[TPIDR_EL1 ] =read_sysreg (tpidr_el1); ctxt->gp_regs.sp_el1 =read_sysreg (sp_el1); ctxt->gp_regs.elr_el1 =read_sysreg_el1 (elr); ctxt->gp_regs.spsr[KVM_SPSR_EL1 ]=read_sysreg_el1 (spsr); + ctxt->gp_regs.regs.pc =read_sysreg_el2 (elr); + ctxt->gp_regs.regs.pstate =read_sysreg_el2 (spsr); } static hyp_alternate_select(__sysreg_call_save_host_state,
@@ -89,11 +89,8 @@ static void __hyp_text __sysreg_restore_common_state(struct kvm_cpu_context *ctxwrite_sysreg (ctxt->sys_regs[ACTLR_EL1 ], actlr_el1);write_sysreg (ctxt->sys_regs[TPIDR_EL0 ], tpidr_el0);write_sysreg (ctxt->sys_regs[TPIDRRO_EL0 ], tpidrro_el0); -write_sysreg (ctxt->sys_regs[TPIDR_EL1 ], tpidr_el1);write_sysreg (ctxt->sys_regs[MDSCR_EL1 ], mdscr_el1);write_sysreg (ctxt->gp_regs.regs.sp, sp_el0); -write_sysreg_el2 (ctxt->gp_regs.regs.pc, elr); -write_sysreg_el2 (ctxt->gp_regs.regs.pstate, spsr); } static void __hyp_text __sysreg_restore_state(struct kvm_cpu_context *ctxt)
@@ -115,10 +112,13 @@ static void __hyp_text __sysreg_restore_state(struct kvm_cpu_context *ctxt)write_sysreg_el1 (ctxt->sys_regs[AMAIR_EL1 ], amair);write_sysreg_el1 (ctxt->sys_regs[CNTKCTL_EL1 ], cntkctl);write_sysreg (ctxt->sys_regs[PAR_EL1 ], par_el1); +write_sysreg (ctxt->sys_regs[TPIDR_EL1 ], tpidr_el1);write_sysreg (ctxt->gp_regs.sp_el1, sp_el1);write_sysreg_el1 (ctxt->gp_regs.elr_el1, elr);write_sysreg_el1 (ctxt->gp_regs.spsr[KVM_SPSR_EL1 ],spsr); +write_sysreg_el2 (ctxt->gp_regs.regs.pc, elr); +write_sysreg_el2 (ctxt->gp_regs.regs.pstate, spsr); } static hyp_alternate_select(__sysreg_call_restore_host_state,
@@ -183,3 +183,8 @@ void __hyp_text __sysreg32_restore_state(struct kvm_vcpu *vcpu)if (vcpu->arch.debug_flags &KVM_ARM64_DEBUG_DIRTY )write_sysreg (sysreg[DBGVCR32_EL2 ], dbgvcr32_el2); } + +void __hyp_text __kvm_set_tpidr_el2(u64 tpidr_el2) +{ + asm("msr tpidr_el2, %0" : :"r" (tpidr_el2)); +}
arch/arm64/kvm/reset.c +4 -0
@@ -122,6 +122,10 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)/* 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 ; +/* Reset timer */ return kvm_timer_vcpu_reset (vcpu); }
arch/arm64/mm/proc.S +8 -0
@@ -70,7 +70,11 @@ ENTRY(cpu_do_suspend) mrs x8, mdscr_el1 mrs x9, oslsr_el1 mrs x10, sctlr_el1 +alternative_if_not ARM64_HAS_VIRT_HOST_EXTN mrs x11, tpidr_el1 +alternative_else + mrs x11, tpidr_el2 +alternative_endif mrs x12, sp_el0 stp x2, x3, [x0] stp x4, xzr, [x0, #16]
@@ -116,7 +120,11 @@ ENTRY(cpu_do_resume) msr mdscr_el1, x10 msr sctlr_el1, x12 +alternative_if_not ARM64_HAS_VIRT_HOST_EXTN msr tpidr_el1, x13 +alternative_else + msr tpidr_el2, x13 +alternative_endif msr sp_el0, x14 /* * Restore oslsr_el1 by writing oslar_el1
arch/x86/include/asm/asm.h +59 -0
65 lines not on this page · raw message
arch/x86/include/asm/irqflags.h +1 -1
@@ -13,7 +13,7 @@* Interrupt control: */ -static inline unsigned long native_save_fl (void ) +extern inline unsigned long native_save_fl (void ) {unsigned long flags;
arch/x86/kernel/Makefile +1 -0
@@ -58,6 +58,7 @@ obj-y += alternative.o i8253.o pci-nommu.o hw_breakpoint.o obj-y += tsc.o tsc_msr.o io_delay.o rtc.o obj-y += pci-iommu_table.o obj-y += resource.o +obj-y += irqflags.o obj-y += process.o obj-y += fpu/
arch/x86/kernel/irqflags.S new file +26 -0
@@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#include <asm/asm.h> +#include <asm/export.h> +#include <linux/linkage.h> + +/* + * unsigned long native_save_fl(void) + */ +ENTRY(native_save_fl) + pushf + pop %_ASM_AX + ret +ENDPROC(native_save_fl) +EXPORT_SYMBOL(native_save_fl) + +/* + * void native_restore_fl(unsigned long flags) + * %eax/%rdi: flags + */ +ENTRY(native_restore_fl) + push %_ASM_ARG1 + popf + ret +ENDPROC(native_restore_fl) +EXPORT_SYMBOL(native_restore_fl)
block/blk-core.c +3 -6
@@ -779,7 +779,6 @@ EXPORT_SYMBOL(blk_alloc_queue);int blk_queue_enter (struct request_queue *q,bool nowait) {while (true) { -int ret;if (percpu_ref_tryget_live (&q->q_usage_counter))return 0 ;
@@ -796,13 +795,11 @@ int blk_queue_enter(struct request_queue *q, bool nowait)*/ smp_rmb (); - ret =wait_event_interruptible (q->mq_freeze_wq, - !atomic_read (&q->mq_freeze_depth) || -blk_queue_dying (q)); +wait_event (q->mq_freeze_wq, + !atomic_read (&q->mq_freeze_depth) || +blk_queue_dying (q));if (blk_queue_dying (q))return -ENODEV ; -if (ret) -return ret; } }
crypto/af_alg.c +3 -1
@@ -1183,8 +1183,10 @@ int af_alg_get_rsgl(struct sock *sk, struct msghdr *msg, int flags,/* make one iovec available as scatterlist */ err =af_alg_make_sg (&rsgl->sgl, &msg->msg_iter, seglen); -if (err <0 ) +if (err <0 ) { + rsgl->sg_num_bytes =0 ;return err; + }/* chain the new scatterlist with previous one */ if (areq->last_rsgl)
drivers/atm/zatm.c +2 -0
@@ -1483,6 +1483,8 @@ static int zatm_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)return -EFAULT ;if (pool <0 || pool >ZATM_LAST_POOL )return -EINVAL ; + pool =array_index_nospec (pool, +ZATM_LAST_POOL +1 );if (copy_from_user (&info, &((struct zatm_pool_req __user *) arg)->info,sizeof (info)))return -EFAULT ;
drivers/cpufreq/cppc_cpufreq.c +44 -2
58 lines not on this page · raw message
drivers/crypto/amcc/crypto4xx_core.c +11 -12
@@ -207,7 +207,7 @@ static u32 crypto4xx_build_pdr(struct crypto4xx_device *dev) dev->pdr_pa);return -ENOMEM ; } -memset (dev->pdr,0 ,sizeof (struct ce_pd ) *PPC4XX_NUM_PD ); +memset (dev->pdr,0 ,sizeof (struct ce_pd ) *PPC4XX_NUM_PD ); dev->shadow_sa_pool = dma_alloc_coherent(dev->core_dev->device, 256 * PPC4XX_NUM_PD, &dev->shadow_sa_pool_pa,
@@ -240,13 +240,15 @@ static u32 crypto4xx_build_pdr(struct crypto4xx_device *dev)static void crypto4xx_destroy_pdr (struct crypto4xx_device *dev) { -if (dev->pdr !=NULL ) +if (dev->pdr)dma_free_coherent (dev->core_dev->device,sizeof (struct ce_pd ) *PPC4XX_NUM_PD , dev->pdr, dev->pdr_pa); +if (dev->shadow_sa_pool)dma_free_coherent (dev->core_dev->device,256 *PPC4XX_NUM_PD , dev->shadow_sa_pool, dev->shadow_sa_pool_pa); +if (dev->shadow_sr_pool) dma_free_coherent(dev->core_dev->device, sizeof(struct sa_state_record) * PPC4XX_NUM_PD,
@@ -416,12 +418,12 @@ static u32 crypto4xx_build_sdr(struct crypto4xx_device *dev)static void crypto4xx_destroy_sdr (struct crypto4xx_device *dev) { -if (dev->sdr !=NULL ) +if (dev->sdr)dma_free_coherent (dev->core_dev->device,sizeof (struct ce_sd ) *PPC4XX_NUM_SD , dev->sdr, dev->sdr_pa); -if (dev->scatter_buffer_va !=NULL ) +if (dev->scatter_buffer_va) dma_free_coherent(dev->core_dev->device, dev->scatter_buffer_size * PPC4XX_NUM_SD, dev->scatter_buffer_va,
@@ -1033,12 +1035,10 @@ int crypto4xx_register_alg(struct crypto4xx_device *sec_dev,break ; } -if (rc) { -list_del (&alg->entry); +if (rc)kfree (alg); - }else { +else list_add_tail (&alg->entry, &sec_dev->alg_list); - } }return 0 ;
@@ -1193,7 +1193,7 @@ static int crypto4xx_probe(struct platform_device *ofdev) rc =crypto4xx_build_gdr (core_dev->dev);if (rc) - goto err_build_gdr; + goto err_build_pdr; rc =crypto4xx_build_sdr (core_dev->dev);if (rc)
@@ -1236,12 +1236,11 @@ static int crypto4xx_probe(struct platform_device *ofdev) err_request_irq:irq_dispose_mapping (core_dev->irq);tasklet_kill (&core_dev->tasklet); -crypto4xx_destroy_sdr (core_dev->dev); err_build_sdr: +crypto4xx_destroy_sdr (core_dev->dev);crypto4xx_destroy_gdr (core_dev->dev); -err_build_gdr: -crypto4xx_destroy_pdr (core_dev->dev); err_build_pdr: +crypto4xx_destroy_pdr (core_dev->dev);kfree (core_dev->dev); err_alloc_dev:kfree (core_dev);
drivers/media/rc/rc-main.c +2 -2
@@ -1824,11 +1824,11 @@ void rc_unregister_device(struct rc_dev *dev)if (!dev)return ; -del_timer_sync (&dev->timer_keyup); -if (dev->driver_type ==RC_DRIVER_IR_RAW )ir_raw_event_unregister (dev); +del_timer_sync (&dev->timer_keyup); +rc_free_rx_device (dev);device_del (&dev->dev);
drivers/mtd/nand/denali_dt.c +5 -1
@@ -122,7 +122,11 @@ static int denali_dt_probe(struct platform_device *pdev)if (ret)return ret; - denali->clk_x_rate =clk_get_rate (dt->clk); +/* +* Hardcode the clock rate for the backward compatibility. +* This works for both SOCFPGA and UniPhier. +*/ + denali->clk_x_rate =200000000 ; ret =denali_init (denali);if (ret)
drivers/net/ethernet/atheros/alx/main.c +7 -1
@@ -1897,13 +1897,19 @@ static int alx_resume(struct device *dev)struct pci_dev *pdev =to_pci_dev (dev);struct alx_priv *alx =pci_get_drvdata (pdev);struct alx_hw *hw = &alx->hw; +int err;alx_reset_phy (hw);if (!netif_running (alx->dev))return 0 ;netif_device_attach (alx->dev); -return __alx_open (alx, true); + +rtnl_lock (); + err =__alx_open (alx, true); +rtnl_unlock (); + +return err; } static SIMPLE_DEV_PM_OPS(alx_pm_ops, alx_suspend, alx_resume);
drivers/net/ethernet/broadcom/bcm63xx_enet.c +25 -9
@@ -1062,7 +1062,8 @@ static int bcm_enet_open(struct net_device *dev) val =enet_readl (priv,ENET_CTL_REG ); val |=ENET_CTL_ENABLE_MASK ;enet_writel (priv, val,ENET_CTL_REG ); -enet_dma_writel (priv,ENETDMA_CFG_EN_MASK ,ENETDMA_CFG_REG ); +if (priv->dma_has_sram) +enet_dma_writel (priv,ENETDMA_CFG_EN_MASK ,ENETDMA_CFG_REG );enet_dmac_writel (priv, priv->dma_chan_en_mask,ENETDMAC_CHANCFG , priv->rx_chan);
@@ -1773,7 +1774,9 @@ static int bcm_enet_probe(struct platform_device *pdev) ret =PTR_ERR (priv->mac_clk); goto out; } -clk_prepare_enable (priv->mac_clk); + ret =clk_prepare_enable (priv->mac_clk); +if (ret) + goto out_put_clk_mac;/* initialize default and fetch platform data */ priv->rx_ring_size =BCMENET_DEF_RX_DESC ;
@@ -1805,9 +1808,11 @@ static int bcm_enet_probe(struct platform_device *pdev)if (IS_ERR (priv->phy_clk)) { ret =PTR_ERR (priv->phy_clk); priv->phy_clk =NULL ; - goto out_put_clk_mac; + goto out_disable_clk_mac; } -clk_prepare_enable (priv->phy_clk); + ret =clk_prepare_enable (priv->phy_clk); +if (ret) + goto out_put_clk_phy; }/* do minimal hardware init to be able to probe mii bus */
@@ -1901,13 +1906,16 @@ static int bcm_enet_probe(struct platform_device *pdev) out_uninit_hw:/* turn off mdc clock */ enet_writel (priv,0 ,ENET_MIISC_REG ); -if (priv->phy_clk) { +if (priv->phy_clk)clk_disable_unprepare (priv->phy_clk); + +out_put_clk_phy: +if (priv->phy_clk)clk_put (priv->phy_clk); - } -out_put_clk_mac: +out_disable_clk_mac:clk_disable_unprepare (priv->mac_clk); +out_put_clk_mac:clk_put (priv->mac_clk); out:free_netdev (dev);
@@ -2752,7 +2760,9 @@ static int bcm_enetsw_probe(struct platform_device *pdev) ret =PTR_ERR (priv->mac_clk); goto out_unmap; } -clk_enable (priv->mac_clk); + ret =clk_prepare_enable (priv->mac_clk); +if (ret) + goto out_put_clk; priv->rx_chan =0 ; priv->tx_chan =1 ;
@@ -2773,7 +2783,7 @@ static int bcm_enetsw_probe(struct platform_device *pdev) ret =register_netdev (dev);if (ret) - goto out_put_clk; + goto out_disable_clk;netif_carrier_off (dev);platform_set_drvdata (pdev, dev);
@@ -2782,6 +2792,9 @@ static int bcm_enetsw_probe(struct platform_device *pdev)return 0 ; +out_disable_clk: +clk_disable_unprepare (priv->mac_clk); + out_put_clk:clk_put (priv->mac_clk);
@@ -2813,6 +2826,9 @@ static int bcm_enetsw_remove(struct platform_device *pdev) res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );release_mem_region (res->start,resource_size (res)); +clk_disable_unprepare (priv->mac_clk); +clk_put (priv->mac_clk); +free_netdev (dev);return 0 ; }
drivers/net/ethernet/cadence/macb_ptp.c +1 -4
@@ -170,10 +170,7 @@ static int gem_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)if (delta >TSU_NSEC_MAX_VAL ) {gem_tsu_get_time (&bp->ptp_clock_info, &now); -if (sign) - now =timespec64_sub (now, then); -else - now =timespec64_add (now, then); + now =timespec64_add (now, then);gem_tsu_set_time (&bp->ptp_clock_info, (const struct timespec64 *)&now);
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +2 -0
@@ -51,6 +51,7 @@#include <linux/sched.h> #include <linux/slab.h> #include <linux/uaccess.h> +#include <linux/nospec.h> #include "common.h" #include "cxgb3_ioctl.h"
@@ -2268,6 +2269,7 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)if (t.qset_idx >= nqsets)return -EINVAL ; + t.qset_idx =array_index_nospec (t.qset_idx, nqsets); q = &adapter->params.sge.qset[q1 + t.qset_idx]; t.rspq_size = q->rspq_size;
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +14 -10
@@ -2211,9 +2211,10 @@ static struct sk_buff *ixgbe_build_skb(struct ixgbe_ring *rx_ring,return skb; } -#define IXGBE_XDP_PASS 0 -#define IXGBE_XDP_CONSUMED 1 -#define IXGBE_XDP_TX 2 +#define IXGBE_XDP_PASS 0 +#define IXGBE_XDP_CONSUMED BIT(0) +#define IXGBE_XDP_TX BIT(1) +#define IXGBE_XDP_REDIR BIT(2)static int ixgbe_xmit_xdp_ring (struct ixgbe_adapter *adapter,struct xdp_buff *xdp);
@@ -2242,7 +2243,7 @@ static struct sk_buff *ixgbe_run_xdp(struct ixgbe_adapter *adapter,case XDP_REDIRECT : err =xdp_do_redirect (adapter->netdev, xdp, xdp_prog);if (!err) - result =IXGBE_XDP_TX ; + result =IXGBE_XDP_REDIR ;else result =IXGBE_XDP_CONSUMED ;break ;
@@ -2302,7 +2303,7 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,unsigned int mss =0 ;#endif /* IXGBE_FCOE */ u16 cleaned_count =ixgbe_desc_unused (rx_ring); -bool xdp_xmit = false; +unsigned int xdp_xmit =0 ;while (likely (total_rx_packets < budget)) {union ixgbe_adv_rx_desc *rx_desc;
@@ -2342,8 +2343,10 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector, }if (IS_ERR (skb)) { -if (PTR_ERR (skb) == -IXGBE_XDP_TX ) { - xdp_xmit = true; +unsigned int xdp_res = -PTR_ERR (skb); + +if (xdp_res & (IXGBE_XDP_TX |IXGBE_XDP_REDIR )) { + xdp_xmit |= xdp_res;ixgbe_rx_buffer_flip (rx_ring, rx_buffer, size); }else { rx_buffer->pagecnt_bias++;
@@ -2415,7 +2418,10 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector, total_rx_packets++; } -if (xdp_xmit) { +if (xdp_xmit &IXGBE_XDP_REDIR ) +xdp_do_flush_map (); + +if (xdp_xmit &IXGBE_XDP_TX ) {struct ixgbe_ring *ring = adapter->xdp_ring[smp_processor_id ()];/* Force memory writes to complete before letting h/w
@@ -2423,8 +2429,6 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,*/ wmb ();writel (ring->next_to_use, ring->tail); - -xdp_do_flush_map (); }u64_stats_update_begin (&rx_ring->syncp);
drivers/net/ethernet/marvell/mvneta.c +1 -1
@@ -1959,7 +1959,7 @@ static int mvneta_rx_swbm(struct mvneta_port *pp, int rx_todo, rx_bytes = rx_desc->data_size - (ETH_FCS_LEN +MVNETA_MH_SIZE ); index = rx_desc - rxq->descs; data = rxq->buf_virt_addr[index]; - phys_addr = rx_desc->buf_phys_addr; + phys_addr = rx_desc->buf_phys_addr - pp->rx_offset_correction;if (!mvneta_rxq_desc_is_first_last (rx_status) || (rx_status &MVNETA_RXD_ERR_SUMMARY )) {
drivers/net/ethernet/mellanox/mlx5/core/cmd.c +4 -4
@@ -801,6 +801,7 @@ static void cmd_work_handler(struct work_struct *work)unsigned long flags;bool poll_cmd = ent->polling;int alloc_ret; +int cmd_mode; sem = ent->page_queue ? &cmd->pages_sem : &cmd->sem;down (sem);
@@ -847,6 +848,7 @@ static void cmd_work_handler(struct work_struct *work)set_signature (ent, !cmd->checksum_disabled);dump_command (dev, ent,1 ); ent->ts1 =ktime_get_ns (); + cmd_mode = cmd->mode;if (ent->callback)schedule_delayed_work (&ent->cb_timeout_work, cb_timeout);
@@ -871,7 +873,7 @@ static void cmd_work_handler(struct work_struct *work)iowrite32be (1 << ent->idx, &dev->iseg->cmd_dbell);mmiowb ();/* if not in polling don't use ent after this point */ -if (cmd->mode ==CMD_MODE_POLLING || poll_cmd) { +if (cmd_mode ==CMD_MODE_POLLING || poll_cmd) {poll_timeout (ent);/* make sure we read the descriptor after ownership is SW */ rmb ();
@@ -1272,7 +1274,7 @@ static ssize_t outlen_write(struct file *filp, const char __user *buf, {struct mlx5_core_dev *dev = filp->private_data;struct mlx5_cmd_debug *dbg = &dev->cmd.dbg; -char outlen_str[8 ]; +char outlen_str[8 ] = {0 };int outlen;void *ptr;int err;
@@ -1287,8 +1289,6 @@ static ssize_t outlen_write(struct file *filp, const char __user *buf,if (copy_from_user (outlen_str, buf, count))return -EFAULT ; - outlen_str[7 ] =0 ; - err =sscanf (outlen_str,"%d" , &outlen);if (err <0 )return err;
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +6 -6
@@ -2626,7 +2626,7 @@ void mlx5e_activate_priv_channels(struct mlx5e_priv *priv)mlx5e_activate_channels (&priv->channels);netif_tx_start_all_queues (priv->netdev); -if (MLX5_VPORT_MANAGER (priv->mdev)) +if (MLX5_ESWITCH_MANAGER (priv->mdev))mlx5e_add_sqs_fwd_rules (priv);mlx5e_wait_channels_min_rx_wqes (&priv->channels);
@@ -2637,7 +2637,7 @@ void mlx5e_deactivate_priv_channels(struct mlx5e_priv *priv) {mlx5e_redirect_rqts_to_drop (priv); -if (MLX5_VPORT_MANAGER (priv->mdev)) +if (MLX5_ESWITCH_MANAGER (priv->mdev))mlx5e_remove_sqs_fwd_rules (priv);/* FIXME: This is a W/A only for tx timeout watch dog false alarm when
@@ -4127,7 +4127,7 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev)mlx5e_set_netdev_dev_addr (netdev);#if IS_ENABLED (CONFIG_MLX5_ESWITCH ) -if (MLX5_VPORT_MANAGER (mdev)) +if (MLX5_ESWITCH_MANAGER (mdev)) netdev->switchdev_ops = &mlx5e_switchdev_ops;#endif
@@ -4273,7 +4273,7 @@ static void mlx5e_nic_enable(struct mlx5e_priv *priv)mlx5e_enable_async_events (priv); -if (MLX5_VPORT_MANAGER (priv->mdev)) +if (MLX5_ESWITCH_MANAGER (priv->mdev))mlx5e_register_vport_reps (priv);if (netdev->reg_state !=NETREG_REGISTERED )
@@ -4300,7 +4300,7 @@ static void mlx5e_nic_disable(struct mlx5e_priv *priv)queue_work (priv->wq, &priv->set_rx_mode_work); -if (MLX5_VPORT_MANAGER (priv->mdev)) +if (MLX5_ESWITCH_MANAGER (priv->mdev))mlx5e_unregister_vport_reps (priv);mlx5e_disable_async_events (priv);
@@ -4483,7 +4483,7 @@ static void *mlx5e_add(struct mlx5_core_dev *mdev)return NULL ;#ifdef CONFIG_MLX5_ESWITCH -if (MLX5_VPORT_MANAGER (mdev)) { +if (MLX5_ESWITCH_MANAGER (mdev)) { rpriv =mlx5e_alloc_nic_rep_priv (mdev);if (!rpriv) {mlx5_core_warn (mdev,"Failed to alloc NIC rep priv data\n" );
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +6 -2
@@ -710,7 +710,7 @@ bool mlx5e_is_uplink_rep(struct mlx5e_priv *priv)struct mlx5e_rep_priv *rpriv = priv->ppriv;struct mlx5_eswitch_rep *rep; -if (!MLX5_CAP_GEN (priv->mdev, vport_group_manager)) +if (!MLX5_ESWITCH_MANAGER (priv->mdev))return false; rep = rpriv->rep;
@@ -724,8 +724,12 @@ bool mlx5e_is_uplink_rep(struct mlx5e_priv *priv)static bool mlx5e_is_vf_vport_rep (struct mlx5e_priv *priv) {struct mlx5e_rep_priv *rpriv = priv->ppriv; -struct mlx5_eswitch_rep *rep = rpriv->rep; +struct mlx5_eswitch_rep *rep; +if (!MLX5_ESWITCH_MANAGER (priv->mdev)) +return false; + + rep = rpriv->rep;if (rep && rep->vport !=FDB_UPLINK_VPORT )return true;
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +1 -1
@@ -1535,7 +1535,7 @@ int mlx5_eswitch_enable_sriov(struct mlx5_eswitch *esw, int nvfs, int mode)if (!ESW_ALLOWED (esw))return 0 ; -if (!MLX5_CAP_GEN (esw->dev, eswitch_flow_table) || +if (!MLX5_ESWITCH_MANAGER (esw->dev) || !MLX5_CAP_ESW_FLOWTABLE_FDB (esw->dev, ft_support)) {esw_warn (esw->dev,"E-Switch FDB is not supported, aborting ...\n" );return -EOPNOTSUPP ;
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +2 -0
@@ -39,6 +39,8 @@#include <linux/mlx5/device.h> #include "lib/mpfs.h" +#define MLX5_ESWITCH_MANAGER (mdev) MLX5_CAP_GEN(mdev, eswitch_manager) +enum {SRIOV_NONE ,SRIOV_LEGACY ,
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +2 -2
@@ -912,8 +912,8 @@ static int mlx5_devlink_eswitch_check(struct devlink *devlink)if (MLX5_CAP_GEN (dev, port_type) !=MLX5_CAP_PORT_TYPE_ETH )return -EOPNOTSUPP ; -if (!MLX5_CAP_GEN (dev, vport_group_manager)) -return -EOPNOTSUPP ; +if (!MLX5_ESWITCH_MANAGER (dev)) +return -EPERM ;if (dev->priv.eswitch->mode ==SRIOV_NONE )return -EOPNOTSUPP ;
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +2 -1
@@ -36,6 +36,7 @@#include "mlx5_core.h" #include "fs_core.h" #include "fs_cmd.h" +#include "eswitch.h" #include "diag/fs_tracepoint.h" #define INIT_TREE_NODE_ARRAY_SIZE (...) (sizeof((struct init_tree_node[]){__VA_ARGS__}) /\
@@ -2211,7 +2212,7 @@ int mlx5_init_fs(struct mlx5_core_dev *dev) goto err; } -if (MLX5_CAP_GEN (dev, eswitch_flow_table)) { +if (MLX5_ESWITCH_MANAGER (dev)) {if (MLX5_CAP_ESW_FLOWTABLE_FDB (dev, ft_support)) { err =init_fdb_root_ns (steering);if (err)
drivers/net/ethernet/mellanox/mlx5/core/fw.c +3 -2
@@ -34,6 +34,7 @@#include <linux/mlx5/cmd.h> #include <linux/module.h> #include "mlx5_core.h" +#include "eswitch.h" #include "../../mlxfw/mlxfw.h" static int mlx5_cmd_query_adapter(struct mlx5_core_dev *dev, u32 *out,
@@ -152,13 +153,13 @@ int mlx5_query_hca_caps(struct mlx5_core_dev *dev) }if (MLX5_CAP_GEN (dev, vport_group_manager) && -MLX5_CAP_GEN (dev, eswitch_flow_table)) { +MLX5_ESWITCH_MANAGER (dev)) { err =mlx5_core_get_caps (dev,MLX5_CAP_ESWITCH_FLOW_TABLE );if (err)return err; } -if (MLX5_CAP_GEN (dev, eswitch_flow_table)) { +if (MLX5_ESWITCH_MANAGER (dev)) { err =mlx5_core_get_caps (dev,MLX5_CAP_ESWITCH );if (err)return err;
drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c +5 -4
@@ -34,6 +34,7 @@#include <linux/mlx5/driver.h> #include <linux/mlx5/mlx5_ifc.h> #include "mlx5_core.h" +#include "eswitch.h" #include "lib/mpfs.h" /* HW L2 Table (MPFS) management */
@@ -98,7 +99,7 @@ int mlx5_mpfs_init(struct mlx5_core_dev *dev)int l2table_size =1 <<MLX5_CAP_GEN (dev, log_max_l2_table);struct mlx5_mpfs *mpfs; -if (!MLX5_VPORT_MANAGER (dev)) +if (!MLX5_ESWITCH_MANAGER (dev))return 0 ; mpfs =kzalloc (sizeof (*mpfs),GFP_KERNEL );
@@ -122,7 +123,7 @@ void mlx5_mpfs_cleanup(struct mlx5_core_dev *dev) {struct mlx5_mpfs *mpfs = dev->priv.mpfs; -if (!MLX5_VPORT_MANAGER (dev)) +if (!MLX5_ESWITCH_MANAGER (dev))return ;WARN_ON (!hlist_empty (mpfs->hash));
@@ -137,7 +138,7 @@ int mlx5_mpfs_add_mac(struct mlx5_core_dev *dev, u8 *mac)u32 index;int err; -if (!MLX5_VPORT_MANAGER (dev)) +if (!MLX5_ESWITCH_MANAGER (dev))return 0 ;mutex_lock (&mpfs->lock);
@@ -179,7 +180,7 @@ int mlx5_mpfs_del_mac(struct mlx5_core_dev *dev, u8 *mac)int err =0 ;u32 index; -if (!MLX5_VPORT_MANAGER (dev)) +if (!MLX5_ESWITCH_MANAGER (dev))return 0 ;mutex_lock (&mpfs->lock);
drivers/net/ethernet/mellanox/mlx5/core/port.c +2 -2
@@ -641,7 +641,7 @@ EXPORT_SYMBOL_GPL(mlx5_query_port_prio_tc);static int mlx5_set_port_qetcr_reg (struct mlx5_core_dev *mdev,u32 *in,int inlen) { -u32 out[MLX5_ST_SZ_DW (qtct_reg)]; +u32 out[MLX5_ST_SZ_DW (qetc_reg)];if (!MLX5_CAP_GEN (mdev, ets))return -EOPNOTSUPP ;
@@ -653,7 +653,7 @@ static int mlx5_set_port_qetcr_reg(struct mlx5_core_dev *mdev, u32 *in,static int mlx5_query_port_qetcr_reg (struct mlx5_core_dev *mdev,u32 *out,int outlen) { -u32 in[MLX5_ST_SZ_DW (qtct_reg)]; +u32 in[MLX5_ST_SZ_DW (qetc_reg)];if (!MLX5_CAP_GEN (mdev, ets))return -EOPNOTSUPP ;
drivers/net/ethernet/mellanox/mlx5/core/sriov.c +6 -1
@@ -88,6 +88,9 @@ static int mlx5_device_enable_sriov(struct mlx5_core_dev *dev, int num_vfs)return -EBUSY ; } +if (!MLX5_ESWITCH_MANAGER (dev)) + goto enable_vfs_hca; + err =mlx5_eswitch_enable_sriov (dev->priv.eswitch, num_vfs,SRIOV_LEGACY );if (err) { mlx5_core_warn(dev,
@@ -95,6 +98,7 @@ static int mlx5_device_enable_sriov(struct mlx5_core_dev *dev, int num_vfs)return err; } +enable_vfs_hca:for (vf =0 ; vf < num_vfs; vf++) { err =mlx5_core_enable_hca (dev, vf +1 );if (err) {
@@ -140,7 +144,8 @@ static void mlx5_device_disable_sriov(struct mlx5_core_dev *dev) } out: -mlx5_eswitch_disable_sriov (dev->priv.eswitch); +if (MLX5_ESWITCH_MANAGER (dev)) +mlx5_eswitch_disable_sriov (dev->priv.eswitch);if (mlx5_wait_for_vf_pages (dev))mlx5_core_warn (dev,"timeout reclaiming VFs pages\n" );
drivers/net/ethernet/qlogic/qed/qed_dcbx.c +4 -4
@@ -700,9 +700,9 @@ qed_dcbx_get_local_lldp_params(struct qed_hwfn *p_hwfn, p_local = &p_hwfn->p_dcbx_info->lldp_local[LLDP_NEAREST_BRIDGE ];memcpy (params->lldp_local.local_chassis_id, p_local->local_chassis_id, -ARRAY_SIZE (p_local->local_chassis_id)); +sizeof (p_local->local_chassis_id));memcpy (params->lldp_local.local_port_id, p_local->local_port_id, -ARRAY_SIZE (p_local->local_port_id)); +sizeof (p_local->local_port_id)); } static void
@@ -714,9 +714,9 @@ qed_dcbx_get_remote_lldp_params(struct qed_hwfn *p_hwfn, p_remote = &p_hwfn->p_dcbx_info->lldp_remote[LLDP_NEAREST_BRIDGE ];memcpy (params->lldp_remote.peer_chassis_id, p_remote->peer_chassis_id, -ARRAY_SIZE (p_remote->peer_chassis_id)); +sizeof (p_remote->peer_chassis_id));memcpy (params->lldp_remote.peer_port_id, p_remote->peer_port_id, -ARRAY_SIZE (p_remote->peer_port_id)); +sizeof (p_remote->peer_port_id)); } static int
drivers/net/ethernet/qlogic/qed/qed_dev.c +1 -1
@@ -1782,7 +1782,7 @@ int qed_hw_init(struct qed_dev *cdev, struct qed_hw_init_params *p_params)DP_INFO (p_hwfn,"Failed to update driver state\n" ); rc =qed_mcp_ov_update_eswitch (p_hwfn, p_hwfn->p_main_ptt, -QED_OV_ESWITCH_VEB ); +QED_OV_ESWITCH_NONE );if (rc)DP_INFO (p_hwfn,"Failed to update eswitch mode\n" ); }
drivers/net/ethernet/qlogic/qed/qed_main.c +8 -0
@@ -779,6 +779,14 @@ static int qed_slowpath_setup_int(struct qed_dev *cdev,/* We want a minimum of one slowpath and one fastpath vector per hwfn */ cdev->int_params.in.min_msix_cnt = cdev->num_hwfns *2 ; +if (is_kdump_kernel ()) { +DP_INFO (cdev, +"Kdump kernel: Limit the max number of requested MSI-X vectors to %hd\n" , + cdev->int_params.in.min_msix_cnt); + cdev->int_params.in.num_vectors = + cdev->int_params.in.min_msix_cnt; + } + rc =qed_set_int_mode (cdev, false);if (rc) {DP_ERR (cdev,"qed_slowpath_setup_int ERR\n" );
drivers/net/ethernet/qlogic/qed/qed_sriov.c +17 -2
@@ -4396,6 +4396,8 @@ static void qed_sriov_enable_qid_config(struct qed_hwfn *hwfn,static int qed_sriov_enable (struct qed_dev *cdev,int num) {struct qed_iov_vf_init_params params; +struct qed_hwfn *hwfn; +struct qed_ptt *ptt;int i, j, rc;if (num >=RESC_NUM (&cdev->hwfns[0 ],QED_VPORT )) {
@@ -4408,8 +4410,8 @@ static int qed_sriov_enable(struct qed_dev *cdev, int num)/* Initialize HW for VF access */ for_each_hwfn (cdev, j) { -struct qed_hwfn *hwfn = &cdev->hwfns[j]; -struct qed_ptt *ptt =qed_ptt_acquire (hwfn); + hwfn = &cdev->hwfns[j]; + ptt =qed_ptt_acquire (hwfn);/* Make sure not to use more than 16 queues per VF */ params.num_queues = min_t(int,
@@ -4445,6 +4447,19 @@ static int qed_sriov_enable(struct qed_dev *cdev, int num) goto err; } + hwfn =QED_LEADING_HWFN (cdev); + ptt =qed_ptt_acquire (hwfn); +if (!ptt) { +DP_ERR (hwfn,"Failed to acquire ptt\n" ); + rc = -EBUSY ; + goto err; + } + + rc =qed_mcp_ov_update_eswitch (hwfn, ptt,QED_OV_ESWITCH_VEB ); +if (rc) +DP_INFO (cdev,"Failed to update eswitch mode\n" ); +qed_ptt_release (hwfn, ptt); +return num; err:
drivers/net/ethernet/qlogic/qede/qede_ptp.c +8 -2
@@ -337,8 +337,14 @@ int qede_ptp_get_ts_info(struct qede_dev *edev, struct ethtool_ts_info *info) {struct qede_ptp *ptp = edev->ptp; -if (!ptp) -return -EIO ; +if (!ptp) { + info->so_timestamping =SOF_TIMESTAMPING_TX_SOFTWARE | +SOF_TIMESTAMPING_RX_SOFTWARE | +SOF_TIMESTAMPING_SOFTWARE ; + info->phc_index =-1 ; + +return 0 ; + } info->so_timestamping =SOF_TIMESTAMPING_TX_SOFTWARE | SOF_TIMESTAMPING_RX_SOFTWARE |
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +10 -0
@@ -914,6 +914,7 @@ static void stmmac_check_pcs_mode(struct stmmac_priv *priv)static int stmmac_init_phy (struct net_device *dev) {struct stmmac_priv *priv =netdev_priv (dev); +u32 tx_cnt = priv->plat->tx_queues_to_use;struct phy_device *phydev;char phy_id_fmt[MII_BUS_ID_SIZE +3 ];char bus_id[MII_BUS_ID_SIZE ];
@@ -954,6 +955,15 @@ static int stmmac_init_phy(struct net_device *dev) phydev->advertising &= ~(SUPPORTED_1000baseT_Half | SUPPORTED_1000baseT_Full); +/* +* Half-duplex mode not supported with multiqueue +* half-duplex can only works with single queue +*/ +if (tx_cnt >1 ) + phydev->supported &= ~(SUPPORTED_1000baseT_Half | + SUPPORTED_100baseT_Half | + SUPPORTED_10baseT_Half); +/* * Broken HW is sometimes missing the pull-up resistor on the * MDIO line, which results in reads to non-existent devices returning
drivers/net/ethernet/sun/sungem.c +12 -10
@@ -59,8 +59,7 @@#include <linux/sungem_phy.h> #include "sungem.h" -/* Stripping FCS is causing problems, disabled for now */ -#undef STRIP_FCS +#define STRIP_FCS #define DEFAULT_MSG (NETIF_MSG_DRV | \ NETIF_MSG_PROBE | \
@@ -434,7 +433,7 @@ static int gem_rxmac_reset(struct gem *gp)writel (desc_dma &0xffffffff , gp->regs +RXDMA_DBLOW );writel (RX_RING_SIZE -4 , gp->regs +RXDMA_KICK ); val = (RXDMA_CFG_BASE | (RX_OFFSET <<10 ) | - ((14 /2 ) <<13 ) |RXDMA_CFG_FTHRESH_128 ); + (ETH_HLEN <<13 ) |RXDMA_CFG_FTHRESH_128 );writel (val, gp->regs +RXDMA_CFG );if (readl (gp->regs +GREG_BIFCFG ) &GREG_BIFCFG_M66EN ) writel(((5 & RXDMA_BLANK_IPKTS) |
@@ -759,7 +758,6 @@ static int gem_rx(struct gem *gp, int work_to_do)struct net_device *dev = gp->dev;int entry, drops, work_done =0 ;u32 done; -__sum16 csum;if (netif_msg_rx_status (gp)) printk(KERN_DEBUG "%s: rx interrupt, done: %d, rx_new: %d\n",
@@ -854,9 +852,13 @@ static int gem_rx(struct gem *gp, int work_to_do) skb = copy_skb; } - csum = (__force __sum16 )htons ((status &RXDCTRL_TCPCSUM ) ^0xffff ); - skb->csum =csum_unfold (csum); - skb->ip_summed =CHECKSUM_COMPLETE ; +if (likely (dev->features &NETIF_F_RXCSUM )) { +__sum16 csum; + + csum = (__force __sum16 )htons ((status &RXDCTRL_TCPCSUM ) ^0xffff ); + skb->csum =csum_unfold (csum); + skb->ip_summed =CHECKSUM_COMPLETE ; + } skb->protocol =eth_type_trans (skb, gp->dev);napi_gro_receive (&gp->napi, skb);
@@ -1760,7 +1762,7 @@ static void gem_init_dma(struct gem *gp)writel (0 , gp->regs +TXDMA_KICK ); val = (RXDMA_CFG_BASE | (RX_OFFSET <<10 ) | - ((14 /2 ) <<13 ) |RXDMA_CFG_FTHRESH_128 ); + (ETH_HLEN <<13 ) |RXDMA_CFG_FTHRESH_128 );writel (val, gp->regs +RXDMA_CFG );writel (desc_dma >>32 , gp->regs +RXDMA_DBHI );
@@ -2986,8 +2988,8 @@ static int gem_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)pci_set_drvdata (pdev, dev);/* We can do scatter/gather and HW checksum */ - dev->hw_features =NETIF_F_SG |NETIF_F_HW_CSUM ; - dev->features |= dev->hw_features |NETIF_F_RXCSUM ; + dev->hw_features =NETIF_F_SG |NETIF_F_HW_CSUM |NETIF_F_RXCSUM ; + dev->features = dev->hw_features;if (pci_using_dac) dev->features |=NETIF_F_HIGHDMA ;
drivers/net/geneve.c +1 -1
@@ -474,7 +474,7 @@ static struct sk_buff **geneve_gro_receive(struct sock *sk, out_unlock:rcu_read_unlock (); out: -NAPI_GRO_CB (skb)->flush |= flush; +skb_gro_flush_final (skb, pp, flush);return pp; }
drivers/net/hyperv/hyperv_net.h +1 -1
@@ -207,7 +207,7 @@ int netvsc_recv_callback(struct net_device *net,void netvsc_channel_cb (void *context);int netvsc_poll (struct napi_struct *napi,int budget); -void rndis_set_subchannel (struct work_struct *w); +int rndis_set_subchannel (struct net_device *ndev,struct netvsc_device *nvdev);int rndis_filter_open (struct netvsc_device *nvdev);int rndis_filter_close (struct netvsc_device *nvdev); struct netvsc_device *rndis_filter_device_add(struct hv_device *dev,
drivers/net/hyperv/netvsc.c +36 -1
@@ -62,6 +62,41 @@ void netvsc_switch_datapath(struct net_device *ndev, bool vf) VM_PKT_DATA_INBAND, 0); } +/* Worker to setup sub channels on initial setup +* Initial hotplug event occurs in softirq context +* and can't wait for channels. +*/ +static void netvsc_subchan_work (struct work_struct *w) +{ +struct netvsc_device *nvdev = + container_of(w, struct netvsc_device, subchan_work); +struct rndis_device *rdev; +int i, ret; + +/* Avoid deadlock with device removal already under RTNL */ +if (!rtnl_trylock ()) { +schedule_work (w); +return ; + } + + rdev = nvdev->extension; +if (rdev) { + ret =rndis_set_subchannel (rdev->ndev, nvdev); +if (ret ==0 ) { +netif_device_attach (rdev->ndev); + }else { +/* fallback to only primary channel */ +for (i =1 ; i < nvdev->num_chn; i++) +netif_napi_del (&nvdev->chan_table[i].napi); + + nvdev->max_chn =1 ; + nvdev->num_chn =1 ; + } + } + +rtnl_unlock (); +} +static struct netvsc_device *alloc_net_device (void ) {struct netvsc_device *net_device;
@@ -78,7 +113,7 @@ static struct netvsc_device *alloc_net_device(void)init_completion (&net_device->channel_init_wait);init_waitqueue_head (&net_device->subchan_open); -INIT_WORK (&net_device->subchan_work, rndis_set_subchannel); +INIT_WORK (&net_device->subchan_work, netvsc_subchan_work);return net_device; }
drivers/net/hyperv/netvsc_drv.c +16 -1
@@ -911,8 +911,20 @@ static int netvsc_attach(struct net_device *ndev,if (IS_ERR (nvdev))return PTR_ERR (nvdev); -/* Note: enable and attach happen when sub-channels setup */ +if (nvdev->num_chn >1 ) { + ret =rndis_set_subchannel (ndev, nvdev); + +/* if unavailable, just proceed with one queue */ +if (ret) { + nvdev->max_chn =1 ; + nvdev->num_chn =1 ; + } + } + +/* In any case device is now ready */ +netif_device_attach (ndev); +/* Note: enable and attach happen when sub-channels setup */ netif_carrier_off (ndev);if (netif_running (ndev)) {
@@ -2035,6 +2047,9 @@ static int netvsc_probe(struct hv_device *dev,memcpy (net->dev_addr, device_info.mac_adr,ETH_ALEN ); +if (nvdev->num_chn >1 ) +schedule_work (&nvdev->subchan_work); +/* hw_features computed in rndis_netdev_set_hwcaps() */ net->features = net->hw_features | NETIF_F_HIGHDMA | NETIF_F_SG |
drivers/net/hyperv/rndis_filter.c +12 -49
96 lines not on this page · raw message
drivers/net/ipvlan/ipvlan_main.c +2 -1
@@ -546,7 +546,8 @@ int ipvlan_link_new(struct net *src_net, struct net_device *dev, ipvlan->dev = dev; ipvlan->port = port; ipvlan->sfeatures =IPVLAN_FEATURES ; -ipvlan_adjust_mtu (ipvlan, phy_dev); +if (!tb[IFLA_MTU ]) +ipvlan_adjust_mtu (ipvlan, phy_dev);INIT_LIST_HEAD (&ipvlan->addrs);/* If the port-id base is at the MAX value, then wrap it around and
drivers/net/usb/lan78xx.c +4 -1
@@ -3197,6 +3197,7 @@ static void lan78xx_tx_bh(struct lan78xx_net *dev) pkt_cnt =0 ; count =0 ; length =0 ; +spin_lock_irqsave (&tqp->lock, flags);for (skb = tqp->next; pkt_cnt < tqp->qlen; skb = skb->next) {if (skb_is_gso (skb)) {if (pkt_cnt) {
@@ -3205,7 +3206,8 @@ static void lan78xx_tx_bh(struct lan78xx_net *dev) } count =1 ; length = skb->len -TX_OVERHEAD ; - skb2 =skb_dequeue (tqp); +__skb_unlink (skb, tqp); +spin_unlock_irqrestore (&tqp->lock, flags); goto gso_skb; }
@@ -3214,6 +3216,7 @@ static void lan78xx_tx_bh(struct lan78xx_net *dev) skb_totallen = skb->len +roundup (skb_totallen,sizeof (u32)); pkt_cnt++; } +spin_unlock_irqrestore (&tqp->lock, flags);/* copy to a single skb */ skb =alloc_skb (skb_totallen,GFP_ATOMIC );
drivers/net/usb/qmi_wwan.c +1 -0
@@ -1245,6 +1245,7 @@ static const struct usb_device_id products[] = { {QMI_FIXED_INTF(0x413c, 0x81b3, 8)}, /* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card (rev3) */ {QMI_FIXED_INTF(0x413c, 0x81b6, 8)}, /* Dell Wireless 5811e */ {QMI_FIXED_INTF(0x413c, 0x81b6, 10)}, /* Dell Wireless 5811e */ + {QMI_FIXED_INTF(0x413c, 0x81d7, 1)}, /* Dell Wireless 5821e */ {QMI_FIXED_INTF(0x03f0, 0x4e1d, 8)}, /* HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module */ {QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */ {QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */
drivers/net/usb/r8152.c +2 -1
@@ -3959,7 +3959,8 @@ static int rtl8152_close(struct net_device *netdev)#ifdef CONFIG_PM_SLEEP unregister_pm_notifier (&tp->pm_notifier);#endif -napi_disable (&tp->napi); +if (!test_bit (RTL8152_UNPLUG , &tp->flags)) +napi_disable (&tp->napi);clear_bit (WORK_ENABLE , &tp->flags);usb_kill_urb (tp->intr_urb);cancel_delayed_work_sync (&tp->schedule);
drivers/net/vxlan.c +1 -3
@@ -623,9 +623,7 @@ static struct sk_buff **vxlan_gro_receive(struct sock *sk, flush =0 ; out: -skb_gro_remcsum_cleanup (skb, &grc); - skb->remcsum_offload =0 ; -NAPI_GRO_CB (skb)->flush |= flush; +skb_gro_flush_final_remcsum (skb, pp, flush, &grc);return pp; }
drivers/net/wireless/realtek/rtlwifi/base.c +10 -7
@@ -483,18 +483,21 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw) } -void rtl_deinit_deferred_work (struct ieee80211_hw *hw) +void rtl_deinit_deferred_work (struct ieee80211_hw *hw,bool ips_wq) {struct rtl_priv *rtlpriv =rtl_priv (hw);del_timer_sync (&rtlpriv->works.watchdog_timer); -cancel_delayed_work (&rtlpriv->works.watchdog_wq); -cancel_delayed_work (&rtlpriv->works.ips_nic_off_wq); -cancel_delayed_work (&rtlpriv->works.ps_work); -cancel_delayed_work (&rtlpriv->works.ps_rfon_wq); -cancel_delayed_work (&rtlpriv->works.fwevt_wq); -cancel_delayed_work (&rtlpriv->works.c2hcmd_wq); +cancel_delayed_work_sync (&rtlpriv->works.watchdog_wq); +if (ips_wq) +cancel_delayed_work (&rtlpriv->works.ips_nic_off_wq); +else +cancel_delayed_work_sync (&rtlpriv->works.ips_nic_off_wq); +cancel_delayed_work_sync (&rtlpriv->works.ps_work); +cancel_delayed_work_sync (&rtlpriv->works.ps_rfon_wq); +cancel_delayed_work_sync (&rtlpriv->works.fwevt_wq); +cancel_delayed_work_sync (&rtlpriv->works.c2hcmd_wq); }EXPORT_SYMBOL_GPL (rtl_deinit_deferred_work);
drivers/net/wireless/realtek/rtlwifi/base.h +1 -1
@@ -121,7 +121,7 @@ void rtl_init_rfkill(struct ieee80211_hw *hw);void rtl_deinit_rfkill (struct ieee80211_hw *hw);void rtl_watch_dog_timer_callback (unsigned long data); -void rtl_deinit_deferred_work (struct ieee80211_hw *hw); +void rtl_deinit_deferred_work (struct ieee80211_hw *hw,bool ips_wq);bool rtl_action_proc (struct ieee80211_hw *hw,struct sk_buff *skb,u8 is_tx); int rtlwifi_rate_mapping(struct ieee80211_hw *hw, bool isht,
drivers/net/wireless/realtek/rtlwifi/core.c +1 -2
@@ -130,7 +130,6 @@ static void rtl_fw_do_work(const struct firmware *firmware, void *context, firmware->size); rtlpriv->rtlhal.wowlan_fwsize = firmware->size; } - rtlpriv->rtlhal.fwsize = firmware->size;release_firmware (firmware); }
@@ -196,7 +195,7 @@ static void rtl_op_stop(struct ieee80211_hw *hw)/* reset sec info */ rtl_cam_reset_sec_info (hw); -rtl_deinit_deferred_work (hw); +rtl_deinit_deferred_work (hw, false); } rtlpriv->intf_ops->adapter_stop (hw);
drivers/net/wireless/realtek/rtlwifi/pci.c +1 -1
@@ -2359,7 +2359,7 @@ void rtl_pci_disconnect(struct pci_dev *pdev)ieee80211_unregister_hw (hw); rtlmac->mac80211_registered =0 ; }else { -rtl_deinit_deferred_work (hw); +rtl_deinit_deferred_work (hw, false); rtlpriv->intf_ops->adapter_stop (hw); } rtlpriv->cfg->ops->disable_interrupt (hw);
drivers/net/wireless/realtek/rtlwifi/ps.c +2 -2
@@ -66,7 +66,7 @@ bool rtl_ps_disable_nic(struct ieee80211_hw *hw)struct rtl_priv *rtlpriv =rtl_priv (hw);/*<1> Stop all timer */ -rtl_deinit_deferred_work (hw); +rtl_deinit_deferred_work (hw, true);/*<2> Disable Interrupt */ rtlpriv->cfg->ops->disable_interrupt (hw);
@@ -287,7 +287,7 @@ void rtl_ips_nic_on(struct ieee80211_hw *hw)struct rtl_ps_ctl *ppsc =rtl_psc (rtl_priv (hw));enum rf_pwrstate rtstate; -cancel_delayed_work (&rtlpriv->works.ips_nic_off_wq); +cancel_delayed_work_sync (&rtlpriv->works.ips_nic_off_wq);spin_lock (&rtlpriv->locks.ips_lock);if (ppsc->inactiveps) {
drivers/net/wireless/realtek/rtlwifi/usb.c +1 -1
@@ -1150,7 +1150,7 @@ void rtl_usb_disconnect(struct usb_interface *intf)ieee80211_unregister_hw (hw); rtlmac->mac80211_registered =0 ; }else { -rtl_deinit_deferred_work (hw); +rtl_deinit_deferred_work (hw, false); rtlpriv->intf_ops->adapter_stop (hw); }/*deinit rfkill */
drivers/pci/dwc/pci-exynos.c +2 -1
@@ -695,7 +695,8 @@ static int __init exynos_pcie_probe(struct platform_device *pdev)return ret; } -if (ep->ops && ep->ops->get_clk_resources) { +if (ep->ops && ep->ops->get_clk_resources && + ep->ops->init_clk_resources) { ret = ep->ops->get_clk_resources (ep);if (ret)return ret;
drivers/pci/host/pci-hyperv.c +5 -3
@@ -1091,6 +1091,7 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)struct pci_bus *pbus;struct pci_dev *pdev;struct cpumask *dest; +unsigned long flags;struct compose_comp_ctxt comp;struct tran_int_desc *int_desc;struct {
@@ -1182,14 +1183,15 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)* the channel callback directly when channel->target_cpu is * the current CPU. When the higher level interrupt code * calls us with interrupt enabled, let's add the -* local_bh_disable()/enable() to avoid race. +* local_irq_save()/restore() to avoid race: +* hv_pci_onchannelcallback() can also run in tasklet. */ -local_bh_disable (); +local_irq_save (flags);if (hbus->hdev->channel->target_cpu ==smp_processor_id ())hv_pci_onchannelcallback (hbus); -local_bh_enable (); +local_irq_restore (flags);if (hpdev->state == hv_pcichild_ejecting) { dev_err_once(&hbus->hdev->device,
drivers/usb/host/xhci-hub.c +1 -1
@@ -366,7 +366,7 @@ int xhci_find_slot_id_by_port(struct usb_hcd *hcd, struct xhci_hcd *xhci, slot_id =0 ;for (i =0 ; i <MAX_HC_SLOTS ; i++) { -if (!xhci->devs[i]) +if (!xhci->devs[i] || !xhci->devs[i]->udev)continue ; speed = xhci->devs[i]->udev->speed; if (((speed >= USB_SPEED_SUPER) == (hcd->speed >= HCD_USB3))
drivers/vhost/net.c +2 -1
@@ -1186,7 +1186,8 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd)if (ubufs)vhost_net_ubuf_put_wait_and_free (ubufs); err_ubufs: -sockfd_put (sock); +if (sock) +sockfd_put (sock); err_vq:mutex_unlock (&vq->mutex); err:
fs/autofs4/dev-ioctl.c +13 -9
@@ -148,6 +148,15 @@ static int validate_dev_ioctl(int cmd, struct autofs_dev_ioctl *param) cmd); goto out; } + }else { +unsigned int inr =_IOC_NR (cmd); + +if (inr ==AUTOFS_DEV_IOCTL_OPENMOUNT_CMD || + inr ==AUTOFS_DEV_IOCTL_REQUESTER_CMD || + inr ==AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD ) { + err = -EINVAL ; + goto out; + } } err =0 ;
@@ -284,7 +293,8 @@ static int autofs_dev_ioctl_openmount(struct file *fp,dev_t devid;int err, fd; -/* param->path has already been checked */ +/* param->path has been checked in validate_dev_ioctl() */ +if (!param->openmount.devid)return -EINVAL ;
@@ -446,10 +456,7 @@ static int autofs_dev_ioctl_requester(struct file *fp,dev_t devid;int err = -ENOENT ; -if (param->size <=AUTOFS_DEV_IOCTL_SIZE ) { - err = -EINVAL ; - goto out; - } +/* param->path has been checked in validate_dev_ioctl() */ devid = sbi->sb->s_dev;
@@ -534,10 +541,7 @@ static int autofs_dev_ioctl_ismountpoint(struct file *fp,unsigned int devid, magic;int err = -ENOENT ; -if (param->size <=AUTOFS_DEV_IOCTL_SIZE ) { - err = -EINVAL ; - goto out; - } +/* param->path has been checked in validate_dev_ioctl() */ name = param->path; type = param->ismountpoint.in.type;
fs/btrfs/tree-log.c +112 -25
161 lines not on this page · raw message
fs/ocfs2/aops.c +18 -8
@@ -134,6 +134,19 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock,return err; } +static int ocfs2_lock_get_block (struct inode *inode,sector_t iblock, +struct buffer_head *bh_result,int create) +{ +int ret =0 ; +struct ocfs2_inode_info *oi =OCFS2_I (inode); + +down_read (&oi->ip_alloc_sem); + ret =ocfs2_get_block (inode, iblock, bh_result, create); +up_read (&oi->ip_alloc_sem); + +return ret; +} +int ocfs2_get_block (struct inode *inode,sector_t iblock,struct buffer_head *bh_result,int create) {
@@ -2128,7 +2141,7 @@ static void ocfs2_dio_free_write_ctx(struct inode *inode,* called like this: dio->get_blocks(dio->inode, fs_startblk, * fs_count, map_bh, dio->rw == WRITE); */ -static int ocfs2_dio_get_block (struct inode *inode,sector_t iblock, +static int ocfs2_dio_wr_get_block (struct inode *inode,sector_t iblock,struct buffer_head *bh_result,int create) {struct ocfs2_super *osb =OCFS2_SB (inode->i_sb);
@@ -2154,12 +2167,9 @@ static int ocfs2_dio_get_block(struct inode *inode, sector_t iblock,* while file size will be changed. */ if (pos + total_len <=i_size_read (inode)) { -down_read (&oi->ip_alloc_sem); -/* This is the fast path for re-write. */ - ret =ocfs2_get_block (inode, iblock, bh_result, create); - -up_read (&oi->ip_alloc_sem); +/* This is the fast path for re-write. */ + ret =ocfs2_lock_get_block (inode, iblock, bh_result, create);if (buffer_mapped (bh_result) && !buffer_new (bh_result) && ret ==0 )
@@ -2424,9 +2434,9 @@ static ssize_t ocfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter)return 0 ;if (iov_iter_rw (iter) ==READ ) - get_block = ocfs2_get_block; + get_block = ocfs2_lock_get_block;else - get_block = ocfs2_dio_get_block; + get_block = ocfs2_dio_wr_get_block; return __blockdev_direct_IO(iocb, inode, inode->i_sb->s_bdev, iter, get_block,
fs/ocfs2/cluster/nodemanager.c +55 -8
54 lines not on this page · raw message
fs/reiserfs/prints.c +81 -60
141 lines not on this page · raw message
net/ipv6/netfilter/nf_conntrack_reasm.c +2 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.