Linux 4.9.114
Greg KH
maintainerI'm announcing the release of the 4.9.114 kernel.
All users of the 4.9 kernel series must upgrade.
The updated 4.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.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/kernel-parameters.txt | 17 ++ Makefile | 2 arch/arm/include/asm/kvm_host.h | 12 + arch/arm/include/asm/kvm_mmu.h | 12 + arch/arm/kvm/arm.c | 24 +-- arch/arm/kvm/psci.c | 18 ++ arch/arm64/Kconfig | 9 + arch/arm64/include/asm/alternative.h | 43 +++++ arch/arm64/include/asm/assembler.h | 27 +++ 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 | 12 + arch/arm64/include/asm/thread_info.h | 1 arch/arm64/kernel/Makefile | 1 arch/arm64/kernel/alternative.c | 54 +++++-- 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 | 32 ++++ 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/mips/kernel/process.c | 45 ++++-- 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 +++ drivers/atm/zatm.c | 2 drivers/crypto/amcc/crypto4xx_core.c | 23 +-- drivers/mtd/devices/m25p80.c | 3 drivers/net/ethernet/broadcom/bcm63xx_enet.c | 34 +++- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 8 - drivers/net/ethernet/mellanox/mlx5/core/port.c | 4 drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 8 - drivers/net/ethernet/qlogic/qed/qed_main.c | 9 + drivers/net/ethernet/sun/sungem.c | 22 +- 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/wireless/realtek/rtlwifi/core.c | 1 drivers/vhost/net.c | 3 fs/ocfs2/aops.c | 26 ++- fs/ocfs2/cluster/nodemanager.c | 63 +++++++- fs/reiserfs/prints.c | 141 ++++++++++-------- include/linux/arm-smccc.h | 10 + include/linux/compiler-gcc.h | 35 +++- include/linux/string.h | 2 net/bridge/netfilter/ebtables.c | 13 + net/dccp/ccids/ccid3.c | 16 +- net/dns_resolver/dns_key.c | 28 ++- net/ipv4/sysctl_net_ipv4.c | 18 +- net/ipv4/tcp_input.c | 9 + net/ipv6/netfilter/nf_conntrack_reasm.c | 2 net/nfc/llcp_commands.c | 9 - net/packet/af_packet.c | 14 - net/rds/loop.c | 1 net/rds/rds.h | 5 net/rds/recv.c | 5 net/sched/sch_blackhole.c | 2 virt/kvm/arm/hyp/vgic-v2-sr.c | 2 71 files changed, 1305 insertions(+), 270 deletions(-)
Aleksander Morgado (1):
qmi_wwan: add support for the Dell Wireless 5821e module
Alex Vesker (2):
net/mlx5: Fix incorrect raw command length parsing net/mlx5: Fix command interface race in polling 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
David Rientjes (2):
compiler, clang: suppress warning for unused static inline functions compiler, clang: always inline when CONFIG_OPTIMIZE_INLINING is disabled
Eric Biggers (2):
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: sungem: fix rx checksum support
net/packet: fix use-after-free
Florian Westphal (2):
netfilter: ebtables: reject non-bridge targets
netfilter: ipv6: nf_defrag: drop skb dst before queueing
Greg Kroah-Hartman (1):
Linux 4.9.114
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>
Heiner Kallweit (1):
mtd: m25p80: consider max message size in m25p80_read
Ilpo Järvinen (1):
tcp: prevent bogus FRTO undos with non-SACK flows
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
Jason Wang (1):
vhost_net: validate sock before trying to put its fd
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
Linus Torvalds (1):
compiler, clang: properly override 'inline' for clang
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
Mark Rutland (1):
arm64: assembler: introduce ldr_this_cpu
Nick Desaulniers (2):
compiler-gcc.h: Add __attribute__((gnu_inline)) to all inline declarations x86/paravirt: Make native_save_fl() extern inline
Paul Burton (1):
MIPS: Use async IPIs for arch_trigger_cpumask_backtrace()
Ping-Ke Shih (1):
rtlwifi: rtl8821ae: fix firmware is not ready to run
Santosh Shilimkar (1):
rds: avoid unenecessary cong_update in loop transport
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
Sudarsana Reddy Kalluru (2):
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.
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/kernel-parameters.txt +17 -0
@@ -4023,6 +4023,23 @@ bytes respectively. Such letter suffixes can also be entirely omitted. spia_pedr= spia_peddr= + 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,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 113 +SUBLEVEL = 114 EXTRAVERSION = NAME = Roaring Lionus
arch/arm/include/asm/kvm_host.h +12 -0
@@ -327,4 +327,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. */
@@ -249,6 +256,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/arm/kvm/arm.c +9 -15
@@ -51,8 +51,8 @@ __asm__(".arch_extension virt" );#endif +DEFINE_PER_CPU (kvm_cpu_context_t, kvm_host_cpu_state); static DEFINE_PER_CPU(unsigned long, kvm_arm_hyp_stack_page); -static kvm_cpu_context_t __percpu *kvm_host_cpu_state;static unsigned long hyp_default_vectors;/* Per-CPU variable containing the currently running vcpu. */
@@ -338,7 +338,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) } vcpu->cpu = cpu; - vcpu->arch.host_cpu_context =this_cpu_ptr (kvm_host_cpu_state); + vcpu->arch.host_cpu_context =this_cpu_ptr (&kvm_host_cpu_state);kvm_arm_set_running_vcpu (vcpu); }
@@ -1199,19 +1199,8 @@ static inline void hyp_cpu_pm_exit(void) }#endif -static void teardown_common_resources (void ) -{ -free_percpu (kvm_host_cpu_state); -} -static int init_common_resources (void ) { - kvm_host_cpu_state =alloc_percpu (kvm_cpu_context_t); -if (!kvm_host_cpu_state) { -kvm_err ("Cannot allocate host CPU state\n" ); -return -ENOMEM ; - } -/* set size of VMID supported by CPU */ kvm_vmid_bits =kvm_get_vmid_bits ();kvm_info ("%d-bit VMID\n" , kvm_vmid_bits);
@@ -1369,7 +1358,7 @@ static int init_hyp_mode(void)for_each_possible_cpu (cpu) {kvm_cpu_context_t *cpu_ctxt; - cpu_ctxt =per_cpu_ptr (kvm_host_cpu_state, cpu); + cpu_ctxt =per_cpu_ptr (&kvm_host_cpu_state, cpu); err =create_hyp_mappings (cpu_ctxt, cpu_ctxt +1 ,PAGE_HYP );if (err) {
@@ -1378,6 +1367,12 @@ static int init_hyp_mode(void) } } + err =hyp_map_aux_data (); +if (err) { +kvm_err ("Cannot map host auxilary data: %d\n" , err); + goto out_err; + } +kvm_info ("Hyp mode initialized successfully\n" );return 0 ;
@@ -1447,7 +1442,6 @@ int kvm_arch_init(void *opaque) out_hyp:teardown_hyp_mode (); out_err: -teardown_common_resources ();return err; }
arch/arm/kvm/psci.c +16 -2
@@ -403,7 +403,7 @@ static int kvm_psci_call(struct kvm_vcpu *vcpu)int kvm_hvc_call_handler (struct kvm_vcpu *vcpu) {u32 func_id =smccc_get_function (vcpu); -u32 val =PSCI_RET_NOT_SUPPORTED ; +u32 val =SMCCC_RET_NOT_SUPPORTED ;u32 feature;switch (func_id) {
@@ -415,7 +415,21 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)switch (feature) {case ARM_SMCCC_ARCH_WORKAROUND_1 :if (kvm_arm_harden_branch_predictor ()) - val =0 ; + val =SMCCC_RET_SUCCESS ; +break ; +case ARM_SMCCC_ARCH_WORKAROUND_2 : +switch (kvm_arm_have_ssbd ()) { +case KVM_SSBD_FORCE_DISABLE : +case KVM_SSBD_UNKNOWN : +break ; +case KVM_SSBD_KERNEL : + val =SMCCC_RET_SUCCESS ; +break ; +case KVM_SSBD_FORCE_ENABLE : +case KVM_SSBD_MITIGATED : + val =SMCCC_RET_NOT_REQUIRED ; +break ; + }break ; }break ;
arch/arm64/Kconfig +9 -0
@@ -776,6 +776,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 +23 -4
@@ -239,14 +239,33 @@ lr .req x30 // link register .endm /* + * @dst: Result of per_cpu(sym, smp_processor_id()) * @sym: The name of the per-cpu variable - * @reg: Result of per_cpu(sym, smp_processor_id()) * @tmp: scratch register */ - .macro this_cpu_ptr, sym, reg, tmp - adr_l \reg, \sym + .macro adr_this_cpu, dst, sym, tmp + adr_l \dst, \sym +alternative_if_not ARM64_HAS_VIRT_HOST_EXTN mrs \tmp, tpidr_el1 - add \reg, \reg, \tmp +alternative_else + mrs \tmp, tpidr_el2 +alternative_endif + add \dst, \dst, \tmp + .endm + + /* + * @dst: Result of READ_ONCE(per_cpu(sym, smp_processor_id())) + * @sym: The name of the per-cpu variable + * @tmp: scratch 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
@@ -36,7 +36,8 @@#define ARM64_MISMATCHED_CACHE_LINE_SIZE 15#define ARM64_UNMAP_KERNEL_AT_EL0 16#define ARM64_HARDEN_BRANCH_PREDICTOR 17 +#define ARM64_SSBD 18 -#define ARM64_NCAPS 18 +#define ARM64_NCAPS 19#endif /* __ASM_CPUCAPS_H */
arch/arm64/include/asm/cpufeature.h +22 -0
@@ -221,6 +221,28 @@ static inline bool system_supports_mixed_endian_el0(void)return id_aa64mmfr0_mixed_endian_el0 (read_system_reg (SYS_ID_AA64MMFR0_EL1 )); } +#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 +10 -2
@@ -16,9 +16,14 @@#ifndef __ASM_PERCPU_H#define __ASM_PERCPU_H +#include <asm/alternative.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 )
@@ -29,7 +34,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
@@ -122,6 +122,7 @@ static inline struct thread_info *current_thread_info(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
@@ -50,6 +50,7 @@ arm64-obj-$(CONFIG_RANDOMIZE_BASE) += kaslr.o arm64-obj-$(CONFIG_HIBERNATION) += hibernate.o hibernate-asm.o arm64-obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o \ cpu-reset.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 +38 -16
100 lines not on this page · raw message
arch/arm64/kernel/asm-offsets.c +2 -0
@@ -127,11 +127,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
@@ -829,6 +829,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" ,
@@ -895,6 +911,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 +31 -1
@@ -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>
@@ -95,6 +96,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, #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
@@ -122,6 +142,14 @@ alternative_else_nop_endif ldr x19, [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
@@ -190,6 +218,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 msr spsr_el1, x22
@@ -243,7 +273,7 @@ alternative_insn eret, nop, ARM64_UNMAP_KERNEL_AT_EL0 cmp x25, tsk b.ne 9998f - this_cpu_ptr irq_stack, x25, x26 + adr_this_cpu x25, irq_stack, x26 mov x26, #IRQ_STACK_START_SP add x26, x25, x26
arch/arm64/kernel/hibernate.c +11 -0
@@ -308,6 +308,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
@@ -67,6 +67,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
@@ -118,6 +118,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
@@ -135,6 +135,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, cpu_vtimer_irq); }
arch/mips/kernel/process.c +30 -15
64 lines not on this page · raw message
arch/x86/include/asm/asm.h +59 -0
65 lines not on this page · raw message
arch/x86/include/asm/irqflags.h +1 -1
@@ -12,7 +12,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
@@ -56,6 +56,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)
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/crypto/amcc/crypto4xx_core.c +11 -12
@@ -208,7 +208,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,
@@ -241,13 +241,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,
@@ -417,12 +419,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,
@@ -1034,12 +1036,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/mtd/devices/m25p80.c +2 -1
@@ -172,7 +172,8 @@ static ssize_t m25p80_read(struct spi_nor *nor, loff_t from, size_t len, t[1 ].rx_buf = buf; t[1 ].rx_nbits =m25p80_rx_nbits (nor); - t[1 ].len =min (len,spi_max_transfer_size (spi)); + t[1 ].len =min3 (len,spi_max_transfer_size (spi), +spi_max_message_size (spi) - t[0 ].len);spi_message_add_tail (&t[1 ], &m); ret =spi_sync (spi, &m);
drivers/net/ethernet/broadcom/bcm63xx_enet.c +25 -9
@@ -1063,7 +1063,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);
@@ -1790,7 +1791,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 ;
@@ -1822,9 +1825,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 */
@@ -1915,13 +1920,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);
@@ -2766,7 +2774,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 ;
@@ -2787,7 +2797,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);
@@ -2796,6 +2806,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);
@@ -2827,6 +2840,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/chelsio/cxgb3/cxgb3_main.c +2 -0
@@ -50,6 +50,7 @@#include <linux/stringify.h> #include <linux/sched.h> #include <linux/slab.h> +#include <linux/nospec.h> #include <asm/uaccess.h> #include "common.h"
@@ -2259,6 +2260,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/mellanox/mlx5/core/cmd.c +4 -4
@@ -784,6 +784,7 @@ static void cmd_work_handler(struct work_struct *work)struct semaphore *sem;unsigned long flags;int alloc_ret; +int cmd_mode; sem = ent->page_queue ? &cmd->pages_sem : &cmd->sem;down (sem);
@@ -830,6 +831,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);
@@ -854,7 +856,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 ) { +if (cmd_mode ==CMD_MODE_POLLING ) {poll_timeout (ent);/* make sure we read the descriptor after ownership is SW */ rmb ();
@@ -1256,7 +1258,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;
@@ -1271,8 +1273,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/port.c +2 -2
@@ -575,7 +575,7 @@ EXPORT_SYMBOL_GPL(mlx5_set_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 -ENOTSUPP ;
@@ -587,7 +587,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 -ENOTSUPP ;
drivers/net/ethernet/qlogic/qed/qed_dcbx.c +4 -4
@@ -677,9 +677,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
@@ -692,9 +692,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_main.c +9 -0
@@ -23,6 +23,7 @@#include <linux/vmalloc.h> #include <linux/qed/qed_if.h> #include <linux/qed/qed_ll2_if.h> +#include <linux/crash_dump.h> #include "qed.h" #include "qed_sriov.h"
@@ -701,6 +702,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/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);
@@ -1754,7 +1756,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 );
@@ -2972,8 +2974,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/ipvlan/ipvlan_main.c +2 -1
@@ -525,7 +525,8 @@ static 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);/* TODO Probably put random address here to be presented to the
drivers/net/usb/lan78xx.c +4 -1
@@ -2964,6 +2964,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) {
@@ -2972,7 +2973,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; }
@@ -2981,6 +2983,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
@@ -946,6 +946,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
@@ -3327,7 +3327,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/wireless/realtek/rtlwifi/core.c +0 -1
@@ -131,7 +131,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); }
drivers/vhost/net.c +2 -1
@@ -1052,7 +1052,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/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) {
@@ -2120,7 +2133,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);
@@ -2146,12 +2159,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 )
@@ -2416,9 +2426,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
143 lines not on this page · raw message
fs/reiserfs/prints.c +81 -60
219 lines not on this page · raw message
include/linux/arm-smccc.h +10 -0
@@ -80,6 +80,11 @@ ARM_SMCCC_SMC_32, \ 0, 0x8000) +#define ARM_SMCCC_ARCH_WORKAROUND_2 \ + ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ + ARM_SMCCC_SMC_32, \ + 0, 0x7fff) +#ifndef __ASSEMBLY__#include <linux/linkage.h>
@@ -291,5 +296,10 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,*/ #define arm_smccc_1_1_hvc (...) __arm_smccc_1_1(SMCCC_HVC_INST, __VA_ARGS__) +/* Return codes defined in ARM DEN 0070A */ +#define SMCCC_RET_SUCCESS 0 +#define SMCCC_RET_NOT_SUPPORTED -1 +#define SMCCC_RET_NOT_REQUIRED -2 +#endif /*__ASSEMBLY__*/ #endif /*__LINUX_ARM_SMCCC_H*/
include/linux/compiler-gcc.h +27 -8
@@ -64,22 +64,41 @@#define __must_be_array (a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))#endif +/* +* Feature detection for gnu_inline (gnu89 extern inline semantics). Either +* __GNUC_STDC_INLINE__ is defined (not using gnu89 extern inline semantics, +* and we opt in to the gnu89 semantics), or __GNUC_STDC_INLINE__ is not +* defined so the gnu89 semantics are the default. +*/ +#ifdef __GNUC_STDC_INLINE__ +# define __gnu_inline __attribute__((gnu_inline)) +#else +# define __gnu_inline +#endif +/* * Force always-inline if the user requests it so via the .config, -* or if gcc is too old: +* or if gcc is too old. +* GCC does not warn about unused static inline functions for +* -Wunused-function. This turns out to avoid the need for complex #ifdef +* directives. Suppress the warning in clang as well by using "unused" +* function attribute, which is redundant but not harmful for gcc. +* Prefer gnu_inline, so that extern inline functions do not emit an +* externally visible function. This makes extern inline behave as per gnu89 +* semantics rather than c99. This prevents multiple symbol definition errors +* of extern inline functions at link time. +* A lot of inline functions can cause havoc with function tracing. */ #if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING ) || \ !defined(CONFIG_OPTIMIZE_INLINING ) || (__GNUC__ <4 ) -#define inline inline __attribute__((always_inline)) notrace -#define __inline__ __inline__ __attribute__((always_inline)) notrace -#define __inline __inline __attribute__((always_inline)) notrace +#define inline \ + inline __attribute__((always_inline, unused)) notrace __gnu_inline#else -/* A lot of inline functions can cause havoc with function tracing */ -#define inline inline notrace -#define __inline__ __inline__ notrace -#define __inline __inline notrace +#define inline inline __attribute__((unused)) notrace __gnu_inline#endif +#define __inline__ inline +#define __inline inline#define __always_inline inline __attribute__((always_inline))#define noinline __attribute__((noinline))
include/linux/string.h +1 -1
@@ -27,7 +27,7 @@ extern char * strncpy(char *,const char *, __kernel_size_t);size_t strlcpy (char *,const char *,size_t );#endif #ifndef __HAVE_ARCH_STRSCPY -ssize_t __must_check strscpy (char *,const char *,size_t ); +ssize_t strscpy (char *,const char *,size_t );#endif #ifndef __HAVE_ARCH_STRCATextern char *strcat (char *,const char *);
net/bridge/netfilter/ebtables.c +13 -0
@@ -406,6 +406,12 @@ ebt_check_watcher(struct ebt_entry_watcher *w, struct xt_tgchk_param *par, watcher =xt_request_find_target (NFPROTO_BRIDGE , w->u.name,0 );if (IS_ERR (watcher))return PTR_ERR (watcher); + +if (watcher->family !=NFPROTO_BRIDGE ) { +module_put (watcher->me); +return -ENOENT ; + } + w->u.watcher = watcher; par->target = watcher;
@@ -727,6 +733,13 @@ ebt_check_entry(struct ebt_entry *e, struct net *net, goto cleanup_watchers; } +/* Reject UNSPEC, xtables verdicts/return values are incompatible */ +if (target->family !=NFPROTO_BRIDGE ) { +module_put (target->me); + ret = -ENOENT ; + goto cleanup_watchers; + } + t->u.target = target;if (t->u.target == &ebt_standard_target) {if (gap <sizeof (struct ebt_standard_target )) {
net/dccp/ccids/ccid3.c +9 -7
@@ -599,7 +599,7 @@ static void ccid3_hc_rx_send_feedback(struct sock *sk, {struct ccid3_hc_rx_sock *hc =ccid3_hc_rx_sk (sk);struct dccp_sock *dp =dccp_sk (sk); -ktime_t now =ktime_get_real (); +ktime_t now =ktime_get ();s64 delta =0 ;switch (fbtype) {
@@ -624,15 +624,14 @@ static void ccid3_hc_rx_send_feedback(struct sock *sk,case CCID3_FBACK_PERIODIC : delta =ktime_us_delta (now, hc->rx_tstamp_last_feedback);if (delta <=0 ) -DCCP_BUG ("delta (%ld) <= 0" , (long )delta); -else - hc->rx_x_recv =scaled_div32 (hc->rx_bytes_recv, delta); + delta =1 ; + hc->rx_x_recv =scaled_div32 (hc->rx_bytes_recv, delta);break ;default :return ; } -ccid3_pr_debug ("Interval %ldusec, X_recv=%u, 1/p=%u\n" , (long )delta, +ccid3_pr_debug ("Interval %lldusec, X_recv=%u, 1/p=%u\n" , delta, hc->rx_x_recv, hc->rx_pinv); hc->rx_tstamp_last_feedback = now;
@@ -679,7 +678,8 @@ static int ccid3_hc_rx_insert_options(struct sock *sk, struct sk_buff *skb)static u32 ccid3_first_li (struct sock *sk) {struct ccid3_hc_rx_sock *hc =ccid3_hc_rx_sk (sk); -u32 x_recv, p, delta; +u32 x_recv, p; +s64 delta;u64 fval;if (hc->rx_rtt ==0 ) {
@@ -687,7 +687,9 @@ static u32 ccid3_first_li(struct sock *sk) hc->rx_rtt =DCCP_FALLBACK_RTT ; } - delta =ktime_to_us (net_timedelta (hc->rx_tstamp_last_feedback)); + delta =ktime_us_delta (ktime_get (), hc->rx_tstamp_last_feedback); +if (delta <=0 ) + delta =1 ; x_recv =scaled_div32 (hc->rx_bytes_recv, delta);if (x_recv ==0 ) {/* would also trigger divide-by-zero */ DCCP_WARN ("X_recv==0\n" );
net/dns_resolver/dns_key.c +16 -12
@@ -87,35 +87,39 @@ dns_resolver_preparse(struct key_preparsed_payload *prep) opt++;kdebug ("options: '%s'" , opt); do { + int opt_len, opt_nlen; const char *eq; - int opt_len, opt_nlen, opt_vlen, tmp; + char optval[128]; next_opt = memchr(opt, '#', end - opt) ?: end; opt_len = next_opt - opt; - if (opt_len <= 0 || opt_len > 128) { + if (opt_len <= 0 || opt_len > sizeof(optval)) { pr_warn_ratelimited("Invalid option length (%d) for dns_resolver key\n", opt_len); return -EINVAL; } - eq = memchr(opt, '=', opt_len) ?: end; - opt_nlen = eq - opt; - eq++; - opt_vlen = next_opt - eq; /* will be -1 if no value */ + eq = memchr(opt, '=', opt_len); + if (eq) { + opt_nlen = eq - opt; + eq++; + memcpy(optval, eq, next_opt - eq); + optval[next_opt - eq] = '\0'; + } else { + opt_nlen = opt_len; + optval[0] = '\0'; + } - tmp = opt_vlen >= 0 ? opt_vlen : 0; - kdebug("option '%*.*s' val '%*.*s'", - opt_nlen, opt_nlen, opt, tmp, tmp, eq); + kdebug("option '%*.*s' val '%s'", + opt_nlen, opt_nlen, opt, optval); /* see if it's an error number representing a DNS error * that's to be recorded as the result in this key */ if (opt_nlen == sizeof(DNS_ERRORNO_OPTION) - 1 && memcmp(opt, DNS_ERRORNO_OPTION, opt_nlen) == 0) { kdebug("dns error number option"); - if (opt_vlen <= 0) - goto bad_option_value; - ret = kstrtoul(eq, 10, &derrno); + ret = kstrtoul(optval, 10, &derrno); if (ret < 0) goto bad_option_value;
net/ipv4/sysctl_net_ipv4.c +13 -5
@@ -212,8 +212,9 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write, {struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH *2 +10 ) };struct tcp_fastopen_context *ctxt; -int ret;u32 user_key[4 ];/* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */ +__le32 key[4 ]; +int ret, i; tbl.data =kmalloc (tbl.maxlen,GFP_KERNEL );if (!tbl.data)
@@ -222,11 +223,14 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,rcu_read_lock (); ctxt =rcu_dereference (tcp_fastopen_ctx);if (ctxt) -memcpy (user_key, ctxt->key,TCP_FASTOPEN_KEY_LENGTH ); +memcpy (key, ctxt->key,TCP_FASTOPEN_KEY_LENGTH );else -memset (user_key,0 ,sizeof (user_key)); +memset (key,0 ,sizeof (key));rcu_read_unlock (); +for (i =0 ; i <ARRAY_SIZE (key); i++) + user_key[i] =le32_to_cpu (key[i]); +snprintf (tbl.data, tbl.maxlen,"%08x-%08x-%08x-%08x" , user_key[0 ], user_key[1 ], user_key[2 ], user_key[3 ]); ret =proc_dostring (&tbl, write, buffer, lenp, ppos);
@@ -242,12 +246,16 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,* first invocation of tcp_fastopen_cookie_gen */ tcp_fastopen_init_key_once (false); -tcp_fastopen_reset_cipher (user_key,TCP_FASTOPEN_KEY_LENGTH ); + +for (i =0 ; i <ARRAY_SIZE (user_key); i++) + key[i] =cpu_to_le32 (user_key[i]); + +tcp_fastopen_reset_cipher (key,TCP_FASTOPEN_KEY_LENGTH ); } bad_key:pr_debug ("proc FO key set 0x%x-%x-%x-%x <- 0x%s: %u\n" , - user_key[0 ], user_key[1 ], user_key[2 ], user_key[3 ], + user_key[0 ], user_key[1 ], user_key[2 ], user_key[3 ], (char *)tbl.data, ret);kfree (tbl.data);return ret;
net/ipv4/tcp_input.c +9 -0
@@ -3236,6 +3236,15 @@ static int tcp_clean_rtx_queue(struct sock *sk, int prior_fackets,if (tcp_is_reno (tp)) {tcp_remove_reno_sacks (sk, pkts_acked); + +/* If any of the cumulatively ACKed segments was +* retransmitted, non-SACK case cannot confirm that +* progress was due to original transmission due to +* lack of TCPCB_SACKED_ACKED bits even if some of +* the packets may have been never retransmitted. +*/ +if (flag &FLAG_RETRANS_DATA_ACKED ) + flag &= ~FLAG_ORIG_SACK_ACKED ; }else {int delta;
net/ipv6/netfilter/nf_conntrack_reasm.c +2 -0
@@ -618,6 +618,8 @@ int nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user) fq->q.meat == fq->q.len && nf_ct_frag6_reasm(fq, skb, dev)) ret =0 ; + else +skb_dst_drop (skb ); out_unlock:spin_unlock_bh (&fq->q.lock);
net/nfc/llcp_commands.c +6 -3
@@ -753,11 +753,14 @@ int nfc_llcp_send_ui_frame(struct nfc_llcp_sock *sock, u8 ssap, u8 dsap,pr_debug ("Fragment %zd bytes remaining %zd" , frag_len, remaining_len); - pdu =nfc_alloc_send_skb (sock->dev, &sock->sk,MSG_DONTWAIT , + pdu =nfc_alloc_send_skb (sock->dev, &sock->sk,0 , frag_len +LLCP_HEADER_SIZE , &err);if (pdu ==NULL ) { -pr_err ("Could not allocate PDU\n" ); -continue ; +pr_err ("Could not allocate PDU (error=%d)\n" , err); + len -= remaining_len; +if (len ==0 ) + len = err; +break ; } pdu =llcp_add_header (pdu, dsap, ssap,LLCP_PDU_UI );
net/packet/af_packet.c +6 -8
@@ -2265,6 +2265,12 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev,if (po->stats.stats1.tp_drops) status |=TP_STATUS_LOSING ; } + +if (do_vnet && +__packet_rcv_vnet (skb, h.raw + macoff - +sizeof (struct virtio_net_hdr ))) + goto drop_n_account; + po->stats.stats1.tp_packets++;if (copy_skb) { status |=TP_STATUS_COPY ;
@@ -2272,14 +2278,6 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, }spin_unlock (&sk->sk_receive_queue.lock); -if (do_vnet) { -if (__packet_rcv_vnet (skb, h.raw + macoff - -sizeof (struct virtio_net_hdr ))) { -spin_lock (&sk->sk_receive_queue.lock); - goto drop_n_account; - } - } -skb_copy_bits (skb,0 , h.raw + macoff, snaplen);if (!(ts_status =tpacket_get_timestamp (skb, &ts, po->tp_tstamp)))
net/rds/loop.c +1 -0
@@ -193,4 +193,5 @@ struct rds_transport rds_loop_transport = { .inc_copy_to_user = rds_message_inc_copy_to_user, .inc_free = rds_loop_inc_free, .t_name = "loopback", + .t_type = RDS_TRANS_LOOP, };
net/rds/rds.h +5 -0
@@ -440,6 +440,11 @@ struct rds_notifier {int n_status; }; +/* Available as part of RDS core, so doesn't need to participate +* in get_preferred transport etc +*/ +#define RDS_TRANS_LOOP 3 +/** * struct rds_transport - transport specific behavioural hooks *
net/rds/recv.c +5 -0
@@ -94,6 +94,11 @@ static void rds_recv_rcvbuf_delta(struct rds_sock *rs, struct sock *sk,return ; rs->rs_rcv_bytes += delta; + +/* loop transport doesn't send/recv congestion updates */ +if (rs->rs_transport->t_type ==RDS_TRANS_LOOP ) +return ; + now_congested = rs->rs_rcv_bytes >rds_sk_rcvbuf (rs); rdsdebug("rs %p (%pI4:%u) recv bytes %d buf %d "
net/sched/sch_blackhole.c +1 -1
@@ -21,7 +21,7 @@ static int blackhole_enqueue(struct sk_buff *skb, struct Qdisc *sch, struct sk_buff **to_free) {qdisc_drop (skb, sch, to_free); -return NET_XMIT_SUCCESS ; +return NET_XMIT_SUCCESS | __NET_XMIT_BYPASS; }static struct sk_buff *blackhole_dequeue (struct Qdisc *sch)
virt/kvm/arm/hyp/vgic-v2-sr.c +1 -1
@@ -203,7 +203,7 @@ int __hyp_text __vgic_v2_perform_cpuif_access(struct kvm_vcpu *vcpu)return -1 ; rd =kvm_vcpu_dabt_get_rd (vcpu); - addr =kern_hyp_va ((kern_hyp_va (&kvm_vgic_global_state))->vcpu_base_va); + addr =kern_hyp_va (hyp_symbol_addr (kvm_vgic_global_state)->vcpu_base_va); addr += fault_ipa - vgic->vgic_cpu_base;if (kvm_vcpu_dabt_iswrite (vcpu)) {