Linux 4.19.58
Greg KH
maintainerI'm announcing the release of the 4.19.58 kernel.
All users of the 4.19 kernel series must upgrade.
The updated 4.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.19.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 8 ++ arch/arm64/kernel/module.c | 8 +- arch/mips/Makefile | 3 arch/mips/mm/mmap.c | 2 arch/mips/mm/tlbex.c | 29 +++++--- arch/x86/boot/compressed/head_64.S | 2 arch/x86/include/asm/intel-family.h | 3 arch/x86/kernel/ftrace.c | 3 arch/x86/kvm/lapic.c | 2 arch/x86/kvm/x86.c | 6 - block/blk-core.c | 5 - crypto/cryptd.c | 1 crypto/crypto_user.c | 3 drivers/dma/imx-sdma.c | 4 - drivers/dma/qcom/bam_dma.c | 3 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 19 ----- drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c | 4 - drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c | 4 + drivers/gpu/drm/drm_fb_helper.c | 6 + drivers/gpu/drm/drm_panel_orientation_quirks.c | 32 +++++++++ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 7 +- drivers/gpu/drm/i915/intel_csr.c | 18 +++++ drivers/gpu/drm/imx/ipuv3-crtc.c | 6 - drivers/gpu/drm/mediatek/mtk_drm_drv.c | 8 -- drivers/gpu/drm/mediatek/mtk_dsi.c | 12 +++ drivers/i2c/busses/i2c-pca-platform.c | 3 drivers/md/raid0.c | 2 drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 5 + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 10 ++ drivers/platform/mellanox/mlxreg-hotplug.c | 1 drivers/platform/x86/asus-nb-wmi.c | 8 ++ drivers/platform/x86/asus-wmi.c | 2 drivers/platform/x86/asus-wmi.h | 1 drivers/platform/x86/intel-vbtn.c | 16 ++++ drivers/platform/x86/mlx-platform.c | 2 drivers/scsi/hpsa.c | 7 +- drivers/scsi/hpsa_cmd.h | 1 drivers/spi/spi-bitbang.c | 2 drivers/target/target_core_user.c | 3 drivers/tty/rocket.c | 2 drivers/tty/serial/sc16is7xx.c | 2 drivers/usb/gadget/udc/fusb300_udc.c | 5 + drivers/usb/gadget/udc/lpc32xx_udc.c | 3 fs/btrfs/dev-replace.c | 26 ++++--- fs/btrfs/volumes.c | 2 fs/btrfs/volumes.h | 5 + fs/f2fs/debug.c | 19 +++-- fs/f2fs/super.c | 5 + fs/nfsd/nfs4state.c | 2 fs/userfaultfd.c | 42 +++++++----- include/linux/filter.h | 2 include/net/ipv6_frag.h | 1 kernel/bpf/core.c | 21 ++++-- kernel/cgroup/cpuset.c | 15 ++++ kernel/livepatch/core.c | 6 + kernel/ptrace.c | 4 - kernel/trace/ftrace.c | 12 ++- kernel/trace/trace.c | 10 +- lib/mpi/mpi-pow.c | 6 - mm/mlock.c | 4 - mm/vmscan.c | 27 ++++--- net/bluetooth/l2cap_core.c | 2 net/core/sysctl_net_core.c | 20 ++++- net/ipv6/netfilter/nf_conntrack_reasm.c | 22 +++--- net/mac80211/mesh_pathtbl.c | 2 net/netfilter/nf_flow_table_ip.c | 3 net/netfilter/nft_flow_offload.c | 31 ++++++-- net/rds/send.c | 4 - net/smc/af_smc.c | 6 - net/sunrpc/xprtrdma/svc_rdma_transport.c | 7 +- scripts/decode_stacktrace.sh | 2 sound/core/seq/oss/seq_oss_ioctl.c | 2 sound/core/seq/oss/seq_oss_rw.c | 2 sound/firewire/amdtp-am824.c | 2 sound/hda/ext/hdac_ext_bus.c | 1 sound/pci/hda/hda_codec.c | 1 sound/pci/hda/patch_realtek.c | 8 +- sound/soc/codecs/ak4458.c | 18 +++-- sound/soc/codecs/cs4265.c | 2 sound/soc/codecs/max98090.c | 16 ++++ sound/soc/codecs/rt274.c | 3 sound/soc/soc-pcm.c | 3 sound/soc/sunxi/sun4i-i2s.c | 6 + sound/usb/line6/pcm.c | 5 + sound/usb/mixer_quirks.c | 4 - tools/testing/selftests/net/fib_rule_tests.sh | 4 - 89 files changed, 465 insertions(+), 197 deletions(-)
Alex Deucher (1):
drm/amdgpu/gfx9: use reset default for PA_SC_FIFO_SIZE
Alexandre Belloni (1):
usb: gadget: udc: lpc32xx: allocate descriptor with GFP_ATOMIC
Amadeusz Sławiński (2):
ALSA: hdac: fix memory release for SST and SOF drivers
SoC: rt274: Fix internal jack assignment in set_jack callback
Ard Biesheuvel (1):
arm64: kaslr: keep modules inside module region when KASAN is enabled
Cedric Hombourger (1):
MIPS: have "plain" make calls build dtbs for selected platforms
Chuck Lever (1):
svcrdma: Ignore source port when computing DRC hash
Colin Ian King (3):
ALSA: seq: fix incorrect order of dest_client/dest_ports arguments
ALSA: usb-audio: fix sign unintended sign extension on left shifts
net: hns: fix unsigned comparison to less than zero
Daniel Borkmann (1):
bpf: fix bpf_jit_limit knob for PAGE_SIZE >= 64K
David Ahern (1):
selftests: fib_rule_tests: Fix icmp proto with ipv6
David S. Miller (1):
rds: Fix warning.
Dennis Wassenberg (1):
ALSA: hda/realtek - Change front mic location for Lenovo M710q
Dmitry Korotin (1):
MIPS: Add missing EHB in mtc0 -> mfc0 sequence.
Don Brace (1):
scsi: hpsa: correct ioaccel2 chaining
Eiichi Tsukata (1):
tracing/snapshot: Resize spare buffer if size changed
Eric Biggers (2):
crypto: user - prevent operating on larval algorithms fs/userfaultfd.c: disable irqs for fault_pending and event locks
Eric Dumazet (1):
ip6: fix skb leak in ip6frag_expire_frag_queue()
Evan Quan (1):
drm/amd/powerplay: use hardware fan control if no powerplay fan table
Florian Westphal (4):
netfilter: nf_flow_table: ignore DF bit setting
netfilter: nft_flow_offload: set liberal tracking mode for tcp
netfilter: nft_flow_offload: don't offload when sequence numbers need adjustment
netfilter: nft_flow_offload: IPCB is only valid for ipv4 family
Greg Kroah-Hartman (1):
Linux 4.19.58
Guilherme G. Piccoli (2):
block: Fix a NULL pointer dereference in generic_make_request() md/raid0: Do not bypass blocking queue entered for raid0 bios
Guillaume Nault (2):
netfilter: ipv6: nf_defrag: fix leakage of unqueued fragments
netfilter: ipv6: nf_defrag: accept duplicate fragments again
Guoqing Jiang (1):
sc16is7xx: move label 'err_spi' to correct section
Hans de Goede (3):
drm: panel-orientation-quirks: Add quirk for GPD pocket2
drm: panel-orientation-quirks: Add quirk for GPD MicroPC
platform/x86: asus-wmi: Only Tell EC the OS will handle display hotkeys from asus_nb_wmi
Hauke Mehrtens (1):
MIPS: Fix bounds check virt_addr_valid
Herbert Xu (1):
lib/mpi: Fix karactx leak in mpi_powm
Hsin-Yi Wang (5):
drm/mediatek: fix unbind functions
drm/mediatek: unbind components in mtk_drm_unbind() drm/mediatek: call drm_atomic_helper_shutdown() when unbinding driver drm/mediatek: clear num_pipes when unbind driver drm/mediatek: call mtk_dsi_stop() after mtk_drm_crtc_atomic_disable()
Ido Schimmel (1):
mlxsw: spectrum: Handle VLAN device unlinking
Jaegeuk Kim (1):
f2fs: don't access node/meta inode mapping after iput
Jann Horn (1):
ptrace: Fix ->ptracer_cred handling for PTRACE_TRACEME
Joel Savitz (1):
cpuset: restore sanity to cpuset_cpus_allowed_fallback()
Josh Poimboeuf (1):
module: Fix livepatch/ftrace module text permissions race
Joshua Scott (1):
ARM: dts: armada-xp-98dx3236: Switch to armada-38x-uart serial node
Kan Liang (1):
x86/CPU: Add more Icelake model numbers
Kirill A. Shutemov (1):
x86/boot/compressed/64: Do not corrupt EDX on EFER.LME=1 setting
Libin Yang (1):
ASoC: soc-pcm: BE dai needs prepare when pause release after resume
Linus Torvalds (1):
tty: rocket: fix incorrect forward declaration of 'rp_init()'
Linus Walleij (1):
i2c: pca-platform: Fix GPIO lookup code
Lucas De Marchi (1):
drm/i915/dmc: protect against reading random memory
Lucas Stach (1):
drm/etnaviv: add missing failure path to destroy suballoc
Manuel Traut (1):
scripts/decode_stacktrace.sh: prefix addr2line with $CROSS_COMPILE
Marcus Cooper (2):
ASoC: sun4i-i2s: Fix sun8i tx channel offset mask
ASoC: sun4i-i2s: Add offset to RX channel select
Marek Szyprowski (1):
media: s5p-mfc: fix incorrect bus assignment in virtual child device
Mathew King (1):
platform/x86: intel-vbtn: Report switch events when event wakes device
Matias Karhumaa (1):
Bluetooth: Fix faulty expression for minimum encryption key size check
Matt Flax (1):
ASoC : cs4265 : readable register too low
Nikolay Borisov (1):
btrfs: Ensure replaced device doesn't have pending chunk allocation
Noralf Trønnes (1):
drm/fb-helper: generic: Don't take module ref for fbcon
Paolo Bonzini (1):
KVM: x86: degrade WARN to pr_warn_ratelimited
Paul Menzel (1):
nfsd: Fix overflow causing non-working mounts on 1 TB machines
Petr Mladek (1):
ftrace/x86: Remove possible deadlock between register_kprobe() and ftrace_run_update_code()
Richard Sailer (1):
ALSA: hda/realtek: Add quirks for several Clevo notebook barebones
Robert Beckett (2):
drm/imx: notify drm core before sending event during crtc disable drm/imx: only send event on crtc disable if kept disabled
Robin Gong (1):
dmaengine: imx-sdma: remove BD_INTR for channel0
Salil Mehta (1):
net: hns: Fixes the missing put_device in positive leg for roce reset
Shakeel Butt (1):
mm/vmscan.c: prevent useless kswapd loops
Sricharan R (1):
dmaengine: qcom: bam_dma: Fix completed descriptors count
Takashi Iwai (2):
ALSA: line6: Fix write on zero-sized buffer
ALSA: hda: Initialize power_state field properly
Takashi Sakamoto (1):
ALSA: firewire-lib/fireworks: fix miss detection of received MIDI messages
Ursula Braun (1):
net/smc: move unhash before release of clcsock
Vadim Pasternak (2):
platform/x86: mlx-platform: Fix parent device in i2c-mux-reg device registration platform/mellanox: mlxreg-hotplug: Add devm_free_irq call to remove flow
Vasily Gorbik (1):
tracing: avoid build warning with HAVE_NOP_MCOUNT
Vincent Whitchurch (1):
crypto: cryptd - Fix skcipher instance memory leak
Viorel Suman (2):
ASoC: ak4458: add return value for ak4458_probe
ASoC: ak4458: rstn_control - return a non-zero on error only
Wanpeng Li (1):
KVM: LAPIC: Fix pending interrupt in IRR blocked by software disable LAPIC
Wei Li (1):
ftrace: Fix NULL pointer dereference in free_ftrace_func_mapper()
Wei Yongjun (1):
mac80211: mesh: fix missing unlock on error in table_path_del()
Xiubo Li (1):
scsi: tcmu: fix use after free
Young Xiao (1):
usb: gadget: fusb300_udc: Fix memory leak of fusb300->ep[i]
Yu-Hsuan Hsu (1):
ASoC: max98090: remove 24-bit format support if RJ is 0
YueHaibing (1):
spi: bitbang: Fix NULL pointer dereference in spi_unregister_master
swkhack (1):
mm/mlock.c: change count_mm_mlocked_page_nr return type
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 19 -SUBLEVEL = 57 +SUBLEVEL = 58 EXTRAVERSION = NAME = "People's Front"
arch/arm/boot/dts/armada-xp-98dx3236.dtsi +8 -0
@@ -336,3 +336,11 @@ status = "disabled"; }; +&uart0 { + compatible = "marvell,armada-38x-uart"; +}; + +&uart1 { + compatible = "marvell,armada-38x-uart"; +}; +
arch/arm64/kernel/module.c +6 -2
@@ -32,6 +32,7 @@void *module_alloc (unsigned long size) { +u64 module_alloc_end = module_alloc_base +MODULES_VSIZE ;gfp_t gfp_mask =GFP_KERNEL ;void *p;
@@ -39,9 +40,12 @@ void *module_alloc(unsigned long size)if (IS_ENABLED (CONFIG_ARM64_MODULE_PLTS )) gfp_mask |= __GFP_NOWARN; +if (IS_ENABLED (CONFIG_KASAN )) +/* don't exceed the static module region - see below */ + module_alloc_end =MODULES_END ; + p =__vmalloc_node_range (size,MODULE_ALIGN , module_alloc_base, - module_alloc_base +MODULES_VSIZE , - gfp_mask,PAGE_KERNEL_EXEC ,0 , + module_alloc_end, gfp_mask,PAGE_KERNEL_EXEC ,0 ,NUMA_NO_NODE ,__builtin_return_address (0 )); if (!p && IS_ENABLED(CONFIG_ARM64_MODULE_PLTS) &&
arch/mips/Makefile +2 -1
@@ -16,6 +16,7 @@ archscripts: scripts_basic $(Q)$(MAKE) $(build)=arch/mips/boot/tools relocs KBUILD_DEFCONFIG := 32r2el_defconfig +KBUILD_DTBS := dtbs # # Select the object file format to substitute into the linker script.
@@ -385,7 +386,7 @@ quiet_cmd_64 = OBJCOPY $@ vmlinux.64: vmlinux $(call cmd,64) -all: $(all-y) +all: $(all-y) $(KBUILD_DTBS) # boot $(boot-y): $(vmlinux-32) FORCE
arch/mips/mm/mmap.c +1 -1
@@ -203,7 +203,7 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)int __virt_addr_valid (const volatile void *kaddr) { -unsigned long vaddr = (unsigned long )vaddr; +unsigned long vaddr = (unsigned long )kaddr;if ((vaddr <PAGE_OFFSET ) || (vaddr >=MAP_BASE ))return 0 ;
arch/mips/mm/tlbex.c +20 -9
@@ -391,6 +391,7 @@ static struct work_registers build_get_work_registers(u32 **p)static void build_restore_work_registers (u32 **p) {if (scratch_reg >=0 ) { +uasm_i_ehb (p);UASM_i_MFC0 (p,1 ,c0_kscratch (), scratch_reg);return ; }
@@ -667,10 +668,12 @@ static void build_restore_pagemask(u32 **p, struct uasm_reloc **r,uasm_i_mtc0 (p,0 ,C0_PAGEMASK );uasm_il_b (p, r, lid); } -if (scratch_reg >=0 ) +if (scratch_reg >=0 ) { +uasm_i_ehb (p);UASM_i_MFC0 (p,1 ,c0_kscratch (), scratch_reg); -else + }else {UASM_i_LW (p,1 ,scratchpad_offset (0 ),0 ); + } }else {/* Reset default page size */ if (PM_DEFAULT_MASK >>16 ) {
@@ -935,10 +938,12 @@ build_get_pgd_vmalloc64(u32 **p, struct uasm_label **l, struct uasm_reloc **r,uasm_i_jr (p, ptr);if (mode == refill_scratch) { -if (scratch_reg >=0 ) +if (scratch_reg >=0 ) { +uasm_i_ehb (p);UASM_i_MFC0 (p,1 ,c0_kscratch (), scratch_reg); -else + }else {UASM_i_LW (p,1 ,scratchpad_offset (0 ),0 ); + } }else {uasm_i_nop (p); }
@@ -1255,6 +1260,7 @@ build_fast_tlb_refill_handler (u32 **p, struct uasm_label **l,UASM_i_MTC0 (p, odd,C0_ENTRYLO1 );/* load it */ if (c0_scratch_reg >=0 ) { +uasm_i_ehb (p);UASM_i_MFC0 (p, scratch,c0_kscratch (), c0_scratch_reg);build_tlb_write_entry (p, l, r, tlb_random);uasm_l_leave (l, *p);
@@ -1600,15 +1606,17 @@ static void build_setup_pgd(void)uasm_i_dinsm (&p, a0,0 ,29 ,64 -29 );uasm_l_tlbl_goaround1 (&l, p);UASM_i_SLL (&p, a0, a0,11 ); -uasm_i_jr (&p,31 );UASM_i_MTC0 (&p, a0,C0_CONTEXT ); +uasm_i_jr (&p,31 ); + uasm_i_ehb(&p); }else {/* PGD in c0_KScratch */ -uasm_i_jr (&p,31 );if (cpu_has_ldpte)UASM_i_MTC0 (&p, a0,C0_PWBASE );else UASM_i_MTC0 (&p, a0,c0_kscratch (), pgd_reg); +uasm_i_jr (&p,31 ); +uasm_i_ehb (&p); }#else #ifdef CONFIG_SMP
@@ -1622,13 +1630,16 @@ static void build_setup_pgd(void)UASM_i_LA_mostly (&p, a2, pgdc);UASM_i_SW (&p, a0,uasm_rel_lo (pgdc), a2);#endif /* SMP */ -uasm_i_jr (&p,31 );/* if pgd_reg is allocated, save PGD also to scratch register */ -if (pgd_reg !=-1 ) +if (pgd_reg !=-1 ) {UASM_i_MTC0 (&p, a0,c0_kscratch (), pgd_reg); -else +uasm_i_jr (&p,31 ); +uasm_i_ehb (&p); + }else { +uasm_i_jr (&p,31 );uasm_i_nop (&p); + }#endif if (p >= (u32 *)tlbmiss_handler_setup_pgd_end)panic ("tlbmiss_handler_setup_pgd space exceeded" );
arch/x86/boot/compressed/head_64.S +2 -0
@@ -602,10 +602,12 @@ ENTRY(trampoline_32bit_src) 3: /* Set EFER.LME=1 as a precaution in case hypervsior pulls the rug */ pushl %ecx + pushl %edx movl $MSR_EFER, %ecx rdmsr btsl $_EFER_LME, %eax wrmsr + popl %edx popl %ecx /* Enable PAE and LA57 (if required) paging modes */
arch/x86/include/asm/intel-family.h +3 -0
@@ -52,6 +52,9 @@#define INTEL_FAM6_CANNONLAKE_MOBILE 0x66 +#define INTEL_FAM6_ICELAKE_X 0x6A +#define INTEL_FAM6_ICELAKE_XEON_D 0x6C +#define INTEL_FAM6_ICELAKE_DESKTOP 0x7D#define INTEL_FAM6_ICELAKE_MOBILE 0x7E/* "Small Core" Processors (Atom) */
arch/x86/kernel/ftrace.c +3 -0
@@ -22,6 +22,7 @@#include <linux/init.h> #include <linux/list.h> #include <linux/module.h> +#include <linux/memory.h> #include <trace/syscall.h>
@@ -35,6 +36,7 @@int ftrace_arch_code_modify_prepare (void ) { +mutex_lock (&text_mutex);set_kernel_text_rw ();set_all_modules_text_rw ();return 0 ;
@@ -44,6 +46,7 @@ int ftrace_arch_code_modify_post_process(void) {set_all_modules_text_ro ();set_kernel_text_ro (); +mutex_unlock (&text_mutex);return 0 ; }
arch/x86/kvm/lapic.c +1 -1
@@ -2275,7 +2275,7 @@ int kvm_apic_has_interrupt(struct kvm_vcpu *vcpu)struct kvm_lapic *apic = vcpu->arch.apic;u32 ppr; -if (!apic_enabled (apic)) +if (!kvm_apic_hw_enabled (apic))return -1 ;__apic_update_ppr (apic, &ppr);
arch/x86/kvm/x86.c +3 -3
@@ -1447,7 +1447,7 @@ static int set_tsc_khz(struct kvm_vcpu *vcpu, u32 user_tsc_khz, bool scale) vcpu->arch.tsc_always_catchup =1 ;return 0 ; }else { -WARN (1 ,"user requested TSC rate below hardware speed\n" ); +pr_warn_ratelimited ("user requested TSC rate below hardware speed\n" );return -1 ; } }
@@ -1457,8 +1457,8 @@ static int set_tsc_khz(struct kvm_vcpu *vcpu, u32 user_tsc_khz, bool scale) user_tsc_khz, tsc_khz);if (ratio ==0 || ratio >= kvm_max_tsc_scaling_ratio) { -WARN_ONCE (1 ,"Invalid TSC scaling ratio - virtual-tsc-khz=%u\n" , - user_tsc_khz); +pr_warn_ratelimited ("Invalid TSC scaling ratio - virtual-tsc-khz=%u\n" , + user_tsc_khz);return -1 ; }
block/blk-core.c +2 -3
@@ -2445,10 +2445,8 @@ blk_qc_t generic_make_request(struct bio *bio) flags =0 ;if (bio->bi_opf &REQ_NOWAIT ) flags =BLK_MQ_REQ_NOWAIT ; -if (blk_queue_enter (q, flags) <0 ) { +if (blk_queue_enter (q, flags) <0 ) enter_succeeded = false; - q =NULL ; - } }if (enter_succeeded) {
@@ -2479,6 +2477,7 @@ blk_qc_t generic_make_request(struct bio *bio)bio_wouldblock_error (bio); elsebio_io_error (bio ); + q =NULL ; } bio =bio_list_pop (&bio_list_on_stack[0 ]); }while (bio);
crypto/cryptd.c +1 -0
@@ -586,6 +586,7 @@ static void cryptd_skcipher_free(struct skcipher_instance *inst)struct skcipherd_instance_ctx *ctx =skcipher_instance_ctx (inst);crypto_drop_skcipher (&ctx->spawn); +kfree (inst); } static int cryptd_create_skcipher(struct crypto_template *tmpl,
crypto/crypto_user.c +3 -0
@@ -55,6 +55,9 @@ static struct crypto_alg *crypto_alg_match(struct crypto_user_alg *p, int exact)list_for_each_entry (q, &crypto_alg_list, cra_list) {int match =0 ; +if (crypto_is_larval (q)) +continue ; +if ((q->cra_flags ^ p->cru_type) & p->cru_mask)continue ;
drivers/dma/imx-sdma.c +2 -2
@@ -681,7 +681,7 @@ static int sdma_load_script(struct sdma_engine *sdma, void *buf, int size,spin_lock_irqsave (&sdma->channel_0_lock, flags); bd0->mode.command =C0_SETPM ; - bd0->mode.status =BD_DONE |BD_INTR |BD_WRAP |BD_EXTD ; + bd0->mode.status =BD_DONE |BD_WRAP |BD_EXTD ; bd0->mode.count = size /2 ; bd0->buffer_addr = buf_phys; bd0->ext_buffer_addr = address;
@@ -1000,7 +1000,7 @@ static int sdma_load_context(struct sdma_channel *sdmac) context->gReg[7 ] = sdmac->watermark_level; bd0->mode.command =C0_SETDM ; - bd0->mode.status =BD_DONE |BD_INTR |BD_WRAP |BD_EXTD ; + bd0->mode.status =BD_DONE |BD_WRAP |BD_EXTD ; bd0->mode.count =sizeof (*context) /4 ; bd0->buffer_addr = sdma->context_phys; bd0->ext_buffer_addr =2048 + (sizeof (*context) /4 ) * channel;
drivers/dma/qcom/bam_dma.c +3 -0
@@ -808,6 +808,9 @@ static u32 process_channel_irqs(struct bam_device *bdev)/* Number of bytes available to read */ avail =CIRC_CNT (offset, bchan->head,MAX_DESCRIPTORS +1 ); +if (offset < bchan->head) + avail--; +list_for_each_entry_safe (async_desc, tmp, &bchan->desc_list, desc_node) {/* Not enough data to read */
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0 -19
@@ -1801,25 +1801,6 @@ static void gfx_v9_0_gpu_init(struct amdgpu_device *adev)mutex_unlock (&adev->srbm_mutex);gfx_v9_0_init_compute_vmid (adev); - -mutex_lock (&adev->grbm_idx_mutex); -/* -* making sure that the following register writes will be broadcasted -* to all the shaders -*/ -gfx_v9_0_select_se_sh (adev,0xffffffff ,0xffffffff ,0xffffffff ); - -WREG32_SOC15 (GC ,0 , mmPA_SC_FIFO_SIZE, - (adev->gfx.config.sc_prim_fifo_size_frontend << -PA_SC_FIFO_SIZE__SC_FRONTEND_PRIM_FIFO_SIZE__SHIFT ) | - (adev->gfx.config.sc_prim_fifo_size_backend << -PA_SC_FIFO_SIZE__SC_BACKEND_PRIM_FIFO_SIZE__SHIFT ) | - (adev->gfx.config.sc_hiz_tile_fifo_size << -PA_SC_FIFO_SIZE__SC_HIZ_TILE_FIFO_SIZE__SHIFT ) | - (adev->gfx.config.sc_earlyz_tile_fifo_size << -PA_SC_FIFO_SIZE__SC_EARLYZ_TILE_FIFO_SIZE__SHIFT )); -mutex_unlock (&adev->grbm_idx_mutex); - }static void gfx_v9_0_wait_for_rlc_serdes (struct amdgpu_device *adev)
drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c +3 -1
@@ -916,8 +916,10 @@ static int init_thermal_controller(PHM_PlatformCaps_ThermalController ); -if (0 == powerplay_table->usFanTableOffset) +if (0 == powerplay_table->usFanTableOffset) { + hwmgr->thermal_controller.use_hw_fan_control =1 ;return 0 ; + } fan_table = (const PPTable_Generic_SubTable_Header *) (((unsigned long)powerplay_table) +
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +1 -0
@@ -677,6 +677,7 @@ struct pp_thermal_controller_info {uint8_t ucType;uint8_t ucI2cLine;uint8_t ucI2cAddress; +uint8_t use_hw_fan_control;struct pp_fan_info fanInfo;struct pp_advance_fan_control_parameters advanceFanControlParameters; };
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +4 -0
@@ -2038,6 +2038,10 @@ static int polaris10_thermal_setup_fan_table(struct pp_hwmgr *hwmgr)return 0 ; } +/* use hardware fan control */ +if (hwmgr->thermal_controller.use_hw_fan_control) +return 0 ; + tmp64 = hwmgr->thermal_controller.advanceFanControlParameters. usPWMMin * duty100;do_div (tmp64,10000 );
drivers/gpu/drm/drm_fb_helper.c +4 -2
@@ -2957,7 +2957,8 @@ static int drm_fbdev_fb_open(struct fb_info *info, int user) {struct drm_fb_helper *fb_helper = info->par; -if (!try_module_get (fb_helper->dev->driver->fops->owner)) +/* No need to take a ref for fbcon because it unbinds on unregister */ +if (user && !try_module_get (fb_helper->dev->driver->fops->owner))return -ENODEV ;return 0 ;
@@ -2967,7 +2968,8 @@ static int drm_fbdev_fb_release(struct fb_info *info, int user) {struct drm_fb_helper *fb_helper = info->par; -module_put (fb_helper->dev->driver->fops->owner); +if (user) +module_put (fb_helper->dev->driver->fops->owner);return 0 ; }
drivers/gpu/drm/drm_panel_orientation_quirks.c +32 -0
@@ -42,6 +42,14 @@ static const struct drm_dmi_panel_orientation_data asus_t100ha = { .orientation = DRM_MODE_PANEL_ORIENTATION_LEFT_UP, }; +static const struct drm_dmi_panel_orientation_data gpd_micropc = { + .width =720 , + .height =1280 , + .bios_dates = (const char *const []){"04/26/2019" , +NULL }, + .orientation =DRM_MODE_PANEL_ORIENTATION_RIGHT_UP , +}; +static const struct drm_dmi_panel_orientation_data gpd_pocket = { .width =1200 , .height =1920 ,
@@ -50,6 +58,14 @@ static const struct drm_dmi_panel_orientation_data gpd_pocket = { .orientation = DRM_MODE_PANEL_ORIENTATION_RIGHT_UP, }; +static const struct drm_dmi_panel_orientation_data gpd_pocket2 = { + .width =1200 , + .height =1920 , + .bios_dates = (const char *const []){"06/28/2018" ,"08/28/2018" , +"12/07/2018" ,NULL }, + .orientation =DRM_MODE_PANEL_ORIENTATION_RIGHT_UP , +}; +static const struct drm_dmi_panel_orientation_data gpd_win = { .width =720 , .height =1280 ,
@@ -85,6 +101,14 @@ static const struct dmi_system_id orientation_data[] = { DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100HAN"), }, .driver_data = (void *)&asus_t100ha, + }, { /* GPD MicroPC (generic strings, also match on bios date) */ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"Default string" ), +DMI_EXACT_MATCH (DMI_PRODUCT_NAME ,"Default string" ), +DMI_EXACT_MATCH (DMI_BOARD_VENDOR ,"Default string" ), + DMI_EXACT_MATCH(DMI_BOARD_NAME, "Default string"), + }, + .driver_data = (void *)&gpd_micropc, }, { /** GPD Pocket, note that the the DMI data is less generic then * it seems, devices with a board-vendor of "AMI Corporation"
@@ -98,6 +122,14 @@ static const struct dmi_system_id orientation_data[] = { DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Default string"), }, .driver_data = (void *)&gpd_pocket, + }, { /* GPD Pocket 2 (generic strings, also match on bios date) */ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"Default string" ), +DMI_EXACT_MATCH (DMI_PRODUCT_NAME ,"Default string" ), +DMI_EXACT_MATCH (DMI_BOARD_VENDOR ,"Default string" ), + DMI_EXACT_MATCH(DMI_BOARD_NAME, "Default string"), + }, + .driver_data = (void *)&gpd_pocket2, }, { /* GPD Win (same note on DMI match as GPD Pocket) */ .matches = { DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +5 -2
@@ -760,7 +760,7 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu)if (IS_ERR (gpu->cmdbuf_suballoc)) {dev_err (gpu->dev,"Failed to create cmdbuf suballocator\n" ); ret =PTR_ERR (gpu->cmdbuf_suballoc); - goto fail; + goto destroy_iommu; }/* Create buffer: */
@@ -768,7 +768,7 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu) PAGE_SIZE);if (ret) {dev_err (gpu->dev,"could not create command buffer\n" ); - goto destroy_iommu; + goto destroy_suballoc; } if (gpu->mmu->version == ETNAVIV_IOMMU_V1 &&
@@ -800,6 +800,9 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu) free_buffer:etnaviv_cmdbuf_free (&gpu->buffer); gpu->buffer.suballoc =NULL ; +destroy_suballoc: +etnaviv_cmdbuf_suballoc_destroy (gpu->cmdbuf_suballoc); + gpu->cmdbuf_suballoc =NULL ; destroy_iommu:etnaviv_iommu_destroy (gpu->mmu); gpu->mmu =NULL ;
drivers/gpu/drm/i915/intel_csr.c +18 -0
@@ -282,10 +282,17 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,uint32_t i;uint32_t *dmc_payload;uint32_t required_version; +size_t fsize;if (!fw)return NULL ; + fsize =sizeof (struct intel_css_header ) + +sizeof (struct intel_package_header ) + +sizeof (struct intel_dmc_header ); +if (fsize > fw->size) + goto error_truncated; +/* Extract CSS Header information*/ css_header = (struct intel_css_header *)fw->data; if (sizeof(struct intel_css_header) !=
@@ -360,6 +367,9 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,return NULL ; } readcount += dmc_offset; + fsize += dmc_offset; +if (fsize > fw->size) + goto error_truncated;/* Extract dmc_header information. */ dmc_header = (struct intel_dmc_header *)&fw->data[readcount];
@@ -391,6 +401,10 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,/* fw_size is in dwords, so multiplied by 4 to convert into bytes. */ nbytes = dmc_header->fw_size *4 ; + fsize += nbytes; +if (fsize > fw->size) + goto error_truncated; +if (nbytes >CSR_MAX_FW_SIZE ) {DRM_ERROR ("DMC firmware too big (%u bytes)\n" , nbytes);return NULL ;
@@ -404,6 +418,10 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv, }return memcpy (dmc_payload, &fw->data[readcount], nbytes); + +error_truncated: +DRM_ERROR ("Truncated DMC firmware, rejecting.\n" ); +return NULL ; }static void csr_load_work_fn (struct work_struct *work)
drivers/gpu/drm/imx/ipuv3-crtc.c +3 -3
@@ -98,14 +98,14 @@ static void ipu_crtc_atomic_disable(struct drm_crtc *crtc,ipu_dc_disable (ipu);ipu_prg_disable (ipu); +drm_crtc_vblank_off (crtc); +spin_lock_irq (&crtc->dev->event_lock); -if (crtc->state->event) { +if (crtc->state->event && !crtc->state->active) {drm_crtc_send_vblank_event (crtc, crtc->state->event); crtc->state->event =NULL ; }spin_unlock_irq (&crtc->dev->event_lock); - -drm_crtc_vblank_off (crtc); }static void imx_drm_crtc_reset (struct drm_crtc *crtc)
drivers/gpu/drm/mediatek/mtk_drm_drv.c +3 -5
@@ -310,6 +310,7 @@ static int mtk_drm_kms_init(struct drm_device *drm)static void mtk_drm_kms_deinit (struct drm_device *drm) {drm_kms_helper_poll_fini (drm); +drm_atomic_helper_shutdown (drm);component_unbind_all (drm->dev, drm);drm_mode_config_cleanup (drm);
@@ -390,7 +391,9 @@ static void mtk_drm_unbind(struct device *dev)struct mtk_drm_private *private =dev_get_drvdata (dev);drm_dev_unregister (private->drm); +mtk_drm_kms_deinit (private->drm);drm_dev_put (private->drm); + private->num_pipes =0 ; private->drm =NULL ; }
@@ -559,13 +562,8 @@ static int mtk_drm_probe(struct platform_device *pdev)static int mtk_drm_remove (struct platform_device *pdev) {struct mtk_drm_private *private =platform_get_drvdata (pdev); -struct drm_device *drm = private->drm;int i; -drm_dev_unregister (drm); -mtk_drm_kms_deinit (drm); -drm_dev_put (drm); -component_master_del (&pdev->dev, &mtk_drm_ops);pm_runtime_disable (&pdev->dev);of_node_put (private->mutex_node);
drivers/gpu/drm/mediatek/mtk_dsi.c +11 -1
@@ -630,6 +630,15 @@ static void mtk_dsi_poweroff(struct mtk_dsi *dsi)if (--dsi->refcount !=0 )return ; +/* +* mtk_dsi_stop() and mtk_dsi_start() is asymmetric, since +* mtk_dsi_stop() should be called after mtk_drm_crtc_atomic_disable(), +* which needs irq for vblank, and mtk_dsi_stop() will disable irq. +* mtk_dsi_start() needs to be called in mtk_output_dsi_enable(), +* after dsi is fully set. +*/ +mtk_dsi_stop (dsi); +if (!mtk_dsi_switch_to_cmd_mode (dsi,VM_DONE_INT_FLAG ,500 )) {if (dsi->panel) {if (drm_panel_unprepare (dsi->panel)) {
@@ -696,7 +705,6 @@ static void mtk_output_dsi_disable(struct mtk_dsi *dsi) } } -mtk_dsi_stop (dsi);mtk_dsi_poweroff (dsi); dsi->enabled = false;
@@ -841,6 +849,8 @@ static void mtk_dsi_destroy_conn_enc(struct mtk_dsi *dsi)/* Skip connector cleanup if creation was delegated to the bridge */ if (dsi->conn.dev)drm_connector_cleanup (&dsi->conn); +if (dsi->panel) +drm_panel_detach (dsi->panel); }static void mtk_dsi_ddp_start (struct mtk_ddp_comp *comp)
drivers/i2c/busses/i2c-pca-platform.c +1 -2
@@ -21,7 +21,6 @@#include <linux/platform_device.h> #include <linux/i2c-algo-pca.h> #include <linux/platform_data/i2c-pca-platform.h> -#include <linux/gpio.h> #include <linux/gpio/consumer.h> #include <linux/io.h> #include <linux/of.h>
@@ -173,7 +172,7 @@ static int i2c_pca_pf_probe(struct platform_device *pdev) i2c->adap.dev.parent = &pdev->dev; i2c->adap.dev.of_node = np; - i2c->gpio =devm_gpiod_get_optional (&pdev->dev,"reset-gpios" ,GPIOD_OUT_LOW ); + i2c->gpio =devm_gpiod_get_optional (&pdev->dev,"reset" ,GPIOD_OUT_LOW );if (IS_ERR (i2c->gpio))return PTR_ERR (i2c->gpio);
drivers/md/raid0.c +2 -0
@@ -547,6 +547,7 @@ static void raid0_handle_discard(struct mddev *mddev, struct bio *bio)trace_block_bio_remap (bdev_get_queue (rdev->bdev), discard_bio,disk_devt (mddev->gendisk), bio->bi_iter.bi_sector); +bio_clear_flag (bio,BIO_QUEUE_ENTERED );generic_make_request (discard_bio); }bio_endio (bio);
@@ -602,6 +603,7 @@ static bool raid0_make_request(struct mddev *mddev, struct bio *bio) disk_devt(mddev->gendisk), bio_sector);mddev_check_writesame (mddev, bio);mddev_check_write_zeroes (mddev, bio); +bio_clear_flag (bio,BIO_QUEUE_ENTERED );generic_make_request (bio);return true; }
drivers/media/platform/s5p-mfc/s5p_mfc.c +0 -1
@@ -1089,7 +1089,6 @@ static struct device *s5p_mfc_alloc_memdev(struct device *dev,device_initialize (child);dev_set_name (child,"%s:%s" ,dev_name (dev), name); child->parent = dev; - child->bus = dev->bus; child->coherent_dma_mask = dev->coherent_dma_mask; child->dma_mask = dev->dma_mask; child->release = s5p_mfc_memdev_release;
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c +4 -1
@@ -2777,7 +2777,7 @@ static void set_promisc_tcam_enable(struct dsaf_device *dsaf_dev, u32 port)struct hns_mac_cb *mac_cb;u8 addr[ETH_ALEN ] = {0 };u8 port_num; -u16 mskid; +int mskid;/* promisc use vague table match with vlanid = 0 & macaddr = 0 */ hns_dsaf_set_mac_key (dsaf_dev, &mac_key,0x00 , port, addr);
@@ -3149,6 +3149,9 @@ int hns_dsaf_roce_reset(struct fwnode_handle *dsaf_fwnode, bool dereset)dsaf_set_bit (credit,DSAF_SBM_ROCEE_CFG_CRD_EN_B ,1 );dsaf_write_dev (dsaf_dev,DSAF_SBM_ROCEE_CFG_REG_REG , credit); } + +put_device (&pdev->dev); +return 0 ; }EXPORT_SYMBOL (hns_dsaf_roce_reset);
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +10 -0
@@ -4681,6 +4681,16 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *lower_dev, }else if (netif_is_macvlan (upper_dev)) {if (!info->linking)mlxsw_sp_rif_macvlan_del (mlxsw_sp, upper_dev); + }else if (is_vlan_dev (upper_dev)) { +struct net_device *br_dev; + +if (!netif_is_bridge_port (upper_dev)) +break ; +if (info->linking) +break ; + br_dev =netdev_master_upper_dev_get (upper_dev); +mlxsw_sp_port_bridge_leave (mlxsw_sp_port, upper_dev, + br_dev); }break ; }
drivers/platform/mellanox/mlxreg-hotplug.c +1 -0
@@ -673,6 +673,7 @@ static int mlxreg_hotplug_remove(struct platform_device *pdev)/* Clean interrupts setup. */ mlxreg_hotplug_unset_irq (priv); +devm_free_irq (&pdev->dev, priv->irq, priv);return 0 ; }
drivers/platform/x86/asus-nb-wmi.c +8 -0
@@ -78,10 +78,12 @@ static bool asus_q500a_i8042_filter(unsigned char data, unsigned char str,static struct quirk_entry quirk_asus_unknown = { .wapf =0 , + .wmi_backlight_set_devstate = true, };static struct quirk_entry quirk_asus_q500a = { .i8042_filter = asus_q500a_i8042_filter, + .wmi_backlight_set_devstate = true, };/*
@@ -92,26 +94,32 @@ static struct quirk_entry quirk_asus_q500a = {static struct quirk_entry quirk_asus_x55u = { .wapf =4 , .wmi_backlight_power = true, + .wmi_backlight_set_devstate = true, .no_display_toggle = true, };static struct quirk_entry quirk_asus_wapf4 = { .wapf =4 , + .wmi_backlight_set_devstate = true, };static struct quirk_entry quirk_asus_x200ca = { .wapf =2 , + .wmi_backlight_set_devstate = true, };static struct quirk_entry quirk_asus_ux303ub = { .wmi_backlight_native = true, + .wmi_backlight_set_devstate = true, };static struct quirk_entry quirk_asus_x550lb = { + .wmi_backlight_set_devstate = true, .xusb2pr =0x01D9 , };static struct quirk_entry quirk_asus_forceals = { + .wmi_backlight_set_devstate = true, .wmi_force_als_set = true, };
drivers/platform/x86/asus-wmi.c +1 -1
@@ -2231,7 +2231,7 @@ static int asus_wmi_add(struct platform_device *pdev) err =asus_wmi_backlight_init (asus);if (err && err != -ENODEV ) goto fail_backlight; - }else + }else if (asus->driver->quirks->wmi_backlight_set_devstate) err =asus_wmi_set_devstate (ASUS_WMI_DEVID_BACKLIGHT ,2 ,NULL ); status = wmi_install_notify_handler(asus->driver->event_guid,
drivers/platform/x86/asus-wmi.h +1 -0
@@ -44,6 +44,7 @@ struct quirk_entry {bool store_backlight_power;bool wmi_backlight_power;bool wmi_backlight_native; +bool wmi_backlight_set_devstate;bool wmi_force_als_set;int wapf;/*
drivers/platform/x86/intel-vbtn.c +14 -2
@@ -76,12 +76,24 @@ static void notify_handler(acpi_handle handle, u32 event, void *context)struct platform_device *device = context;struct intel_vbtn_priv *priv =dev_get_drvdata (&device->dev);unsigned int val = !(event &1 );/* Even=press, Odd=release */ -const struct key_entry *ke_rel; +const struct key_entry *ke, *ke_rel;bool autorelease;if (priv->wakeup_mode) { -if (sparse_keymap_entry_from_scancode (priv->input_dev, event)) { + ke =sparse_keymap_entry_from_scancode (priv->input_dev, event); +if (ke) {pm_wakeup_hard_event (&device->dev); + +/* +* Switch events like tablet mode will wake the device +* and report the new switch position to the input +* subsystem. +*/ +if (ke->type ==KE_SW ) +sparse_keymap_report_event (priv->input_dev, + event, + val, +0 );return ; } goto out_unknown;
drivers/platform/x86/mlx-platform.c +1 -1
@@ -1626,7 +1626,7 @@ static int __init mlxplat_init(void)for (i =0 ; i <ARRAY_SIZE (mlxplat_mux_data); i++) { priv->pdev_mux[i] =platform_device_register_resndata ( - &mlxplat_dev->dev, + &priv->pdev_i2c->dev,"i2c-mux-reg" , i,NULL ,0 , &mlxplat_mux_data[i],sizeof (mlxplat_mux_data[i]));
drivers/scsi/hpsa.c +6 -1
@@ -4923,7 +4923,7 @@ static int hpsa_scsi_ioaccel2_queue_command(struct ctlr_info *h, curr_sg->reserved[0 ] =0 ; curr_sg->reserved[1 ] =0 ; curr_sg->reserved[2 ] =0 ; - curr_sg->chain_indicator =0x80 ; + curr_sg->chain_indicator =IOACCEL2_CHAIN ; curr_sg = h->ioaccel2_cmd_sg_list[c->cmdindex]; }
@@ -4940,6 +4940,11 @@ static int hpsa_scsi_ioaccel2_queue_command(struct ctlr_info *h, curr_sg++; } +/* +* Set the last s/g element bit +*/ + (curr_sg -1 )->chain_indicator =IOACCEL2_LAST_SG ; +switch (cmd->sc_data_direction) {case DMA_TO_DEVICE : cp->direction &= ~IOACCEL2_DIRECTION_MASK ;
drivers/scsi/hpsa_cmd.h +1 -0
@@ -517,6 +517,7 @@ struct ioaccel2_sg_element {u8 reserved[3 ];u8 chain_indicator;#define IOACCEL2_CHAIN 0x80 +#define IOACCEL2_LAST_SG 0x40 };/*
drivers/spi/spi-bitbang.c +1 -1
@@ -416,7 +416,7 @@ int spi_bitbang_start(struct spi_bitbang *bitbang)if (ret)spi_master_put (master); -return 0 ; +return ret; }EXPORT_SYMBOL_GPL (spi_bitbang_start);
drivers/target/target_core_user.c +2 -1
@@ -1317,12 +1317,13 @@ static int tcmu_check_expired_cmd(int id, void *p, void *data)* target_complete_cmd will translate this to LUN COMM FAILURE */ scsi_status =SAM_STAT_CHECK_CONDITION ; +list_del_init (&cmd->queue_entry); }else { +list_del_init (&cmd->queue_entry);idr_remove (&udev->commands, id);tcmu_free_cmd (cmd); scsi_status =SAM_STAT_TASK_SET_FULL ; } -list_del_init (&cmd->queue_entry);pr_debug ("Timing out cmd %u on dev %s that is %s.\n" , id, udev->name, is_running ?"inflight" :"queued" );
drivers/tty/rocket.c +1 -1
@@ -266,7 +266,7 @@ MODULE_PARM_DESC(pc104_3, "set interface types for ISA(PC104) board #3 (e.g. pc1module_param_array (pc104_4, ulong,NULL ,0 );MODULE_PARM_DESC (pc104_4,"set interface types for ISA(PC104) board #4 (e.g. pc104_4=232,232,485,485,..." ); -static int rp_init (void ); +static int __init rp_init (void );static void rp_cleanup_module (void );module_init (rp_init);
drivers/tty/serial/sc16is7xx.c +2 -0
@@ -1494,10 +1494,12 @@ static int __init sc16is7xx_init(void)#endif return ret; +#ifdef CONFIG_SERIAL_SC16IS7XX_SPI err_spi:#ifdef CONFIG_SERIAL_SC16IS7XX_I2C i2c_del_driver (&sc16is7xx_i2c_uart_driver);#endif +#endif err_i2c:uart_unregister_driver (&sc16is7xx_uart);return ret;
drivers/usb/gadget/udc/fusb300_udc.c +5 -0
@@ -1342,12 +1342,15 @@ static const struct usb_gadget_ops fusb300_gadget_ops = {static int fusb300_remove (struct platform_device *pdev) {struct fusb300 *fusb300 =platform_get_drvdata (pdev); +int i;usb_del_gadget_udc (&fusb300->gadget);iounmap (fusb300->reg);free_irq (platform_get_irq (pdev,0 ), fusb300);fusb300_free_request (&fusb300->ep[0 ]->ep, fusb300->ep0_req); +for (i =0 ; i <FUSB300_MAX_NUM_EP ; i++) +kfree (fusb300->ep[i]);kfree (fusb300);return 0 ;
@@ -1491,6 +1494,8 @@ static int fusb300_probe(struct platform_device *pdev)if (fusb300->ep0_req)fusb300_free_request (&fusb300->ep[0 ]->ep, fusb300->ep0_req); +for (i =0 ; i <FUSB300_MAX_NUM_EP ; i++) +kfree (fusb300->ep[i]);kfree (fusb300); }if (reg)
drivers/usb/gadget/udc/lpc32xx_udc.c +1 -2
@@ -922,8 +922,7 @@ static struct lpc32xx_usbd_dd_gad *udc_dd_alloc(struct lpc32xx_udc *udc)dma_addr_t dma;struct lpc32xx_usbd_dd_gad *dd; - dd = (struct lpc32xx_usbd_dd_gad *)dma_pool_alloc ( - udc->dd_cache, (GFP_KERNEL |GFP_DMA ), &dma); + dd =dma_pool_alloc (udc->dd_cache,GFP_ATOMIC |GFP_DMA , &dma);if (dd) dd->this_dma = dma;
fs/btrfs/dev-replace.c +17 -9
@@ -599,17 +599,25 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, }btrfs_wait_ordered_roots (fs_info,U64_MAX ,0 , (u64)-1 ); - trans =btrfs_start_transaction (root,0 ); -if (IS_ERR (trans)) { -mutex_unlock (&dev_replace->lock_finishing_cancel_unmount); -return PTR_ERR (trans); +while (1 ) { + trans =btrfs_start_transaction (root,0 ); +if (IS_ERR (trans)) { +mutex_unlock (&dev_replace->lock_finishing_cancel_unmount); +return PTR_ERR (trans); + } + ret =btrfs_commit_transaction (trans); +WARN_ON (ret); +/* keep away write_all_supers() during the finishing procedure */ +mutex_lock (&fs_info->fs_devices->device_list_mutex); +mutex_lock (&fs_info->chunk_mutex); +if (src_device->has_pending_chunks) { +mutex_unlock (&root->fs_info->chunk_mutex); +mutex_unlock (&root->fs_info->fs_devices->device_list_mutex); + }else { +break ; + } } - ret =btrfs_commit_transaction (trans); -WARN_ON (ret); -/* keep away write_all_supers() during the finishing procedure */ -mutex_lock (&fs_info->fs_devices->device_list_mutex); -mutex_lock (&fs_info->chunk_mutex);btrfs_dev_replace_write_lock (dev_replace); dev_replace->replace_state = scrub_ret ? BTRFS_IOCTL_DEV_REPLACE_STATE_CANCELED
fs/btrfs/volumes.c +2 -0
@@ -4873,6 +4873,7 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,for (i =0 ; i < map->num_stripes; i++) { num_bytes = map->stripes[i].dev->bytes_used + stripe_size;btrfs_device_set_bytes_used (map->stripes[i].dev, num_bytes); + map->stripes[i].dev->has_pending_chunks = true; }atomic64_sub (stripe_size * map->num_stripes, &info->free_chunk_space);
@@ -7348,6 +7349,7 @@ void btrfs_update_commit_device_bytes_used(struct btrfs_transaction *trans)for (i =0 ; i < map->num_stripes; i++) { dev = map->stripes[i].dev; dev->commit_bytes_used = dev->bytes_used; + dev->has_pending_chunks = false; } }mutex_unlock (&fs_info->chunk_mutex);
fs/btrfs/volumes.h +5 -0
@@ -54,6 +54,11 @@ struct btrfs_device {spinlock_t io_lock____cacheline_aligned ;int running_pending; +/* When true means this device has pending chunk alloc in +* current transaction. Protected by chunk_mutex. +*/ +bool has_pending_chunks; +/* regular prio bios */ struct btrfs_pending_bios pending_bios;/* sync bios */
fs/f2fs/debug.c +12 -7
@@ -94,8 +94,10 @@ static void update_general_status(struct f2fs_sb_info *sbi) si->free_secs =free_sections (sbi); si->prefree_count =prefree_segments (sbi); si->dirty_count =dirty_segments (sbi); - si->node_pages =NODE_MAPPING (sbi)->nrpages; - si->meta_pages =META_MAPPING (sbi)->nrpages; +if (sbi->node_inode) + si->node_pages =NODE_MAPPING (sbi)->nrpages; +if (sbi->meta_inode) + si->meta_pages =META_MAPPING (sbi)->nrpages; si->nats =NM_I (sbi)->nat_cnt; si->dirty_nats =NM_I (sbi)->dirty_nat_cnt; si->sits =MAIN_SEGS (sbi);
@@ -168,7 +170,6 @@ static void update_sit_info(struct f2fs_sb_info *sbi)static void update_mem_info (struct f2fs_sb_info *sbi) {struct f2fs_stat_info *si =F2FS_STAT (sbi); -unsigned npages;int i;if (si->base_mem)
@@ -251,10 +252,14 @@ static void update_mem_info(struct f2fs_sb_info *sbi)sizeof (struct extent_node ); si->page_mem =0 ; - npages =NODE_MAPPING (sbi)->nrpages; - si->page_mem += (unsigned long long )npages <<PAGE_SHIFT ; - npages =META_MAPPING (sbi)->nrpages; - si->page_mem += (unsigned long long )npages <<PAGE_SHIFT ; +if (sbi->node_inode) { +unsigned npages =NODE_MAPPING (sbi)->nrpages; + si->page_mem += (unsigned long long )npages <<PAGE_SHIFT ; + } +if (sbi->meta_inode) { +unsigned npages =META_MAPPING (sbi)->nrpages; + si->page_mem += (unsigned long long )npages <<PAGE_SHIFT ; + } }static int stat_show (struct seq_file *s,void *v)
fs/f2fs/super.c +5 -0
@@ -1050,7 +1050,10 @@ static void f2fs_put_super(struct super_block *sb)f2fs_bug_on (sbi, sbi->fsync_node_num);iput (sbi->node_inode); + sbi->node_inode =NULL ; +iput (sbi->meta_inode); + sbi->meta_inode =NULL ;/* * iput() can update stat information, if f2fs_write_checkpoint()
@@ -3166,6 +3169,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)f2fs_release_ino_entry (sbi, true);truncate_inode_pages_final (NODE_MAPPING (sbi));iput (sbi->node_inode); + sbi->node_inode =NULL ; free_stats:f2fs_destroy_stats (sbi); free_nm:
@@ -3178,6 +3182,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) free_meta_inode:make_bad_inode (sbi->meta_inode);iput (sbi->meta_inode); + sbi->meta_inode =NULL ; free_io_dummy:mempool_destroy (sbi->write_io_dummy); free_percpu:
fs/nfsd/nfs4state.c +1 -1
@@ -1523,7 +1523,7 @@ static u32 nfsd4_get_drc_mem(struct nfsd4_channel_attrs *ca)* Never use more than a third of the remaining memory, * unless it's the only way to give this client a slot: */ - avail =clamp_t (int, avail, slotsize, total_avail/3 ); + avail = clamp_t(unsigned long, avail, slotsize, total_avail/3); num =min_t (int, num, avail / slotsize); nfsd_drc_mem_used += num * slotsize;spin_unlock (&nfsd_drc_lock);
fs/userfaultfd.c +26 -16
133 lines not on this page · raw message
include/linux/filter.h +1 -1
@@ -837,7 +837,7 @@ bpf_run_sk_reuseport(struct sock_reuseport *reuse, struct sock *sk,extern int bpf_jit_enable;extern int bpf_jit_harden;extern int bpf_jit_kallsyms; -extern int bpf_jit_limit; +extern long bpf_jit_limit;typedef void (*bpf_jit_fill_hole_t )(void *area,unsigned int size);
include/net/ipv6_frag.h +0 -1
@@ -94,7 +94,6 @@ ip6frag_expire_frag_queue(struct net *net, struct frag_queue *fq) goto out; head->dev = dev; -skb_get (head);spin_unlock (&fq->q.lock);icmpv6_send (head,ICMPV6_TIME_EXCEED ,ICMPV6_EXC_FRAGTIME ,0 );
kernel/bpf/core.c +15 -6
@@ -366,13 +366,11 @@ void bpf_prog_kallsyms_del_all(struct bpf_prog *fp) }#ifdef CONFIG_BPF_JIT -# define BPF_JIT_LIMIT_DEFAULT (PAGE_SIZE * 40000) -/* All BPF JIT sysctl knobs here. */ int bpf_jit_enable__read_mostly =IS_BUILTIN (CONFIG_BPF_JIT_ALWAYS_ON );int bpf_jit_harden__read_mostly ;int bpf_jit_kallsyms__read_mostly ; -int bpf_jit_limit__read_mostly =BPF_JIT_LIMIT_DEFAULT ; +long bpf_jit_limit__read_mostly ; static __always_inline void bpf_get_prog_addr_region(const struct bpf_prog *prog,
@@ -583,16 +581,27 @@ int bpf_get_kallsym(unsigned int symnum, unsigned long *value, char *type,static atomic_long_t bpf_jit_current; +/* Can be overridden by an arch's JIT compiler if it has a custom, +* dedicated BPF backend memory area, or if neither of the two +* below apply. +*/ +u64 __weak bpf_jit_alloc_exec_limit (void ) +{#if defined(MODULES_VADDR ) +return MODULES_END -MODULES_VADDR ; +#else +return VMALLOC_END -VMALLOC_START ; +#endif +} +static int __init bpf_jit_charge_init (void ) {/* Only used as heuristic here to derive limit. */ - bpf_jit_limit =min_t (u64,round_up ((MODULES_END -MODULES_VADDR ) >>2 , -PAGE_SIZE ),INT_MAX ); + bpf_jit_limit =min_t (u64,round_up (bpf_jit_alloc_exec_limit () >>2 , +PAGE_SIZE ),LONG_MAX );return 0 ; }pure_initcall (bpf_jit_charge_init); -#endif static int bpf_jit_charge_modmem (u32 pages) {
kernel/cgroup/cpuset.c +14 -1
@@ -2432,10 +2432,23 @@ void cpuset_cpus_allowed(struct task_struct *tsk, struct cpumask *pmask)spin_unlock_irqrestore (&callback_lock, flags); } +/** +* cpuset_cpus_allowed_fallback - final fallback before complete catastrophe. +* @tsk: pointer to task_struct with which the scheduler is struggling +* +* Description: In the case that the scheduler cannot find an allowed cpu in +* tsk->cpus_allowed, we fall back to task_cs(tsk)->cpus_allowed. In legacy +* mode however, this value is the same as task_cs(tsk)->effective_cpus, +* which will not contain a sane cpumask during cases such as cpu hotplugging. +* This is the absolute last resort for the scheduler and it is only used if +* _every_ other avenue has been traveled. +**/ +void cpuset_cpus_allowed_fallback (struct task_struct *tsk) {rcu_read_lock (); -do_set_cpus_allowed (tsk,task_cs (tsk)->effective_cpus); +do_set_cpus_allowed (tsk,is_in_v2_mode () ? +task_cs (tsk)->cpus_allowed : cpu_possible_mask);rcu_read_unlock ();/*
kernel/livepatch/core.c +6 -0
@@ -30,6 +30,7 @@#include <linux/elf.h> #include <linux/moduleloader.h> #include <linux/completion.h> +#include <linux/memory.h> #include <asm/cacheflush.h> #include "core.h" #include "patch.h"
@@ -708,16 +709,21 @@ static int klp_init_object_loaded(struct klp_patch *patch,struct klp_func *func;int ret; +mutex_lock (&text_mutex); +module_disable_ro (patch->mod); ret =klp_write_object_relocations (patch->mod, obj);if (ret) {module_enable_ro (patch->mod, true); +mutex_unlock (&text_mutex);return ret; }arch_klp_init_object_loaded (patch, obj);module_enable_ro (patch->mod, true); +mutex_unlock (&text_mutex); +klp_for_each_func (obj, func) { ret = klp_find_object_symbol(obj->name, func->old_name, func->old_sympos,
kernel/ptrace.c +1 -3
@@ -78,9 +78,7 @@ void __ptrace_link(struct task_struct *child, struct task_struct *new_parent,*/ static void ptrace_link (struct task_struct *child,struct task_struct *new_parent) { -rcu_read_lock (); -__ptrace_link (child, new_parent,__task_cred (new_parent)); -rcu_read_unlock (); +__ptrace_link (child, new_parent,current_cred ()); }/**
kernel/trace/ftrace.c +7 -5
@@ -2952,14 +2952,13 @@ static int ftrace_update_code(struct module *mod, struct ftrace_page *new_pgs) p = &pg->records[i]; p->flags = rec_flags; -#ifndef CC_USING_NOP_MCOUNT /* * Do the initial record conversion from mcount jump * to the NOP instructions. */ -if (!ftrace_code_disable (mod, p)) +if (!__is_defined (CC_USING_NOP_MCOUNT ) && + !ftrace_code_disable (mod, p))break ; -#endif update_cnt++; }
@@ -4208,10 +4207,13 @@ void free_ftrace_func_mapper(struct ftrace_func_mapper *mapper,struct ftrace_func_entry *entry;struct ftrace_func_map *map;struct hlist_head *hhd; -int size =1 << mapper->hash.size_bits; -int i; +int size, i; + +if (!mapper) +return ;if (free_func && mapper->hash.count) { + size =1 << mapper->hash.size_bits;for (i =0 ; i < size; i++) { hhd = &mapper->hash.buckets[i];hlist_for_each_entry (entry, hhd, hlist) {
kernel/trace/trace.c +6 -4
@@ -6471,11 +6471,13 @@ tracing_snapshot_write(struct file *filp, const char __user *ubuf, size_t cnt, break; }#endif -if (!tr->allocated_snapshot) { +if (tr->allocated_snapshot) + ret =resize_buffer_duplicate_size (&tr->max_buffer, + &tr->trace_buffer, iter->cpu_file); +else ret =tracing_alloc_snapshot_instance (tr); -if (ret <0 ) -break ; - } +if (ret <0 ) +break ;local_irq_disable ();/* Now, we're going to swap */ if (iter->cpu_file ==RING_BUFFER_ALL_CPUS )
lib/mpi/mpi-pow.c +2 -4
@@ -37,6 +37,7 @@int mpi_powm (MPI res,MPI base,MPI exp,MPI mod) {mpi_ptr_t mp_marker =NULL , bp_marker =NULL , ep_marker =NULL ; +struct karatsuba_ctx karactx = {};mpi_ptr_t xp_marker =NULL ;mpi_ptr_t tspace =NULL ;mpi_ptr_t rp, ep, mp, bp;
@@ -163,13 +164,11 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod)int c;mpi_limb_t e;mpi_limb_t carry_limb; -struct karatsuba_ctx karactx; xp = xp_marker =mpi_alloc_limb_space (2 * (msize +1 ));if (!xp) goto enomem; -memset (&karactx,0 ,sizeof karactx); negative_result = (ep[0 ] &1 ) && base->sign; i = esize -1 ;
@@ -294,8 +293,6 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod)if (mod_shift_cnt)mpihelp_rshift (rp, rp, rsize, mod_shift_cnt);MPN_NORMALIZE (rp, rsize); - -mpihelp_release_karatsuba_ctx (&karactx); }if (negative_result && rsize) {
@@ -312,6 +309,7 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod) leave: rc =0 ; enomem: +mpihelp_release_karatsuba_ctx (&karactx);if (assign_rp)mpi_assign_limb_space (res, rp, size);if (mp_marker)
mm/mlock.c +2 -2
@@ -636,11 +636,11 @@ static int apply_vma_lock_flags(unsigned long start, size_t len,* is also counted. * Return value: previously mlocked page counts */ -static int count_mm_mlocked_page_nr (struct mm_struct *mm, +static unsigned long count_mm_mlocked_page_nr (struct mm_struct *mm,unsigned long start,size_t len) {struct vm_area_struct *vma; -int count =0 ; +unsigned long count =0 ;if (mm ==NULL ) mm = current->mm;
mm/vmscan.c +15 -12
@@ -3599,19 +3599,18 @@ static int balance_pgdat(pg_data_t *pgdat, int order, int classzone_idx) }/* -* pgdat->kswapd_classzone_idx is the highest zone index that a recent -* allocation request woke kswapd for. When kswapd has not woken recently, -* the value is MAX_NR_ZONES which is not a valid index. This compares a -* given classzone and returns it or the highest classzone index kswapd -* was recently woke for. +* The pgdat->kswapd_classzone_idx is used to pass the highest zone index to be +* reclaimed by kswapd from the waker. If the value is MAX_NR_ZONES which is not +* a valid index then either kswapd runs for first time or kswapd couldn't sleep +* after previous reclaim attempt (node is still unbalanced). In that case +* return the zone index of the previous kswapd reclaim cycle. */ static enum zone_type kswapd_classzone_idx (pg_data_t *pgdat, -enum zone_type classzone_idx) +enum zone_type prev_classzone_idx) {if (pgdat->kswapd_classzone_idx ==MAX_NR_ZONES ) -return classzone_idx; - -return max (pgdat->kswapd_classzone_idx, classzone_idx); +return prev_classzone_idx; +return pgdat->kswapd_classzone_idx; } static void kswapd_try_to_sleep(pg_data_t *pgdat, int alloc_order, int reclaim_order,
@@ -3752,7 +3751,7 @@ static int kswapd(void *p)/* Read the new order and classzone_idx */ alloc_order = reclaim_order = pgdat->kswapd_order; - classzone_idx =kswapd_classzone_idx (pgdat,0 ); + classzone_idx =kswapd_classzone_idx (pgdat, classzone_idx); pgdat->kswapd_order =0 ; pgdat->kswapd_classzone_idx =MAX_NR_ZONES ;
@@ -3806,8 +3805,12 @@ void wakeup_kswapd(struct zone *zone, gfp_t gfp_flags, int order,if (!cpuset_zone_allowed (zone, gfp_flags))return ; pgdat = zone->zone_pgdat; - pgdat->kswapd_classzone_idx =kswapd_classzone_idx (pgdat, - classzone_idx); + +if (pgdat->kswapd_classzone_idx ==MAX_NR_ZONES ) + pgdat->kswapd_classzone_idx = classzone_idx; +else + pgdat->kswapd_classzone_idx =max (pgdat->kswapd_classzone_idx, + classzone_idx); pgdat->kswapd_order =max (pgdat->kswapd_order, order);if (!waitqueue_active (&pgdat->kswapd_wait))return ;
net/bluetooth/l2cap_core.c +1 -1
@@ -1352,7 +1352,7 @@ static bool l2cap_check_enc_key_size(struct hci_conn *hcon)* actually encrypted before enforcing a key size. */ return (!test_bit (HCI_CONN_ENCRYPT , &hcon->flags) || - hcon->enc_key_size >HCI_MIN_ENC_KEY_SIZE ); + hcon->enc_key_size >=HCI_MIN_ENC_KEY_SIZE ); }static void l2cap_do_start (struct l2cap_chan *chan)
net/core/sysctl_net_core.c +17 -3
@@ -28,6 +28,8 @@ static int two __maybe_unused = 2;static int min_sndbuf =SOCK_MIN_SNDBUF ;static int min_rcvbuf =SOCK_MIN_RCVBUF ;static int max_skb_frags =MAX_SKB_FRAGS ; +static long long_one__maybe_unused =1 ; +static long long_max__maybe_unused =LONG_MAX ;static int net_msg_warn;/* Unused, but still a sysctl */
@@ -289,6 +291,17 @@ proc_dointvec_minmax_bpf_restricted(struct ctl_table *table, int write,return proc_dointvec_minmax (table, write, buffer, lenp, ppos); } + +static int +proc_dolongvec_minmax_bpf_restricted (struct ctl_table *table,int write, +void __user *buffer,size_t *lenp, +loff_t *ppos) +{ +if (!capable (CAP_SYS_ADMIN )) +return -EPERM ; + +return proc_doulongvec_minmax (table, write, buffer, lenp, ppos); +}#endif static struct ctl_table net_core_table[] = {
@@ -398,10 +411,11 @@ static struct ctl_table net_core_table[] = { { .procname = "bpf_jit_limit", .data = &bpf_jit_limit, - .maxlen = sizeof(int), + .maxlen = sizeof(long), .mode = 0600, - .proc_handler = proc_dointvec_minmax_bpf_restricted, - .extra1 = &one, + .proc_handler = proc_dolongvec_minmax_bpf_restricted, + .extra1 = &long_one, + .extra2 = &long_max, }, #endif {
net/ipv6/netfilter/nf_conntrack_reasm.c +12 -10
@@ -265,8 +265,14 @@ static int nf_ct_frag6_queue(struct frag_queue *fq, struct sk_buff *skb, prev = fq->q.fragments_tail; err =inet_frag_queue_insert (&fq->q, skb, offset, end); -if (err) +if (err) { +if (err ==IPFRAG_DUP ) { +/* No error for duplicates, pretend they got queued. */ +kfree_skb (skb); +return -EINPROGRESS ; + } goto insert_error; + }if (dev) fq->iif = dev->ifindex;
@@ -293,15 +299,17 @@ static int nf_ct_frag6_queue(struct frag_queue *fq, struct sk_buff *skb, skb->_skb_refdst =0UL ; err =nf_ct_frag6_reasm (fq, skb, prev, dev); skb->_skb_refdst = orefdst; -return err; + +/* After queue has assumed skb ownership, only 0 or +* -EINPROGRESS must be returned. +*/ +return err ? -EINPROGRESS :0 ; }skb_dst_drop (skb);return -EINPROGRESS ; insert_error: -if (err ==IPFRAG_DUP ) - goto err;inet_frag_kill (&fq->q); err:skb_dst_drop (skb);
@@ -481,12 +489,6 @@ int nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user) ret =0 ; } -/* after queue has assumed skb ownership, only 0 or -EINPROGRESS -* must be returned. -*/ -if (ret) - ret = -EINPROGRESS ; -spin_unlock_bh (&fq->q.lock);inet_frag_put (&fq->q);return ret;
net/mac80211/mesh_pathtbl.c +1 -1
@@ -627,7 +627,7 @@ static int table_path_del(struct mesh_table *tbl,spin_lock_bh (&tbl->walk_lock); mpath =rhashtable_lookup_fast (&tbl->rhead, addr, mesh_rht_params);if (!mpath) { -rcu_read_unlock (); +spin_unlock_bh (&tbl->walk_lock);return -ENXIO ; }
net/netfilter/nf_flow_table_ip.c +1 -2
@@ -246,8 +246,7 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb, flow = container_of(tuplehash, struct flow_offload, tuplehash[dir]); rt = (struct rtable *)flow->tuplehash[dir].tuple.dst_cache; -if (unlikely (nf_flow_exceeds_mtu (skb, flow->tuplehash[dir].tuple.mtu)) && - (ip_hdr (skb)->frag_off &htons (IP_DF )) !=0 ) +if (unlikely (nf_flow_exceeds_mtu (skb, flow->tuplehash[dir].tuple.mtu)))return NF_ACCEPT ;if (skb_try_make_writable (skb,sizeof (*iph)))
net/netfilter/nft_flow_offload.c +21 -10
@@ -12,7 +12,6 @@#include <net/netfilter/nf_conntrack_core.h> #include <linux/netfilter/nf_conntrack_common.h> #include <net/netfilter/nf_flow_table.h> -#include <net/netfilter/nf_conntrack_helper.h> struct nft_flow_offload {struct nft_flowtable *flowtable;
@@ -49,15 +48,20 @@ static int nft_flow_route(const struct nft_pktinfo *pkt,return 0 ; } -static bool nft_flow_offload_skip (struct sk_buff *skb) +static bool nft_flow_offload_skip (struct sk_buff *skb,int family) { -struct ip_options *opt = &(IPCB (skb)->opt); - -if (unlikely (opt->optlen)) -return true;if (skb_sec_path (skb))return true; +if (family ==NFPROTO_IPV4 ) { +const struct ip_options *opt; + + opt = &(IPCB (skb)->opt); + +if (unlikely (opt->optlen)) +return true; + } +return false; }
@@ -67,15 +71,15 @@ static void nft_flow_offload_eval(const struct nft_expr *expr, {struct nft_flow_offload *priv =nft_expr_priv (expr);struct nf_flowtable *flowtable = &priv->flowtable->data; -const struct nf_conn_help *help;enum ip_conntrack_info ctinfo;struct nf_flow_route route;struct flow_offload *flow;enum ip_conntrack_dir dir; +bool is_tcp = false;struct nf_conn *ct;int ret; -if (nft_flow_offload_skip (pkt->skb)) +if (nft_flow_offload_skip (pkt->skb,nft_pf (pkt))) goto out; ct =nf_ct_get (pkt->skb, &ctinfo);
@@ -84,14 +88,16 @@ static void nft_flow_offload_eval(const struct nft_expr *expr,switch (ct->tuplehash[IP_CT_DIR_ORIGINAL ].tuple.dst.protonum) {case IPPROTO_TCP : + is_tcp = true; +break ;case IPPROTO_UDP :break ;default : goto out; } - help =nfct_help (ct); -if (help) +if (nf_ct_ext_exist (ct,NF_CT_EXT_HELPER ) || + ct->status &IPS_SEQ_ADJUST ) goto out; if (ctinfo == IP_CT_NEW ||
@@ -109,6 +115,11 @@ static void nft_flow_offload_eval(const struct nft_expr *expr,if (!flow) goto err_flow_alloc; +if (is_tcp) { + ct->proto.tcp.seen[0 ].flags |=IP_CT_TCP_FLAG_BE_LIBERAL ; + ct->proto.tcp.seen[1 ].flags |=IP_CT_TCP_FLAG_BE_LIBERAL ; + } + ret =flow_offload_add (flowtable, flow);if (ret <0 ) goto err_flow_add;
net/rds/send.c +3 -1
@@ -1106,9 +1106,11 @@ int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len) sock_flag(rds_rs_to_sk(rs), SOCK_ZEROCOPY));int num_sgs =ceil (payload_len,PAGE_SIZE );int namelen; -struct rds_iov_vector_arr vct = {0 }; +struct rds_iov_vector_arr vct;int ind; +memset (&vct,0 ,sizeof (vct)); +/* expect 1 RDMA CMSG per rds_sendmsg. can still grow if more needed. */ vct.incr =1 ;
net/smc/af_smc.c +3 -3
@@ -848,11 +848,11 @@ static int smc_clcsock_accept(struct smc_sock *lsmc, struct smc_sock **new_smc)if (rc <0 ) lsk->sk_err = -rc;if (rc <0 || lsk->sk_state ==SMC_CLOSED ) { + new_sk->sk_prot->unhash (new_sk);if (new_clcsock)sock_release (new_clcsock); new_sk->sk_state =SMC_CLOSED ;sock_set_flag (new_sk,SOCK_DEAD ); - new_sk->sk_prot->unhash (new_sk);sock_put (new_sk);/* final */ *new_smc =NULL ; goto out;
@@ -903,11 +903,11 @@ struct sock *smc_accept_dequeue(struct sock *parent,smc_accept_unlink (new_sk);if (new_sk->sk_state ==SMC_CLOSED ) { + new_sk->sk_prot->unhash (new_sk);if (isk->clcsock) {sock_release (isk->clcsock); isk->clcsock =NULL ; } - new_sk->sk_prot->unhash (new_sk);sock_put (new_sk);/* final */ continue ; }
@@ -932,6 +932,7 @@ void smc_close_non_accepted(struct sock *sk)sock_set_flag (sk,SOCK_DEAD ); sk->sk_shutdown |=SHUTDOWN_MASK ; } + sk->sk_prot->unhash (sk);if (smc->clcsock) {struct socket *tcp;
@@ -947,7 +948,6 @@ void smc_close_non_accepted(struct sock *sk)smc_conn_free (&smc->conn); }release_sock (sk); - sk->sk_prot->unhash (sk);sock_put (sk);/* final sock_put */ }
net/sunrpc/xprtrdma/svc_rdma_transport.c +6 -1
@@ -270,9 +270,14 @@ static void handle_connect_req(struct rdma_cm_id *new_cma_id,/* Save client advertised inbound read limit for use later in accept. */ newxprt->sc_ord = param->initiator_depth; -/* Set the local and remote addresses in the transport */ sa = (struct sockaddr *)&newxprt->sc_cm_id->route.addr.dst_addr;svc_xprt_set_remote (&newxprt->sc_xprt, sa,svc_addr_len (sa)); +/* The remote port is arbitrary and not under the control of the +* client ULP. Set it to a fixed value so that the DRC continues +* to be effective after a reconnect. +*/ +rpc_set_port ((struct sockaddr *)&newxprt->sc_xprt.xpt_remote,0 ); + sa = (struct sockaddr *)&newxprt->sc_cm_id->route.addr.src_addr;svc_xprt_set_local (&newxprt->sc_xprt, sa,svc_addr_len (sa));
scripts/decode_stacktrace.sh +1 -1
@@ -66,7 +66,7 @@ parse_symbol() { if [[ "${cache[$module,$address]+isset}" == "isset" ]]; then local code=${cache[$module,$address]} else - local code=$(addr2line -i -e "$objfile" "$address") + local code=$(${CROSS_COMPILE}addr2line -i -e "$objfile" "$address") cache[$module,$address]=$code fi
sound/core/seq/oss/seq_oss_ioctl.c +1 -1
@@ -62,7 +62,7 @@ static int snd_seq_oss_oob_user(struct seq_oss_devinfo *dp, void __user *arg)if (copy_from_user (ev, arg,8 ))return -EFAULT ;memset (&tmpev,0 ,sizeof (tmpev)); -snd_seq_oss_fill_addr (dp, &tmpev, dp->addr.port, dp->addr.client); +snd_seq_oss_fill_addr (dp, &tmpev, dp->addr.client, dp->addr.port); tmpev.time.tick =0 ;if (!snd_seq_oss_process_event (dp, (union evrec *)ev, &tmpev)) {snd_seq_oss_dispatch (dp, &tmpev,0 ,0 );
sound/core/seq/oss/seq_oss_rw.c +1 -1
@@ -174,7 +174,7 @@ insert_queue(struct seq_oss_devinfo *dp, union evrec *rec, struct file *opt)memset (&event,0 ,sizeof (event));/* set dummy -- to be sure */ event.type =SNDRV_SEQ_EVENT_NOTEOFF ; -snd_seq_oss_fill_addr (dp, &event, dp->addr.port, dp->addr.client); +snd_seq_oss_fill_addr (dp, &event, dp->addr.client, dp->addr.port);if (snd_seq_oss_process_event (dp, rec, &event))return 0 ;/* invalid event - no need to insert queue */
sound/firewire/amdtp-am824.c +1 -1
@@ -321,7 +321,7 @@ static void read_midi_messages(struct amdtp_stream *s,u8 *b;for (f =0 ; f < frames; f++) { - port = (s->data_block_counter + f) %8 ; + port = (8 - s->tx_first_dbc + s->data_block_counter + f) %8 ; b = (u8 *)&buffer[p->midi_position]; len = b[0 ] -0x80 ;
sound/hda/ext/hdac_ext_bus.c +0 -1
@@ -173,7 +173,6 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_device_init);void snd_hdac_ext_bus_device_exit (struct hdac_device *hdev) {snd_hdac_device_exit (hdev); -kfree (hdev); }EXPORT_SYMBOL_GPL (snd_hdac_ext_bus_device_exit);
sound/pci/hda/hda_codec.c +1 -0
@@ -971,6 +971,7 @@ int snd_hda_codec_device_new(struct hda_bus *bus, struct snd_card *card,/* power-up all before initialization */ hda_set_power_state (codec,AC_PWRST_D0 ); + codec->core.dev.power.power_state =PMSG_ON ;snd_hda_codec_proc_new (codec);
sound/pci/hda/patch_realtek.c +5 -3
@@ -2443,9 +2443,10 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = {SND_PCI_QUIRK (0x1558 ,0x9501 ,"Clevo P950HR" ,ALC1220_FIXUP_CLEVO_P950 ),SND_PCI_QUIRK (0x1558 ,0x95e1 ,"Clevo P95xER" ,ALC1220_FIXUP_CLEVO_P950 ),SND_PCI_QUIRK (0x1558 ,0x95e2 ,"Clevo P950ER" ,ALC1220_FIXUP_CLEVO_P950 ), -SND_PCI_QUIRK (0x1558 ,0x96e1 ,"System76 Oryx Pro (oryp5)" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), -SND_PCI_QUIRK (0x1558 ,0x97e1 ,"System76 Oryx Pro (oryp5)" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), -SND_PCI_QUIRK (0x1558 ,0x65d1 ,"Tuxedo Book XC1509" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), +SND_PCI_QUIRK (0x1558 ,0x96e1 ,"Clevo P960[ER][CDFN]-K" ,ALC1220_FIXUP_CLEVO_P950 ), +SND_PCI_QUIRK (0x1558 ,0x97e1 ,"Clevo P970[ER][CDFN]" ,ALC1220_FIXUP_CLEVO_P950 ), +SND_PCI_QUIRK (0x1558 ,0x65d1 ,"Clevo PB51[ER][CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), +SND_PCI_QUIRK (0x1558 ,0x67d1 ,"Clevo PB71[ER][CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK_VENDOR (0x1558 ,"Clevo laptop" ,ALC882_FIXUP_EAPD ),SND_PCI_QUIRK (0x161f ,0x2054 ,"Medion laptop" ,ALC883_FIXUP_EAPD ), SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Y530", ALC882_FIXUP_LENOVO_Y530),
@@ -6938,6 +6939,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x17aa ,0x30bb ,"ThinkCentre AIO" ,ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY ),SND_PCI_QUIRK (0x17aa ,0x30e2 ,"ThinkCentre AIO" ,ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY ),SND_PCI_QUIRK (0x17aa ,0x310c ,"ThinkCentre Station" ,ALC294_FIXUP_LENOVO_MIC_LOCATION ), +SND_PCI_QUIRK (0x17aa ,0x3111 ,"ThinkCentre Station" ,ALC294_FIXUP_LENOVO_MIC_LOCATION ),SND_PCI_QUIRK (0x17aa ,0x312a ,"ThinkCentre Station" ,ALC294_FIXUP_LENOVO_MIC_LOCATION ),SND_PCI_QUIRK (0x17aa ,0x312f ,"ThinkCentre Station" ,ALC294_FIXUP_LENOVO_MIC_LOCATION ), SND_PCI_QUIRK(0x17aa, 0x313c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),
sound/soc/codecs/ak4458.c +11 -7
@@ -272,7 +272,10 @@ static int ak4458_rstn_control(struct snd_soc_component *component, int bit)AK4458_00_CONTROL1 ,AK4458_RSTN_MASK , 0x0); -return ret; +if (ret <0 ) +return ret; + +return 0 ; } static int ak4458_hw_params(struct snd_pcm_substream *substream,
@@ -492,9 +495,10 @@ static void ak4458_power_on(struct ak4458_priv *ak4458) } } -static void ak4458_init (struct snd_soc_component *component) +static int ak4458_init (struct snd_soc_component *component) {struct ak4458_priv *ak4458 =snd_soc_component_get_drvdata (component); +int ret;/* External Mute ON */ if (ak4458->mute_gpiod)
@@ -502,21 +506,21 @@ static void ak4458_init(struct snd_soc_component *component)ak4458_power_on (ak4458); -snd_soc_component_update_bits (component,AK4458_00_CONTROL1 , + ret =snd_soc_component_update_bits (component,AK4458_00_CONTROL1 ,0x80 ,0x80 );/* ACKS bit = 1; 10000000 */ +if (ret <0 ) +return ret; -ak4458_rstn_control (component,1 ); +return ak4458_rstn_control (component,1 ); }static int ak4458_probe (struct snd_soc_component *component) {struct ak4458_priv *ak4458 =snd_soc_component_get_drvdata (component); -ak4458_init (component); - ak4458->fs =48000 ; -return 0 ; +return ak4458_init (component); }static void ak4458_remove (struct snd_soc_component *component)
sound/soc/codecs/cs4265.c +1 -1
@@ -60,7 +60,7 @@ static const struct reg_default cs4265_reg_defaults[] = {static bool cs4265_readable_register (struct device *dev,unsigned int reg) {switch (reg) { - case CS4265_CHIP_ID ... CS4265_SPDIF_CTL2: + case CS4265_CHIP_ID ... CS4265_MAX_REGISTER:return true;default :return false;
sound/soc/codecs/max98090.c +16 -0
@@ -1924,6 +1924,21 @@ static int max98090_configure_dmic(struct max98090_priv *max98090,return 0 ; } +static int max98090_dai_startup (struct snd_pcm_substream *substream, +struct snd_soc_dai *dai) +{ +struct snd_soc_component *component = dai->component; +struct max98090_priv *max98090 =snd_soc_component_get_drvdata (component); +unsigned int fmt = max98090->dai_fmt; + +/* Remove 24-bit format support if it is not in right justified mode. */ +if ((fmt &SND_SOC_DAIFMT_FORMAT_MASK ) !=SND_SOC_DAIFMT_RIGHT_J ) { + substream->runtime->hw.formats =SNDRV_PCM_FMTBIT_S16_LE ; +snd_pcm_hw_constraint_msbits (substream->runtime,0 ,16 ,16 ); + } +return 0 ; +} +static int max98090_dai_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params,struct snd_soc_dai *dai)
@@ -2331,6 +2346,7 @@ EXPORT_SYMBOL_GPL(max98090_mic_detect);#define MAX98090_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE)static const struct snd_soc_dai_ops max98090_dai_ops = { + .startup = max98090_dai_startup, .set_sysclk = max98090_dai_set_sysclk, .set_fmt = max98090_dai_set_fmt, .set_tdm_slot = max98090_set_tdm_slot,
sound/soc/codecs/rt274.c +2 -1
@@ -398,6 +398,8 @@ static int rt274_mic_detect(struct snd_soc_component *component, {struct rt274_priv *rt274 =snd_soc_component_get_drvdata (component); + rt274->jack = jack; +if (jack ==NULL ) {/* Disable jack detection */ regmap_update_bits(rt274->regmap, RT274_EAPD_GPIO_IRQ_CTRL,
@@ -405,7 +407,6 @@ static int rt274_mic_detect(struct snd_soc_component *component,return 0 ; } - rt274->jack = jack;regmap_update_bits (rt274->regmap,RT274_EAPD_GPIO_IRQ_CTRL ,RT274_IRQ_EN ,RT274_IRQ_EN );
sound/soc/soc-pcm.c +2 -1
@@ -2451,7 +2451,8 @@ int dpcm_be_dai_prepare(struct snd_soc_pcm_runtime *fe, int stream)if ((be->dpcm[stream].state !=SND_SOC_DPCM_STATE_HW_PARAMS ) && (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_STOP ) && - (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_SUSPEND )) + (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_SUSPEND ) && + (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_PAUSED ))continue ; dev_dbg(be->dev, "ASoC: prepare BE %s\n",
sound/soc/sunxi/sun4i-i2s.c +5 -1
@@ -110,7 +110,7 @@#define SUN8I_I2S_TX_CHAN_MAP_REG 0x44#define SUN8I_I2S_TX_CHAN_SEL_REG 0x34 -#define SUN8I_I2S_TX_CHAN_OFFSET_MASK GENMASK(13, 11) +#define SUN8I_I2S_TX_CHAN_OFFSET_MASK GENMASK(13, 12)#define SUN8I_I2S_TX_CHAN_OFFSET (offset) (offset << 12)#define SUN8I_I2S_TX_CHAN_EN_MASK GENMASK(11, 4)#define SUN8I_I2S_TX_CHAN_EN (num_chan) (((1 << num_chan) - 1) << 4)
@@ -460,6 +460,10 @@ static int sun4i_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)regmap_update_bits (i2s->regmap,SUN8I_I2S_TX_CHAN_SEL_REG ,SUN8I_I2S_TX_CHAN_OFFSET_MASK ,SUN8I_I2S_TX_CHAN_OFFSET (offset)); + +regmap_update_bits (i2s->regmap,SUN8I_I2S_RX_CHAN_SEL_REG , +SUN8I_I2S_TX_CHAN_OFFSET_MASK , +SUN8I_I2S_TX_CHAN_OFFSET (offset)); }regmap_field_write (i2s->field_fmt_mode, val);
sound/usb/line6/pcm.c +5 -0
@@ -560,6 +560,11 @@ int line6_init_pcm(struct usb_line6 *line6, line6pcm->max_packet_size_out =usb_maxpacket (line6->usbdev,usb_sndisocpipe (line6->usbdev, ep_write),1 ); +if (!line6pcm->max_packet_size_in || !line6pcm->max_packet_size_out) { +dev_err (line6pcm->line6->ifcdev, +"cannot get proper max packet size\n" ); +return -EINVAL ; + }spin_lock_init (&line6pcm->out.lock);spin_lock_init (&line6pcm->in.lock);
sound/usb/mixer_quirks.c +2 -2
@@ -753,7 +753,7 @@ static int snd_ni_control_init_val(struct usb_mixer_interface *mixer,return err; } - kctl->private_value |= (value <<24 ); + kctl->private_value |= ((unsigned int )value <<24 );return 0 ; }
@@ -914,7 +914,7 @@ static int snd_ftu_eff_switch_init(struct usb_mixer_interface *mixer,if (err <0 )return err; - kctl->private_value |= value[0 ] <<24 ; + kctl->private_value |= (unsigned int )value[0 ] <<24 ;return 0 ; }
tools/testing/selftests/net/fib_rule_tests.sh +2 -2
@@ -148,8 +148,8 @@ fib_rule6_test() fib_check_iproute_support "ipproto" "ipproto" if [ $? -eq 0 ]; then - match="ipproto icmp" - fib_rule6_test_match_n_redirect "$match" "$match" "ipproto icmp match" + match="ipproto ipv6-icmp" + fib_rule6_test_match_n_redirect "$match" "$match" "ipproto ipv6-icmp match" fi }