Linux 4.12.6
Greg KH
maintainerI'm announcing the release of the 4.12.6 kernel.
All users of the 4.12 kernel series must upgrade.
The updated 4.12.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.12.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/boot/dts/armada-388-gp.dts | 4 arch/arm/boot/dts/tango4-vantage-1172.dts | 2 arch/arm/mach-mvebu/platsmp.c | 2 arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 arch/mips/include/asm/mach-ralink/ralink_regs.h | 2 arch/parisc/include/asm/thread_info.h | 2 arch/parisc/kernel/cache.c | 5 arch/parisc/kernel/irq.c | 2 arch/powerpc/kernel/irq.c | 15 + arch/powerpc/kernel/ptrace.c | 13 arch/sparc/include/asm/mmu_context_64.h | 14 - arch/sparc/include/asm/trap_block.h | 1 arch/sparc/kernel/smp_64.c | 185 ++++++++----- arch/sparc/kernel/sun4v_ivec.S | 15 + arch/sparc/kernel/traps_64.c | 1 arch/sparc/kernel/tsb.S | 12 arch/sparc/lib/U3memcpy.S | 4 arch/sparc/mm/init_64.c | 25 + arch/sparc/power/hibernate.c | 3 arch/x86/kernel/kvm.c | 6 block/blk-core.c | 4 block/blk-mq-cpumap.c | 5 block/blk-mq.c | 120 -------- block/blk-mq.h | 5 drivers/acpi/acpi_lpss.c | 14 + drivers/ata/libata-scsi.c | 6 drivers/clk/sunxi-ng/ccu-sun5i.c | 2 drivers/gpio/gpiolib.c | 9 drivers/gpu/drm/amd/amdgpu/clearstate_gfx9.h | 41 +- drivers/gpu/drm/amd/amdgpu/si.c | 2 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 9 drivers/iommu/amd_iommu.c | 1 drivers/media/pci/saa7164/saa7164-bus.c | 13 drivers/media/platform/davinci/vpfe_capture.c | 22 - drivers/media/rc/ir-lirc-codec.c | 2 drivers/media/rc/ir-spi.c | 9 drivers/media/usb/pulse8-cec/pulse8-cec.c | 2 drivers/mmc/core/host.c | 72 ++--- drivers/mmc/host/dw_mmc.c | 24 - drivers/mmc/host/sdhci-of-at91.c | 35 ++ drivers/net/bonding/bond_main.c | 4 drivers/net/dsa/b53/b53_common.c | 1 drivers/net/dsa/mv88e6xxx/chip.c | 1 drivers/net/ethernet/aurora/nb8800.c | 9 drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 25 + drivers/net/ethernet/mellanox/mlx5/core/en.h | 10 drivers/net/ethernet/mellanox/mlx5/core/en_clock.c | 222 +++++++++++----- drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 4 drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 drivers/net/ethernet/mellanox/mlx5/core/eq.c | 2 drivers/net/ethernet/mellanox/mlx5/core/ipoib.c | 16 - drivers/net/ethernet/mellanox/mlx5/core/lag.c | 25 - drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h | 5 drivers/net/irda/mcs7780.c | 16 - drivers/net/phy/phy.c | 3 drivers/net/virtio_net.c | 5 drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 5 drivers/net/wireless/intel/iwlwifi/dvm/tx.c | 2 drivers/scsi/Kconfig | 2 drivers/target/target_core_user.c | 16 - fs/btrfs/extent-tree.c | 4 fs/ext4/acl.c | 25 + fs/ext4/file.c | 3 fs/ext4/resize.c | 3 fs/nfs/nfs4proc.c | 11 fs/nfs/nfs4xdr.c | 2 fs/ocfs2/acl.c | 24 - fs/userfaultfd.c | 5 include/linux/cpuhotplug.h | 1 include/linux/cpuset.h | 19 + include/linux/mlx5/mlx5_ifc.h | 10 include/linux/mm_types.h | 4 include/linux/nfs_xdr.h | 2 include/linux/workqueue.h | 4 include/net/sctp/sctp.h | 4 include/net/udp.h | 1 include/sound/soc.h | 6 kernel/cgroup/cgroup-internal.h | 3 kernel/cgroup/cgroup.c | 66 ++-- kernel/cgroup/cpuset.c | 1 kernel/time/timer.c | 2 kernel/workqueue.c | 23 + mm/hugetlb.c | 9 mm/internal.h | 5 mm/madvise.c | 1 mm/memory.c | 1 mm/mprotect.c | 1 mm/mremap.c | 8 mm/rmap.c | 36 ++ net/core/dev_ioctl.c | 3 net/core/rtnetlink.c | 4 net/dccp/feat.c | 7 net/dccp/ipv4.c | 1 net/dccp/ipv6.c | 1 net/ipv4/fib_frontend.c | 9 net/ipv4/fib_semantics.c | 2 net/ipv4/syncookies.c | 1 net/ipv4/tcp_bbr.c | 49 ++- net/ipv4/udp.c | 3 net/ipv6/ip6_output.c | 4 net/ipv6/output_core.c | 8 net/ipv6/syncookies.c | 1 net/ipv6/udp.c | 27 + net/openvswitch/conntrack.c | 7 net/packet/af_packet.c | 2 net/sctp/sm_make_chunk.c | 4 sound/pci/hda/patch_realtek.c | 1 sound/soc/soc-core.c | 25 - sound/soc/soc-pcm.c | 36 -- sound/soc/ux500/mop500.c | 4 virt/kvm/arm/mmu.c | 4 112 files changed, 949 insertions(+), 626 deletions(-)
Alex Deucher (1):
drm/amdgpu: fix header on gfx9 clear state
Alex Vesker (1):
net/mlx5e: IPoIB, Modify add/remove underlay QPN flows
Alexander Potapenko (2):
ipv4: ipv6: initialize treq->txhash in cookie_v[46]_check()
sctp: don't dereference ptr before leaving _sctp_walk_{params, errors}()
Anton Blanchard (1):
ir-spi: Fix issues with lirc API
Arend Van Spriel (1):
brcmfmac: fix memleak due to calling brcmf_sdiod_sgtable_alloc() twice
Arnd Bergmann (1):
scsi: lpfc: fix linking against modular NVMe support
Aviv Heller (1):
net/mlx5: Consider tx_enabled in all modes on remap
Banajit Goswami (1):
ASoC: do not close shared backend dailink
Bartosz Golaszewski (1):
gpiolib: skip unwanted events, don't convert them to opposite edge
Christoph Hellwig (3):
blk-mq: Include all present CPUs in the default queue mapping
blk-mq: Create hctx for each present CPU
block: disable runtime-pm for blk-mq
Dan Carpenter (1):
libata: array underflow in ata_find_dev()
Daniel Jordan (1):
mm/hugetlb.c: __get_user_pages ignores certain follow_hugetlb_page errors
David Ahern (1):
Revert "rtnetlink: Do not generate notifications for CHANGEADDR event"
David S. Miller (2):
net: Zero terminate ifr_name in dev_ifname().
sparc64: Fix exception handling in UltraSPARC-III memcpy.
David Woods (2):
mmc: core: Use device_property_read instead of of_property_read
mmc: dw_mmc: Use device_property_read instead of of_property_read
Dima Zavin (1):
cpuset: fix a deadlock due to incomplete patching of cpusets_enabled()
Emmanuel Grumbach (1):
iwlwifi: dvm: prevent an out of bounds access
Ernesto A. Fernández (1):
ext4: preserve i_mode if __ext4_set_acl() fails
Eugenia Emantayev (7):
net/mlx5: Fix mlx5_ifc_mtpps_reg_bits structure size net/mlx5e: Add field select to MTPPS register
net/mlx5e: Fix broken disable 1PPS flow
net/mlx5e: Change 1PPS out scheme
net/mlx5e: Add missing support for PTP_CLK_REQ_PPS request net/mlx5e: Fix wrong delay calculation for overflow check scheduling net/mlx5e: Schedule overflow check work to mlx5e workqueue
Florian Fainelli (2):
net: dsa: b53: Add missing ARL entries for BCM53125
net: phy: Correctly process PHY_HALTED in phy_stop_machine()
Greg Kroah-Hartman (1):
Linux 4.12.6
Gregory CLEMENT (3):
ARM64: dts: marvell: armada-37xx: Fix the number of GPIO on south bridge
ARM: mvebu: use __pa_symbol in the mv98dx3236 platform SMP code
ARM: dts: armada-38x: Fix irq type for pca955
Gustavo Romero (1):
powerpc/tm: Fix saving of TM SPRs in core dump
Hans Verkuil (1):
media: pulse8-cec: persistent_config should be off by default
Hans de Goede (1):
ACPI / LPSS: Only call pwm_add_table() for the first PWM controller
Harvey Hunt (1):
MIPS: ralink: Fix build error due to missing header
Helge Deller (1):
parisc: Increase thread and stack size to 32kb
Ido Schimmel (1):
ipv4: fib: Fix NULL pointer deref during fib_sync_down_dev()
Ilan Tayari (1):
net/mlx5e: Fix outer_header_zero() check size
Jan Kara (3):
ocfs2: don't clear SGID when inheriting ACLs
ext4: fix SEEK_HOLE/SEEK_DATA for blocksize < pagesize
ext4: Don't clear SGID when inheriting ACLs
Jane Chu (1):
sparc64: Measure receiver forward progress to avoid send mondo timeout
Jean Delvare (1):
drm/amdgpu: Fix undue fallthroughs in golden registers initialization
Jerry Lee (1):
ext4: fix overflow caused by missing cast in ext4_resize_fs()
Johan Hovold (2):
ASoC: fix pcm-creation regression
ASoC: ux500: Restore platform DAI assignments
John David Anglin (1):
parisc: Handle vma's whose context is not current in flush_cache_range
Kosuke Tatsukawa (1):
net: bonding: Fix transmit load balancing in balance-alb mode
Levin, Alexander (1):
wireless: wext: terminate ifr name coming from userspace
Liping Zhang (1):
openvswitch: fix potential out of bound access in parse_ct
Ludovic Desroches (1):
mmc: sdhci-of-at91: force card detect value for non removable devices
Mahesh Bandewar (1):
ipv4: initialize fib_trie prior to register_netdev_notifier call.
Marc Gonzalez (2):
ARM: dts: tango4: Request RGMII RX and TX clock delays
net: ethernet: nb8800: Handle all 4 RGMII modes identically
Martin Hundebøll (1):
net: dsa: mv88e6xxx: Enable CMODE config support for 6390X
Matija Glavinic Pecotic (1):
timers: Fix overflow in get_next_timer_interrupt
Maxime Ripard (1):
clk: sunxi-ng: sun5i: Add clk_set_rate_parent to the CPU clock
Mel Gorman (1):
mm, mprotect: flush TLB if potentially racing with a parallel reclaim leaving stale TLB entries
Michael S. Tsirkin (1):
virtio_net: fix truesize for mergeable buffers
Mike Rapoport (3):
userfaultfd: non-cooperative: notify about unmap of destination during mremap
userfaultfd_zeropage: return -ENOSPC in case mm has gone
userfaultfd: non-cooperative: flush event_wqh at release time
Moshe Shemesh (2):
net/mlx5: Fix command completion after timeout access invalid structure net/mlx5: Fix command bad flow on command entry allocation failure
Neal Cardwell (5):
tcp_bbr: cut pacing rate only if filled pipe
tcp_bbr: introduce bbr_bw_to_pacing_rate() helper
tcp_bbr: introduce bbr_init_pacing_rate_from_rtt() helper
tcp_bbr: remove sk_pacing_rate=0 transient during init
tcp_bbr: init pacing rate on first RTT sample
Nicholas Piggin (1):
powerpc/64: Fix __check_irq_replay missing decrementer interrupt
Nitin Gupta (1):
sparc64: Register hugepages during arch init
Omar Sandoval (1):
Btrfs: fix early ENOSPC due to delalloc
Paolo Abeni (1):
udp6: fix socket leak on early demux
Paul Blakey (1):
net/mlx5: Fix mlx5_add_flow_rules call with correct num of dests
Prabhakar Lad (1):
media: platform: davinci: return -EINVAL for VPFE_CMD_S_CCDC_RAW_PARAMS ioctl
Rob Gardner (1):
sparc64: Prevent perf from running during super critical sections
Sabrina Dubroca (1):
ipv6: avoid overflow of offset in ip6_find_1stfragopt
Sean Young (1):
media: lirc: LIRC_GET_REC_RESOLUTION should return microseconds
Sergei A. Trusov (1):
ALSA: hda - Fix speaker output from VAIO VPCL14M1R
Sinclair Yeh (1):
drm/vmwgfx: Fix cursor hotspot issue with Wayland on Fedora
Stefano Brivio (1):
ipv6: Don't increase IPSTATS_MIB_FRAGFAILS twice in ip6_fragment()
Steven Toth (1):
saa7164: fix double fetch PCIe access condition
Suravee Suthikulpanit (1):
iommu/amd: Enable ga_log_intr when enabling guest_mode
Suzuki K Poulose (1):
KVM: arm/arm64: Handle hva aging while destroying the vm
Tejun Heo (5):
cgroup: don't call migration methods if there are no tasks to migrate
cgroup: create dfl_root files on subsys registration
cgroup: fix error return value from cgroup_subtree_control()
workqueue: restore WQ_UNBOUND/max_active==1 to be ordered
workqueue: implicit ordered attribute should be overridable
Thomas Jarosch (1):
mcs7780: Fix initialization when CONFIG_VMAP_STACK is enabled
Trond Myklebust (1):
NFSv4: Fix EXCHANGE_ID corrupt verifier issue
WANG Cong (3):
rtnetlink: allocate more memory for dev_set_mac_address()
packet: fix use-after-free in prb_retire_rx_blk_timer_expired()
bonding: commit link status change after propose
Wanpeng Li (1):
KVM: async_pf: make rcu irq exit if not triggered from idle task
Xin Long (5):
sctp: fix an array overflow when all ext chunks are set
dccp: fix a memleak that dccp_ipv6 doesn't put reqsk properly
dccp: fix a memleak that dccp_ipv4 doesn't put reqsk properly
dccp: fix a memleak for dccp_feat_init err process
sctp: fix the check for _sctp_walk_params and _sctp_walk_errors
Xiubo Li (2):
tcmu: Fix flushing cmd entry dcache page
tcmu: Fix possbile memory leak / OOPs when recalculating cmd base size
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 12 -SUBLEVEL = 5 +SUBLEVEL = 6 EXTRAVERSION = NAME = Fearless Coyote
arch/arm/boot/dts/armada-388-gp.dts +2 -2
@@ -75,7 +75,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pca0_pins>; interrupt-parent = <&gpio0>; - interrupts = <18 IRQ_TYPE_EDGE_FALLING>; + interrupts = <18 IRQ_TYPE_LEVEL_LOW>; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -87,7 +87,7 @@ compatible = "nxp,pca9555"; pinctrl-names = "default"; interrupt-parent = <&gpio0>; - interrupts = <18 IRQ_TYPE_EDGE_FALLING>; + interrupts = <18 IRQ_TYPE_LEVEL_LOW>; gpio-controller; #gpio-cells = <2>; interrupt-controller;
arch/arm/boot/dts/tango4-vantage-1172.dts +1 -1
@@ -22,7 +22,7 @@ }; ð0 { - phy-connection-type = "rgmii"; + phy-connection-type = "rgmii-id"; phy-handle = <ð0_phy>; #address-cells = <1>; #size-cells = <0>;
arch/arm/mach-mvebu/platsmp.c +1 -1
@@ -211,7 +211,7 @@ static int mv98dx3236_resume_set_cpu_boot_addr(int hw_cpu, void *boot_addr)return PTR_ERR (base);writel (0 , base +MV98DX3236_CPU_RESUME_CTRL_REG ); -writel (virt_to_phys (boot_addr), base +MV98DX3236_CPU_RESUME_ADDR_REG ); +writel (__pa_symbol (boot_addr), base +MV98DX3236_CPU_RESUME_ADDR_REG );iounmap (base);
arch/arm64/boot/dts/marvell/armada-37xx.dtsi +1 -1
@@ -219,7 +219,7 @@ reg = <0x18800 0x100>, <0x18C00 0x20>; gpiosb: gpio { #gpio-cells = <2>; - gpio-ranges = <&pinctrl_sb 0 0 29>; + gpio-ranges = <&pinctrl_sb 0 0 30>; gpio-controller; interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
arch/mips/include/asm/mach-ralink/ralink_regs.h +2 -0
@@ -13,6 +13,8 @@#ifndef _RALINK_REGS_H_#define _RALINK_REGS_H_ +#include <linux/io.h> +enum ralink_soc_type {RALINK_UNKNOWN =0 , RT2880_SOC,
arch/parisc/include/asm/thread_info.h +1 -1
@@ -34,7 +34,7 @@ struct thread_info {/* thread information allocation */ -#define THREAD_SIZE_ORDER 2/* PA-RISC requires at least 16k stack */ +#define THREAD_SIZE_ORDER 3/* PA-RISC requires at least 32k stack */ /* Be sure to hunt all references to this down when you change the size of * the kernel stack */ #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
arch/parisc/kernel/cache.c +2 -3
@@ -587,13 +587,12 @@ void flush_cache_range(struct vm_area_struct *vma,if (parisc_requires_coherency ())flush_tlb_range (vma, start, end); -if ((end - start) >= parisc_cache_flush_threshold) { +if ((end - start) >= parisc_cache_flush_threshold + || vma->vm_mm->context !=mfsp (3 )) {flush_cache_all ();return ; } -BUG_ON (vma->vm_mm->context !=mfsp (3 )); -flush_user_dcache_range_asm (start, end);if (vma->vm_flags &VM_EXEC )flush_user_icache_range_asm (start, end);
arch/parisc/kernel/irq.c +1 -1
@@ -380,7 +380,7 @@ static inline int eirr_to_irq(unsigned long eirr)/* * IRQ STACK - used for irq handler */ -#define IRQ_STACK_SIZE (4096 << 2)/* 16k irq stack size */ +#define IRQ_STACK_SIZE (4096 << 3)/* 32k irq stack size */ union irq_stack_union {unsigned long stack[IRQ_STACK_SIZE /sizeof (unsigned long )];
arch/powerpc/kernel/irq.c +14 -1
@@ -145,6 +145,19 @@ notrace unsigned int __check_irq_replay(void)/* Clear bit 0 which we wouldn't clear otherwise */ local_paca->irq_happened &= ~PACA_IRQ_HARD_DIS ; +if (happened &PACA_IRQ_HARD_DIS ) { +/* +* We may have missed a decrementer interrupt if hard disabled. +* Check the decrementer register in case we had a rollover +* while hard disabled. +*/ +if (!(happened &PACA_IRQ_DEC )) { +if (decrementer_check_overflow ()) { + local_paca->irq_happened |=PACA_IRQ_DEC ; + happened |=PACA_IRQ_DEC ; + } + } + }/* * Force the delivery of pending soft-disabled interrupts on PS3.
@@ -170,7 +183,7 @@ notrace unsigned int __check_irq_replay(void)* in case we also had a rollover while hard disabled */ local_paca->irq_happened &= ~PACA_IRQ_DEC ; -if ((happened &PACA_IRQ_DEC ) ||decrementer_check_overflow ()) +if (happened &PACA_IRQ_DEC )return 0x900 ;/* Finally check if an external interrupt happened */
arch/powerpc/kernel/ptrace.c +10 -3
@@ -127,12 +127,19 @@ static void flush_tmregs_to_thread(struct task_struct *tsk)* If task is not current, it will have been flushed already to * it's thread_struct during __switch_to(). * -* A reclaim flushes ALL the state. +* A reclaim flushes ALL the state or if not in TM save TM SPRs +* in the appropriate thread structures from live. */ -if (tsk == current &&MSR_TM_SUSPENDED (mfmsr ())) - tm_reclaim_current(TM_CAUSE_SIGNAL); +if (tsk != current) +return ; +if (MSR_TM_SUSPENDED (mfmsr ())) { +tm_reclaim_current (TM_CAUSE_SIGNAL ); + }else { +tm_enable (); +tm_save_sprs (&(tsk->thread)); + } }#else static inline void flush_tmregs_to_thread (struct task_struct *tsk) { }
arch/sparc/include/asm/mmu_context_64.h +9 -5
@@ -27,9 +27,11 @@ void destroy_context(struct mm_struct *mm);void __tsb_context_switch (unsigned long pgd_pa,struct tsb_config *tsb_base,struct tsb_config *tsb_huge, -unsigned long tsb_descr_pa); +unsigned long tsb_descr_pa, +unsigned long secondary_ctx); -static inline void tsb_context_switch (struct mm_struct *mm) +static inline void tsb_context_switch_ctx (struct mm_struct *mm, +unsigned long ctx) { __tsb_context_switch(__pa(mm->pgd), &mm->context.tsb_block[MM_TSB_BASE],
@@ -40,9 +42,12 @@ static inline void tsb_context_switch(struct mm_struct *mm)#else NULL #endif - , __pa(&mm->context.tsb_descr[MM_TSB_BASE])); + ,__pa (&mm->context.tsb_descr[MM_TSB_BASE ]), + ctx); } +#define tsb_context_switch (X ) tsb_context_switch_ctx(X, 0) +void tsb_grow (struct mm_struct *mm,unsigned long tsb_index,unsigned long mm_rss);
@@ -112,8 +117,7 @@ static inline void switch_mm(struct mm_struct *old_mm, struct mm_struct *mm, str* cpu0 to update it's TSB because at that point the cpu_vm_mask * only had cpu1 set in it. */ -load_secondary_context (mm); -tsb_context_switch (mm); +tsb_context_switch_ctx (mm,CTX_HWBITS (mm->context));/* Any time a processor runs a context on an address space * for the first time, we must flush that context out of the
arch/sparc/include/asm/trap_block.h +1 -0
@@ -54,6 +54,7 @@ extern struct trap_per_cpu trap_block[NR_CPUS];void init_cur_cpu_trap (struct thread_info *);void setup_tba (void );extern int ncpus_probed; +extern u64 cpu_mondo_counter[NR_CPUS ];unsigned long real_hard_smp_processor_id (void );
arch/sparc/kernel/smp_64.c +115 -70
231 lines not on this page · raw message
arch/sparc/kernel/sun4v_ivec.S +15 -0
@@ -26,6 +26,21 @@ sun4v_cpu_mondo: ldxa [%g0] ASI_SCRATCHPAD, %g4 sub %g4, TRAP_PER_CPU_FAULT_INFO, %g4 + /* Get smp_processor_id() into %g3 */ + sethi %hi(trap_block), %g5 + or %g5, %lo(trap_block), %g5 + sub %g4, %g5, %g3 + srlx %g3, TRAP_BLOCK_SZ_SHIFT, %g3 + + /* Increment cpu_mondo_counter[smp_processor_id()] */ + sethi %hi(cpu_mondo_counter), %g5 + or %g5, %lo(cpu_mondo_counter), %g5 + sllx %g3, 3, %g3 + add %g5, %g3, %g5 + ldx [%g5], %g3 + add %g3, 1, %g3 + stx %g3, [%g5] + /* Get CPU mondo queue base phys address into %g7. */ ldx [%g4 + TRAP_PER_CPU_CPU_MONDO_PA], %g7
arch/sparc/kernel/traps_64.c +1 -0
@@ -2733,6 +2733,7 @@ void do_getpsr(struct pt_regs *regs) } } +u64 cpu_mondo_counter[NR_CPUS ] = {0 };struct trap_per_cpu trap_block[NR_CPUS ];EXPORT_SYMBOL (trap_block);
arch/sparc/kernel/tsb.S +12 -0
@@ -360,6 +360,7 @@ tsb_flush: * %o1: TSB base config pointer * %o2: TSB huge config pointer, or NULL if none * %o3: Hypervisor TSB descriptor physical address + * %o4: Secondary context to load, if non-zero * * We have to run this whole thing with interrupts * disabled so that the current cpu doesn't change
@@ -372,6 +373,17 @@ __tsb_context_switch: rdpr %pstate, %g1 wrpr %g1, PSTATE_IE, %pstate + brz,pn %o4, 1f + mov SECONDARY_CONTEXT, %o5 + +661: stxa %o4, [%o5] ASI_DMMU + .section .sun4v_1insn_patch, "ax" + .word 661b + stxa %o4, [%o5] ASI_MMU + .previous + flush %g6 + +1: TRAP_LOAD_TRAP_BLOCK(%g2, %g3) stx %o0, [%g2 + TRAP_PER_CPU_PGD_PADDR]
arch/sparc/lib/U3memcpy.S +2 -2
@@ -145,13 +145,13 @@ ENDPROC(U3_retl_o2_plus_GS_plus_0x08) ENTRY(U3_retl_o2_and_7_plus_GS) and %o2, 7, %o2 retl - add %o2, GLOBAL_SPARE, %o2 + add %o2, GLOBAL_SPARE, %o0 ENDPROC(U3_retl_o2_and_7_plus_GS) ENTRY(U3_retl_o2_and_7_plus_GS_plus_8) add GLOBAL_SPARE, 8, GLOBAL_SPARE and %o2, 7, %o2 retl - add %o2, GLOBAL_SPARE, %o2 + add %o2, GLOBAL_SPARE, %o0 ENDPROC(U3_retl_o2_and_7_plus_GS_plus_8) #endif
arch/sparc/mm/init_64.c +24 -1
@@ -325,6 +325,29 @@ static void __update_mmu_tsb_insert(struct mm_struct *mm, unsigned long tsb_inde }#ifdef CONFIG_HUGETLB_PAGE +static void __init add_huge_page_size (unsigned long size) +{ +unsigned int order; + +if (size_to_hstate (size)) +return ; + + order =ilog2 (size) -PAGE_SHIFT ; +hugetlb_add_hstate (order); +} + +static int __init hugetlbpage_init (void ) +{ +add_huge_page_size (1UL <<HPAGE_64K_SHIFT ); +add_huge_page_size (1UL <<HPAGE_SHIFT ); +add_huge_page_size (1UL <<HPAGE_256MB_SHIFT ); +add_huge_page_size (1UL <<HPAGE_2GB_SHIFT ); + +return 0 ; +} + +arch_initcall (hugetlbpage_init); +static int __init setup_hugepagesz (char *string) {unsigned long long hugepage_size;
@@ -364,7 +387,7 @@ static int __init setup_hugepagesz(char *string) goto out; } -hugetlb_add_hstate (hugepage_shift -PAGE_SHIFT ); +add_huge_page_size (hugepage_size); rc =1 ; out:
arch/sparc/power/hibernate.c +1 -2
@@ -35,6 +35,5 @@ void restore_processor_state(void) {struct mm_struct *mm = current->active_mm; -load_secondary_context (mm); -tsb_context_switch (mm); +tsb_context_switch_ctx (mm,CTX_HWBITS (mm->context)); }
arch/x86/kernel/kvm.c +4 -2
@@ -151,6 +151,8 @@ void kvm_async_pf_task_wait(u32 token)if (hlist_unhashed (&n.link))break ; +rcu_irq_exit (); +if (!n.halted) {local_irq_enable ();schedule ();
@@ -159,11 +161,11 @@ void kvm_async_pf_task_wait(u32 token)/* * We cannot reschedule. So halt. */ -rcu_irq_exit ();native_safe_halt ();local_irq_disable (); -rcu_irq_enter (); } + +rcu_irq_enter (); }if (!n.halted)finish_swait (&n.wq, &wait);
block/blk-core.c +4 -0
@@ -3307,6 +3307,10 @@ EXPORT_SYMBOL(blk_finish_plug);*/ void blk_pm_runtime_init (struct request_queue *q,struct device *dev) { +/* not support for RQF_PM and ->rpm_status in blk-mq yet */ +if (q->mq_ops) +return ; + q->dev = dev; q->rpm_status =RPM_ACTIVE ;pm_runtime_set_autosuspend_delay (q->dev,-1 );
block/blk-mq-cpumap.c +2 -3
@@ -35,7 +35,6 @@ int blk_mq_map_queues(struct blk_mq_tag_set *set) {unsigned int *map = set->mq_map;unsigned int nr_queues = set->nr_hw_queues; -const struct cpumask *online_mask = cpu_online_mask;unsigned int i, nr_cpus, nr_uniq_cpus, queue, first_sibling;cpumask_var_t cpus;
@@ -44,7 +43,7 @@ int blk_mq_map_queues(struct blk_mq_tag_set *set)cpumask_clear (cpus); nr_cpus = nr_uniq_cpus =0 ; -for_each_cpu (i, online_mask) { +for_each_present_cpu (i) { nr_cpus++; first_sibling =get_first_sibling (i);if (!cpumask_test_cpu (first_sibling, cpus))
@@ -54,7 +53,7 @@ int blk_mq_map_queues(struct blk_mq_tag_set *set) queue =0 ;for_each_possible_cpu (i) { -if (!cpumask_test_cpu (i, online_mask)) { +if (!cpumask_test_cpu (i, cpu_present_mask)) { map[i] =0 ;continue ; }
block/blk-mq.c +11 -109
190 lines not on this page · raw message
block/blk-mq.h +0 -5
@@ -56,11 +56,6 @@ void __blk_mq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq, bool at_head);void blk_mq_insert_requests (struct blk_mq_hw_ctx *hctx,struct blk_mq_ctx *ctx,struct list_head *list); -/* -* CPU hotplug helpers -*/ -void blk_mq_enable_hotplug (void ); -void blk_mq_disable_hotplug (void );/* * CPU -> queue mappings
drivers/acpi/acpi_lpss.c +14 -0
@@ -85,6 +85,7 @@ static const struct lpss_device_desc lpss_dma_desc = { };struct lpss_private_data { +struct acpi_device *adev;void __iomem *mmio_base;resource_size_t mmio_size;unsigned int fixed_clk_rate;
@@ -155,6 +156,12 @@ static struct pwm_lookup byt_pwm_lookup[] = {static void byt_pwm_setup (struct lpss_private_data *pdata) { +struct acpi_device *adev = pdata->adev; + +/* Only call pwm_add_table for the first PWM controller */ +if (!adev->pnp.unique_id ||strcmp (adev->pnp.unique_id,"1" )) +return ; +if (!acpi_dev_present ("INT33FD" ,NULL ,-1 ))pwm_add_table (byt_pwm_lookup,ARRAY_SIZE (byt_pwm_lookup)); }
@@ -180,6 +187,12 @@ static struct pwm_lookup bsw_pwm_lookup[] = {static void bsw_pwm_setup (struct lpss_private_data *pdata) { +struct acpi_device *adev = pdata->adev; + +/* Only call pwm_add_table for the first PWM controller */ +if (!adev->pnp.unique_id ||strcmp (adev->pnp.unique_id,"1" )) +return ; +pwm_add_table (bsw_pwm_lookup,ARRAY_SIZE (bsw_pwm_lookup)); }
@@ -456,6 +469,7 @@ static int acpi_lpss_create_device(struct acpi_device *adev, goto err_out; } + pdata->adev = adev; pdata->dev_desc = dev_desc;if (dev_desc->setup)
drivers/ata/libata-scsi.c +4 -2
@@ -3028,10 +3028,12 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc)static struct ata_device *ata_find_dev (struct ata_port *ap,int devno) {if (!sata_pmp_attached (ap)) { -if (likely (devno <ata_link_max_devices (&ap->link))) +if (likely (devno >=0 && + devno <ata_link_max_devices (&ap->link)))return &ap->link.device[devno]; }else { -if (likely (devno < ap->nr_pmp_links)) +if (likely (devno >=0 && + devno < ap->nr_pmp_links))return &ap->pmp_link[devno].device[0 ]; }
drivers/clk/sunxi-ng/ccu-sun5i.c +1 -1
@@ -184,7 +184,7 @@ static struct ccu_mux cpu_clk = { .hw.init = CLK_HW_INIT_PARENTS("cpu", cpu_parents, &ccu_mux_ops, - CLK_IS_CRITICAL), + CLK_SET_RATE_PARENT | CLK_IS_CRITICAL), } };
drivers/gpio/gpiolib.c +4 -5
@@ -704,24 +704,23 @@ static irqreturn_t lineevent_irq_thread(int irq, void *p) {struct lineevent_state *le = p;struct gpioevent_data ge; -int ret; +int ret, level; ge.timestamp =ktime_get_real_ns (); + level =gpiod_get_value_cansleep (le->desc);if (le->eflags &GPIOEVENT_REQUEST_RISING_EDGE && le->eflags &GPIOEVENT_REQUEST_FALLING_EDGE ) { -int level =gpiod_get_value_cansleep (le->desc); -if (level)/* Emit low-to-high event */ ge.id =GPIOEVENT_EVENT_RISING_EDGE ;else /* Emit high-to-low event */ ge.id =GPIOEVENT_EVENT_FALLING_EDGE ; - }else if (le->eflags &GPIOEVENT_REQUEST_RISING_EDGE ) { + }else if (le->eflags &GPIOEVENT_REQUEST_RISING_EDGE && level) {/* Emit low-to-high event */ ge.id =GPIOEVENT_EVENT_RISING_EDGE ; - }else if (le->eflags &GPIOEVENT_REQUEST_FALLING_EDGE ) { + }else if (le->eflags &GPIOEVENT_REQUEST_FALLING_EDGE && !level) {/* Emit high-to-low event */ ge.id =GPIOEVENT_EVENT_FALLING_EDGE ; }else {
drivers/gpu/drm/amd/amdgpu/clearstate_gfx9.h +21 -20
45 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/si.c +2 -0
@@ -1385,6 +1385,7 @@ static void si_init_golden_registers(struct amdgpu_device *adev)amdgpu_program_register_sequence (adev, pitcairn_mgcg_cgcg_init, (const u32 )ARRAY_SIZE (pitcairn_mgcg_cgcg_init)); +break ;case CHIP_VERDE : amdgpu_program_register_sequence(adev, verde_golden_registers,
@@ -1409,6 +1410,7 @@ static void si_init_golden_registers(struct amdgpu_device *adev)amdgpu_program_register_sequence (adev, oland_mgcg_cgcg_init, (const u32 )ARRAY_SIZE (oland_mgcg_cgcg_init)); +break ;case CHIP_HAINAN : amdgpu_program_register_sequence(adev, hainan_golden_registers,
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +9 -0
@@ -384,6 +384,12 @@ vmw_du_cursor_plane_atomic_update(struct drm_plane *plane, hotspot_x = du->hotspot_x; hotspot_y = du->hotspot_y; + +if (plane->fb) { + hotspot_x += plane->fb->hot_x; + hotspot_y += plane->fb->hot_y; + } + du->cursor_surface = vps->surf; du->cursor_dmabuf = vps->dmabuf;
@@ -411,6 +417,9 @@ vmw_du_cursor_plane_atomic_update(struct drm_plane *plane,vmw_cursor_update_position (dev_priv, true, du->cursor_x + hotspot_x, du->cursor_y + hotspot_y); + + du->core_hotspot_x = hotspot_x - du->hotspot_x; + du->core_hotspot_y = hotspot_y - du->hotspot_y; }else {DRM_ERROR ("Failed to update cursor image\n" ); }
drivers/iommu/amd_iommu.c +1 -0
@@ -4316,6 +4316,7 @@ static int amd_ir_set_vcpu_affinity(struct irq_data *data, void *vcpu_info)/* Setting */ irte->hi.fields.ga_root_ptr = (pi_data->base >>12 ); irte->hi.fields.vector = vcpu_pi_info->vector; + irte->lo.fields_vapic.ga_log_intr =1 ; irte->lo.fields_vapic.guest_mode =1 ; irte->lo.fields_vapic.ga_tag = pi_data->ga_tag;
drivers/media/pci/saa7164/saa7164-bus.c +1 -12
@@ -389,11 +389,11 @@ int saa7164_bus_get(struct saa7164_dev *dev, struct tmComResInfo* msg, msg_tmp.size =le16_to_cpu ((__force __le16 )msg_tmp.size); msg_tmp.command =le32_to_cpu ((__force __le32 )msg_tmp.command); msg_tmp.controlselector =le16_to_cpu ((__force __le16 )msg_tmp.controlselector); +memcpy (msg, &msg_tmp,sizeof (*msg));/* No need to update the read positions, because this was a peek */ /* If the caller specifically want to peek, return */ if (peekonly) { -memcpy (msg, &msg_tmp,sizeof (*msg)); goto peekout; }
@@ -438,21 +438,15 @@ int saa7164_bus_get(struct saa7164_dev *dev, struct tmComResInfo* msg, space_rem = bus->m_dwSizeGetRing - curr_grp;if (space_rem <sizeof (*msg)) { -/* msg wraps around the ring */ -memcpy_fromio (msg, bus->m_pdwGetRing + curr_grp, space_rem); -memcpy_fromio ((u8 *)msg + space_rem, bus->m_pdwGetRing, -sizeof (*msg) - space_rem);if (buf)memcpy_fromio (buf, bus->m_pdwGetRing +sizeof (*msg) - space_rem, buf_size); }else if (space_rem ==sizeof (*msg)) { -memcpy_fromio (msg, bus->m_pdwGetRing + curr_grp,sizeof (*msg));if (buf)memcpy_fromio (buf, bus->m_pdwGetRing, buf_size); }else {/* Additional data wraps around the ring */ -memcpy_fromio (msg, bus->m_pdwGetRing + curr_grp,sizeof (*msg));if (buf) {memcpy_fromio (buf, bus->m_pdwGetRing + curr_grp +sizeof (*msg), space_rem -sizeof (*msg));
@@ -465,15 +459,10 @@ int saa7164_bus_get(struct saa7164_dev *dev, struct tmComResInfo* msg, }else {/* No wrapping */ -memcpy_fromio (msg, bus->m_pdwGetRing + curr_grp,sizeof (*msg));if (buf)memcpy_fromio (buf, bus->m_pdwGetRing + curr_grp +sizeof (*msg), buf_size); } -/* Convert from little endian to CPU */ - msg->size =le16_to_cpu ((__force __le16 )msg->size); - msg->command =le32_to_cpu ((__force __le32 )msg->command); - msg->controlselector =le16_to_cpu ((__force __le16 )msg->controlselector);/* Update the read positions, adjusting the ring */ saa7164_writel (bus->m_dwGetReadPos, new_grp);
drivers/media/platform/davinci/vpfe_capture.c +2 -20
@@ -1719,27 +1719,9 @@ static long vpfe_param_handler(struct file *file, void *priv,switch (cmd) {case VPFE_CMD_S_CCDC_RAW_PARAMS : + ret = -EINVAL ;v4l2_warn (&vpfe_dev->v4l2_dev, -"VPFE_CMD_S_CCDC_RAW_PARAMS: experimental ioctl\n" ); -if (ccdc_dev->hw_ops.set_params) { - ret = ccdc_dev->hw_ops.set_params (param); -if (ret) { -v4l2_dbg (1 , debug, &vpfe_dev->v4l2_dev, -"Error setting parameters in CCDC\n" ); - goto unlock_out; - } - ret =vpfe_get_ccdc_image_format (vpfe_dev, - &vpfe_dev->fmt); -if (ret <0 ) { -v4l2_dbg (1 , debug, &vpfe_dev->v4l2_dev, -"Invalid image format at CCDC\n" ); - goto unlock_out; - } - }else { - ret = -EINVAL ; -v4l2_dbg (1 , debug, &vpfe_dev->v4l2_dev, -"VPFE_CMD_S_CCDC_RAW_PARAMS not supported\n" ); - } +"VPFE_CMD_S_CCDC_RAW_PARAMS not supported\n" );break ;default : ret = -ENOTTY ;
drivers/media/rc/ir-lirc-codec.c +1 -1
@@ -266,7 +266,7 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,if (!dev->rx_resolution)return -ENOTTY ; - val = dev->rx_resolution; + val = dev->rx_resolution /1000 ;break ;case LIRC_SET_WIDEBAND_RECEIVER :
drivers/media/rc/ir-spi.c +6 -3
@@ -57,10 +57,13 @@ static int ir_spi_tx(struct rc_dev *dev,/* convert the pulse/space signal to raw binary signal */ for (i =0 ; i < count; i++) { +unsigned int periods;int j;u16 val = ((i +1 ) %2 ) ? idata->pulse : idata->space; -if (len + buffer[i] >=IR_SPI_MAX_BUFSIZE ) + periods =DIV_ROUND_CLOSEST (buffer[i] * idata->freq,1000000 ); + +if (len + periods >=IR_SPI_MAX_BUFSIZE )return -EINVAL ;/*
@@ -69,13 +72,13 @@ static int ir_spi_tx(struct rc_dev *dev,* contain a space duration. */ val = (i %2 ) ? idata->space : idata->pulse; -for (j =0 ; j < buffer[i]; j++) +for (j =0 ; j < periods; j++) idata->tx_buf[len++] = val; }memset (&xfer,0 ,sizeof (xfer)); - xfer.speed_hz = idata->freq; + xfer.speed_hz = idata->freq *16 ; xfer.len = len *sizeof (*idata->tx_buf); xfer.tx_buf = idata->tx_buf;
drivers/media/usb/pulse8-cec/pulse8-cec.c +1 -1
@@ -51,7 +51,7 @@ MODULE_DESCRIPTION("Pulse Eight HDMI CEC driver");MODULE_LICENSE ("GPL" );static int debug; -static int persistent_config =1 ; +static int persistent_config;module_param (debug, int,0644 );module_param (persistent_config, int,0644 );MODULE_PARM_DESC (debug,"debug level (0-1)" );
drivers/mmc/core/host.c +35 -37
144 lines not on this page · raw message
drivers/mmc/host/dw_mmc.c +12 -12
@@ -2707,8 +2707,8 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) host->slot[id] = slot; mmc->ops = &dw_mci_ops; -if (of_property_read_u32_array (host->dev->of_node, -"clock-freq-min-max" , freq,2 )) { +if (device_property_read_u32_array (host->dev,"clock-freq-min-max" , + freq,2 )) { mmc->f_min =DW_MCI_FREQ_MIN ; mmc->f_max =DW_MCI_FREQ_MAX ; }else {
@@ -2808,7 +2808,6 @@ static void dw_mci_init_dma(struct dw_mci *host) {int addr_config;struct device *dev = host->dev; -struct device_node *np = dev->of_node;/* * Check tansfer mode from HCON[17:16]
@@ -2869,8 +2868,9 @@ static void dw_mci_init_dma(struct dw_mci *host)dev_info (host->dev,"Using internal DMA controller.\n" ); }else {/* TRANS_MODE_EDMAC: check dma bindings again */ -if ((of_property_count_strings (np,"dma-names" ) <0 ) || - (!of_find_property (np,"dmas" ,NULL ))) { +if ((device_property_read_string_array (dev,"dma-names" , +NULL ,0 ) <0 ) || + !device_property_present (dev,"dmas" )) { goto no_dma; } host->dma_ops = &dw_mci_edmac_ops;
@@ -2937,7 +2937,6 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) {struct dw_mci_board *pdata;struct device *dev = host->dev; -struct device_node *np = dev->of_node;const struct dw_mci_drv_data *drv_data = host->drv_data;int ret;u32 clock_frequency;
@@ -2954,20 +2953,21 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) }/* find out number of slots supported */ -of_property_read_u32 (np,"num-slots" , &pdata->num_slots); +device_property_read_u32 (dev,"num-slots" , &pdata->num_slots); -if (of_property_read_u32 (np,"fifo-depth" , &pdata->fifo_depth)) +if (device_property_read_u32 (dev,"fifo-depth" , &pdata->fifo_depth))dev_info (dev,"fifo-depth property not found, using value of FIFOTH register as default\n" ); -of_property_read_u32 (np,"card-detect-delay" , &pdata->detect_delay_ms); +device_property_read_u32 (dev,"card-detect-delay" , + &pdata->detect_delay_ms); -of_property_read_u32 (np,"data-addr" , &host->data_addr_override); +device_property_read_u32 (dev,"data-addr" , &host->data_addr_override); -if (of_get_property (np,"fifo-watermark-aligned" ,NULL )) +if (device_property_present (dev,"fifo-watermark-aligned" )) host->wm_aligned = true; -if (!of_property_read_u32 (np,"clock-frequency" , &clock_frequency)) +if (!device_property_read_u32 (dev,"clock-frequency" , &clock_frequency)) pdata->bus_hz = clock_frequency;if (drv_data && drv_data->parse_dt) {
drivers/mmc/host/sdhci-of-at91.c +34 -1
@@ -31,6 +31,7 @@#define SDMMC_MC1R 0x204#define SDMMC_MC1R_DDR BIT(3) +#define SDMMC_MC1R_FCD BIT(7)#define SDMMC_CACR 0x230#define SDMMC_CACR_CAPWREN BIT(0)#define SDMMC_CACR_KEY (0x46 << 8)
@@ -43,6 +44,15 @@ struct sdhci_at91_priv {struct clk *mainck; }; +static void sdhci_at91_set_force_card_detect (struct sdhci_host *host) +{ +u8 mc1r; + + mc1r =readb (host->ioaddr +SDMMC_MC1R ); + mc1r |=SDMMC_MC1R_FCD ; +writeb (mc1r, host->ioaddr +SDMMC_MC1R ); +} +static void sdhci_at91_set_clock (struct sdhci_host *host,unsigned int clock) {u16 clk;
@@ -110,10 +120,18 @@ void sdhci_at91_set_uhs_signaling(struct sdhci_host *host, unsigned int timing)sdhci_set_uhs_signaling (host, timing); } +static void sdhci_at91_reset (struct sdhci_host *host,u8 mask) +{ +sdhci_reset (host, mask); + +if (host->mmc->caps &MMC_CAP_NONREMOVABLE ) +sdhci_at91_set_force_card_detect (host); +} +static const struct sdhci_ops sdhci_at91_sama5d2_ops = { .set_clock = sdhci_at91_set_clock, .set_bus_width = sdhci_set_bus_width, - .reset = sdhci_reset, + .reset = sdhci_at91_reset, .set_uhs_signaling = sdhci_at91_set_uhs_signaling, .set_power = sdhci_at91_set_power, };
@@ -324,6 +342,21 @@ static int sdhci_at91_probe(struct platform_device *pdev) host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION ; } +/* +* If the device attached to the MMC bus is not removable, it is safer +* to set the Force Card Detect bit. People often don't connect the +* card detect signal and use this pin for another purpose. If the card +* detect pin is not muxed to SDHCI controller, a default value is +* used. This value can be different from a SoC revision to another +* one. Problems come when this default value is not card present. To +* avoid this case, if the device is non removable then the card +* detection procedure using the SDMCC_CD signal is bypassed. +* This bit is reset when a software reset for all command is performed +* so we need to implement our own reset function to set back this bit. +*/ +if (host->mmc->caps &MMC_CAP_NONREMOVABLE ) +sdhci_at91_set_force_card_detect (host); +pm_runtime_put_autosuspend (&pdev->dev);return 0 ;
drivers/net/bonding/bond_main.c +3 -1
@@ -2047,6 +2047,7 @@ static int bond_miimon_inspect(struct bonding *bond)continue ;bond_propose_link_state (slave,BOND_LINK_FAIL ); + commit++; slave->delay = bond->params.downdelay;if (slave->delay) { netdev_info(bond->dev, "link status down for %sinterface %s, disabling it in %d ms\n",
@@ -2085,6 +2086,7 @@ static int bond_miimon_inspect(struct bonding *bond)continue ;bond_propose_link_state (slave,BOND_LINK_BACK ); + commit++; slave->delay = bond->params.updelay;if (slave->delay) {
@@ -4598,7 +4600,7 @@ static int bond_check_params(struct bond_params *params) } ad_user_port_key = valptr->value; -if (bond_mode ==BOND_MODE_TLB ) { +if ((bond_mode ==BOND_MODE_TLB ) || (bond_mode ==BOND_MODE_ALB )) {bond_opt_initstr (&newval,"default" ); valptr =bond_opt_parse (bond_opt_get (BOND_OPT_TLB_DYNAMIC_LB ), &newval);
drivers/net/dsa/b53/b53_common.c +1 -0
@@ -1668,6 +1668,7 @@ static const struct b53_chip_data b53_switch_chips[] = { .dev_name = "BCM53125", .vlans = 4096, .enabled_ports = 0xff, + .arl_entries = 4, .cpu_port = B53_CPU_PORT, .vta_regs = B53_VTA_REGS, .duplex_reg = B53_DUPLEX_STAT_GE,
drivers/net/dsa/mv88e6xxx/chip.c +1 -0
@@ -3377,6 +3377,7 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = { .port_jumbo_config = mv88e6165_port_jumbo_config, .port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting, .port_pause_config = mv88e6390_port_pause_config, + .port_set_cmode = mv88e6390x_port_set_cmode, .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit, .port_disable_pri_override = mv88e6xxx_port_disable_pri_override, .stats_snapshot = mv88e6390_g1_stats_snapshot,
drivers/net/ethernet/aurora/nb8800.c +4 -5
@@ -609,7 +609,7 @@ static void nb8800_mac_config(struct net_device *dev) mac_mode |=HALF_DUPLEX ;if (gigabit) { -if (priv->phy_mode ==PHY_INTERFACE_MODE_RGMII ) +if (phy_interface_is_rgmii (dev->phydev)) mac_mode |=RGMII_MODE ; mac_mode |=GMAC_MODE ;
@@ -1268,11 +1268,10 @@ static int nb8800_tangox_init(struct net_device *dev)break ;case PHY_INTERFACE_MODE_RGMII : - pad_mode =PAD_MODE_RGMII ; -break ; - +case PHY_INTERFACE_MODE_RGMII_ID : +case PHY_INTERFACE_MODE_RGMII_RXID :case PHY_INTERFACE_MODE_RGMII_TXID : - pad_mode =PAD_MODE_RGMII |PAD_MODE_GTX_CLK_DELAY ; + pad_mode =PAD_MODE_RGMII ;break ;default :
drivers/net/ethernet/mellanox/mlx5/core/cmd.c +21 -4
@@ -777,6 +777,10 @@ static void cb_timeout_handler(struct work_struct *work)mlx5_cmd_comp_handler (dev,1UL << ent->idx, true); } +static void free_msg (struct mlx5_core_dev *dev,struct mlx5_cmd_msg *msg); +static void mlx5_free_cmd_msg (struct mlx5_core_dev *dev, +struct mlx5_cmd_msg *msg); +static void cmd_work_handler (struct work_struct *work) { struct mlx5_cmd_work_ent *ent = container_of(work, struct mlx5_cmd_work_ent, work);
@@ -786,16 +790,27 @@ static void cmd_work_handler(struct work_struct *work)struct mlx5_cmd_layout *lay;struct semaphore *sem;unsigned long flags; +int alloc_ret; sem = ent->page_queue ? &cmd->pages_sem : &cmd->sem;down (sem);if (!ent->page_queue) { - ent->idx =alloc_ent (cmd); -if (ent->idx <0 ) { + alloc_ret =alloc_ent (cmd); +if (alloc_ret <0 ) {mlx5_core_err (dev,"failed to allocate command entry\n" ); +if (ent->callback) { + ent->callback (-EAGAIN , ent->context); +mlx5_free_cmd_msg (dev, ent->out); +free_msg (dev, ent->in); +free_cmd (ent); + }else { + ent->ret = -EAGAIN ; +complete (&ent->done); + }up (sem);return ; } + ent->idx = alloc_ret; }else { ent->idx = cmd->max_reg_cmds;spin_lock_irqsave (&cmd->alloc_lock, flags);
@@ -955,7 +970,7 @@ static int mlx5_cmd_invoke(struct mlx5_core_dev *dev, struct mlx5_cmd_msg *in, err =wait_func (dev, ent);if (err == -ETIMEDOUT ) - goto out_free; + goto out; ds = ent->ts2 - ent->ts1; op =MLX5_GET (mbox_in, in->first.data, opcode);
@@ -1419,6 +1434,7 @@ void mlx5_cmd_comp_handler(struct mlx5_core_dev *dev, u64 vec, bool forced)mlx5_core_err (dev,"Command completion arrived after timeout (entry idx = %d).\n" , ent->idx);free_ent (cmd, ent->idx); +free_cmd (ent); }continue ; }
@@ -1477,7 +1493,8 @@ void mlx5_cmd_comp_handler(struct mlx5_core_dev *dev, u64 vec, bool forced)free_msg (dev, ent->in); err = err ? err : ent->status; -free_cmd (ent); +if (!forced) +free_cmd (ent);callback (err, context); }else {complete (&ent->done);
drivers/net/ethernet/mellanox/mlx5/core/en.h +9 -1
@@ -261,6 +261,14 @@ struct mlx5e_dcbx { };#endif +#define MAX_PIN_NUM 8 +struct mlx5e_pps { +u8 pin_caps[MAX_PIN_NUM ]; +struct work_struct out_work; +u64 start[MAX_PIN_NUM ]; +u8 enabled; +}; +struct mlx5e_tstamp {rwlock_t lock;struct cyclecounter cycles;
@@ -272,7 +280,7 @@ struct mlx5e_tstamp {struct mlx5_core_dev *mdev;struct ptp_clock *ptp;struct ptp_clock_info ptp_info; -u8 *pps_pin_caps; +struct mlx5e_pps pps_info; };enum {
drivers/net/ethernet/mellanox/mlx5/core/en_clock.c +159 -63
340 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c +2 -2
@@ -276,7 +276,7 @@ static void add_rule_to_list(struct mlx5e_priv *priv,static bool outer_header_zero (u32 *match_criteria) { -int size =MLX5_ST_SZ_BYTES (fte_match_param); +int size =MLX5_FLD_SZ_BYTES (fte_match_param, outer_headers);char *outer_headers_c =MLX5_ADDR_OF (fte_match_param, match_criteria, outer_headers);
@@ -320,7 +320,7 @@ add_ethtool_flow_rule(struct mlx5e_priv *priv, spec->match_criteria_enable = (!outer_header_zero (spec->match_criteria)); flow_act.flow_tag =MLX5_FS_DEFAULT_FLOW_TAG ; - rule =mlx5_add_flow_rules (ft, spec, &flow_act, dst,1 ); + rule =mlx5_add_flow_rules (ft, spec, &flow_act, dst, dst ?1 :0 );if (IS_ERR (rule)) { err =PTR_ERR (rule); netdev_err(priv->netdev, "%s: failed to add ethtool steering rule: %d\n",
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +0 -1
@@ -365,7 +365,6 @@ static void mlx5e_async_event(struct mlx5_core_dev *mdev, void *vpriv,break ;case MLX5_DEV_EVENT_PPS : eqe = (struct mlx5_eqe *)param; - ptp_event.type =PTP_CLOCK_EXTTS ; ptp_event.index = eqe->data.pps.pin; ptp_event.timestamp = timecounter_cyc2time(&priv->tstamp.clock,
drivers/net/ethernet/mellanox/mlx5/core/eq.c +1 -1
@@ -690,7 +690,7 @@ int mlx5_start_eqs(struct mlx5_core_dev *dev)else mlx5_core_dbg (dev,"port_module_event is not set\n" ); -if (MLX5_CAP_GEN (dev, pps)) +if (MLX5_PPS_CAP (dev)) async_event_mask |= (1ull <<MLX5_EVENT_TYPE_PPS_EVENT ); err = mlx5_create_map_eq(dev, &table->cmd_eq, MLX5_EQ_VEC_CMD,
drivers/net/ethernet/mellanox/mlx5/core/ipoib.c +11 -5
@@ -160,8 +160,6 @@ static int mlx5i_create_underlay_qp(struct mlx5_core_dev *mdev, struct mlx5_corestatic void mlx5i_destroy_underlay_qp (struct mlx5_core_dev *mdev,struct mlx5_core_qp *qp) { -mlx5_fs_remove_rx_underlay_qpn (mdev, qp->qpn); -mlx5_core_destroy_qp (mdev, qp); }
@@ -176,8 +174,6 @@ static int mlx5i_init_tx(struct mlx5e_priv *priv)return err; } -mlx5_fs_add_rx_underlay_qpn (priv->mdev, ipriv->qp.qpn); - err =mlx5e_create_tis (priv->mdev,0 /* tc */ , ipriv->qp.qpn, &priv->tisn[0 ]);if (err) {mlx5_core_warn (priv->mdev,"create tis failed, %d\n" , err);
@@ -235,6 +231,7 @@ static void mlx5i_destroy_flow_steering(struct mlx5e_priv *priv)static int mlx5i_init_rx (struct mlx5e_priv *priv) { +struct mlx5i_priv *ipriv = priv->ppriv;int err; err =mlx5e_create_indirect_rqt (priv);
@@ -253,12 +250,18 @@ static int mlx5i_init_rx(struct mlx5e_priv *priv)if (err) goto err_destroy_indirect_tirs; - err =mlx5i_create_flow_steering (priv); + err =mlx5_fs_add_rx_underlay_qpn (priv->mdev, ipriv->qp.qpn);if (err) goto err_destroy_direct_tirs; + err =mlx5i_create_flow_steering (priv); +if (err) + goto err_remove_rx_underlay_qpn; +return 0 ; +err_remove_rx_underlay_qpn: +mlx5_fs_remove_rx_underlay_qpn (priv->mdev, ipriv->qp.qpn); err_destroy_direct_tirs:mlx5e_destroy_direct_tirs (priv); err_destroy_indirect_tirs:
@@ -272,6 +275,9 @@ static int mlx5i_init_rx(struct mlx5e_priv *priv)static void mlx5i_cleanup_rx (struct mlx5e_priv *priv) { +struct mlx5i_priv *ipriv = priv->ppriv; + +mlx5_fs_remove_rx_underlay_qpn (priv->mdev, ipriv->qp.qpn);mlx5i_destroy_flow_steering (priv);mlx5e_destroy_direct_tirs (priv);mlx5e_destroy_indirect_tirs (priv);
drivers/net/ethernet/mellanox/mlx5/core/lag.c +10 -15
@@ -157,22 +157,17 @@ static bool mlx5_lag_is_bonded(struct mlx5_lag *ldev)static void mlx5_infer_tx_affinity_mapping (struct lag_tracker *tracker,u8 *port1,u8 *port2) { -if (tracker->tx_type ==NETDEV_LAG_TX_TYPE_ACTIVEBACKUP ) { -if (tracker->netdev_state[0 ].tx_enabled) { - *port1 =1 ; - *port2 =1 ; - }else { - *port1 =2 ; - *port2 =2 ; - } - }else { - *port1 =1 ; - *port2 =2 ; -if (!tracker->netdev_state[0 ].link_up) - *port1 =2 ; -else if (!tracker->netdev_state[1 ].link_up) - *port2 =1 ; + *port1 =1 ; + *port2 =2 ; +if (!tracker->netdev_state[0 ].tx_enabled || + !tracker->netdev_state[0 ].link_up) { + *port1 =2 ; +return ; } + +if (!tracker->netdev_state[1 ].tx_enabled || + !tracker->netdev_state[1 ].link_up) + *port2 =1 ; } static void mlx5_activate_lag(struct mlx5_lag *ldev,
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +5 -0
@@ -153,6 +153,11 @@ int mlx5_set_mtpps(struct mlx5_core_dev *mdev, u32 *mtpps, u32 mtpps_size);int mlx5_query_mtppse (struct mlx5_core_dev *mdev,u8 pin,u8 *arm,u8 *mode);int mlx5_set_mtppse (struct mlx5_core_dev *mdev,u8 pin,u8 arm,u8 mode); +#define MLX5_PPS_CAP (mdev) (MLX5_CAP_GEN((mdev), pps) && \ + MLX5_CAP_GEN((mdev), pps_modify) && \ + MLX5_CAP_MCAM_FEATURE((mdev), mtpps_fs) && \ + MLX5_CAP_MCAM_FEATURE((mdev), mtpps_enh_out_per_adj)) +void mlx5e_init (void );void mlx5e_cleanup (void );
drivers/net/irda/mcs7780.c +13 -3
@@ -141,9 +141,19 @@ static int mcs_set_reg(struct mcs_cb *mcs, __u16 reg, __u16 val)static int mcs_get_reg (struct mcs_cb *mcs,__u16 reg,__u16 * val) {struct usb_device *dev = mcs->usbdev; -int ret =usb_control_msg (dev,usb_rcvctrlpipe (dev,0 ),MCS_RDREQ , -MCS_RD_RTYPE ,0 , reg, val,2 , -msecs_to_jiffies (MCS_CTRL_TIMEOUT )); +void *dmabuf; +int ret; + + dmabuf =kmalloc (sizeof (__u16),GFP_KERNEL ); +if (!dmabuf) +return -ENOMEM ; + + ret =usb_control_msg (dev,usb_rcvctrlpipe (dev,0 ),MCS_RDREQ , +MCS_RD_RTYPE ,0 , reg, dmabuf,2 , +msecs_to_jiffies (MCS_CTRL_TIMEOUT )); + +memcpy (val, dmabuf,sizeof (__u16)); +kfree (dmabuf);return ret; }
drivers/net/phy/phy.c +3 -0
@@ -749,6 +749,9 @@ void phy_stop_machine(struct phy_device *phydev)if (phydev->state >PHY_UP && phydev->state !=PHY_HALTED ) phydev->state =PHY_UP ;mutex_unlock (&phydev->lock); + +/* Now we can run the state machine synchronously */ +phy_state_machine (&phydev->state_queue.work); }/**
drivers/net/virtio_net.c +2 -3
@@ -889,21 +889,20 @@ static int add_recvbuf_mergeable(struct virtnet_info *vi, buf = (char *)page_address (alloc_frag->page) + alloc_frag->offset; buf += headroom;/* advance address leaving hole at front of pkt */ - ctx = (void *)(unsigned long )len;get_page (alloc_frag->page); alloc_frag->offset += len + headroom; hole = alloc_frag->size - alloc_frag->offset;if (hole < len + headroom) {/* To avoid internal fragmentation, if there is very likely not * enough space for another buffer, add the remaining space to -* the current buffer. This extra space is not included in -* the truesize stored in ctx. +* the current buffer. */ len += hole; alloc_frag->offset += hole; }sg_init_one (rq->sg, buf, len); + ctx = (void *)(unsigned long )len; err =virtqueue_add_inbuf_ctx (rq->vq, rq->sg,1 , buf, ctx, gfp);if (err <0 )put_page (virt_to_head_page (buf));
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +0 -5
@@ -4168,11 +4168,6 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev) goto fail; } -/* allocate scatter-gather table. sg support -* will be disabled upon allocation failure. -*/ -brcmf_sdiod_sgtable_alloc (bus->sdiodev); -/* Query the F2 block size, set roundup accordingly */ bus->blocksize = bus->sdiodev->func[2 ]->cur_blksize; bus->roundup =min (max_roundup, bus->blocksize);
drivers/net/wireless/intel/iwlwifi/dvm/tx.c +1 -1
@@ -1190,11 +1190,11 @@ void iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb) next_reclaimed;IWL_DEBUG_TX_REPLY (priv,"Next reclaimed packet:%d\n" , next_reclaimed); +iwlagn_check_ratid_empty (priv, sta_id, tid); }iwl_trans_reclaim (priv->trans, txq_id, ssn, &skbs); -iwlagn_check_ratid_empty (priv, sta_id, tid); freed =0 ;/* process frames */
drivers/scsi/Kconfig +2 -0
@@ -1241,6 +1241,8 @@ config SCSI_LPFC tristate "Emulex LightPulse Fibre Channel Support" depends on PCI && SCSI depends on SCSI_FC_ATTRS + depends on NVME_TARGET_FC || NVME_TARGET_FC=n + depends on NVME_FC || NVME_FC=n select CRC_T10DIF ---help--- This lpfc driver supports the Emulex LightPulse
drivers/target/target_core_user.c +7 -9
@@ -437,7 +437,7 @@ static int scatter_data_area(struct tcmu_dev *udev, to_offset =get_block_offset_user (udev, dbi, block_remaining); offset =DATA_BLOCK_SIZE - block_remaining; - to = (void *)(unsigned long )to + offset; + to += offset;if (*iov_cnt !=0 && to_offset ==iov_tail (udev, *iov)) {
@@ -510,7 +510,7 @@ static void gather_data_area(struct tcmu_dev *udev, struct tcmu_cmd *cmd, copy_bytes =min_t (size_t, sg_remaining, block_remaining); offset =DATA_BLOCK_SIZE - block_remaining; - from = (void *)(unsigned long )from + offset; + from += offset;tcmu_flush_dcache_range (from, copy_bytes);memcpy (to + sg->length - sg_remaining, from, copy_bytes);
@@ -699,25 +699,24 @@ tcmu_queue_cmd_ring(struct tcmu_cmd *tcmu_cmd)size_t pad_size =head_to_end (cmd_head, udev->cmdr_size); entry = (void *) mb +CMDR_OFF + cmd_head; -tcmu_flush_dcache_range (entry,sizeof (*entry));tcmu_hdr_set_op (&entry->hdr.len_op,TCMU_OP_PAD );tcmu_hdr_set_len (&entry->hdr.len_op, pad_size); entry->hdr.cmd_id =0 ;/* not used for PAD */ entry->hdr.kflags =0 ; entry->hdr.uflags =0 ; +tcmu_flush_dcache_range (entry,sizeof (*entry));UPDATE_HEAD (mb->cmd_head, pad_size, udev->cmdr_size); +tcmu_flush_dcache_range (mb,sizeof (*mb)); cmd_head = mb->cmd_head % udev->cmdr_size;/* UAM */ WARN_ON (cmd_head !=0 ); } entry = (void *) mb +CMDR_OFF + cmd_head; -tcmu_flush_dcache_range (entry,sizeof (*entry)); +memset (entry,0 , command_size);tcmu_hdr_set_op (&entry->hdr.len_op,TCMU_OP_CMD ); entry->hdr.cmd_id = tcmu_cmd->cmd_id; - entry->hdr.kflags =0 ; - entry->hdr.uflags =0 ;/* Handle allocating space from the data area */ tcmu_cmd_reset_dbi_cur (tcmu_cmd);
@@ -736,11 +735,10 @@ tcmu_queue_cmd_ring(struct tcmu_cmd *tcmu_cmd)return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE ; } entry->req.iov_cnt = iov_cnt; - entry->req.iov_dif_cnt =0 ;/* Handle BIDI commands */ + iov_cnt =0 ;if (se_cmd->se_cmd_flags &SCF_BIDI ) { - iov_cnt =0 ; iov++; ret = scatter_data_area(udev, tcmu_cmd, se_cmd->t_bidi_data_sg,
@@ -753,8 +751,8 @@ tcmu_queue_cmd_ring(struct tcmu_cmd *tcmu_cmd)pr_err ("tcmu: alloc and scatter bidi data failed\n" );return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE ; } - entry->req.iov_bidi_cnt = iov_cnt; } + entry->req.iov_bidi_cnt = iov_cnt;/* * Recalaulate the command's base size and size according
fs/btrfs/extent-tree.c +0 -4
@@ -4776,10 +4776,6 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig,else flush =BTRFS_RESERVE_NO_FLUSH ;spin_lock (&space_info->lock); -if (can_overcommit (root, space_info, orig, flush)) { -spin_unlock (&space_info->lock); -break ; - }if (list_empty (&space_info->tickets) &&list_empty (&space_info->priority_tickets)) {spin_unlock (&space_info->lock);
fs/ext4/acl.c +17 -8
@@ -193,13 +193,6 @@ __ext4_set_acl(handle_t *handle, struct inode *inode, int type,switch (type) {case ACL_TYPE_ACCESS : name_index =EXT4_XATTR_INDEX_POSIX_ACL_ACCESS ; -if (acl) { - error =posix_acl_update_mode (inode, &inode->i_mode, &acl); -if (error) -return error; - inode->i_ctime =current_time (inode); -ext4_mark_inode_dirty (handle, inode); - }break ;case ACL_TYPE_DEFAULT :
@@ -221,8 +214,9 @@ __ext4_set_acl(handle_t *handle, struct inode *inode, int type, value, size, 0);kfree (value); -if (!error) +if (!error) {set_cached_acl (inode, type, acl); + }return error; }
@@ -232,6 +226,8 @@ ext4_set_acl(struct inode *inode, struct posix_acl *acl, int type) {handle_t *handle;int error, retries =0 ; +umode_t mode = inode->i_mode; +int update_mode =0 ; error =dquot_initialize (inode);if (error)
@@ -242,7 +238,20 @@ ext4_set_acl(struct inode *inode, struct posix_acl *acl, int type)if (IS_ERR (handle))return PTR_ERR (handle); +if ((type ==ACL_TYPE_ACCESS ) && acl) { + error =posix_acl_update_mode (inode, &mode, &acl); +if (error) + goto out_stop; + update_mode =1 ; + } + error =__ext4_set_acl (handle, inode, type, acl); +if (!error && update_mode) { + inode->i_mode = mode; + inode->i_ctime =current_time (inode); +ext4_mark_inode_dirty (handle, inode); + } +out_stop:ext4_journal_stop (handle);if (error == -ENOSPC &&ext4_should_retry_alloc (inode->i_sb, &retries)) goto retry;
fs/ext4/file.c +3 -0
@@ -521,6 +521,8 @@ static int ext4_find_unwritten_pgoff(struct inode *inode, lastoff =page_offset (page); bh = head =page_buffers (page); do { + if (lastoff + bh->b_size <= startoff) + goto next; if (buffer_uptodate(bh) || buffer_unwritten(bh)) { if (whence == SEEK_DATA)
@@ -535,6 +537,7 @@ static int ext4_find_unwritten_pgoff(struct inode *inode,unlock_page (page); goto out; } +next: lastoff += bh->b_size; bh = bh->b_this_page; }while (bh != head);
fs/ext4/resize.c +2 -1
@@ -1927,7 +1927,8 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count) n_desc_blocks = o_desc_blocks +le16_to_cpu (es->s_reserved_gdt_blocks); n_group = n_desc_blocks *EXT4_DESC_PER_BLOCK (sb); - n_blocks_count = n_group *EXT4_BLOCKS_PER_GROUP (sb); + n_blocks_count = (ext4_fsblk_t )n_group * +EXT4_BLOCKS_PER_GROUP (sb); n_group--;/* set to last group number */ }
fs/nfs/nfs4proc.c +4 -7
@@ -7407,7 +7407,7 @@ static void nfs4_exchange_id_done(struct rpc_task *task, void *data) cdata->res.server_scope =NULL ; }/* Save the EXCHANGE_ID verifier session trunk tests */ -memcpy (clp->cl_confirm.data, cdata->args.verifier->data, +memcpy (clp->cl_confirm.data, cdata->args.verifier.data,sizeof (clp->cl_confirm.data)); } out:
@@ -7444,7 +7444,6 @@ static const struct rpc_call_ops nfs4_exchange_id_call_ops = {static int _nfs4_proc_exchange_id (struct nfs_client *clp,struct rpc_cred *cred,u32 sp4_how,struct rpc_xprt *xprt) { -nfs4_verifier verifier;struct rpc_message msg = { .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_EXCHANGE_ID ], .rpc_cred = cred,
@@ -7468,8 +7467,7 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred,return -ENOMEM ; } -if (!xprt) -nfs4_init_boot_verifier (clp, &verifier); +nfs4_init_boot_verifier (clp, &calldata->args.verifier); status =nfs4_init_uniform_client_string (clp);if (status)
@@ -7510,9 +7508,8 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred, task_setup_data.rpc_xprt = xprt; task_setup_data.flags =RPC_TASK_SOFT |RPC_TASK_SOFTCONN |RPC_TASK_ASYNC ; - calldata->args.verifier = &clp->cl_confirm; - }else { - calldata->args.verifier = &verifier; +memcpy (calldata->args.verifier.data, clp->cl_confirm.data, +sizeof (calldata->args.verifier.data)); } calldata->args.client = clp;#ifdef CONFIG_NFS_V4_1_MIGRATION
fs/nfs/nfs4xdr.c +1 -1
@@ -1765,7 +1765,7 @@ static void encode_exchange_id(struct xdr_stream *xdr,int len =0 ;encode_op_hdr (xdr,OP_EXCHANGE_ID , decode_exchange_id_maxsz, hdr); -encode_nfs4_verifier (xdr, args->verifier); +encode_nfs4_verifier (xdr, &args->verifier);encode_string (xdr,strlen (args->client->cl_owner_id), args->client->cl_owner_id);
fs/ocfs2/acl.c +12 -12
@@ -240,18 +240,6 @@ int ocfs2_set_acl(handle_t *handle,switch (type) {case ACL_TYPE_ACCESS : name_index =OCFS2_XATTR_INDEX_POSIX_ACL_ACCESS ; -if (acl) { -umode_t mode; - - ret =posix_acl_update_mode (inode, &mode, &acl); -if (ret) -return ret; - - ret =ocfs2_acl_set_mode (inode, di_bh, - handle, mode); -if (ret) -return ret; - }break ;case ACL_TYPE_DEFAULT : name_index =OCFS2_XATTR_INDEX_POSIX_ACL_DEFAULT ;
@@ -289,7 +277,19 @@ int ocfs2_iop_set_acl(struct inode *inode, struct posix_acl *acl, int type) had_lock =ocfs2_inode_lock_tracker (inode, &bh,1 , &oh);if (had_lock <0 )return had_lock; +if (type ==ACL_TYPE_ACCESS && acl) { +umode_t mode; + + status =posix_acl_update_mode (inode, &mode, &acl); +if (status) + goto unlock; + + status =ocfs2_acl_set_mode (inode, bh,NULL , mode); +if (status) + goto unlock; + } status =ocfs2_set_acl (NULL , inode, bh, type, acl,NULL ,NULL ); +unlock:ocfs2_inode_unlock_tracker (inode,1 , &oh, had_lock);brelse (bh);return status;
fs/userfaultfd.c +5 -0
@@ -851,6 +851,9 @@ static int userfaultfd_release(struct inode *inode, struct file *file)__wake_up_locked_key (&ctx->fault_wqh,TASK_NORMAL , &range);spin_unlock (&ctx->fault_pending_wqh.lock); +/* Flush pending events that may still wait on event_wqh */ +wake_up_all (&ctx->event_wqh); +wake_up_poll (&ctx->fd_wqh,POLLHUP );userfaultfd_ctx_put (ctx);return 0 ;
@@ -1645,6 +1648,8 @@ static int userfaultfd_zeropage(struct userfaultfd_ctx *ctx, ret =mfill_zeropage (ctx->mm, uffdio_zeropage.range.start, uffdio_zeropage.range.len);mmput (ctx->mm); + }else { +return -ENOSPC ; }if (unlikely (put_user (ret, &user_uffdio_zeropage->zeropage)))return -EFAULT ;
include/linux/cpuhotplug.h +0 -1
@@ -58,7 +58,6 @@ enum cpuhp_state {CPUHP_XEN_EVTCHN_PREPARE ,CPUHP_ARM_SHMOBILE_SCU_PREPARE ,CPUHP_SH_SH3X_PREPARE , -CPUHP_BLK_MQ_PREPARE ,CPUHP_NET_FLOW_PREPARE ,CPUHP_TOPOLOGY_PREPARE , CPUHP_NET_IUCV_PREPARE,
include/linux/cpuset.h +17 -2
@@ -18,6 +18,19 @@#ifdef CONFIG_CPUSETS +/* +* Static branch rewrites can happen in an arbitrary order for a given +* key. In code paths where we need to loop with read_mems_allowed_begin() and +* read_mems_allowed_retry() to get a consistent view of mems_allowed, we need +* to ensure that begin() always gets rewritten before retry() in the +* disabled -> enabled transition. If not, then if local irqs are disabled +* around the loop, we can deadlock since retry() would always be +* comparing the latest value of the mems_allowed seqcount against 0 as +* begin() still would see cpusets_enabled() as false. The enabled -> disabled +* transition should happen in reverse order for the same reasons (want to stop +* looking at real value of mems_allowed.sequence in retry() first). +*/ +extern struct static_key_false cpusets_pre_enable_key;extern struct static_key_false cpusets_enabled_key;static inline bool cpusets_enabled (void ) {
@@ -32,12 +45,14 @@ static inline int nr_cpusets(void)static inline void cpuset_inc (void ) { +static_branch_inc (&cpusets_pre_enable_key);static_branch_inc (&cpusets_enabled_key); }static inline void cpuset_dec (void ) {static_branch_dec (&cpusets_enabled_key); +static_branch_dec (&cpusets_pre_enable_key); }extern int cpuset_init (void );
@@ -115,7 +130,7 @@ extern void cpuset_print_current_mems_allowed(void);*/ static inline unsigned int read_mems_allowed_begin (void ) { -if (!cpusets_enabled ()) +if (!static_branch_unlikely (&cpusets_pre_enable_key))return 0 ;return read_seqcount_begin (¤t->mems_allowed_seq);
@@ -129,7 +144,7 @@ static inline unsigned int read_mems_allowed_begin(void)*/ static inline bool read_mems_allowed_retry (unsigned int seq) { -if (!cpusets_enabled ()) +if (!static_branch_unlikely (&cpusets_enabled_key))return false;return read_seqcount_retry (¤t->mems_allowed_seq, seq);
include/linux/mlx5/mlx5_ifc.h +7 -3
@@ -7718,8 +7718,10 @@ struct mlx5_ifc_pcam_reg_bits { };struct mlx5_ifc_mcam_enhanced_features_bits { -u8 reserved_at_0[0x7f ]; +u8 reserved_at_0[0x7d ]; +u8 mtpps_enh_out_per_adj[0x1 ]; +u8 mtpps_fs[0x1 ];u8 pcie_performance_group[0x1 ]; };
@@ -8115,7 +8117,8 @@ struct mlx5_ifc_mtpps_reg_bits {u8 reserved_at_78[0x4 ];u8 cap_pin_4_mode[0x4 ]; -u8 reserved_at_80[0x80 ]; +u8 field_select[0x20 ]; +u8 reserved_at_a0[0x60 ];u8 enable[0x1 ];u8 reserved_at_101[0xb ];
@@ -8130,8 +8133,9 @@ struct mlx5_ifc_mtpps_reg_bits {u8 out_pulse_duration[0x10 ];u8 out_periodic_adjustment[0x10 ]; +u8 enhanced_out_periodic_adjustment[0x20 ]; -u8 reserved_at_1a0[0x60 ]; +u8 reserved_at_1c0[0x20 ]; };struct mlx5_ifc_mtppse_reg_bits {
include/linux/mm_types.h +4 -0
@@ -494,6 +494,10 @@ struct mm_struct {* PROT_NONE or PROT_NUMA mapped page. */ bool tlb_flush_pending; +#endif +#ifdef CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH +/* See flush_tlb_batched_pending() */ +bool tlb_flush_batched;#endif struct uprobes_state uprobes_state;#ifdef CONFIG_HUGETLB_PAGE
include/linux/nfs_xdr.h +1 -1
@@ -1222,7 +1222,7 @@ struct nfs41_state_protection {struct nfs41_exchange_id_args {struct nfs_client *client; -nfs4_verifier *verifier; +nfs4_verifier verifier;u32 flags;struct nfs41_state_protection state_protect; };
include/linux/workqueue.h +3 -1
@@ -323,6 +323,7 @@ enum { __WQ_DRAINING =1 <<16 ,/* internal: workqueue is draining */ __WQ_ORDERED =1 <<17 ,/* internal: workqueue is ordered */ + __WQ_ORDERED_EXPLICIT =1 <<18 ,/* internal: alloc_ordered_workqueue() */ __WQ_LEGACY =1 <<18 ,/* internal: create*_workqueue() */ WQ_MAX_ACTIVE = 512, /* I like 512, better ideas? */
@@ -422,7 +423,8 @@ __alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active,* Pointer to the allocated workqueue on success, %NULL on failure. */ #define alloc_ordered_workqueue(fmt, flags, args...) \ - alloc_workqueue(fmt, WQ_UNBOUND | __WQ_ORDERED | (flags), 1, ##args) + alloc_workqueue(fmt, WQ_UNBOUND | __WQ_ORDERED | \ + __WQ_ORDERED_EXPLICIT | (flags), 1, ##args)#define create_workqueue (name) \ alloc_workqueue("%s", __WQ_LEGACY | WQ_MEM_RECLAIM, 1, (name))
include/net/sctp/sctp.h +4 -0
@@ -469,6 +469,8 @@ _sctp_walk_params((pos), (chunk), ntohs((chunk)->chunk_hdr.length), member)#define _sctp_walk_params (pos, chunk, end, member)\ for (pos.v = chunk->member;\ + (pos.v + offsetof(struct sctp_paramhdr, length) + sizeof(pos.p->length) <=\ + (void *)chunk + end) &&\ pos.v <= (void *)chunk + end - ntohs(pos.p->length) &&\ ntohs(pos.p->length) >= sizeof(sctp_paramhdr_t);\ pos.v += SCTP_PAD4(ntohs(pos.p->length)))
@@ -479,6 +481,8 @@ _sctp_walk_errors((err), (chunk_hdr), ntohs((chunk_hdr)->length))#define _sctp_walk_errors (err, chunk_hdr, end)\ for (err = (sctp_errhdr_t *)((void *)chunk_hdr + \ sizeof(sctp_chunkhdr_t));\ + ((void *)err + offsetof(sctp_errhdr_t, length) + sizeof(err->length) <=\ + (void *)chunk_hdr + end) &&\ (void *)err <= (void *)chunk_hdr + end - ntohs(err->length) &&\ ntohs(err->length) >= sizeof(sctp_errhdr_t); \ err = (sctp_errhdr_t *)((void *)err + SCTP_PAD4(ntohs(err->length))))
include/net/udp.h +1 -0
@@ -265,6 +265,7 @@ static inline struct sk_buff *skb_recv_udp(struct sock *sk, unsigned int flags, }void udp_v4_early_demux (struct sk_buff *skb); +void udp_sk_rx_dst_set (struct sock *sk,struct dst_entry *dst);int udp_get_port (struct sock *sk,unsigned short snum,int (*saddr_cmp)(const struct sock *,const struct sock *));
include/sound/soc.h +0 -6
@@ -795,10 +795,6 @@ struct snd_soc_component_driver {int (*suspend)(struct snd_soc_component *);int (*resume)(struct snd_soc_component *); -/* pcm creation and destruction */ -int (*pcm_new)(struct snd_soc_pcm_runtime *); -void (*pcm_free)(struct snd_pcm *); -/* DT */ int (*of_xlate_dai_name)(struct snd_soc_component *component, struct of_phandle_args *args,
@@ -872,8 +868,6 @@ struct snd_soc_component {void (*remove)(struct snd_soc_component *);int (*suspend)(struct snd_soc_component *);int (*resume)(struct snd_soc_component *); -int (*pcm_new)(struct snd_soc_pcm_runtime *); -void (*pcm_free)(struct snd_pcm *);/* machine specific init */ int (*init)(struct snd_soc_component *component);
kernel/cgroup/cgroup-internal.h +3 -0
@@ -33,6 +33,9 @@ struct cgroup_taskset {struct list_head src_csets;struct list_head dst_csets; +/* the number of tasks in the set */ +int nr_tasks; +/* the subsys currently being processed */ int ssid;
kernel/cgroup/cgroup.c +37 -29
106 lines not on this page · raw message
kernel/cgroup/cpuset.c +1 -0
@@ -63,6 +63,7 @@#include <linux/cgroup.h> #include <linux/wait.h> +DEFINE_STATIC_KEY_FALSE (cpusets_pre_enable_key);DEFINE_STATIC_KEY_FALSE (cpusets_enabled_key);/* See "Frequency meter" comments, below. */
kernel/time/timer.c +1 -1
@@ -1495,7 +1495,7 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem) base->is_idle = false; }else {if (!is_max_delta) - expires = basem + (nextevt - basej) *TICK_NSEC ; + expires = basem + (u64)(nextevt - basej) *TICK_NSEC ;/* * If we expect to sleep more than a tick, mark the base idle: */
kernel/workqueue.c +19 -4
@@ -3744,8 +3744,12 @@ static int apply_workqueue_attrs_locked(struct workqueue_struct *wq,return -EINVAL ;/* creating multiple pwqs breaks ordering guarantee */ -if (WARN_ON ((wq->flags & __WQ_ORDERED) && !list_empty (&wq->pwqs))) -return -EINVAL ; +if (!list_empty (&wq->pwqs)) { +if (WARN_ON (wq->flags & __WQ_ORDERED_EXPLICIT)) +return -EINVAL ; + + wq->flags &= ~__WQ_ORDERED; + } ctx =apply_wqattrs_prepare (wq, attrs);if (!ctx)
@@ -3929,6 +3933,16 @@ struct workqueue_struct *__alloc_workqueue_key(const char *fmt,struct workqueue_struct *wq;struct pool_workqueue *pwq; +/* +* Unbound && max_active == 1 used to imply ordered, which is no +* longer the case on NUMA machines due to per-node pools. While +* alloc_ordered_workqueue() is the right way to create an ordered +* workqueue, keep the previous behavior to avoid subtle breakages +* on NUMA. +*/ +if ((flags &WQ_UNBOUND ) && max_active ==1 ) + flags |= __WQ_ORDERED; +/* see the comment above the definition of WQ_POWER_EFFICIENT */ if ((flags &WQ_POWER_EFFICIENT ) && wq_power_efficient) flags |=WQ_UNBOUND ;
@@ -4119,13 +4133,14 @@ void workqueue_set_max_active(struct workqueue_struct *wq, int max_active)struct pool_workqueue *pwq;/* disallow meddling with max_active for ordered workqueues */ -if (WARN_ON (wq->flags & __WQ_ORDERED)) +if (WARN_ON (wq->flags & __WQ_ORDERED_EXPLICIT))return ; max_active =wq_clamp_max_active (max_active, wq->flags, wq->name);mutex_lock (&wq->mutex); + wq->flags &= ~__WQ_ORDERED; wq->saved_max_active = max_active;for_each_pwq (pwq, wq)
@@ -5253,7 +5268,7 @@ int workqueue_sysfs_register(struct workqueue_struct *wq)* attributes breaks ordering guarantee. Disallow exposing ordered * workqueues. */ -if (WARN_ON (wq->flags & __WQ_ORDERED)) +if (WARN_ON (wq->flags & __WQ_ORDERED_EXPLICIT))return -EINVAL ; wq->wq_dev = wq_dev =kzalloc (sizeof (*wq_dev),GFP_KERNEL );
mm/hugetlb.c +3 -6
@@ -4095,6 +4095,7 @@ long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma,unsigned long vaddr = *position;unsigned long remainder = *nr_pages;struct hstate *h =hstate_vma (vma); +int err = -EFAULT ;while (vaddr < vma->vm_end && remainder) {pte_t *pte;
@@ -4170,11 +4171,7 @@ long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma, } ret =hugetlb_fault (mm, vma, vaddr, fault_flags);if (ret &VM_FAULT_ERROR ) { -int err =vm_fault_to_errno (ret, flags); - -if (err) -return err; - + err =vm_fault_to_errno (ret, flags); remainder =0 ;break ; }
@@ -4229,7 +4226,7 @@ long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma,*/ *position = vaddr; -return i ? i : -EFAULT ; +return i ? i : err; }#ifndef __HAVE_ARCH_FLUSH_HUGETLB_TLB_RANGE
mm/internal.h +4 -1
@@ -498,6 +498,7 @@ extern struct workqueue_struct *mm_percpu_wq;#ifdef CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH void try_to_unmap_flush (void );void try_to_unmap_flush_dirty (void ); +void flush_tlb_batched_pending (struct mm_struct *mm);#else static inline void try_to_unmap_flush (void ) {
@@ -505,7 +506,9 @@ static inline void try_to_unmap_flush(void)static inline void try_to_unmap_flush_dirty (void ) { } - +static inline void flush_tlb_batched_pending (struct mm_struct *mm) +{ +}#endif /* CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH */ extern const struct trace_print_flags pageflag_names[];
mm/madvise.c +1 -0
@@ -320,6 +320,7 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigned long addr,tlb_remove_check_page_size_change (tlb,PAGE_SIZE ); orig_pte = pte =pte_offset_map_lock (mm, pmd, addr, &ptl); +flush_tlb_batched_pending (mm);arch_enter_lazy_mmu_mode ();for (; addr != end; pte++, addr +=PAGE_SIZE ) { ptent = *pte;
mm/memory.c +1 -0
@@ -1197,6 +1197,7 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb,init_rss_vec (rss); start_pte =pte_offset_map_lock (mm, pmd, addr, &ptl); pte = start_pte; +flush_tlb_batched_pending (mm);arch_enter_lazy_mmu_mode (); do { pte_t ptent = *pte;
mm/mprotect.c +1 -0
@@ -66,6 +66,7 @@ static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd, atomic_read(&vma->vm_mm->mm_users) == 1) target_node =numa_node_id (); +flush_tlb_batched_pending (vma->vm_mm);arch_enter_lazy_mmu_mode (); do { oldpte = *pte;
mm/mremap.c +6 -2
@@ -152,6 +152,7 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd, new_ptl =pte_lockptr (mm, new_pmd);if (new_ptl != old_ptl)spin_lock_nested (new_ptl,SINGLE_DEPTH_NESTING ); +flush_tlb_batched_pending (vma->vm_mm);arch_enter_lazy_mmu_mode (); for (; old_addr < old_end; old_pte++, old_addr += PAGE_SIZE,
@@ -428,6 +429,7 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,static unsigned long mremap_to (unsigned long addr,unsigned long old_len,unsigned long new_addr,unsigned long new_len,bool *locked,struct vm_userfaultfd_ctx *uf, +struct list_head *uf_unmap_early,struct list_head *uf_unmap) {struct mm_struct *mm = current->mm;
@@ -446,7 +448,7 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,if (addr + old_len > new_addr && new_addr + new_len > addr) goto out; - ret =do_munmap (mm, new_addr, new_len,NULL ); + ret =do_munmap (mm, new_addr, new_len, uf_unmap_early);if (ret) goto out;
@@ -514,6 +516,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,unsigned long charged =0 ;bool locked = false;struct vm_userfaultfd_ctx uf =NULL_VM_UFFD_CTX ; +LIST_HEAD (uf_unmap_early);LIST_HEAD (uf_unmap);if (flags & ~(MREMAP_FIXED |MREMAP_MAYMOVE ))
@@ -541,7 +544,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,if (flags &MREMAP_FIXED ) { ret =mremap_to (addr, old_len, new_addr, new_len, - &locked, &uf, &uf_unmap); + &locked, &uf, &uf_unmap_early, &uf_unmap); goto out; }
@@ -621,6 +624,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,up_write (¤t->mm->mmap_sem);if (locked && new_len > old_len)mm_populate (new_addr + old_len, new_len - old_len); +userfaultfd_unmap_complete (mm, &uf_unmap_early);mremap_userfaultfd_complete (&uf, addr, new_addr, old_len);userfaultfd_unmap_complete (mm, &uf_unmap);return ret;
mm/rmap.c +36 -0
@@ -616,6 +616,13 @@ static void set_tlb_ubc_flush_pending(struct mm_struct *mm, bool writable)cpumask_or (&tlb_ubc->cpumask, &tlb_ubc->cpumask,mm_cpumask (mm)); tlb_ubc->flush_required = true; +/* +* Ensure compiler does not re-order the setting of tlb_flush_batched +* before the PTE is cleared. +*/ +barrier (); + mm->tlb_flush_batched = true; +/* * If the PTE was dirty then it's best to assume it's writable. The * caller must use try_to_unmap_flush_dirty() or try_to_unmap_flush()
@@ -643,6 +650,35 @@ static bool should_defer_flush(struct mm_struct *mm, enum ttu_flags flags) return should_defer; } + +/* +* Reclaim unmaps pages under the PTL but do not flush the TLB prior to +* releasing the PTL if TLB flushes are batched. It's possible for a parallel +* operation such as mprotect or munmap to race between reclaim unmapping +* the page and flushing the page. If this race occurs, it potentially allows +* access to data via a stale TLB entry. Tracking all mm's that have TLB +* batching in flight would be expensive during reclaim so instead track +* whether TLB batching occurred in the past and if so then do a flush here +* if required. This will cost one additional flush per reclaim cycle paid +* by the first operation at risk such as mprotect and mumap. +* +* This must be called under the PTL so that an access to tlb_flush_batched +* that is potentially a "reclaim vs mprotect/munmap/etc" race will synchronise +* via the PTL. +*/ +void flush_tlb_batched_pending (struct mm_struct *mm) +{ +if (mm->tlb_flush_batched) { +flush_tlb_mm (mm); + +/* +* Do not allow the compiler to re-order the clearing of +* tlb_flush_batched before the tlb is flushed. +*/ +barrier (); + mm->tlb_flush_batched = false; + } +}#else static void set_tlb_ubc_flush_pending (struct mm_struct *mm,bool writable) {
net/core/dev_ioctl.c +3 -0
@@ -28,6 +28,7 @@ static int dev_ifname(struct net *net, struct ifreq __user *arg)if (copy_from_user (&ifr, arg,sizeof (struct ifreq )))return -EFAULT ; + ifr.ifr_name[IFNAMSIZ -1 ] =0 ; error =netdev_get_name (net, ifr.ifr_name, ifr.ifr_ifindex);if (error)
@@ -423,6 +424,8 @@ int dev_ioctl(struct net *net, unsigned int cmd, void __user *arg)if (copy_from_user (&iwr, arg,sizeof (iwr)))return -EFAULT ; + iwr.ifr_name[sizeof (iwr.ifr_name) -1 ] =0 ; +return wext_handle_ioctl (net, &iwr, cmd, arg); }
net/core/rtnetlink.c +3 -1
@@ -1977,7 +1977,8 @@ static int do_setlink(const struct sk_buff *skb,struct sockaddr *sa;int len; - len =sizeof (sa_family_t) + dev->addr_len; + len =sizeof (sa_family_t) +max_t (size_t, dev->addr_len, +sizeof (*sa)); sa =kmalloc (len,GFP_KERNEL );if (!sa) { err = -ENOMEM ;
@@ -4165,6 +4166,7 @@ static int rtnetlink_event(struct notifier_block *this, unsigned long event, voiswitch (event) {case NETDEV_REBOOT : +case NETDEV_CHANGEADDR :case NETDEV_CHANGENAME :case NETDEV_FEAT_CHANGE :case NETDEV_BONDING_FAILOVER :
net/dccp/feat.c +5 -2
@@ -1471,9 +1471,12 @@ int dccp_feat_init(struct sock *sk)* singleton values (which always leads to failure). * These settings can still (later) be overridden via sockopts. */ -if (ccid_get_builtin_ccids (&tx.val, &tx.len) || -ccid_get_builtin_ccids (&rx.val, &rx.len)) +if (ccid_get_builtin_ccids (&tx.val, &tx.len))return -ENOBUFS ; +if (ccid_get_builtin_ccids (&rx.val, &rx.len)) { +kfree (tx.val); +return -ENOBUFS ; + }if (!dccp_feat_prefer (sysctl_dccp_tx_ccid, tx.val, tx.len) || !dccp_feat_prefer (sysctl_dccp_rx_ccid, rx.val, rx.len))
net/dccp/ipv4.c +1 -0
@@ -631,6 +631,7 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) goto drop_and_free;inet_csk_reqsk_queue_hash_add (sk, req,DCCP_TIMEOUT_INIT ); +reqsk_put (req);return 0 ; drop_and_free:
net/dccp/ipv6.c +1 -0
@@ -380,6 +380,7 @@ static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb) goto drop_and_free;inet_csk_reqsk_queue_hash_add (sk, req,DCCP_TIMEOUT_INIT ); +reqsk_put (req);return 0 ; drop_and_free:
net/ipv4/fib_frontend.c +5 -4
@@ -1327,13 +1327,14 @@ static struct pernet_operations fib_net_ops = {void __init ip_fib_init (void ) { -rtnl_register (PF_INET ,RTM_NEWROUTE , inet_rtm_newroute,NULL ,NULL ); -rtnl_register (PF_INET ,RTM_DELROUTE , inet_rtm_delroute,NULL ,NULL ); -rtnl_register (PF_INET ,RTM_GETROUTE ,NULL , inet_dump_fib,NULL ); +fib_trie_init ();register_pernet_subsys (&fib_net_ops); +register_netdevice_notifier (&fib_netdev_notifier);register_inetaddr_notifier (&fib_inetaddr_notifier); -fib_trie_init (); +rtnl_register (PF_INET ,RTM_NEWROUTE , inet_rtm_newroute,NULL ,NULL ); +rtnl_register (PF_INET ,RTM_DELROUTE , inet_rtm_delroute,NULL ,NULL ); +rtnl_register (PF_INET ,RTM_GETROUTE ,NULL , inet_dump_fib,NULL ); }
net/ipv4/fib_semantics.c +1 -1
@@ -1372,7 +1372,7 @@ static int call_fib_nh_notifiers(struct fib_nh *fib_nh,return call_fib_notifiers (dev_net (fib_nh->nh_dev), event_type, &info.info);case FIB_EVENT_NH_DEL : -if ((IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN (in_dev) && +if ((in_dev &&IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN (in_dev) && fib_nh->nh_flags &RTNH_F_LINKDOWN ) || (fib_nh->nh_flags &RTNH_F_DEAD )) return call_fib_notifiers(dev_net(fib_nh->nh_dev),
net/ipv4/syncookies.c +1 -0
@@ -332,6 +332,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb) treq->rcv_isn =ntohl (th->seq) -1 ; treq->snt_isn = cookie; treq->ts_off =0 ; + treq->txhash =net_tx_rndhash (); req->mss = mss; ireq->ir_num =ntohs (th->dest); ireq->ir_rmt_port = th->source;
net/ipv4/tcp_bbr.c +38 -11
81 lines not on this page · raw message
net/ipv4/udp.c +2 -1
@@ -1762,7 +1762,7 @@ static int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)/* For TCP sockets, sk_rx_dst is protected by socket lock * For UDP, we use xchg() to guard against concurrent changes. */ -static void udp_sk_rx_dst_set (struct sock *sk,struct dst_entry *dst) +void udp_sk_rx_dst_set (struct sock *sk,struct dst_entry *dst) {struct dst_entry *old;
@@ -2120,6 +2120,7 @@ void udp_destroy_sock(struct sock *sk)encap_destroy (sk); } } +EXPORT_SYMBOL (udp_sk_rx_dst_set);/* * Socket option code for UDP
net/ipv6/ip6_output.c +0 -4
@@ -673,8 +673,6 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, *prevhdr =NEXTHDR_FRAGMENT ; tmp_hdr =kmemdup (skb_network_header (skb), hlen,GFP_ATOMIC );if (!tmp_hdr) { -IP6_INC_STATS (net,ip6_dst_idev (skb_dst (skb)), -IPSTATS_MIB_FRAGFAILS ); err = -ENOMEM ; goto fail; }
@@ -793,8 +791,6 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, frag =alloc_skb (len + hlen +sizeof (struct frag_hdr ) + hroom + troom,GFP_ATOMIC );if (!frag) { -IP6_INC_STATS (net,ip6_dst_idev (skb_dst (skb)), -IPSTATS_MIB_FRAGFAILS ); err = -ENOMEM ; goto fail; }
net/ipv6/output_core.c +6 -2
@@ -78,7 +78,7 @@ EXPORT_SYMBOL(ipv6_select_ident);int ip6_find_1stfragopt (struct sk_buff *skb,u8 **nexthdr) { -u16 offset =sizeof (struct ipv6hdr ); +unsigned int offset =sizeof (struct ipv6hdr );unsigned int packet_len =skb_tail_pointer (skb) -skb_network_header (skb);int found_rhdr =0 ;
@@ -86,6 +86,7 @@ int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr)while (offset <= packet_len) {struct ipv6_opt_hdr *exthdr; +unsigned int len;switch (**nexthdr) {
@@ -111,7 +112,10 @@ int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr)
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.