5.4.61-rc1 review
Subsystems (6)
Greg Kroah-Hartman
maintainercover 5.4.61-rc1 review
This is the start of the stable review cycle for the 5.4.61 release. There are 107 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 26 Aug 2020 08:23:34 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.61-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.4.61-rc1
Juergen Gross <[email protected]>
xen: don't reschedule in preemption off sections
Peter Xu <[email protected]>
mm/hugetlb: fix calculation of adjust_range_if_pmd_sharing_possible
Al Viro <[email protected]>
do_epoll_ctl(): clean the failure exits up a bit
Marc Zyngier <[email protected]>
epoll: Keep a reference on files added to the check list
Li Heng <[email protected]>
efi: add missed destroy_workqueue when efisubsys_init fails
Vasant Hegde <[email protected]>
powerpc/pseries: Do not initiate shutdown when system is running on UPS
Tom Rix <[email protected]>
net: dsa: b53: check for timeout
Haiyang Zhang <[email protected]>
hv_netvsc: Fix the queue_mapping in netvsc_vf_xmit()
Wang Hai <[email protected]>
net: gemini: Fix missing free_netdev() in error path of gemini_ethernet_port_probe()
Shay Agroskin <[email protected]>
net: ena: Prevent reset after device destruction
Jiri Wiesner <[email protected]>
bonding: fix active-backup failover for current ARP slave
Stephen Boyd <[email protected]>
ARM64: vdso32: Install vdso32 from vdso_install
David Howells <[email protected]>
afs: Fix NULL deref in afs_dynroot_depopulate()
Selvin Xavier <[email protected]>
RDMA/bnxt_re: Do not add user qps to flushlist
Randy Dunlap <[email protected]>
Fix build error when CONFIG_ACPI is not set/enabled:
Juergen Gross <[email protected]>
efi: avoid error message when booting under Xen
Masahiro Yamada <[email protected]>
kconfig: qconf: fix signal connection to invalid slots
Masahiro Yamada <[email protected]>
kconfig: qconf: do not limit the pop-up menu to the first row
Quinn Tran <[email protected]>
Revert "scsi: qla2xxx: Disable T10-DIF feature with FC-NVMe during probe"
Jim Mattson <[email protected]>
kvm: x86: Toggling CR4.PKE does not load PDPTEs in PAE mode
Jim Mattson <[email protected]>
kvm: x86: Toggling CR4.SMAP does not load PDPTEs in PAE mode
Alex Williamson <[email protected]>
vfio/type1: Add proper error unwind for vfio_iommu_replay()
Dinghao Liu <[email protected]>
ASoC: intel: Fix memleak in sst_media_open
Srinivas Kandagatla <[email protected]>
ASoC: msm8916-wcd-analog: fix register Interrupt offset
Heiko Carstens <[email protected]>
s390/ptrace: fix storage key handling
Heiko Carstens <[email protected]>
s390/runtime_instrumentation: fix storage key handling
Cong Wang <[email protected]>
bonding: fix a potential double-unregister
Zhang Changzhong <[email protected]>
can: j1939: add rxtimer for multipacket broadcast session
Zhang Changzhong <[email protected]>
can: j1939: abort multipacket broadcast session when timeout occurs
Zhang Changzhong <[email protected]>
can: j1939: cancel rxtimer on multipacket broadcast session complete
Zhang Changzhong <[email protected]>
can: j1939: fix support for multipacket broadcast message
Jarod Wilson <[email protected]>
bonding: show saner speed for broadcast mode
Fugang Duan <[email protected]>
net: fec: correct the error path for regulator disable in probe
Grzegorz Szczurek <[email protected]>
i40e: Fix crash during removing i40e driver
Przemyslaw Patynowski <[email protected]>
i40e: Set RX_ONLY mode for unicast promiscuous on VLAN
Oleksij Rempel <[email protected]>
can: j1939: transport: add j1939_session_skb_find_by_offset() function
Oleksij Rempel <[email protected]>
can: j1939: transport: j1939_simple_recv(): ignore local J1939 messages send not by J1939 stack
Eric Dumazet <[email protected]>
can: j1939: fix kernel-infoleak in j1939_sk_sock2sockaddr_can()
John Fastabend <[email protected]>
bpf: sock_ops sk access may stomp registers when dst_reg = src_reg
Srinivas Kandagatla <[email protected]>
ASoC: q6routing: add dummy register read/write function
Srinivas Kandagatla <[email protected]>
ASoC: q6afe-dai: mark all widgets registers as SND_SOC_NOPM
Amelie Delaunay <[email protected]>
spi: stm32: fixes suspend/resume management
Stephen Suryaputra <[email protected]>
netfilter: nf_tables: nft_exthdr: the presence return value should be little-endian
Jan Kara <[email protected]>
ext4: don't allow overlapping system zones
Eric Sandeen <[email protected]>
ext4: fix potential negative array index in do_split()
Helge Deller <[email protected]>
fs/signalfd.c: fix inconsistent return codes for signalfd4
Luc Van Oostenryck <[email protected]>
alpha: fix annotation of io{read,write}{16,32}be()Eiichi Tsukata <[email protected]>
xfs: Fix UBSAN null-ptr-deref in xfs_sysfs_init
Gaurav Singh <[email protected]>
tools/testing/selftests/cgroup/cgroup_util.c: cg_read_strcmp: fix null pointer dereference
Evgeny Novikov <[email protected]>
media: camss: fix memory leaks on error handling paths in probe
Mao Wenan <[email protected]>
virtio_ring: Avoid loop when vq is broken in virtqueue_poll
Javed Hasan <[email protected]>
scsi: libfc: Free skb in fc_disc_gpn_id_resp() for valid cases
Srinivas Pandruvada <[email protected]>
cpufreq: intel_pstate: Fix cpuinfo_max_freq when MSR_TURBO_RATIO_LIMIT is 0
Boris Ostrovsky <[email protected]>
swiotlb-xen: use vmalloc_to_page on vmalloc virt addresses
Xiubo Li <[email protected]>
ceph: fix use-after-free for fsc->mdsc
Zhe Li <[email protected]>
jffs2: fix UAF problem
Felix Kuehling <[email protected]>
drm/ttm: fix offset in VMAs with a pg_offs in ttm_bo_vm_access
Darrick J. Wong <[email protected]>
xfs: fix inode quota reservation checks
Chuck Lever <[email protected]>
svcrdma: Fix another Receive buffer leak
Greg Ungerer <[email protected]>
m68knommu: fix overwriting of bits in ColdFire V3 cache control
Jinyang He <[email protected]>
MIPS: Fix unable to reserve memory for Crash kernel
Xiongfeng Wang <[email protected]>
Input: psmouse - add a newline when printing 'proto' by sysfs
Evgeny Novikov <[email protected]>
media: vpss: clean up resources in init
Huacai Chen <[email protected]>
rtc: goldfish: Enable interrupt in set_alarm() when necessary
Chuhong Yuan <[email protected]>
media: budget-core: Improve exception handling in budget_register()
Bodo Stroesser <[email protected]>
scsi: target: tcmu: Fix crash in tcmu_flush_dcache_range on ARM
Stanley Chu <[email protected]>
scsi: ufs: Add DELAY_BEFORE_LPM quirk for Micron devices
Rajendra Nayak <[email protected]>
opp: Enable resources again if they were disabled earlier
Liang Chen <[email protected]>
kthread: Do not preempt current task if it is going to call schedule()
Krunoslav Kovac <[email protected]>
drm/amd/display: fix pow() crashing when given base 0
Stylon Wang <[email protected]>
drm/amd/display: Fix EDID parsing after resume from suspend
Daniel Kolesa <[email protected]>
drm/amdgpu/display: use GFP_ATOMIC in dcn20_validate_bandwidth_internal
Yang Shi <[email protected]>
mm/memory.c: skip spurious TLB flush for retried page fault
Steffen Maier <[email protected]>
scsi: zfcp: Fix use-after-free in request timeout handlers
zhangyi (F) <[email protected]>
jbd2: add the missing unlock_buffer() in the error path of jbd2_write_superblock()
Jan Kara <[email protected]>
ext4: fix checking of directory entry validity for inline directories
Kaike Wan <[email protected]>
RDMA/hfi1: Correct an interlock issue for TID RDMA WRITE request
Charan Teja Reddy <[email protected]>
mm, page_alloc: fix core hung in free_pcppages_bulk()
Doug Berger <[email protected]>
mm: include CMA pages in lowmem_reserve at boot
Hugh Dickins <[email protected]>
uprobes: __replace_page() avoid BUG in munlock_vma_page()
Wei Yongjun <[email protected]>
kernel/relay.c: fix memleak on destroy relay channel
Jann Horn <[email protected]>
romfs: fix uninitialized memory leak in romfs_dev_read()
Lukas Wunner <[email protected]>
spi: Prevent adding devices below an unregistering controller
Oleksij Rempel <[email protected]>
can: j1939: socket: j1939_sk_bind(): make sure ml_priv is allocated
Oleksij Rempel <[email protected]>
can: j1939: transport: j1939_session_tx_dat(): fix use-after-free read in j1939_tp_txtimer()
Mike Pozulp <[email protected]>
ALSA: hda/realtek: Add quirk for Samsung Galaxy Book Ion
Mike Pozulp <[email protected]>
ALSA: hda/realtek: Add quirk for Samsung Galaxy Flex Book
David Sterba <[email protected]>
btrfs: add wrapper for transaction abort predicate
Josef Bacik <[email protected]>
btrfs: return EROFS for BTRFS_FS_STATE_ERROR cases
Josef Bacik <[email protected]>
btrfs: don't show full path of bind mounts in subvol=
Marcos Paulo de Souza <[email protected]>
btrfs: export helpers for subvolume name/id resolution
Coly Li <[email protected]>
bcache: avoid nr_stripes overflow in bcache_device_init()
Hugh Dickins <[email protected]>
khugepaged: adjust VM_BUG_ON_MM() in __khugepaged_enter()
Hugh Dickins <[email protected]>
khugepaged: khugepaged_test_exit() check mmget_still_valid()
Masami Hiramatsu <[email protected]>
perf probe: Fix memory leakage when the probe point is not found
Bob Peterson <[email protected]>
gfs2: Never call gfs2_block_zero_range with an open transaction
Andreas Gruenbacher <[email protected]>
gfs2: Improve mmap write vs. punch_hole consistency
Chris Wilson <[email protected]>
drm/vgem: Replace opencoded version of drm_gem_dumb_map_offset()
Masahiro Yamada <[email protected]>
kbuild: support LLVM=1 to switch the default tools to Clang/LLVM
Masahiro Yamada <[email protected]>
kbuild: replace AS=clang with LLVM_IAS=1
Masahiro Yamada <[email protected]>
kbuild: remove AS variable
Masahiro Yamada <[email protected]>
kbuild: remove PYTHON2 variable
Dmitry Golovin <[email protected]>
x86/boot: kbuild: allow readelf executable to be specified
Masahiro Yamada <[email protected]>
net: wan: wanxl: use $(M68KCC) instead of $(M68KAS) for rebuilding firmware
Masahiro Yamada <[email protected]>
net: wan: wanxl: use allow to pass CROSS_COMPILE_M68k for rebuilding firmware
Fangrui Song <[email protected]>
Documentation/llvm: fix the name of llvm-size
Nick Desaulniers <[email protected]>
Documentation/llvm: add documentation on building w/ Clang/LLVM
-------------
Diffstat:
Documentation/kbuild/index.rst | 1 + Documentation/kbuild/kbuild.rst | 5 + Documentation/kbuild/llvm.rst | 87 +++++++++ MAINTAINERS | 1 + Makefile | 42 +++-- arch/alpha/include/asm/io.h | 8 +- arch/arm64/Makefile | 1 + arch/arm64/kernel/vdso32/Makefile | 2 +- arch/m68k/include/asm/m53xxacr.h | 6 +- arch/mips/kernel/setup.c | 2 +- arch/powerpc/platforms/pseries/ras.c | 1 - arch/s390/kernel/ptrace.c | 7 +- arch/s390/kernel/runtime_instr.c | 2 +- arch/x86/boot/compressed/Makefile | 2 +- arch/x86/kvm/x86.c | 2 +- arch/x86/pci/xen.c | 1 + drivers/cpufreq/intel_pstate.c | 1 + drivers/firmware/efi/efi.c | 2 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- drivers/gpu/drm/amd/display/include/fixed31_32.h | 3 + drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +- drivers/gpu/drm/vgem/vgem_drv.c | 27 --- drivers/infiniband/hw/bnxt_re/main.c | 3 +- drivers/infiniband/hw/hfi1/tid_rdma.c | 1 + drivers/input/mouse/psmouse-base.c | 2 +- drivers/md/bcache/super.c | 12 +- drivers/media/pci/ttpci/budget-core.c | 11 +- drivers/media/platform/davinci/vpss.c | 20 +- drivers/media/platform/qcom/camss/camss.c | 30 ++- drivers/net/bonding/bond_main.c | 42 ++++- drivers/net/dsa/b53/b53_common.c | 2 + drivers/net/ethernet/amazon/ena/ena_netdev.c | 19 +- drivers/net/ethernet/cortina/gemini.c | 4 +- drivers/net/ethernet/freescale/fec_main.c | 4 +- drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 2 +- drivers/net/ethernet/intel/i40e/i40e_common.c | 35 +++- drivers/net/ethernet/intel/i40e/i40e_main.c | 3 + drivers/net/hyperv/netvsc_drv.c | 2 +- drivers/net/wan/Kconfig | 2 +- drivers/net/wan/Makefile | 12 +- drivers/opp/core.c | 10 +- drivers/rtc/rtc-goldfish.c | 1 + drivers/s390/scsi/zfcp_fsf.c | 4 +- drivers/scsi/libfc/fc_disc.c | 12 +- drivers/scsi/qla2xxx/qla_os.c | 4 - drivers/scsi/ufs/ufs_quirks.h | 1 + drivers/scsi/ufs/ufshcd.c | 2 + drivers/spi/Kconfig | 3 + drivers/spi/spi-stm32.c | 27 ++- drivers/spi/spi.c | 21 ++- drivers/target/target_core_user.c | 2 +- drivers/vfio/vfio_iommu_type1.c | 71 ++++++- drivers/video/fbdev/efifb.c | 2 +- drivers/virtio/virtio_ring.c | 3 + drivers/xen/preempt.c | 2 +- drivers/xen/swiotlb-xen.c | 8 +- fs/afs/dynroot.c | 20 +- fs/btrfs/block-group.c | 2 +- fs/btrfs/ctree.h | 2 + fs/btrfs/delayed-inode.c | 2 +- fs/btrfs/export.c | 8 +- fs/btrfs/export.h | 5 + fs/btrfs/extent-tree.c | 10 +- fs/btrfs/extent_io.c | 2 +- fs/btrfs/scrub.c | 2 +- fs/btrfs/super.c | 20 +- fs/btrfs/transaction.c | 30 +-- fs/btrfs/transaction.h | 12 ++ fs/ceph/mds_client.c | 3 +- fs/eventpoll.c | 19 +- fs/ext4/block_validity.c | 36 ++-- fs/ext4/namei.c | 22 ++- fs/gfs2/bmap.c | 68 ++++--- fs/jbd2/journal.c | 4 +- fs/jffs2/dir.c | 6 +- fs/romfs/storage.c | 4 +- fs/signalfd.c | 10 +- fs/xfs/xfs_sysfs.h | 6 +- fs/xfs/xfs_trans_dquot.c | 2 +- kernel/events/uprobes.c | 2 +- kernel/kthread.c | 17 +- kernel/relay.c | 1 + mm/hugetlb.c | 24 +-- mm/khugepaged.c | 7 +- mm/memory.c | 3 + mm/page_alloc.c | 7 +- net/can/j1939/socket.c | 14 ++ net/can/j1939/transport.c | 89 +++++++-- net/core/filter.c | 49 +++-- net/netfilter/nft_exthdr.c | 4 +- net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 + scripts/kconfig/qconf.cc | 70 +++---- sound/pci/hda/patch_realtek.c | 2 + sound/soc/codecs/msm8916-wcd-analog.c | 4 +- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 5 +- sound/soc/qcom/qdsp6/q6afe-dai.c | 210 ++++++++++----------- sound/soc/qcom/qdsp6/q6routing.c | 16 ++ tools/objtool/Makefile | 6 + tools/perf/util/probe-finder.c | 2 +- tools/testing/selftests/cgroup/cgroup_util.c | 2 +- 101 files changed, 956 insertions(+), 464 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/107 Documentation/llvm: add documentation on building w/ Clang/LLVM
From: Nick Desaulniers <[email protected]>
commit fcf1b6a35c16ac500fa908a4022238e5d666eabf upstream.
added to kbuild documentation. Provides more official info on building kernels with Clang and LLVM than our wiki.
--- Documentation/kbuild/index.rst | 1 Documentation/kbuild/llvm.rst | 80 +++++++++++++++++++++++++++++++++++++++++ MAINTAINERS | 1 3 files changed, 82 insertions(+) create mode 100644 Documentation/kbuild/llvm.rst
Documentation/kbuild/index.rst +1 -0
@@ -19,6 +19,7 @@ Kernel Build System issues reproducible-builds + llvm .. only:: subproject and html
Documentation/kbuild/llvm.rst new file +80 -0
80 lines not on this page · raw message
MAINTAINERS +1 -0
@@ -4028,6 +4028,7 @@ B: https://github.com/ClangBuiltLinux/li C: irc://chat.freenode.net/clangbuiltlinux S: Supported K: \b(?i:clang|llvm)\b +F: Documentation/kbuild/llvm.rst CLEANCACHE API M: Konrad Rzeszutek Wilk <[email protected]>
Greg Kroah-Hartman
maintainerPATCH 2/107 Documentation/llvm: fix the name of llvm-size
In reply to Greg Kroah-HartmanFrom: Fangrui Song <[email protected]>
commit 0f44fbc162b737ff6251ae248184390ae2279fee upstream.
The tool is called llvm-size, not llvm-objsize.
--- Documentation/kbuild/llvm.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/kbuild/llvm.rst +1 -1
@@ -51,7 +51,7 @@ LLVM has substitutes for GNU binutils ut additional parameters to `make`. make CC=clang AS=clang LD=ld.lld AR=llvm-ar NM=llvm-nm STRIP=llvm-strip \\ - OBJCOPY=llvm-objcopy OBJDUMP=llvm-objdump OBJSIZE=llvm-objsize \\ + OBJCOPY=llvm-objcopy OBJDUMP=llvm-objdump OBJSIZE=llvm-size \\ READELF=llvm-readelf HOSTCC=clang HOSTCXX=clang++ HOSTAR=llvm-ar \\ HOSTLD=ld.lld
Greg Kroah-Hartman
maintainerPATCH 3/107 net: wan: wanxl: use allow to pass CROSS_COMPILE_M68k for rebuilding firmware
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
commit 63b903dfebdea92aa92ad337d8451a6fbfeabf9d upstream.
As far as I understood from the Kconfig help text, this build rule is used to rebuild the driver firmware, which runs on an old m68k-based chip. So, you need m68k tools for the firmware rebuild.
wanxl.c is a PCI driver, but CONFIG_M68K does not select CONFIG_HAVE_PCI. So, you cannot enable CONFIG_WANXL_BUILD_FIRMWARE for ARCH=m68k. In other words, ifeq ($(ARCH),m68k) is false here.
I am keeping the dead code for now, but rebuilding the firmware requires 'as68k' and 'ld68k', which I do not have in hand.
Instead, the kernel.org m68k GCC [1] successfully built it.
Allowing a user to pass in CROSS_COMPILE_M68K= is handier.
--- drivers/net/wan/Kconfig | 2 +- drivers/net/wan/Makefile | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/net/wan/Kconfig +1 -1
@@ -200,7 +200,7 @@ config WANXL_BUILD_FIRMWARE depends on WANXL && !PREVENT_FIRMWARE_BUILD help Allows you to rebuild firmware run by the QUICC processor. - It requires as68k, ld68k and hexdump programs. + It requires m68k toolchains and hexdump programs. You should never need this option, say N.
drivers/net/wan/Makefile +6 -6
@@ -40,17 +40,17 @@ $(obj)/wanxl.o: $(obj)/wanxlfw.inc ifeq ($(CONFIG_WANXL_BUILD_FIRMWARE),y) ifeq ($(ARCH),m68k) - AS68K = $(AS) - LD68K = $(LD) + M68KAS = $(AS) + M68KLD = $(LD) else - AS68K = as68k - LD68K = ld68k + M68KAS = $(CROSS_COMPILE_M68K)as + M68KLD = $(CROSS_COMPILE_M68K)ld endif quiet_cmd_build_wanxlfw = BLD FW $@ cmd_build_wanxlfw = \ - $(CPP) -D__ASSEMBLY__ -Wp,-MD,$(depfile) -I$(srctree)/include/uapi $< | $(AS68K) -m68360 -o $(obj)/wanxlfw.o; \ - $(LD68K) --oformat binary -Ttext 0x1000 $(obj)/wanxlfw.o -o $(obj)/wanxlfw.bin; \ + $(CPP) -D__ASSEMBLY__ -Wp,-MD,$(depfile) -I$(srctree)/include/uapi $< | $(M68KAS) -m68360 -o $(obj)/wanxlfw.o; \ + $(M68KLD) --oformat binary -Ttext 0x1000 $(obj)/wanxlfw.o -o $(obj)/wanxlfw.bin; \ hexdump -ve '"\n" 16/1 "0x%02X,"' $(obj)/wanxlfw.bin | sed 's/0x ,//g;1s/^/static const u8 firmware[]={/;$$s/,$$/\n};\n/' >$(obj)/wanxlfw.inc; \ rm -f $(obj)/wanxlfw.bin $(obj)/wanxlfw.o
Greg Kroah-Hartman
maintainerPATCH 4/107 net: wan: wanxl: use $(M68KCC) instead of $(M68KAS) for rebuilding firmware
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
commit 734f3719d3438f9cc181d674c33ca9762e9148a1 upstream.
The firmware source, wanxlfw.S, is currently compiled by the combo of $(CPP) and $(M68KAS). This is not what we usually do for compiling *.S files. In fact, this Makefile is the only user of $(AS) in the kernel build.
Instead of combining $(CPP) and (AS) from different tool sets, using $(M68KCC) as an assembler driver is simpler, and saner.
--- drivers/net/wan/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wan/Makefile +3 -3
@@ -40,16 +40,16 @@ $(obj)/wanxl.o: $(obj)/wanxlfw.inc ifeq ($(CONFIG_WANXL_BUILD_FIRMWARE),y) ifeq ($(ARCH),m68k) - M68KAS = $(AS) + M68KCC = $(CC) M68KLD = $(LD) else - M68KAS = $(CROSS_COMPILE_M68K)as + M68KCC = $(CROSS_COMPILE_M68K)gcc M68KLD = $(CROSS_COMPILE_M68K)ld endif quiet_cmd_build_wanxlfw = BLD FW $@ cmd_build_wanxlfw = \ - $(CPP) -D__ASSEMBLY__ -Wp,-MD,$(depfile) -I$(srctree)/include/uapi $< | $(M68KAS) -m68360 -o $(obj)/wanxlfw.o; \ + $(M68KCC) -D__ASSEMBLY__ -Wp,-MD,$(depfile) -I$(srctree)/include/uapi -c -o $(obj)/wanxlfw.o $<; \ $(M68KLD) --oformat binary -Ttext 0x1000 $(obj)/wanxlfw.o -o $(obj)/wanxlfw.bin; \ hexdump -ve '"\n" 16/1 "0x%02X,"' $(obj)/wanxlfw.bin | sed 's/0x ,//g;1s/^/static const u8 firmware[]={/;$$s/,$$/\n};\n/' >$(obj)/wanxlfw.inc; \ rm -f $(obj)/wanxlfw.bin $(obj)/wanxlfw.o
Greg Kroah-Hartman
maintainerPATCH 5/107 x86/boot: kbuild: allow readelf executable to be specified
In reply to Greg Kroah-HartmanFrom: Dmitry Golovin <[email protected]>
commit eefb8c124fd969e9a174ff2bedff86aa305a7438 upstream.
Introduce a new READELF variable to top-level Makefile, so the name of readelf binary can be specified.
Before this change the name of the binary was hardcoded to "$(CROSS_COMPILE)readelf" which might not be present for every toolchain.
This allows to build with LLVM Object Reader by using make parameter READELF=llvm-readelf.
--- Makefile | 3 ++- arch/x86/boot/compressed/Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
Makefile +2 -1
@@ -414,6 +414,7 @@ STRIP = $(CROSS_COMPILE)strip OBJCOPY = $(CROSS_COMPILE)objcopy OBJDUMP = $(CROSS_COMPILE)objdump OBJSIZE = $(CROSS_COMPILE)size +READELF = $(CROSS_COMPILE)readelf PAHOLE = pahole LEX = flex YACC = bison
@@ -472,7 +473,7 @@ GCC_PLUGINS_CFLAGS := CLANG_FLAGS := export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC -export CPP AR NM STRIP OBJCOPY OBJDUMP OBJSIZE PAHOLE LEX YACC AWK INSTALLKERNEL +export CPP AR NM STRIP OBJCOPY OBJDUMP OBJSIZE READELF PAHOLE LEX YACC AWK INSTALLKERNEL export PERL PYTHON PYTHON2 PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS LDFLAGS_MODULE
arch/x86/boot/compressed/Makefile +1 -1
@@ -102,7 +102,7 @@ vmlinux-objs-$(CONFIG_EFI_MIXED) += $(ob quiet_cmd_check_data_rel = DATAREL $@ define cmd_check_data_rel for obj in $(filter %.o,$^); do \ - ${CROSS_COMPILE}readelf -S $$obj | grep -qF .rel.local && { \ + $(READELF) -S $$obj | grep -qF .rel.local && { \ echo "error: $$obj has data relocations!" >&2; \ exit 1; \ } || true; \
Greg Kroah-Hartman
maintainerPATCH 6/107 kbuild: remove PYTHON2 variable
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
commit 94f7345b712405b79647a6a4bf8ccbd0d78fa69d upstream.
Python 2 has retired. There is no user of this variable.
--- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Makefile +1 -2
@@ -423,7 +423,6 @@ INSTALLKERNEL := installkernel DEPMOD = /sbin/depmod PERL = perl PYTHON = python -PYTHON2 = python2 PYTHON3 = python3 CHECK = sparse BASH = bash
@@ -474,7 +473,7 @@ CLANG_FLAGS := export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC export CPP AR NM STRIP OBJCOPY OBJDUMP OBJSIZE READELF PAHOLE LEX YACC AWK INSTALLKERNEL -export PERL PYTHON PYTHON2 PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX +export PERL PYTHON PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS LDFLAGS_MODULE export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS KBUILD_LDFLAGS
Greg Kroah-Hartman
maintainerPATCH 7/107 kbuild: remove AS variable
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
commit aa824e0c962b532d5073cbb41b2efcd6f5e72bae upstream.
As commit 5ef872636ca7 ("kbuild: get rid of misleading $(AS) from documents") noted, we rarely use $(AS) directly in the kernel build.
Now that the only/last user of $(AS) in drivers/net/wan/Makefile was converted to $(CC), $(AS) is no longer used in the build process.
You can still pass in AS=clang, which is just a switch to turn on the LLVM integrated assembler.
--- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
Makefile +2 -3
@@ -404,7 +404,6 @@ KBUILD_HOSTLDFLAGS := $(HOST_LFS_LDFLAG KBUILD_HOSTLDLIBS := $(HOST_LFS_LIBS) $(HOSTLDLIBS) # Make variables (CC, etc...) -AS = $(CROSS_COMPILE)as LD = $(CROSS_COMPILE)ld CC = $(CROSS_COMPILE)gcc CPP = $(CC) -E
@@ -471,7 +470,7 @@ KBUILD_LDFLAGS := GCC_PLUGINS_CFLAGS := CLANG_FLAGS := -export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC +export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC export CPP AR NM STRIP OBJCOPY OBJDUMP OBJSIZE READELF PAHOLE LEX YACC AWK INSTALLKERNEL export PERL PYTHON PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS LDFLAGS_MODULE
@@ -534,7 +533,7 @@ endif ifneq ($(GCC_TOOLCHAIN),) CLANG_FLAGS += --gcc-toolchain=$(GCC_TOOLCHAIN) endif -ifeq ($(shell $(AS) --version 2>&1 | head -n 1 | grep clang),) +ifeq ($(if $(AS),$(shell $(AS) --version 2>&1 | head -n 1 | grep clang)),) CLANG_FLAGS += -no-integrated-as endif CLANG_FLAGS += -Werror=unknown-warning-option
Greg Kroah-Hartman
maintainerPATCH 8/107 kbuild: replace AS=clang with LLVM_IAS=1
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
commit 7e20e47c70f810d678d02941fa3c671209c4ca97 upstream.
The 'AS' variable is unused for building the kernel. Only the remaining usage is to turn on the integrated assembler. A boolean flag is a better fit for this purpose.
AS=clang was added for experts. So, I replaced it with LLVM_IAS=1, breaking the backward compatibility.
--- Documentation/kbuild/llvm.rst | 5 ++++- Makefile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-)
Documentation/kbuild/llvm.rst +4 -1
@@ -50,11 +50,14 @@ LLVM Utilities LLVM has substitutes for GNU binutils utilities. These can be invoked as additional parameters to `make`. - make CC=clang AS=clang LD=ld.lld AR=llvm-ar NM=llvm-nm STRIP=llvm-strip \\ + make CC=clang LD=ld.lld AR=llvm-ar NM=llvm-nm STRIP=llvm-strip \\ OBJCOPY=llvm-objcopy OBJDUMP=llvm-objdump OBJSIZE=llvm-size \\ READELF=llvm-readelf HOSTCC=clang HOSTCXX=clang++ HOSTAR=llvm-ar \\ HOSTLD=ld.lld +Currently, the integrated assembler is disabled by default. You can pass +`LLVM_IAS=1` to enable it. + Getting Help ------------
Makefile +1 -1
@@ -533,7 +533,7 @@ endif ifneq ($(GCC_TOOLCHAIN),) CLANG_FLAGS += --gcc-toolchain=$(GCC_TOOLCHAIN) endif -ifeq ($(if $(AS),$(shell $(AS) --version 2>&1 | head -n 1 | grep clang)),) +ifneq ($(LLVM_IAS),1) CLANG_FLAGS += -no-integrated-as endif CLANG_FLAGS += -Werror=unknown-warning-option
Greg Kroah-Hartman
maintainerPATCH 9/107 kbuild: support LLVM=1 to switch the default tools to Clang/LLVM
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
commit a0d1c951ef08ed24f35129267e3595d86f57f5d3 upstream.
As Documentation/kbuild/llvm.rst implies, building the kernel with a full set of LLVM tools gets very verbose and unwieldy.
Provide a single switch LLVM=1 to use Clang and LLVM tools instead of GCC and Binutils. You can pass it from the command line or as an environment variable.
Please note LLVM=1 does not turn on the integrated assembler. You need to pass LLVM_IAS=1 to use it. When the upstream kernel is ready for the integrated assembler, I think we can make it default.
We discussed what we need, and we agreed to go with a simple boolean flag that switches both target and host tools:
https://lkml.org/lkml/2020/3/28/494
https://lkml.org/lkml/2020/4/3/43
Some items discussed, but not adopted:
- LLVM_DIR
When multiple versions of LLVM are installed, I just thought supporting LLVM_DIR=/path/to/my/llvm/bin/ might be useful.
CC = $(LLVM_DIR)clang
LD = $(LLVM_DIR)ld.lld
...However, we can handle this by modifying PATH. So, we decided to not do this.
- LLVM_SUFFIX
Some distributions (e.g. Debian) package specific versions of LLVM with naming conventions that use the version as a suffix.
CC = clang$(LLVM_SUFFIX)
LD = ld.lld(LLVM_SUFFIX)
... will allow a user to pass LLVM_SUFFIX=-11 to use clang-11 etc., but the suffixed versions in /usr/bin/ are symlinks to binaries in /usr/lib/llvm-#/bin/, so this can also be handled by PATH.
--- Documentation/kbuild/kbuild.rst | 5 +++++ Documentation/kbuild/llvm.rst | 8 ++++++-- Makefile | 29 +++++++++++++++++++++++------ tools/objtool/Makefile | 6 ++++++ 4 files changed, 40 insertions(+), 8 deletions(-)
Documentation/kbuild/kbuild.rst +5 -0
@@ -262,3 +262,8 @@ KBUILD_BUILD_USER, KBUILD_BUILD_HOST These two variables allow to override the user@host string displayed during boot and in /proc/version. The default value is the output of the commands whoami and host, respectively. + +LLVM +---- +If this variable is set to 1, Kbuild will use Clang and LLVM utilities instead +of GCC and GNU binutils to build the kernel.
Documentation/kbuild/llvm.rst +6 -2
@@ -47,8 +47,12 @@ example: LLVM Utilities -------------- -LLVM has substitutes for GNU binutils utilities. These can be invoked as -additional parameters to `make`. +LLVM has substitutes for GNU binutils utilities. Kbuild supports `LLVM=1` +to enable them. + + make LLVM=1 + +They can be enabled individually. The full list of the parameters: make CC=clang LD=ld.lld AR=llvm-ar NM=llvm-nm STRIP=llvm-strip \\ OBJCOPY=llvm-objcopy OBJDUMP=llvm-objdump OBJSIZE=llvm-size \\
Makefile +23 -6
@@ -394,8 +394,13 @@ HOST_LFS_CFLAGS := $(shell getconf LFS_C HOST_LFS_LDFLAGS := $(shell getconf LFS_LDFLAGS 2>/dev/null) HOST_LFS_LIBS := $(shell getconf LFS_LIBS 2>/dev/null) -HOSTCC = gcc -HOSTCXX = g++ +ifneq ($(LLVM),) +HOSTCC = clang +HOSTCXX = clang++ +else +HOSTCC = gcc +HOSTCXX = g++ +endif KBUILD_HOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 \ -fomit-frame-pointer -std=gnu89 $(HOST_LFS_CFLAGS) \ $(HOSTCFLAGS)
@@ -404,16 +409,28 @@ KBUILD_HOSTLDFLAGS := $(HOST_LFS_LDFLAG KBUILD_HOSTLDLIBS := $(HOST_LFS_LIBS) $(HOSTLDLIBS) # Make variables (CC, etc...) -LD = $(CROSS_COMPILE)ld -CC = $(CROSS_COMPILE)gcc CPP = $(CC) -E +ifneq ($(LLVM),) +CC = clang +LD = ld.lld +AR = llvm-ar +NM = llvm-nm +OBJCOPY = llvm-objcopy +OBJDUMP = llvm-objdump +READELF = llvm-readelf +OBJSIZE = llvm-size +STRIP = llvm-strip +else +CC = $(CROSS_COMPILE)gcc +LD = $(CROSS_COMPILE)ld AR = $(CROSS_COMPILE)ar NM = $(CROSS_COMPILE)nm -STRIP = $(CROSS_COMPILE)strip OBJCOPY = $(CROSS_COMPILE)objcopy OBJDUMP = $(CROSS_COMPILE)objdump -OBJSIZE = $(CROSS_COMPILE)size READELF = $(CROSS_COMPILE)readelf +OBJSIZE = $(CROSS_COMPILE)size +STRIP = $(CROSS_COMPILE)strip +endif PAHOLE = pahole LEX = flex YACC = bison
tools/objtool/Makefile +6 -0
@@ -3,9 +3,15 @@ include ../scripts/Makefile.include include ../scripts/Makefile.arch # always use the host compiler +ifneq ($(LLVM),) +HOSTAR ?= llvm-ar +HOSTCC ?= clang +HOSTLD ?= ld.lld +else HOSTAR ?= ar HOSTCC ?= gcc HOSTLD ?= ld +endif AR = $(HOSTAR) CC = $(HOSTCC) LD = $(HOSTLD)
Greg Kroah-Hartman
maintainerPATCH 10/107 drm/vgem: Replace opencoded version of drm_gem_dumb_map_offset()
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
[ Upstream commit 119c53d2d4044c59c450c4f5a568d80b9d861856 ]
drm_gem_dumb_map_offset() now exists and does everything vgem_gem_dump_map does and *ought* to do.
In particular, vgem_gem_dumb_map() was trying to reject mmapping an imported dmabuf by checking the existence of obj->filp. Unfortunately, we always allocated an obj->filp, even if unused for an imported dmabuf. Instead, the drm_gem_dumb_map_offset(), since commit 90378e589192 ("drm/gem: drm_gem_dumb_map_offset(): reject dma-buf"), uses the obj->import_attach to reject such invalid mmaps.
This prevents vgem from allowing userspace mmapping the dumb handle and attempting to incorrectly fault in remote pages belonging to another device, where there may not even be a struct page.
v2: Use the default drm_gem_dumb_map_offset() callback
--- drivers/gpu/drm/vgem/vgem_drv.c | 27 --------------------------- 1 file changed, 27 deletions(-)
drivers/gpu/drm/vgem/vgem_drv.c +0 -27
@@ -229,32 +229,6 @@ static int vgem_gem_dumb_create(struct drm_file *file, struct drm_device *dev,return 0 ; } -static int vgem_gem_dumb_map (struct drm_file *file,struct drm_device *dev, -uint32_t handle,uint64_t *offset) -{ -struct drm_gem_object *obj; -int ret; - - obj =drm_gem_object_lookup (file, handle); -if (!obj) -return -ENOENT ; - -if (!obj->filp) { - ret = -EINVAL ; - goto unref; - } - - ret =drm_gem_create_mmap_offset (obj); -if (ret) - goto unref; - - *offset =drm_vma_node_offset_addr (&obj->vma_node); -unref: -drm_gem_object_put_unlocked (obj); - -return ret; -} -static struct drm_ioctl_desc vgem_ioctls[] = {DRM_IOCTL_DEF_DRV (VGEM_FENCE_ATTACH , vgem_fence_attach_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (VGEM_FENCE_SIGNAL , vgem_fence_signal_ioctl,DRM_RENDER_ALLOW ),
@@ -448,7 +422,6 @@ static struct drm_driver vgem_driver = { .fops = &vgem_driver_fops, .dumb_create = vgem_gem_dumb_create, - .dumb_map_offset = vgem_gem_dumb_map, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 11/107 gfs2: Improve mmap write vs. punch_hole consistency
In reply to Greg Kroah-HartmanFrom: Andreas Gruenbacher <[email protected]>
[ Upstream commit 39c3a948ecf6e7b8f55f0e91a5febc924fede4d7 ]
When punching a hole in a file, use filemap_write_and_wait_range to write back any dirty pages in the range of the hole. As a side effect, if the hole isn't page aligned, this marks unaligned pages at the beginning and the end of the hole read-only. This is required when the block size is smaller than the page size: when those pages are written to again after the hole punching, we must make sure that page_mkwrite is called for those pages so that the page will be fully allocated and any blocks turned into holes from the hole punching will be reallocated. (If a page is writably mapped, page_mkwrite won't be called.)
Fixes xfstest generic/567.
--- fs/gfs2/bmap.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
fs/gfs2/bmap.c +9 -2
@@ -2442,8 +2442,16 @@ int __gfs2_punch_hole(struct file *file, loff_t offset, loff_t length)struct inode *inode =file_inode (file);struct gfs2_inode *ip =GFS2_I (inode);struct gfs2_sbd *sdp =GFS2_SB (inode); +unsigned int blocksize =i_blocksize (inode); +loff_t start, end;int error; + start =round_down (offset, blocksize); + end =round_up (offset + length, blocksize) -1 ; + error =filemap_write_and_wait_range (inode->i_mapping, start, end); +if (error) +return error; +if (gfs2_is_jdata (ip)) error =gfs2_trans_begin (sdp,RES_DINODE +2 *RES_JDATA ,GFS2_JTRUNC_REVOKES );
@@ -2457,9 +2465,8 @@ int __gfs2_punch_hole(struct file *file, loff_t offset, loff_t length)if (error) goto out; }else { -unsigned int start_off, end_len, blocksize; +unsigned int start_off, end_len; - blocksize =i_blocksize (inode); start_off = offset & (blocksize -1 ); end_len = (offset + length) & (blocksize -1 );if (start_off) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 12/107 gfs2: Never call gfs2_block_zero_range with an open transaction
In reply to Greg Kroah-HartmanFrom: Bob Peterson <[email protected]>
[ Upstream commit 70499cdfeb3625c87eebe4f7a7ea06fa7447e5df ]
Before this patch, some functions started transactions then they called gfs2_block_zero_range. However, gfs2_block_zero_range, like writes, can start transactions, which results in a recursive transaction error. For example:
do_shrink
trunc_start
gfs2_trans_begin <------------------------------------------------
gfs2_block_zero_range
iomap_zero_range(inode, from, length, NULL, &gfs2_iomap_ops);
iomap_apply ... iomap_zero_range_actor
iomap_begin
gfs2_iomap_begin
gfs2_iomap_begin_write
actor (iomap_zero_range_actor)
iomap_zero
iomap_write_begin
gfs2_iomap_page_prepare
gfs2_trans_begin <------------------------This patch reorders the callers of gfs2_block_zero_range so that they only start their transactions after the call. It also adds a BUG_ON to ensure this doesn't happen again.
--- fs/gfs2/bmap.c | 69 ++++++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 30 deletions(-)
fs/gfs2/bmap.c +39 -30
@@ -1350,9 +1350,15 @@ int gfs2_extent_map(struct inode *inode, u64 lblock, int *new, u64 *dblock, unsireturn ret; } +/* +* NOTE: Never call gfs2_block_zero_range with an open transaction because it +* uses iomap write to perform its actions, which begin their own transactions +* (iomap_begin, page_prepare, etc.) +*/ static int gfs2_block_zero_range (struct inode *inode,loff_t from,unsigned int length) { +BUG_ON (current->journal_info);return iomap_zero_range (inode, from, length,NULL , &gfs2_iomap_ops); }
@@ -1413,6 +1419,16 @@ static int trunc_start(struct inode *inode, u64 newsize)u64 oldsize = inode->i_size;int error; +if (!gfs2_is_stuffed (ip)) { +unsigned int blocksize =i_blocksize (inode); +unsigned int offs = newsize & (blocksize -1 ); +if (offs) { + error =gfs2_block_zero_range (inode, newsize, + blocksize - offs); +if (error) +return error; + } + }if (journaled) error =gfs2_trans_begin (sdp,RES_DINODE +RES_JDATA ,GFS2_JTRUNC_REVOKES );else
@@ -1426,19 +1442,10 @@ static int trunc_start(struct inode *inode, u64 newsize)gfs2_trans_add_meta (ip->i_gl, dibh); -if (gfs2_is_stuffed (ip)) { +if (gfs2_is_stuffed (ip))gfs2_buffer_clear_tail (dibh,sizeof (struct gfs2_dinode ) + newsize); - }else { -unsigned int blocksize =i_blocksize (inode); -unsigned int offs = newsize & (blocksize -1 ); -if (offs) { - error =gfs2_block_zero_range (inode, newsize, - blocksize - offs); -if (error) - goto out; - } +else ip->i_diskflags |=GFS2_DIF_TRUNC_IN_PROG ; - }i_size_write (inode, newsize); ip->i_inode.i_mtime = ip->i_inode.i_ctime =current_time (&ip->i_inode);
@@ -2446,25 +2453,7 @@ int __gfs2_punch_hole(struct file *file, loff_t offset, loff_t length)loff_t start, end;int error; - start =round_down (offset, blocksize); - end =round_up (offset + length, blocksize) -1 ; - error =filemap_write_and_wait_range (inode->i_mapping, start, end); -if (error) -return error; - -if (gfs2_is_jdata (ip)) - error =gfs2_trans_begin (sdp,RES_DINODE +2 *RES_JDATA , -GFS2_JTRUNC_REVOKES ); -else - error =gfs2_trans_begin (sdp,RES_DINODE ,0 ); -if (error) -return error; - -if (gfs2_is_stuffed (ip)) { - error =stuffed_zero_range (inode, offset, length); -if (error) - goto out; - }else { +if (!gfs2_is_stuffed (ip)) {unsigned int start_off, end_len; start_off = offset & (blocksize -1 );
@@ -2487,6 +2476,26 @@ int __gfs2_punch_hole(struct file *file, loff_t offset, loff_t length) } } + start =round_down (offset, blocksize); + end =round_up (offset + length, blocksize) -1 ; + error =filemap_write_and_wait_range (inode->i_mapping, start, end); +if (error) +return error; + +if (gfs2_is_jdata (ip)) + error =gfs2_trans_begin (sdp,RES_DINODE +2 *RES_JDATA , +GFS2_JTRUNC_REVOKES ); +else + error =gfs2_trans_begin (sdp,RES_DINODE ,0 ); +if (error) +return error; + +if (gfs2_is_stuffed (ip)) { + error =stuffed_zero_range (inode, offset, length); +if (error) + goto out; + } +if (gfs2_is_jdata (ip)) {BUG_ON (!current->journal_info);gfs2_journaled_truncate_range (inode, offset, length);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 13/107 perf probe: Fix memory leakage when the probe point is not found
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit 12d572e785b15bc764e956caaa8a4c846fd15694 ]
Fix the memory leakage in debuginfo__find_trace_events() when the probe point is not found in the debuginfo. If there is no probe point found in the debuginfo, debuginfo__find_probes() will NOT return -ENOENT, but 0.
Thus the caller of debuginfo__find_probes() must check the tf.ntevs and release the allocated memory for the array of struct probe_trace_event.
The current code releases the memory only if the debuginfo__find_probes() hits an error but not checks tf.ntevs. In the result, the memory allocated on *tevs are not released if tf.ntevs == 0.
This fixes the memory leakage by checking tf.ntevs == 0 in addition to ret < 0.
--- tools/perf/util/probe-finder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/probe-finder.c +1 -1
@@ -1362,7 +1362,7 @@ int debuginfo__find_trace_events(struct debuginfo *dbg, tf.ntevs =0 ; ret =debuginfo__find_probes (dbg, &tf.pf); -if (ret <0 ) { +if (ret <0 || tf.ntevs ==0 ) {for (i =0 ; i < tf.ntevs; i++)clear_probe_trace_event (&tf.tevs[i]);zfree (tevs);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 14/107 khugepaged: khugepaged_test_exit() check mmget_still_valid()
In reply to Greg Kroah-HartmanFrom: Hugh Dickins <[email protected]>
[ Upstream commit bbe98f9cadff58cdd6a4acaeba0efa8565dabe65 ]
Move collapse_huge_page()'s mmget_still_valid() check into khugepaged_test_exit() itself. collapse_huge_page() is used for anon THP only, and earned its mmget_still_valid() check because it inserts a huge pmd entry in place of the page table's pmd entry; whereas collapse_file()'s retract_page_tables() or collapse_pte_mapped_thp() merely clears the page table's pmd entry. But core dumping without mmap lock must have been as open to mistaking a racily cleared pmd entry for a page table at physical page 0, as exit_mmap() was. And we certainly have no interest in mapping as a THP once dumping core.
--- mm/khugepaged.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
mm/khugepaged.c +1 -4
@@ -401,7 +401,7 @@ static void insert_to_mm_slots_hash(struct mm_struct *mm,static inline int khugepaged_test_exit (struct mm_struct *mm) { -return atomic_read (&mm->mm_users) ==0 ; +return atomic_read (&mm->mm_users) ==0 || !mmget_still_valid (mm); } static bool hugepage_vma_check(struct vm_area_struct *vma,
@@ -1019,9 +1019,6 @@ static void collapse_huge_page(struct mm_struct *mm,* handled by the anon_vma lock + PG_lock. */ down_write (&mm->mmap_sem); - result =SCAN_ANY_PROCESS ; -if (!mmget_still_valid (mm)) - goto out; result =hugepage_vma_revalidate (mm, address, &vma);if (result) goto out;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 15/107 khugepaged: adjust VM_BUG_ON_MM() in __khugepaged_enter()
In reply to Greg Kroah-HartmanFrom: Hugh Dickins <[email protected]>
[ Upstream commit f3f99d63a8156c7a4a6b20aac22b53c5579c7dc1 ]
syzbot crashes on the VM_BUG_ON_MM(khugepaged_test_exit(mm), mm) in __khugepaged_enter(): yes, when one thread is about to dump core, has set core_state, and is waiting for others, another might do something calling __khugepaged_enter(), which now crashes because I lumped the core_state test (known as "mmget_still_valid") into khugepaged_test_exit(). I still think it's best to lump them together, so just in this exceptional case, check mm->mm_users directly instead of khugepaged_test_exit().
--- mm/khugepaged.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/khugepaged.c +1 -1
@@ -438,7 +438,7 @@ int __khugepaged_enter(struct mm_struct *mm)return -ENOMEM ;/* __khugepaged_exit() must not run from under us */ -VM_BUG_ON_MM (khugepaged_test_exit (mm), mm); +VM_BUG_ON_MM (atomic_read (&mm->mm_users) ==0 , mm);if (unlikely (test_and_set_bit (MMF_VM_HUGEPAGE , &mm->flags))) {free_mm_slot (mm_slot);return 0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 16/107 bcache: avoid nr_stripes overflow in bcache_device_init()
In reply to Greg Kroah-HartmanFrom: Coly Li <[email protected]>
[ Upstream commit 65f0f017e7be8c70330372df23bcb2a407ecf02d ]
For some block devices which large capacity (e.g. 8TB) but small io_opt size (e.g. 8 sectors), in bcache_device_init() the stripes number calcu- lated by,
DIV_ROUND_UP_ULL(sectors, d->stripe_size);
might be overflow to the unsigned int bcache_device->nr_stripes.
This patch uses the uint64_t variable to store DIV_ROUND_UP_ULL() and after the value is checked to be available in unsigned int range, sets it to bache_device->nr_stripes. Then the overflow is avoided.
--- drivers/md/bcache/super.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/md/bcache/super.c +6 -6
@@ -816,19 +816,19 @@ static int bcache_device_init(struct bcache_device *d, unsigned int block_size,struct request_queue *q;const size_t max_stripes =min_t (size_t,INT_MAX ,SIZE_MAX /sizeof (atomic_t)); -size_t n; +uint64_t n;int idx;if (!d->stripe_size) d->stripe_size =1 <<31 ; - d->nr_stripes =DIV_ROUND_UP_ULL (sectors, d->stripe_size); - -if (!d->nr_stripes || d->nr_stripes > max_stripes) { -pr_err ("nr_stripes too large or invalid: %u (start sector beyond end of disk?)" , - (unsigned int )d->nr_stripes); + n =DIV_ROUND_UP_ULL (sectors, d->stripe_size); +if (!n || n > max_stripes) { +pr_err ("nr_stripes too large or invalid: %llu (start sector beyond end of disk?)\n" , + n);return -ENOMEM ; } + d->nr_stripes = n; n = d->nr_stripes *sizeof (atomic_t); d->stripe_sectors_dirty =kvzalloc (n,GFP_KERNEL );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 17/107 btrfs: export helpers for subvolume name/id resolution
In reply to Greg Kroah-HartmanFrom: Marcos Paulo de Souza <[email protected]>
[ Upstream commit c0c907a47dccf2cf26251a8fb4a8e7a3bf79ce84 ]
The functions will be used outside of export.c and super.c to allow resolving subvolume name from a given id, eg. for subvolume deletion by id ioctl.
--- fs/btrfs/ctree.h | 2 ++ fs/btrfs/export.c | 8 ++++---- fs/btrfs/export.h | 5 +++++ fs/btrfs/super.c | 8 ++++---- 4 files changed, 15 insertions(+), 8 deletions(-)
fs/btrfs/ctree.h +2 -0
@@ -2965,6 +2965,8 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,int btrfs_parse_options (struct btrfs_fs_info *info,char *options,unsigned long new_flags);int btrfs_sync_fs (struct super_block *sb,int wait); +char *btrfs_get_subvol_name_from_objectid (struct btrfs_fs_info *fs_info, +u64 subvol_objectid); static inline __printf(2, 3) __cold void btrfs_no_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...)
fs/btrfs/export.c +4 -4
@@ -57,9 +57,9 @@ static int btrfs_encode_fh(struct inode *inode, u32 *fh, int *max_len,return type; } -static struct dentry *btrfs_get_dentry (struct super_block *sb,u64 objectid, -u64 root_objectid,u32 generation, -int check_generation) +struct dentry *btrfs_get_dentry (struct super_block *sb,u64 objectid, +u64 root_objectid,u32 generation, +int check_generation) {struct btrfs_fs_info *fs_info =btrfs_sb (sb);struct btrfs_root *root;
@@ -152,7 +152,7 @@ static struct dentry *btrfs_fh_to_dentry(struct super_block *sb, struct fid *fh,return btrfs_get_dentry (sb, objectid, root_objectid, generation,1 ); } -static struct dentry *btrfs_get_parent (struct dentry *child) +struct dentry *btrfs_get_parent (struct dentry *child) {struct inode *dir =d_inode (child);struct btrfs_fs_info *fs_info =btrfs_sb (dir->i_sb);
fs/btrfs/export.h +5 -0
@@ -18,4 +18,9 @@ struct btrfs_fid {u64 parent_root_objectid; } __attribute__ ((packed)); +struct dentry *btrfs_get_dentry (struct super_block *sb,u64 objectid, +u64 root_objectid,u32 generation, +int check_generation); +struct dentry *btrfs_get_parent (struct dentry *child); +#endif
fs/btrfs/super.c +4 -4
@@ -1009,8 +1009,8 @@ out:return error; } -static char *get_subvol_name_from_objectid (struct btrfs_fs_info *fs_info, -u64 subvol_objectid) +char *btrfs_get_subvol_name_from_objectid (struct btrfs_fs_info *fs_info, +u64 subvol_objectid) {struct btrfs_root *root = fs_info->tree_root;struct btrfs_root *fs_root;
@@ -1421,8 +1421,8 @@ static struct dentry *mount_subvol(const char *subvol_name, u64 subvol_objectid, goto out; } } - subvol_name =get_subvol_name_from_objectid (btrfs_sb (mnt->mnt_sb), - subvol_objectid); + subvol_name =btrfs_get_subvol_name_from_objectid ( +btrfs_sb (mnt->mnt_sb), subvol_objectid);if (IS_ERR (subvol_name)) { root =ERR_CAST (subvol_name); subvol_name =NULL ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 18/107 btrfs: dont show full path of bind mounts in subvol=
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
[ Upstream commit 3ef3959b29c4a5bd65526ab310a1a18ae533172a ]
Chris Murphy reported a problem where rpm ostree will bind mount a bunch of things for whatever voodoo it's doing. But when it does this /proc/mounts shows something like
/dev/sda /mnt/test btrfs rw,relatime,subvolid=256,subvol=/foo 0 0 /dev/sda /mnt/test/baz btrfs rw,relatime,subvolid=256,subvol=/foo/bar 0 0
Despite subvolid=256 being subvol=/foo. This is because we're just spitting out the dentry of the mount point, which in the case of bind mounts is the source path for the mountpoint. Instead we should spit out the path to the actual subvol. Fix this by looking up the name for the subvolid we have mounted. With this fix the same test looks like this
/dev/sda /mnt/test btrfs rw,relatime,subvolid=256,subvol=/foo 0 0 /dev/sda /mnt/test/baz btrfs rw,relatime,subvolid=256,subvol=/foo 0 0
--- fs/btrfs/super.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
fs/btrfs/super.c +8 -2
@@ -1291,6 +1291,7 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry) {struct btrfs_fs_info *info =btrfs_sb (dentry->d_sb);const char *compress_type; +const char *subvol_name;if (btrfs_test_opt (info,DEGRADED ))seq_puts (seq,",degraded" );
@@ -1375,8 +1376,13 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry)seq_puts (seq,",ref_verify" );seq_printf (seq,",subvolid=%llu" ,BTRFS_I (d_inode (dentry))->root->root_key.objectid); -seq_puts (seq,",subvol=" ); -seq_dentry (seq, dentry," \t\n\\" ); + subvol_name =btrfs_get_subvol_name_from_objectid (info, +BTRFS_I (d_inode (dentry))->root->root_key.objectid); +if (!IS_ERR (subvol_name)) { +seq_puts (seq,",subvol=" ); +seq_escape (seq, subvol_name," \t\n\\" ); +kfree (subvol_name); + }return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 19/107 btrfs: return EROFS for BTRFS_FS_STATE_ERROR cases
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
Eric reported seeing this message while running generic/475
BTRFS: error (device dm-3) in btrfs_sync_log:3084: errno=-117 Filesystem corrupted
Full stack trace:
BTRFS: error (device dm-0) in btrfs_commit_transaction:2323: errno=-5 IO failure (Error while writing out transaction) BTRFS info (device dm-0): forced readonly
BTRFS warning (device dm-0): Skipping commit of aborted transaction.
------------[ cut here ]------------ BTRFS: error (device dm-0) in cleanup_transaction:1894: errno=-5 IO failure BTRFS: Transaction aborted (error -117) BTRFS warning (device dm-0): direct IO failed ino 3555 rw 0,0 sector 0x1c6480 len 4096 err no 10 BTRFS warning (device dm-0): direct IO failed ino 3555 rw 0,0 sector 0x1c6488 len 4096 err no 10 BTRFS warning (device dm-0): direct IO failed ino 3555 rw 0,0 sector 0x1c6490 len 4096 err no 10 BTRFS warning (device dm-0): direct IO failed ino 3555 rw 0,0 sector 0x1c6498 len 4096 err no 10 BTRFS warning (device dm-0): direct IO failed ino 3555 rw 0,0 sector 0x1c64a0 len 4096 err no 10 BTRFS warning (device dm-0): direct IO failed ino 3555 rw 0,0 sector 0x1c64a8 len 4096 err no 10 BTRFS warning (device dm-0): direct IO failed ino 3555 rw 0,0 sector 0x1c64b0 len 4096 err no 10 BTRFS warning (device dm-0): direct IO failed ino 3555 rw 0,0 sector 0x1c64b8 len 4096 err no 10 BTRFS warning (device dm-0): direct IO failed ino 3555 rw 0,0 sector 0x1c64c0 len 4096 err no 10 BTRFS warning (device dm-0): direct IO failed ino 3572 rw 0,0 sector 0x1b85e8 len 4096 err no 10 BTRFS warning (device dm-0): direct IO failed ino 3572 rw 0,0 sector 0x1b85f0 len 4096 err no 10 WARNING: CPU: 3 PID: 23985 at fs/btrfs/tree-log.c:3084 btrfs_sync_log+0xbc8/0xd60 [btrfs] BTRFS warning (device dm-0): direct IO failed ino 3548 rw 0,0 sector 0x1d4288 len 4096 err no 10 BTRFS warning (device dm-0): direct IO failed ino 3548 rw 0,0 sector 0x1d4290 len 4096 err no 10 BTRFS warning (device dm-0): direct IO failed ino 3548 rw 0,0 sector 0x1d4298 len 4096 err no 10 BTRFS warning (device dm-0): direct IO failed ino 3548 rw 0,0 sector 0x1d42a0 len 4096 err no 10 BTRFS warning (device dm-0): direct IO failed ino 3548 rw 0,0 sector 0x1d42a8 len 4096 err no 10 BTRFS warning (device dm-0): direct IO failed ino 3548 rw 0,0 sector 0x1d42b0 len 4096 err no 10 BTRFS warning (device dm-0): direct IO failed ino 3548 rw 0,0 sector 0x1d42b8 len 4096 err no 10 BTRFS warning (device dm-0): direct IO failed ino 3548 rw 0,0 sector 0x1d42c0 len 4096 err no 10 BTRFS warning (device dm-0): direct IO failed ino 3548 rw 0,0 sector 0x1d42c8 len 4096 err no 10 BTRFS warning (device dm-0): direct IO failed ino 3548 rw 0,0 sector 0x1d42d0 len 4096 err no 10 CPU: 3 PID: 23985 Comm: fsstress Tainted: G W L 5.8.0-rc4-default+ #1181 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-59-gc9ba527-rebuilt.opensuse.org 04/01/2014 RIP: 0010:btrfs_sync_log+0xbc8/0xd60 [btrfs] RSP: 0018:ffff909a44d17bd0 EFLAGS: 00010286 RAX: 0000000000000000 RBX: 0000000000000001 RCX: 0000000000000001 RDX: ffff8f3be41cb940 RSI: ffffffffb0108d2b RDI: ffffffffb0108ff7 RBP: ffff909a44d17e70 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000037988 R12: ffff8f3bd20e4000 R13: ffff8f3bd20e4428 R14: 00000000ffffff8b R15: ffff909a44d17c70 FS: 00007f6a6ed3fb80(0000) GS:ffff8f3c3dc00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f6a6ed3e000 CR3: 00000000525c0003 CR4: 0000000000160ee0 Call Trace: ? finish_wait+0x90/0x90 ? __mutex_unlock_slowpath+0x45/0x2a0 ? lock_acquire+0xa3/0x440 ? lockref_put_or_lock+0x9/0x30 ? dput+0x20/0x4a0 ? dput+0x20/0x4a0 ? do_raw_spin_unlock+0x4b/0xc0 ? _raw_spin_unlock+0x1f/0x30 btrfs_sync_file+0x335/0x490 [btrfs] do_fsync+0x38/0x70 __x64_sys_fsync+0x10/0x20 do_syscall_64+0x50/0xe0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7f6a6ef1b6e3 Code: Bad RIP value. RSP: 002b:00007ffd01e20038 EFLAGS: 00000246 ORIG_RAX: 000000000000004a RAX: ffffffffffffffda RBX: 000000000007a120 RCX: 00007f6a6ef1b6e3 RDX: 00007ffd01e1ffa0 RSI: 00007ffd01e1ffa0 RDI: 0000000000000003 RBP: 0000000000000003 R08: 0000000000000001 R09: 00007ffd01e2004c R10: 0000000000000000 R11: 0000000000000246 R12: 000000000000009f R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 irq event stamp: 0 hardirqs last enabled at (0): [<0000000000000000>] 0x0 hardirqs last disabled at (0): [<ffffffffb007fe0b>] copy_process+0x67b/0x1b00 softirqs last enabled at (0): [<ffffffffb007fe0b>] copy_process+0x67b/0x1b00 softirqs last disabled at (0): [<0000000000000000>] 0x0 ---[ end trace af146e0e38433456 ]--- BTRFS: error (device dm-0) in btrfs_sync_log:3084: errno=-117 Filesystem corrupted
This ret came from btrfs_write_marked_extents(). If we get an aborted transaction via EIO before, we'll see it in btree_write_cache_pages() and return EUCLEAN, which gets printed as "Filesystem corrupted".
Except we shouldn't be returning EUCLEAN here, we need to be returning EROFS because EUCLEAN is reserved for actual corruption, not IO errors.
We are inconsistent about our handling of BTRFS_FS_STATE_ERROR elsewhere, but we want to use EROFS for this particular case. The original transaction abort has the real error code for why we ended up with an aborted transaction, all subsequent actions just need to return EROFS because they may not have a trans handle and have no idea about the original cause of the abort.
After patch "btrfs: don't WARN if we abort a transaction with EROFS" the stacktrace will not be dumped either.
--- fs/btrfs/extent_io.c | 2 +- fs/btrfs/scrub.c | 2 +- fs/btrfs/transaction.c | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-)
fs/btrfs/extent_io.c +1 -1
@@ -4073,7 +4073,7 @@ retry:if (!test_bit (BTRFS_FS_STATE_ERROR , &fs_info->fs_state)) { ret =flush_write_bio (&epd); }else { - ret = -EUCLEAN ; + ret = -EROFS ;end_write_bio (&epd, ret); }return ret;
fs/btrfs/scrub.c +1 -1
@@ -3717,7 +3717,7 @@ static noinline_for_stack int scrub_supers(struct scrub_ctx *sctx,struct btrfs_fs_info *fs_info = sctx->fs_info;if (test_bit (BTRFS_FS_STATE_ERROR , &fs_info->fs_state)) -return -EIO ; +return -EROFS ;/* Seed devices of a new filesystem has their own generation. */ if (scrub_dev->fs_devices != fs_info->fs_devices)
fs/btrfs/transaction.c +4 -1
@@ -873,7 +873,10 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,if (trans->aborted ||test_bit (BTRFS_FS_STATE_ERROR , &info->fs_state)) {wake_up_process (info->transaction_kthread); - err = -EIO ; +if (TRANS_ABORTED (trans)) + err = trans->aborted; +else + err = -EROFS ; }kmem_cache_free (btrfs_trans_handle_cachep, trans);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 20/107 btrfs: add wrapper for transaction abort predicate
In reply to Greg Kroah-HartmanFrom: David Sterba <[email protected]>
[ Upstream commit bf31f87f71cc7a89871ab0a451c047a0c0144bf1 ]
The status of aborted transaction can change between calls and it needs to be accessed by READ_ONCE. Add a helper that also wraps the unlikely hint.
--- fs/btrfs/block-group.c | 2 +- fs/btrfs/delayed-inode.c | 2 +- fs/btrfs/extent-tree.c | 10 +++++----- fs/btrfs/super.c | 2 +- fs/btrfs/transaction.c | 25 +++++++++++++------------ fs/btrfs/transaction.h | 12 ++++++++++++ 6 files changed, 33 insertions(+), 20 deletions(-)
fs/btrfs/block-group.c +1 -1
@@ -2168,7 +2168,7 @@ static int cache_save_setup(struct btrfs_block_group_cache *block_group,return 0 ; } -if (trans->aborted) +if (TRANS_ABORTED (trans))return 0 ; again: inode =lookup_free_space_inode (block_group, path);
fs/btrfs/delayed-inode.c +1 -1
@@ -1151,7 +1151,7 @@ static int __btrfs_run_delayed_items(struct btrfs_trans_handle *trans, int nr)int ret =0 ;bool count = (nr >0 ); -if (trans->aborted) +if (TRANS_ABORTED (trans))return -EIO ; path =btrfs_alloc_path ();
fs/btrfs/extent-tree.c +5 -5
@@ -1561,7 +1561,7 @@ static int run_delayed_extent_op(struct btrfs_trans_handle *trans,int err =0 ;int metadata = !extent_op->is_data; -if (trans->aborted) +if (TRANS_ABORTED (trans))return 0 ;if (metadata && !btrfs_fs_incompat (fs_info,SKINNY_METADATA ))
@@ -1681,7 +1681,7 @@ static int run_one_delayed_ref(struct btrfs_trans_handle *trans, {int ret =0 ; -if (trans->aborted) { +if (TRANS_ABORTED (trans)) {if (insert_reserved)btrfs_pin_extent (trans->fs_info, node->bytenr, node->num_bytes,1 );
@@ -2169,7 +2169,7 @@ int btrfs_run_delayed_refs(struct btrfs_trans_handle *trans,int run_all = count == (unsigned long )-1 ;/* We'll clean this up in btrfs_cleanup_transaction */ -if (trans->aborted) +if (TRANS_ABORTED (trans))return 0 ;if (test_bit (BTRFS_FS_CREATING_FREE_SPACE_TREE , &fs_info->flags))
@@ -2892,7 +2892,7 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans)else unpin = &fs_info->freed_extents[0 ]; -while (!trans->aborted) { +while (!TRANS_ABORTED (trans)) {struct extent_state *cached_state =NULL ;mutex_lock (&fs_info->unused_bg_unpin_mutex);
@@ -2924,7 +2924,7 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans)u64 trimmed =0 ; ret = -EROFS ; -if (!trans->aborted) +if (!TRANS_ABORTED (trans)) ret = btrfs_discard_extent(fs_info, block_group->key.objectid, block_group->key.offset,
fs/btrfs/super.c +1 -1
@@ -241,7 +241,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans, {struct btrfs_fs_info *fs_info = trans->fs_info; - trans->aborted = errno; +WRITE_ONCE (trans->aborted, errno);/* Nothing used. The other threads that have joined this * transaction may be able to continue. */ if (!trans->dirty &&list_empty (&trans->new_bgs)) {
fs/btrfs/transaction.c +13 -12
@@ -174,7 +174,7 @@ loop: cur_trans = fs_info->running_transaction;if (cur_trans) { -if (cur_trans->aborted) { +if (TRANS_ABORTED (cur_trans)) {spin_unlock (&fs_info->trans_lock);return cur_trans->aborted; }
@@ -390,7 +390,7 @@ static inline int is_transaction_blocked(struct btrfs_transaction *trans) {return (trans->state >=TRANS_STATE_BLOCKED && trans->state <TRANS_STATE_UNBLOCKED && - !trans->aborted); + !TRANS_ABORTED (trans)); }/* wait for commit against the current transaction to become unblocked
@@ -409,7 +409,7 @@ static void wait_current_trans(struct btrfs_fs_info *fs_info)wait_event (fs_info->transaction_wait, cur_trans->state >=TRANS_STATE_UNBLOCKED || - cur_trans->aborted); +TRANS_ABORTED (cur_trans));btrfs_put_transaction (cur_trans); }else {spin_unlock (&fs_info->trans_lock);
@@ -870,7 +870,7 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,if (throttle)btrfs_run_delayed_iputs (info); -if (trans->aborted || +if (TRANS_ABORTED (trans) ||test_bit (BTRFS_FS_STATE_ERROR , &info->fs_state)) {wake_up_process (info->transaction_kthread);if (TRANS_ABORTED (trans))
@@ -1730,7 +1730,8 @@ static void wait_current_trans_commit_start(struct btrfs_fs_info *fs_info, struct btrfs_transaction *trans) {wait_event (fs_info->transaction_blocked_wait, - trans->state >=TRANS_STATE_COMMIT_START || trans->aborted); + trans->state >=TRANS_STATE_COMMIT_START || +TRANS_ABORTED (trans)); }/*
@@ -1742,7 +1743,8 @@ static void wait_current_trans_commit_start_and_unblock( struct btrfs_transaction *trans) {wait_event (fs_info->transaction_wait, - trans->state >=TRANS_STATE_UNBLOCKED || trans->aborted); + trans->state >=TRANS_STATE_UNBLOCKED || +TRANS_ABORTED (trans)); }/*
@@ -1960,7 +1962,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) trans->dirty = true;/* Stop the commit early if ->aborted is set */ -if (unlikely (READ_ONCE (cur_trans->aborted))) { +if (TRANS_ABORTED (cur_trans)) { ret = cur_trans->aborted;btrfs_end_transaction (trans);return ret;
@@ -2034,7 +2036,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)wait_for_commit (cur_trans); -if (unlikely (cur_trans->aborted)) +if (TRANS_ABORTED (cur_trans)) ret = cur_trans->aborted;btrfs_put_transaction (cur_trans);
@@ -2053,7 +2055,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)spin_unlock (&fs_info->trans_lock);wait_for_commit (prev_trans); - ret = prev_trans->aborted; + ret =READ_ONCE (prev_trans->aborted);btrfs_put_transaction (prev_trans);if (ret)
@@ -2107,8 +2109,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)wait_event (cur_trans->writer_wait,atomic_read (&cur_trans->num_writers) ==1 ); -/* ->aborted might be set after the previous check, so check it */ -if (unlikely (READ_ONCE (cur_trans->aborted))) { +if (TRANS_ABORTED (cur_trans)) { ret = cur_trans->aborted; goto scrub_continue; }
@@ -2226,7 +2227,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)* The tasks which save the space cache and inode cache may also * update ->aborted, check it. */ -if (unlikely (READ_ONCE (cur_trans->aborted))) { +if (TRANS_ABORTED (cur_trans)) { ret = cur_trans->aborted;mutex_unlock (&fs_info->tree_log_mutex);mutex_unlock (&fs_info->reloc_mutex);
fs/btrfs/transaction.h +12 -0
@@ -116,6 +116,10 @@ struct btrfs_trans_handle {struct btrfs_block_rsv *orig_rsv;refcount_t use_count;unsigned int type; +/* +* Error code of transaction abort, set outside of locks and must use +* the READ_ONCE/WRITE_ONCE access +*/ short aborted;bool adding_csums;bool allocating_chunk;
@@ -127,6 +131,14 @@ struct btrfs_trans_handle {struct list_head new_bgs; }; +/* +* The abort status can be changed between calls and is not protected by locks. +* This accepts btrfs_transaction and btrfs_trans_handle as types. Once it's +* set to a non-zero value it does not change, so the macro should be in checks +* but is not necessary for further reads of the value. +*/ +#define TRANS_ABORTED (trans) (unlikely(READ_ONCE((trans)->aborted))) +struct btrfs_pending_snapshot {struct dentry *dentry;struct inode *dir;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 21/107 ALSA: hda/realtek: Add quirk for Samsung Galaxy Flex Book
In reply to Greg Kroah-HartmanFrom: Mike Pozulp <[email protected]>
commit f70fff83cda63bbf596f99edc131b9daaba07458 upstream.
The Flex Book uses the same ALC298 codec as other Samsung laptops which have the no headphone sound bug, like my Samsung Notebook. The Flex Book owner used Early Patching to confirm that this quirk fixes the bug.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -7666,6 +7666,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x144d ,0xc109 ,"Samsung Ativ book 9 (NP900X3G)" ,ALC269_FIXUP_INV_DMIC ),SND_PCI_QUIRK (0x144d ,0xc169 ,"Samsung Notebook 9 Pen (NP930SBE-K01US)" ,ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET ),SND_PCI_QUIRK (0x144d ,0xc176 ,"Samsung Notebook 9 Pro (NP930MBE-K04US)" ,ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET ), +SND_PCI_QUIRK (0x144d ,0xc189 ,"Samsung Galaxy Flex Book (NT950QCG-X716)" ,ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET ),SND_PCI_QUIRK (0x144d ,0xc740 ,"Samsung Ativ book 8 (NP870Z5G)" ,ALC269_FIXUP_ATIV_BOOK_8 ),SND_PCI_QUIRK (0x144d ,0xc812 ,"Samsung Notebook Pen S (NT950SBE-X58)" ,ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET ), SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC),
Greg Kroah-Hartman
maintainerPATCH 22/107 ALSA: hda/realtek: Add quirk for Samsung Galaxy Book Ion
In reply to Greg Kroah-HartmanFrom: Mike Pozulp <[email protected]>
commit e17f02d0559c174cf1f6435e45134490111eaa37 upstream.
The Galaxy Book Ion uses the same ALC298 codec as other Samsung laptops which have the no headphone sound bug, like my Samsung Notebook. The Galaxy Book owner confirmed that this patch fixes the bug.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -7667,6 +7667,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x144d ,0xc169 ,"Samsung Notebook 9 Pen (NP930SBE-K01US)" ,ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET ),SND_PCI_QUIRK (0x144d ,0xc176 ,"Samsung Notebook 9 Pro (NP930MBE-K04US)" ,ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET ),SND_PCI_QUIRK (0x144d ,0xc189 ,"Samsung Galaxy Flex Book (NT950QCG-X716)" ,ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET ), +SND_PCI_QUIRK (0x144d ,0xc18a ,"Samsung Galaxy Book Ion (NT950XCJ-X716A)" ,ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET ),SND_PCI_QUIRK (0x144d ,0xc740 ,"Samsung Ativ book 8 (NP870Z5G)" ,ALC269_FIXUP_ATIV_BOOK_8 ),SND_PCI_QUIRK (0x144d ,0xc812 ,"Samsung Notebook Pen S (NT950SBE-X58)" ,ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET ), SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC),
Greg Kroah-Hartman
maintainerPATCH 23/107 can: j1939: transport: j1939_session_tx_dat(): fix use-after-free read in j1939_tp_txtimer()
In reply to Greg Kroah-HartmanFrom: Oleksij Rempel <[email protected]>
commit cd3b3636c99fcac52c598b64061f3fe4413c6a12 upstream.
The current stack implementation do not support ECTS requests of not aligned TP sized blocks.
If ECTS will request a block with size and offset spanning two TP blocks, this will cause memcpy() to read beyond the queued skb (which does only contain one TP sized block).
Sometimes KASAN will detect this read if the memory region beyond the skb was previously allocated and freed. In other situations it will stay undetected. The ETP transfer in any case will be corrupted.
This patch adds a sanity check to avoid this kind of read and abort the session with error J1939_XTP_ABORT_ECTS_TOO_BIG.
--- net/can/j1939/transport.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
net/can/j1939/transport.c +15 -0
@@ -787,6 +787,18 @@ static int j1939_session_tx_dat(struct jif (len >7 ) len =7 ; +if (offset + len > se_skb->len) { +netdev_err_once (priv->ndev, +"%s: 0x%p: requested data outside of queued buffer: offset %i, len %i, pkt.tx: %i\n" , + __func__, session, skcb->offset, se_skb->len , session->pkt.tx); +return -EOVERFLOW ; + } + +if (!len) { + ret = -ENOBUFS ; +break ; + } +memcpy (&dat[1 ], &tpdat[offset], len); ret =j1939_tp_tx_dat (session, dat, len +1 );if (ret <0 ) {
@@ -1120,6 +1132,9 @@ static enum hrtimer_restart j1939_tp_txt* cleanup including propagation of the error to user space. */ break ; +case -EOVERFLOW : +j1939_session_cancel (session,J1939_XTP_ABORT_ECTS_TOO_BIG ); +break ;case 0 : session->tx_retry =0 ;break ;
Greg Kroah-Hartman
maintainerPATCH 24/107 can: j1939: socket: j1939_sk_bind(): make sure ml_priv is allocated
In reply to Greg Kroah-HartmanFrom: Oleksij Rempel <[email protected]>
commit af804b7826350d5af728dca4715e473338fbd7e5 upstream.
This patch adds check to ensure that the struct net_device::ml_priv is allocated, as it is used later by the j1939 stack.
The allocation is done by all mainline CAN network drivers, but when using bond or team devices this is not the case.
Bail out if no ml_priv is allocated.
--- net/can/j1939/socket.c | 8 ++++++++ 1 file changed, 8 insertions(+)
net/can/j1939/socket.c +8 -0
@@ -466,6 +466,14 @@ static int j1939_sk_bind(struct socket * goto out_release_sock; } +if (!ndev->ml_priv) { +netdev_warn_once (ndev, +"No CAN mid layer private allocated, please fix your driver and use alloc_candev()!\n" ); +dev_put (ndev); + ret = -ENODEV ; + goto out_release_sock; + } + priv =j1939_netdev_start (ndev);dev_put (ndev);if (IS_ERR (priv)) {
Greg Kroah-Hartman
maintainerPATCH 25/107 spi: Prevent adding devices below an unregistering controller
In reply to Greg Kroah-HartmanFrom: Lukas Wunner <[email protected]>
commit ddf75be47ca748f8b12d28ac64d624354fddf189 upstream.
CONFIG_OF_DYNAMIC and CONFIG_ACPI allow adding SPI devices at runtime using a DeviceTree overlay or DSDT patch. CONFIG_SPI_SLAVE allows the same via sysfs.
But there are no precautions to prevent adding a device below a controller that's being removed. Such a device is unusable and may not even be able to unbind cleanly as it becomes inaccessible once the controller has been torn down. E.g. it is then impossible to quiesce the device's interrupt.
of_spi_notify() and acpi_spi_notify() do hold a ref on the controller, but otherwise run lockless against spi_unregister_controller().
Fix by holding the spi_add_lock in spi_unregister_controller() and bailing out of spi_add_device() if the controller has been unregistered concurrently.
--- drivers/spi/Kconfig | 3 +++ drivers/spi/spi.c | 21 ++++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-)
drivers/spi/Kconfig +3 -0
@@ -944,4 +944,7 @@ config SPI_SLAVE_SYSTEM_CONTROL endif # SPI_SLAVE +config SPI_DYNAMIC + def_bool ACPI || OF_DYNAMIC || SPI_SLAVE + endif # SPI
drivers/spi/spi.c +20 -1
@@ -475,6 +475,12 @@ static LIST_HEAD(spi_controller_list);*/ static DEFINE_MUTEX (board_lock); +/* +* Prevents addition of devices with same chip select and +* addition of devices below an unregistering controller. +*/ +static DEFINE_MUTEX (spi_add_lock); +/** * spi_alloc_device - Allocate a new SPI device * @ctlr: Controller to which device is connected
@@ -553,7 +559,6 @@ static int spi_dev_check(struct device **/ int spi_add_device (struct spi_device *spi) { -static DEFINE_MUTEX (spi_add_lock);struct spi_controller *ctlr = spi->controller;struct device *dev = ctlr->dev.parent;int status;
@@ -581,6 +586,13 @@ int spi_add_device(struct spi_device *sp goto done; } +/* Controller may unregister concurrently */ +if (IS_ENABLED (CONFIG_SPI_DYNAMIC ) && + !device_is_registered (&ctlr->dev)) { + status = -ENODEV ; + goto done; + } +/* Descriptors take precedence */ if (ctlr->cs_gpiods) spi->cs_gpiod = ctlr->cs_gpiods[spi->chip_select];
@@ -2582,6 +2594,10 @@ void spi_unregister_controller(struct spstruct spi_controller *found;int id = ctlr->bus_num; +/* Prevent addition of new devices, unregister existing ones */ +if (IS_ENABLED (CONFIG_SPI_DYNAMIC )) +mutex_lock (&spi_add_lock); +device_for_each_child (&ctlr->dev,NULL , __unregister);/* First make sure that this controller was ever added */
@@ -2602,6 +2618,9 @@ void spi_unregister_controller(struct spif (found == ctlr)idr_remove (&spi_master_idr, id);mutex_unlock (&board_lock); + +if (IS_ENABLED (CONFIG_SPI_DYNAMIC )) +mutex_unlock (&spi_add_lock); }EXPORT_SYMBOL_GPL (spi_unregister_controller);
Greg Kroah-Hartman
maintainerPATCH 26/107 romfs: fix uninitialized memory leak in romfs_dev_read()
In reply to Greg Kroah-HartmanFrom: Jann Horn <[email protected]>
commit bcf85fcedfdd17911982a3e3564fcfec7b01eebd upstream.
romfs has a superblock field that limits the size of the filesystem; data beyond that limit is never accessed.
romfs_dev_read() fetches a caller-supplied number of bytes from the backing device. It returns 0 on success or an error code on failure; therefore, its API can't represent short reads, it's all-or-nothing.
However, when romfs_dev_read() detects that the requested operation would cross the filesystem size limit, it currently silently truncates the requested number of bytes. This e.g. means that when the content of a file with size 0x1000 starts one byte before the filesystem size limit, ->readpage() will only fill a single byte of the supplied page while leaving the rest uninitialized, leaking that uninitialized memory to userspace.
Fix it by returning an error code instead of truncating the read when the requested read operation would go beyond the end of the filesystem.
--- fs/romfs/storage.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/romfs/storage.c +1 -3
@@ -217,10 +217,8 @@ int romfs_dev_read(struct super_block *ssize_t limit; limit =romfs_maxsize (sb); -if (pos >= limit) +if (pos >= limit || buflen > limit - pos)return -EIO ; -if (buflen > limit - pos) - buflen = limit - pos;#ifdef CONFIG_ROMFS_ON_MTD if (sb->s_mtd)
Greg Kroah-Hartman
maintainerPATCH 27/107 kernel/relay.c: fix memleak on destroy relay channel
In reply to Greg Kroah-HartmanFrom: Wei Yongjun <[email protected]>
commit 71e843295c680898959b22dc877ae3839cc22470 upstream.
kmemleak report memory leak as follows:
unreferenced object 0x607ee4e5f948 (size 8):
comm "syz-executor.1", pid 2098, jiffies 4295031601 (age 288.468s) hex dump (first 8 bytes):
00 00 00 00 00 00 00 00 ........
backtrace:
relay_open kernel/relay.c:583 [inline]
relay_open+0xb6/0x970 kernel/relay.c:563
do_blk_trace_setup+0x4a8/0xb20 kernel/trace/blktrace.c:557
__blk_trace_setup+0xb6/0x150 kernel/trace/blktrace.c:597
blk_trace_ioctl+0x146/0x280 kernel/trace/blktrace.c:738
blkdev_ioctl+0xb2/0x6a0 block/ioctl.c:613
block_ioctl+0xe5/0x120 fs/block_dev.c:1871
vfs_ioctl fs/ioctl.c:48 [inline]
__do_sys_ioctl fs/ioctl.c:753 [inline]
__se_sys_ioctl fs/ioctl.c:739 [inline]
__x64_sys_ioctl+0x170/0x1ce fs/ioctl.c:739
do_syscall_64+0x33/0x40 arch/x86/entry/common.c:46
entry_SYSCALL_64_after_hwframe+0x44/0xa9'chan->buf' is malloced in relay_open() by alloc_percpu() but not free while destroy the relay channel. Fix it by adding free_percpu() before return from relay_destroy_channel().
--- kernel/relay.c | 1 + 1 file changed, 1 insertion(+)
kernel/relay.c +1 -0
@@ -197,6 +197,7 @@ free_buf:static void relay_destroy_channel (struct kref *kref) { struct rchan *chan = container_of(kref, struct rchan, kref); +free_percpu (chan->buf);kfree (chan); }
Greg Kroah-Hartman
maintainerPATCH 28/107 uprobes: __replace_page() avoid BUG in munlock_vma_page()
In reply to Greg Kroah-HartmanFrom: Hugh Dickins <[email protected]>
commit c17c3dc9d08b9aad9a55a1e53f205187972f448e upstream.
syzbot crashed on the VM_BUG_ON_PAGE(PageTail) in munlock_vma_page(), when called from uprobes __replace_page(). Which of many ways to fix it? Settled on not calling when PageCompound (since Head and Tail are equals in this context, PageCompound the usual check in uprobes.c, and the prior use of FOLL_SPLIT_PMD will have cleared PageMlocked already).
--- kernel/events/uprobes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/events/uprobes.c +1 -1
@@ -211,7 +211,7 @@ static int __replace_page(struct vm_areatry_to_free_swap (old_page);page_vma_mapped_walk_done (&pvmw); -if (vma->vm_flags &VM_LOCKED ) +if ((vma->vm_flags &VM_LOCKED ) && !PageCompound (old_page))munlock_vma_page (old_page);put_page (old_page);
Greg Kroah-Hartman
maintainerPATCH 29/107 mm: include CMA pages in lowmem_reserve at boot
In reply to Greg Kroah-HartmanFrom: Doug Berger <[email protected]>
commit e08d3fdfe2dafa0331843f70ce1ff6c1c4900bf4 upstream.
The lowmem_reserve arrays provide a means of applying pressure against allocations from lower zones that were targeted at higher zones. Its values are a function of the number of pages managed by higher zones and are assigned by a call to the setup_per_zone_lowmem_reserve() function.
The function is initially called at boot time by the function init_per_zone_wmark_min() and may be called later by accesses of the /proc/sys/vm/lowmem_reserve_ratio sysctl file.
The function init_per_zone_wmark_min() was moved up from a module_init to a core_initcall to resolve a sequencing issue with khugepaged. Unfortunately this created a sequencing issue with CMA page accounting.
The CMA pages are added to the managed page count of a zone when cma_init_reserved_areas() is called at boot also as a core_initcall. This makes it uncertain whether the CMA pages will be added to the managed page counts of their zones before or after the call to init_per_zone_wmark_min() as it becomes dependent on link order. With the current link order the pages are added to the managed count after the lowmem_reserve arrays are initialized at boot.
This means the lowmem_reserve values at boot may be lower than the values used later if /proc/sys/vm/lowmem_reserve_ratio is accessed even if the ratio values are unchanged.
In many cases the difference is not significant, but for example an ARM platform with 1GB of memory and the following memory layout
cma: Reserved 256 MiB at 0x0000000030000000
Zone ranges:
DMA [mem 0x0000000000000000-0x000000002fffffff]
Normal empty
HighMem [mem 0x0000000030000000-0x000000003fffffff]would result in 0 lowmem_reserve for the DMA zone. This would allow userspace to deplete the DMA zone easily.
Funnily enough
$ cat /proc/sys/vm/lowmem_reserve_ratio
would fix up the situation because as a side effect it forces setup_per_zone_lowmem_reserve.
This commit breaks the link order dependency by invoking init_per_zone_wmark_min() as a postcore_initcall so that the CMA pages have the chance to be properly accounted in their zone(s) and allowing the lowmem_reserve arrays to receive consistent values.
--- mm/page_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/page_alloc.c +1 -1
@@ -7867,7 +7867,7 @@ int __meminit init_per_zone_wmark_min(voreturn 0 ; } -core_initcall (init_per_zone_wmark_min) +postcore_initcall (init_per_zone_wmark_min)/* * min_free_kbytes_sysctl_handler - just a wrapper around proc_dointvec() so
Greg Kroah-Hartman
maintainerPATCH 30/107 mm, page_alloc: fix core hung in free_pcppages_bulk()
In reply to Greg Kroah-HartmanFrom: Charan Teja Reddy <[email protected]>
commit 88e8ac11d2ea3acc003cf01bb5a38c8aa76c3cfd upstream.
The following race is observed with the repeated online, offline and a delay between two successive online of memory blocks of movable zone.
P1 P2
Online the first memory block in
the movable zone. The pcp struct
values are initialized to default
values,i.e., pcp->high = 0 &pcp->batch = 1.
Allocate the pages from the movable zone.
Try to Online the second memory
block in the movable zone thus it
entered the online_pages() but yet
to call zone_pcp_update().
This process is entered into the exit path thus it tries to release the order-0 pages to pcp lists through free_unref_page_commit(). As pcp->high = 0, pcp->count = 1 proceed to call the function free_pcppages_bulk().
Update the pcp values thus the
new pcp values are like, say,pcp->high = 378, pcp->batch = 63.
Read the pcp's batch value using READ_ONCE() and pass the same to free_pcppages_bulk(), pcp values passed here are, batch = 63, count = 1.
Since num of pages in the pcp lists are less than ->batch, then it will stuck in while(list_empty(list)) loop with interrupts disabled thus a core hung.
Avoid this by ensuring free_pcppages_bulk() is called with proper count of pcp list pages.
The mentioned race is some what easily reproducible without [1] because pcp's are not updated for the first memory block online and thus there is a enough race window for P2 between alloc+free and pcp struct values update through onlining of second memory block.
With [1], the race still exists but it is very narrow as we update the pcp struct values for the first memory block online itself.
This is not limited to the movable zone, it could also happen in cases with the normal zone (e.g., hotplug to a node that only has DMA memory, or no other memory yet).
[1]: https://patchwork.kernel.org/patch/11696389/
--- mm/page_alloc.c | 5 +++++ 1 file changed, 5 insertions(+)
mm/page_alloc.c +5 -0
@@ -1256,6 +1256,11 @@ static void free_pcppages_bulk(struct zostruct page *page, *tmp;LIST_HEAD (head); +/* +* Ensure proper count is passed which otherwise would stuck in the +* below while (list_empty(list)) loop. +*/ + count =min (pcp->count, count);while (count) {struct list_head *list;
Greg Kroah-Hartman
maintainerPATCH 31/107 RDMA/hfi1: Correct an interlock issue for TID RDMA WRITE request
In reply to Greg Kroah-HartmanFrom: Kaike Wan <[email protected]>
commit b25e8e85e75a61af1ddc88c4798387dd3132dd43 upstream.
The following message occurs when running an AI application with TID RDMA enabled:
hfi1 0000:7f:00.0: hfi1_0: [QP74] hfi1_tid_timeout 4084 hfi1 0000:7f:00.0: hfi1_0: [QP70] hfi1_tid_timeout 4084
The issue happens when TID RDMA WRITE request is followed by an IB_WR_RDMA_WRITE_WITH_IMM request, the latter could be completed first on the responder side. As a result, no ACK packet for the latter could be sent because the TID RDMA WRITE request is still being processed on the responder side.
When the TID RDMA WRITE request is eventually completed, the requester will wait for the IB_WR_RDMA_WRITE_WITH_IMM request to be acknowledged.
If the next request is another TID RDMA WRITE request, no TID RDMA WRITE DATA packet could be sent because the preceding IB_WR_RDMA_WRITE_WITH_IMM request is not completed yet.
Consequently the IB_WR_RDMA_WRITE_WITH_IMM will be retried but it will be ignored on the responder side because the responder thinks it has already been completed. Eventually the retry will be exhausted and the qp will be put into error state on the requester side. On the responder side, the TID resource timer will eventually expire because no TID RDMA WRITE DATA packets will be received for the second TID RDMA WRITE request. There is also risk of a write-after-write memory corruption due to the issue.
Fix by adding a requester side interlock to prevent any potential data corruption and TID RDMA protocol error.
--- drivers/infiniband/hw/hfi1/tid_rdma.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/hw/hfi1/tid_rdma.c +1 -0
@@ -3215,6 +3215,7 @@ bool hfi1_tid_rdma_wqe_interlock(structcase IB_WR_ATOMIC_CMP_AND_SWP :case IB_WR_ATOMIC_FETCH_AND_ADD :case IB_WR_RDMA_WRITE : +case IB_WR_RDMA_WRITE_WITH_IMM :switch (prev->wr.opcode) {case IB_WR_TID_RDMA_WRITE : req =wqe_to_tid_req (prev);
Greg Kroah-Hartman
maintainerPATCH 32/107 ext4: fix checking of directory entry validity for inline directories
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit 7303cb5bfe845f7d43cd9b2dbd37dbb266efda9b upstream.
ext4_search_dir() and ext4_generic_delete_entry() can be called both for standard director blocks and for inline directories stored inside inode or inline xattr space. For the second case we didn't call ext4_check_dir_entry() with proper constraints that could result in accepting corrupted directory entry as well as false positive filesystem errors like:
EXT4-fs error (device dm-0): ext4_search_dir:1395: inode #28320400:
block 113246792: comm dockerd: bad entry in directory: directory entry too close to block end - offset=0, inode=28320403, rec_len=32, name_len=8, size=4096
Fix the arguments passed to ext4_check_dir_entry().
--- fs/ext4/namei.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/ext4/namei.c +3 -3
@@ -1392,8 +1392,8 @@ int ext4_search_dir(struct buffer_head * ext4_match(dir, fname, de)) {/* found a match - just to be sure, do * a full check */ -if (ext4_check_dir_entry (dir,NULL , de, bh, bh->b_data, - bh->b_size, offset)) +if (ext4_check_dir_entry (dir,NULL , de, bh, search_buf, + buf_size, offset))return -1 ; *res_dir = de;return 1 ;
@@ -2462,7 +2462,7 @@ int ext4_generic_delete_entry(handle_t * de = (struct ext4_dir_entry_2 *)entry_buf;while (i < buf_size - csum_size) {if (ext4_check_dir_entry (dir,NULL , de, bh, - bh->b_data, bh->b_size, i)) + entry_buf, buf_size, i))return -EFSCORRUPTED ;if (de == de_del) {if (pde)
Greg Kroah-Hartman
maintainerPATCH 33/107 jbd2: add the missing unlock_buffer() in the error path of jbd2_write_superblock()
In reply to Greg Kroah-HartmanFrom: zhangyi (F) <[email protected]>
commit ef3f5830b859604eda8723c26d90ab23edc027a4 upstream.
jbd2_write_superblock() is under the buffer lock of journal superblock before ending that superblock write, so add a missing unlock_buffer() in in the error path before submitting buffer.
--- fs/jbd2/journal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/jbd2/journal.c +3 -1
@@ -1348,8 +1348,10 @@ static int jbd2_write_superblock(journalint ret;/* Buffer got discarded which means block device got invalidated */ -if (!buffer_mapped (bh)) +if (!buffer_mapped (bh)) { +unlock_buffer (bh);return -EIO ; + }trace_jbd2_write_superblock (journal, write_flags);if (!(journal->j_flags &JBD2_BARRIER ))
Greg Kroah-Hartman
maintainerPATCH 34/107 scsi: zfcp: Fix use-after-free in request timeout handlers
In reply to Greg Kroah-HartmanFrom: Steffen Maier <[email protected]>
commit 2d9a2c5f581be3991ba67fa9e7497c711220ea8e upstream.
Before v4.15 commit 75492a51568b ("s390/scsi: Convert timers to use timer_setup()"), we intentionally only passed zfcp_adapter as context argument to zfcp_fsf_request_timeout_handler(). Since we only trigger adapter recovery, it was unnecessary to sync against races between timeout and (late) completion. Likewise, we only passed zfcp_erp_action as context argument to zfcp_erp_timeout_handler(). Since we only wakeup an ERP action, it was unnecessary to sync against races between timeout and (late) completion.
Meanwhile the timeout handlers get timer_list as context argument and do a timer-specific container-of to zfcp_fsf_req which can have been freed.
Fix it by making sure that any request timeout handlers, that might just have started before del_timer(), are completed by using del_timer_sync() instead. This ensures the request free happens afterwards.
Space time diagram of potential use-after-free:
Basic idea is to have 2 or more pending requests whose timeouts run out at almost the same time.
req 1 timeout ERP thread req 2 timeout ---------------- ---------------- ---------------------------------------
zfcp_fsf_request_timeout_handlerfsf_req = from_timer(fsf_req, t, timer)
adapter = fsf_req->adapterzfcp_qdio_siosl(adapter)zfcp_erp_adapter_reopen(adapter,...)
zfcp_erp_strategy
...
zfcp_fsf_req_dismiss_all
list_for_each_entry_safe
zfcp_fsf_req_complete 1
del_timer 1
zfcp_fsf_req_free 1
zfcp_fsf_req_complete 2
zfcp_fsf_request_timeout_handler
del_timer 2
fsf_req = from_timer(fsf_req, t, timer)
zfcp_fsf_req_free 2
adapter = fsf_req->adapter
^^^^^^^ already freed--- drivers/s390/scsi/zfcp_fsf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/s390/scsi/zfcp_fsf.c +2 -2
@@ -409,7 +409,7 @@ static void zfcp_fsf_req_complete(structreturn ; } -del_timer (&req->timer); +del_timer_sync (&req->timer);zfcp_fsf_protstatus_eval (req);zfcp_fsf_fsfstatus_eval (req); req->handler (req);
@@ -762,7 +762,7 @@ static int zfcp_fsf_req_send(struct zfcp req->qdio_req.qdio_outb_usage =atomic_read (&qdio->req_q_free); req->issued =get_tod_clock ();if (zfcp_qdio_send (qdio, &req->qdio_req)) { -del_timer (&req->timer); +del_timer_sync (&req->timer);/* lookup request again, list might have changed */ zfcp_reqlist_find_rm (adapter->req_list, req_id);zfcp_erp_adapter_reopen (adapter,0 ,"fsrs__1" );
Greg Kroah-Hartman
maintainerPATCH 35/107 mm/memory.c: skip spurious TLB flush for retried page fault
In reply to Greg Kroah-HartmanFrom: Yang Shi <[email protected]>
commit b7333b58f358f38d90d78e00c1ee5dec82df10ad upstream.
Recently we found regression when running will_it_scale/page_fault3 test on ARM64. Over 70% down for the multi processes cases and over 20% down for the multi threads cases. It turns out the regression is caused by commit 89b15332af7c ("mm: drop mmap_sem before calling balance_dirty_pages() in write fault").
The test mmaps a memory size file then write to the mapping, this would make all memory dirty and trigger dirty pages throttle, that upstream commit would release mmap_sem then retry the page fault. The retried page fault would see correct PTEs installed then just fall through to spurious TLB flush. The regression is caused by the excessive spurious TLB flush. It is fine on x86 since x86's spurious TLB flush is no-op.
We could just skip the spurious TLB flush to mitigate the regression.
--- mm/memory.c | 3 +++ 1 file changed, 3 insertions(+)
mm/memory.c +3 -0
@@ -3886,6 +3886,9 @@ static vm_fault_t handle_pte_fault(struc vmf->flags & FAULT_FLAG_WRITE)) { update_mmu_cache(vmf->vma, vmf->address, vmf->pte); } else { +/* Skip spurious TLB flush for retried page fault */ +if (vmf->flags &FAULT_FLAG_TRIED ) + goto unlock;/* * This is needed only for protection faults but the arch code * is not yet telling us if this is a protection fault or not.
Greg Kroah-Hartman
maintainerPATCH 36/107 drm/amdgpu/display: use GFP_ATOMIC in dcn20_validate_bandwidth_internal
In reply to Greg Kroah-HartmanFrom: Daniel Kolesa <[email protected]>
commit f41ed88cbd6f025f7a683a11a74f901555fba11c upstream.
GFP_KERNEL may and will sleep, and this is being executed in a non-preemptible context; this will mess things up since it's called inbetween DC_FP_START/END, and rescheduling will result in the DC_FP_END later being called in a different context (or just crashing if any floating point/vector registers/instructions are used after the call is resumed in a different context).
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +1 -1
@@ -2845,7 +2845,7 @@ static bool dcn20_validate_bandwidth_intint vlevel =0 ;int pipe_split_from[MAX_PIPES ];int pipe_cnt =0 ; -display_e2e_pipe_params_st *pipes =kzalloc (dc->res_pool->pipe_count *sizeof (display_e2e_pipe_params_st),GFP_KERNEL ); +display_e2e_pipe_params_st *pipes =kzalloc (dc->res_pool->pipe_count *sizeof (display_e2e_pipe_params_st),GFP_ATOMIC );DC_LOGGER_INIT (dc->ctx->logger);BW_VAL_TRACE_COUNT ();
Greg Kroah-Hartman
maintainerPATCH 37/107 drm/amd/display: Fix EDID parsing after resume from suspend
In reply to Greg Kroah-HartmanFrom: Stylon Wang <[email protected]>
commit b24bdc37d03a0478189e20a50286092840f414fa upstream.
[Why]
Resuming from suspend, CEA blocks from EDID are not parsed and no video modes can support YUV420. When this happens, output bpc cannot go over 8-bit with 4K modes on HDMI.
[How]
In amdgpu_dm_update_connector_after_detect(), drm_add_edid_modes() is called after drm_connector_update_edid_property() to fully parse EDID and update display info.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -0
@@ -1434,6 +1434,7 @@ amdgpu_dm_update_connector_after_detect(drm_connector_update_edid_property (connector, aconnector->edid); +drm_add_edid_modes (connector, aconnector->edid);if (aconnector->dc_link->aux_mode) drm_dp_cec_set_edid(&aconnector->dm_dp_aux.aux,
Greg Kroah-Hartman
maintainerPATCH 38/107 drm/amd/display: fix pow() crashing when given base 0
In reply to Greg Kroah-HartmanFrom: Krunoslav Kovac <[email protected]>
commit d2e59d0ff4c44d1f6f8ed884a5bea7d1bb7fd98c upstream.
[Why&How]pow(a,x) is implemented as exp(x*log(a)). log(0) will crash. So return 0^x = 0, unless x=0, convention seems to be 0^0 = 1.
--- drivers/gpu/drm/amd/display/include/fixed31_32.h | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/include/fixed31_32.h +3 -0
@@ -431,6 +431,9 @@ struct fixed31_32 dc_fixpt_log(struct fi*/ static inline struct fixed31_32 dc_fixpt_pow (struct fixed31_32 arg1,struct fixed31_32 arg2) { +if (arg1.value ==0 ) +return arg2.value ==0 ? dc_fixpt_one : dc_fixpt_zero; + return dc_fixpt_exp( dc_fixpt_mul( dc_fixpt_log(arg1),
Greg Kroah-Hartman
maintainerPATCH 39/107 kthread: Do not preempt current task if it is going to call schedule()
In reply to Greg Kroah-HartmanFrom: Liang Chen <[email protected]>
commit 26c7295be0c5e6da3fa45970e9748be983175b1b upstream.
when we create a kthread with ktrhead_create_on_cpu(),the child thread entry is ktread.c:ktrhead() which will be preempted by the parent after call complete(done) while schedule() is not called yet,then the parent will call wait_task_inactive(child) but the child is still on the runqueue, so the parent will schedule_hrtimeout() for 1 jiffy,it will waste a lot of time,especially on startup.
parent childktrhead_create_on_cpu()
wait_fo_completion(&done) -----> ktread.c:ktrhead()
|----- complete(done);--wakeup and preempted by parent
kthread_bind() <------------| |-> schedule();--dequeue here wait_task_inactive(child) | schedule_hrtimeout(1 jiffy) -|
So we hope the child just wakeup parent but not preempted by parent, and the child is going to call schedule() soon,then the parent will not call schedule_hrtimeout(1 jiffy) as the child is already dequeue.
The same issue for ktrhead_park()&&kthread_parkme(). This patch can save 120ms on rk312x startup with CONFIG_HZ=300.
--- kernel/kthread.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
kernel/kthread.c +15 -2
@@ -199,8 +199,15 @@ static void __kthread_parkme(struct kthrif (!test_bit (KTHREAD_SHOULD_PARK , &self->flags))break ; +/* +* Thread is going to call schedule(), do not preempt it, +* or the caller of kthread_park() may spend more time in +* wait_task_inactive(). +*/ +preempt_disable ();complete (&self->parked); -schedule (); +schedule_preempt_disabled (); +preempt_enable (); }__set_current_state (TASK_RUNNING ); }
@@ -245,8 +252,14 @@ static int kthread(void *_create)/* OK, tell user we're spawned, wait for stop or wakeup */ __set_current_state (TASK_UNINTERRUPTIBLE ); create->result = current; +/* +* Thread is going to call schedule(), do not preempt it, +* or the creator may spend more time in wait_task_inactive(). +*/ +preempt_disable ();complete (done); -schedule (); +schedule_preempt_disabled (); +preempt_enable (); ret = -EINTR ;if (!test_bit (KTHREAD_SHOULD_STOP , &self->flags)) {
Greg Kroah-Hartman
maintainerPATCH 40/107 opp: Enable resources again if they were disabled earlier
In reply to Greg Kroah-HartmanFrom: Rajendra Nayak <[email protected]>
[ Upstream commit a4501bac0e553bed117b7e1b166d49731caf7260 ]
dev_pm_opp_set_rate() can now be called with freq = 0 in order to either drop performance or bandwidth votes or to disable regulators on platforms which support them.
In such cases, a subsequent call to dev_pm_opp_set_rate() with the same frequency ends up returning early because 'old_freq == freq'
Instead make it fall through and put back the dropped performance and bandwidth votes and/or enable back the regulators.
--- drivers/opp/core.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/opp/core.c +6 -4
@@ -843,10 +843,12 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)/* Return early if nothing to do */ if (old_freq == freq) { -dev_dbg (dev,"%s: old/new frequencies (%lu Hz) are same, nothing to do\n" , - __func__, freq); - ret =0 ; - goto put_opp_table; +if (!opp_table->required_opp_tables && !opp_table->regulators) { +dev_dbg (dev,"%s: old/new frequencies (%lu Hz) are same, nothing to do\n" , + __func__, freq); + ret =0 ; + goto put_opp_table; + } } temp_freq = old_freq;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 41/107 scsi: ufs: Add DELAY_BEFORE_LPM quirk for Micron devices
In reply to Greg Kroah-HartmanFrom: Stanley Chu <[email protected]>
[ Upstream commit c0a18ee0ce78d7957ec1a53be35b1b3beba80668 ]
It is confirmed that Micron device needs DELAY_BEFORE_LPM quirk to have a delay before VCC is powered off. Sdd Micron vendor ID and this quirk for Micron devices.
--- drivers/scsi/ufs/ufs_quirks.h | 1 + drivers/scsi/ufs/ufshcd.c | 2 ++ 2 files changed, 3 insertions(+)
drivers/scsi/ufs/ufs_quirks.h +1 -0
@@ -12,6 +12,7 @@#define UFS_ANY_VENDOR 0xFFFF#define UFS_ANY_MODEL "ANY_MODEL" +#define UFS_VENDOR_MICRON 0x12C#define UFS_VENDOR_TOSHIBA 0x198#define UFS_VENDOR_SAMSUNG 0x1CE#define UFS_VENDOR_SKHYNIX 0x1AD
drivers/scsi/ufs/ufshcd.c +2 -0
@@ -217,6 +217,8 @@ ufs_get_desired_pm_lvl_for_dev_link_state(enum ufs_dev_pwr_mode dev_state,static struct ufs_dev_fix ufs_fixups[] = {/* UFS cards deviations table */ +UFS_FIX (UFS_VENDOR_MICRON ,UFS_ANY_MODEL , +UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM ),UFS_FIX (UFS_VENDOR_SAMSUNG ,UFS_ANY_MODEL ,UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM ), UFS_FIX(UFS_VENDOR_SAMSUNG, UFS_ANY_MODEL,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 42/107 scsi: target: tcmu: Fix crash in tcmu_flush_dcache_range on ARM
In reply to Greg Kroah-HartmanFrom: Bodo Stroesser <[email protected]>
[ Upstream commit 3145550a7f8b08356c8ff29feaa6c56aca12901d ]
This patch fixes the following crash (see
https://bugzilla.kernel.org/show_bug.cgi?id=208045)
Process iscsi_trx (pid: 7496, stack limit = 0x0000000010dd111a)
CPU: 0 PID: 7496 Comm: iscsi_trx Not tainted 4.19.118-0419118-generic
#202004230533
Hardware name: Greatwall QingTian DF720/F601, BIOS 601FBE20 Sep 26 2019
pstate: 80400005 (Nzcv daif +PAN -UAO)
pc : flush_dcache_page+0x18/0x40
lr : is_ring_space_avail+0x68/0x2f8 [target_core_user]
sp : ffff000015123a80
x29: ffff000015123a80 x28: 0000000000000000
x27: 0000000000001000 x26: ffff000023ea5000
x25: ffffcfa25bbe08b8 x24: 0000000000000078
x23: ffff7e0000000000 x22: ffff000023ea5001
x21: ffffcfa24b79c000 x20: 0000000000000fff
x19: ffff7e00008fa940 x18: 0000000000000000
x17: 0000000000000000 x16: ffff2d047e709138
x15: 0000000000000000 x14: 0000000000000000
x13: 0000000000000000 x12: ffff2d047fbd0a40
x11: 0000000000000000 x10: 0000000000000030
x9 : 0000000000000000 x8 : ffffc9a254820a00
x7 : 00000000000013b0 x6 : 000000000000003f
x5 : 0000000000000040 x4 : ffffcfa25bbe08e8
x3 : 0000000000001000 x2 : 0000000000000078
x1 : ffffcfa25bbe08b8 x0 : ffff2d040bc88a18
Call trace:
flush_dcache_page+0x18/0x40
is_ring_space_avail+0x68/0x2f8 [target_core_user]
queue_cmd_ring+0x1f8/0x680 [target_core_user]
tcmu_queue_cmd+0xe4/0x158 [target_core_user]
__target_execute_cmd+0x30/0xf0 [target_core_mod]
target_execute_cmd+0x294/0x390 [target_core_mod]
transport_generic_new_cmd+0x1e8/0x358 [target_core_mod]
transport_handle_cdb_direct+0x50/0xb0 [target_core_mod]
iscsit_execute_cmd+0x2b4/0x350 [iscsi_target_mod]
iscsit_sequence_cmd+0xd8/0x1d8 [iscsi_target_mod]
iscsit_process_scsi_cmd+0xac/0xf8 [iscsi_target_mod]
iscsit_get_rx_pdu+0x404/0xd00 [iscsi_target_mod]
iscsi_target_rx_thread+0xb8/0x130 [iscsi_target_mod]
kthread+0x130/0x138
ret_from_fork+0x10/0x18
Code: f9000bf3 aa0003f3 aa1e03e0 d503201f (f9400260)
---[ end trace 1e451c73f4266776 ]---The solution is based on patch:
"scsi: target: tcmu: Optimize use of flush_dcache_page"
which restricts the use of tcmu_flush_dcache_range() to addresses from vmalloc'ed areas only.
This patch now replaces the virt_to_page() call in tcmu_flush_dcache_range() - which is wrong for vmalloced addrs - by vmalloc_to_page().
The patch was tested on ARM with kernel 4.19.118 and 5.7.2
--- drivers/target/target_core_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/target/target_core_user.c +1 -1
@@ -601,7 +601,7 @@ static inline void tcmu_flush_dcache_range(void *vaddr, size_t size) size =round_up (size+offset,PAGE_SIZE );while (size) { -flush_dcache_page (virt_to_page (start)); +flush_dcache_page (vmalloc_to_page (start)); start +=PAGE_SIZE ; size -=PAGE_SIZE ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 43/107 media: budget-core: Improve exception handling in budget_register()
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit fc0456458df8b3421dba2a5508cd817fbc20ea71 ]
budget_register() has no error handling after its failure. Add the missed undo functions for error handling to fix it.
--- drivers/media/pci/ttpci/budget-core.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/media/pci/ttpci/budget-core.c +8 -3
@@ -369,20 +369,25 @@ static int budget_register(struct budget *budget) ret = dvbdemux->dmx.add_frontend (&dvbdemux->dmx, &budget->hw_frontend);if (ret <0 ) -return ret; + goto err_release_dmx; budget->mem_frontend.source =DMX_MEMORY_FE ; ret = dvbdemux->dmx.add_frontend (&dvbdemux->dmx, &budget->mem_frontend);if (ret <0 ) -return ret; + goto err_release_dmx; ret = dvbdemux->dmx.connect_frontend (&dvbdemux->dmx, &budget->hw_frontend);if (ret <0 ) -return ret; + goto err_release_dmx;dvb_net_init (&budget->dvb_adapter, &budget->dvb_net, &dvbdemux->dmx);return 0 ; + +err_release_dmx: +dvb_dmxdev_release (&budget->dmxdev); +dvb_dmx_release (&budget->demux); +return ret; }static void budget_unregister (struct budget *budget)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 44/107 rtc: goldfish: Enable interrupt in set_alarm() when necessary
In reply to Greg Kroah-HartmanFrom: Huacai Chen <[email protected]>
[ Upstream commit 22f8d5a1bf230cf8567a4121fc3789babb46336d ]
When use goldfish rtc, the "hwclock" command fails with "select() to /dev/rtc to wait for clock tick timed out". This is because "hwclock" need the set_alarm() hook to enable interrupt when alrm->enabled is true. This operation is missing in goldfish rtc (but other rtc drivers, such as cmos rtc, enable interrupt here), so add it.
--- drivers/rtc/rtc-goldfish.c | 1 + 1 file changed, 1 insertion(+)
drivers/rtc/rtc-goldfish.c +1 -0
@@ -73,6 +73,7 @@ static int goldfish_rtc_set_alarm(struct device *dev, rtc_alarm64 =rtc_tm_to_time64 (&alrm->time) *NSEC_PER_SEC ;writel ((rtc_alarm64 >>32 ), base +TIMER_ALARM_HIGH );writel (rtc_alarm64, base +TIMER_ALARM_LOW ); +writel (1 , base +TIMER_IRQ_ENABLED ); }else {/* * if this function was called with enabled=0
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 45/107 media: vpss: clean up resources in init
In reply to Greg Kroah-HartmanFrom: Evgeny Novikov <[email protected]>
[ Upstream commit 9c487b0b0ea7ff22127fe99a7f67657d8730ff94 ]
If platform_driver_register() fails within vpss_init() resources are not cleaned up. The patch fixes this issue by introducing the corresponding error handling.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/media/platform/davinci/vpss.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/media/platform/davinci/vpss.c +16 -4
@@ -505,19 +505,31 @@ static void vpss_exit(void)static int __init vpss_init (void ) { +int ret; +if (!request_mem_region (VPSS_CLK_CTRL ,4 ,"vpss_clock_control" ))return -EBUSY ; oper_cfg.vpss_regs_base2 =ioremap (VPSS_CLK_CTRL ,4 );if (unlikely (!oper_cfg.vpss_regs_base2)) { -release_mem_region (VPSS_CLK_CTRL ,4 ); -return -ENOMEM ; + ret = -ENOMEM ; + goto err_ioremap; }writel (VPSS_CLK_CTRL_VENCCLKEN | -VPSS_CLK_CTRL_DACCLKEN , oper_cfg.vpss_regs_base2); +VPSS_CLK_CTRL_DACCLKEN , oper_cfg.vpss_regs_base2); + + ret =platform_driver_register (&vpss_driver); +if (ret) + goto err_pd_register; + +return 0 ; -return platform_driver_register (&vpss_driver); +err_pd_register: +iounmap (oper_cfg.vpss_regs_base2); +err_ioremap: +release_mem_region (VPSS_CLK_CTRL ,4 ); +return ret; }subsys_initcall (vpss_init);module_exit (vpss_exit);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 46/107 Input: psmouse - add a newline when printing proto by sysfs
In reply to Greg Kroah-HartmanFrom: Xiongfeng Wang <[email protected]>
[ Upstream commit 4aec14de3a15cf9789a0e19c847f164776f49473 ]
When I cat parameter 'proto' by sysfs, it displays as follows. It's better to add a newline for easy reading.
root@syzkaller:~# cat /sys/module/psmouse/parameters/proto autoroot@syzkaller:~#
--- drivers/input/mouse/psmouse-base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/mouse/psmouse-base.c +1 -1
@@ -2042,7 +2042,7 @@ static int psmouse_get_maxproto(char *buffer, const struct kernel_param *kp) {int type = *((unsigned int *)kp->arg); -return sprintf (buffer,"%s" ,psmouse_protocol_by_type (type)->name); +return sprintf (buffer,"%s\n" ,psmouse_protocol_by_type (type)->name); }static int __init psmouse_init (void )
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 47/107 MIPS: Fix unable to reserve memory for Crash kernel
In reply to Greg Kroah-HartmanFrom: Jinyang He <[email protected]>
[ Upstream commit b1ce9716f3b5ed3b49badf1f003b9e34b7ead0f9 ]
Use 0 as the align parameter in memblock_find_in_range() is incorrect when we reserve memory for Crash kernel.
The environment as follows:
[ 0.000000] MIPS: machine is loongson,loongson64c-4core-rs780e ... [ 1.951016] crashkernel=64M@128M
The warning as follows:
[ 0.000000] Invalid memory region reserved for crash kernel
And the iomem as follows:
00200000-0effffff : System RAM
04000000-0484009f : Kernel code
048400a0-04ad7fff : Kernel data
04b40000-05c4c6bf : Kernel bss
1a000000-1bffffff : pci@1a000000
...
The align parameter may be finally used by round_down() or round_up(). Like the following call tree:
mips-next: mm/memblock.c
memblock_find_in_range
└── memblock_find_in_range_node
├── __memblock_find_range_bottom_up
│ └── round_up
└── __memblock_find_range_top_down
└── round_down
\#define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1)\#define round_down(x, y) ((x) & ~__round_mask(x, y)) \#define __round_mask(x, y) ((__typeof__(x))((y)-1))
The round_down(or round_up)'s second parameter must be a power of 2. If the second parameter is 0, it both will return 0.
Use 1 as the parameter to fix the bug and the iomem as follows:
00200000-0effffff : System RAM
04000000-0484009f : Kernel code
048400a0-04ad7fff : Kernel data
04b40000-05c4c6bf : Kernel bss
08000000-0bffffff : Crash kernel
1a000000-1bffffff : pci@1a000000
...
--- arch/mips/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/kernel/setup.c +1 -1
@@ -494,7 +494,7 @@ static void __init mips_parse_crashkernel(void)if (ret !=0 || crash_size <=0 )return ; -if (!memblock_find_in_range (crash_base, crash_base + crash_size, crash_size,0 )) { +if (!memblock_find_in_range (crash_base, crash_base + crash_size, crash_size,1 )) {pr_warn ("Invalid memory region reserved for crash kernel\n" );return ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 48/107 m68knommu: fix overwriting of bits in ColdFire V3 cache control
In reply to Greg Kroah-HartmanFrom: Greg Ungerer <[email protected]>
[ Upstream commit bdee0e793cea10c516ff48bf3ebb4ef1820a116b ]
The Cache Control Register (CACR) of the ColdFire V3 has bits that control high level caching functions, and also enable/disable the use of the alternate stack pointer register (the EUSP bit) to provide separate supervisor and user stack pointer registers. The code as it is today will blindly clear the EUSP bit on cache actions like invalidation. So it is broken for this case - and that will result in failed booting (interrupt entry and exit processing will be completely hosed).
This only affects ColdFire V3 parts that support the alternate stack register (like the 5329 for example) - generally speaking new parts do, older parts don't. It has no impact on ColdFire V3 parts with the single stack pointer, like the 5307 for example.
Fix the cache bit defines used, so they maintain the EUSP bit when carrying out cache actions through the CACR register.
--- arch/m68k/include/asm/m53xxacr.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/m68k/include/asm/m53xxacr.h +3 -3
@@ -89,9 +89,9 @@* coherency though in all cases. And for copyback caches we will need * to push cached data as well. */ -#define CACHE_INIT CACR_CINVA -#define CACHE_INVALIDATE CACR_CINVA -#define CACHE_INVALIDATED CACR_CINVA +#define CACHE_INIT (CACHE_MODE + CACR_CINVA - CACR_EC) +#define CACHE_INVALIDATE (CACHE_MODE + CACR_CINVA) +#define CACHE_INVALIDATED (CACHE_MODE + CACR_CINVA)#define ACR0_MODE ((CONFIG_RAMBASE & 0xff000000) + \ (0x000f0000) + \
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 49/107 svcrdma: Fix another Receive buffer leak
In reply to Greg Kroah-HartmanFrom: Chuck Lever <[email protected]>
[ Upstream commit 64d26422516b2e347b32e6d9b1d40b3c19a62aae ]
During a connection tear down, the Receive queue is flushed before the device resources are freed. Typically, all the Receives flush with IB_WR_FLUSH_ERR.
However, any pending successful Receives flush with IB_WR_SUCCESS, and the server automatically posts a fresh Receive to replace the completing one. This happens even after the connection has closed and the RQ is drained. Receives that are posted after the RQ is drained appear never to complete, causing a Receive resource leak. The leaked Receive buffer is left DMA-mapped.
To prevent these late-posted recv_ctxt's from leaking, block new Receive posting after XPT_CLOSE is set.
--- net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 ++ 1 file changed, 2 insertions(+)
net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +2 -0
@@ -265,6 +265,8 @@ static int svc_rdma_post_recv(struct svcxprt_rdma *rdma) {struct svc_rdma_recv_ctxt *ctxt; +if (test_bit (XPT_CLOSE , &rdma->sc_xprt.xpt_flags)) +return 0 ; ctxt =svc_rdma_recv_ctxt_get (rdma);if (!ctxt)return -ENOMEM ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 50/107 xfs: fix inode quota reservation checks
In reply to Greg Kroah-HartmanFrom: Darrick J. Wong <[email protected]>
[ Upstream commit f959b5d037e71a4d69b5bf71faffa065d9269b4a ]
xfs_trans_dqresv is the function that we use to make reservations against resource quotas. Each resource contains two counters: the q_core counter, which tracks resources allocated on disk; and the dquot reservation counter, which tracks how much of that resource has either been allocated or reserved by threads that are working on metadata updates.
For disk blocks, we compare the proposed reservation counter against the hard and soft limits to decide if we're going to fail the operation. However, for inodes we inexplicably compare against the q_core counter, not the incore reservation count.
Since the q_core counter is always lower than the reservation count and we unlock the dquot between reservation and transaction commit, this means that multiple threads can reserve the last inode count before we hit the hard limit, and when they commit, we'll be well over the hard limit.
Fix this by checking against the incore inode reservation counter, since we would appear to maintain that correctly (and that's what we report in GETQUOTA).
--- fs/xfs/xfs_trans_dquot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/xfs/xfs_trans_dquot.c +1 -1
@@ -646,7 +646,7 @@ xfs_trans_dqresv( } }if (ninos >0 ) { - total_count =be64_to_cpu (dqp->q_core.d_icount) + ninos; + total_count = dqp->q_res_icount + ninos; timer =be32_to_cpu (dqp->q_core.d_itimer); warns =be16_to_cpu (dqp->q_core.d_iwarns); warnlimit = dqp->q_mount->m_quotainfo->qi_iwarnlimit;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 51/107 drm/ttm: fix offset in VMAs with a pg_offs in ttm_bo_vm_access
In reply to Greg Kroah-HartmanFrom: Felix Kuehling <[email protected]>
[ Upstream commit c0001213d195d1bac83e0744c06ff06dd5a8ba53 ]
VMAs with a pg_offs that's offset from the start of the vma_node need to adjust the offset within the BO accordingly. This matches the offset calculation in ttm_bo_vm_fault_reserved.
--- drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/ttm/ttm_bo_vm.c +3 -1
@@ -358,8 +358,10 @@ static int ttm_bo_vm_access_kmap(struct ttm_buffer_object *bo,static int ttm_bo_vm_access (struct vm_area_struct *vma,unsigned long addr,void *buf,int len,int write) { -unsigned long offset = (addr) - vma->vm_start;struct ttm_buffer_object *bo = vma->vm_private_data; +unsigned long offset = (addr) - vma->vm_start + + ((vma->vm_pgoff -drm_vma_node_start (&bo->base.vma_node)) + <<PAGE_SHIFT );int ret;if (len <1 || (offset + len) >>PAGE_SHIFT > bo->num_pages)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 52/107 jffs2: fix UAF problem
In reply to Greg Kroah-HartmanFrom: Zhe Li <[email protected]>
[ Upstream commit 798b7347e4f29553db4b996393caf12f5b233daf ]
The log of UAF problem is listed below.
BUG: KASAN: use-after-free in jffs2_rmdir+0xa4/0x1cc [jffs2] at addr c1f165fc Read of size 4 by task rm/8283 =============================================================================
BUG kmalloc-32 (Tainted: P B O ): kasan: bad access detected
-----------------------------------------------------------------------------
INFO: Allocated in 0xbbbbbbbb age=3054364 cpu=0 pid=0
0xb0bba6ef
jffs2_write_dirent+0x11c/0x9c8 [jffs2]
__slab_alloc.isra.21.constprop.25+0x2c/0x44
__kmalloc+0x1dc/0x370
jffs2_write_dirent+0x11c/0x9c8 [jffs2]
jffs2_do_unlink+0x328/0x5fc [jffs2]
jffs2_rmdir+0x110/0x1cc [jffs2]
vfs_rmdir+0x180/0x268
do_rmdir+0x2cc/0x300
ret_from_syscall+0x0/0x3c
INFO: Freed in 0x205b age=3054364 cpu=0 pid=0
0x2e9173
jffs2_add_fd_to_list+0x138/0x1dc [jffs2]
jffs2_add_fd_to_list+0x138/0x1dc [jffs2]
jffs2_garbage_collect_dirent.isra.3+0x21c/0x288 [jffs2]
jffs2_garbage_collect_live+0x16bc/0x1800 [jffs2]
jffs2_garbage_collect_pass+0x678/0x11d4 [jffs2]
jffs2_garbage_collect_thread+0x1e8/0x3b0 [jffs2]
kthread+0x1a8/0x1b0
ret_from_kernel_thread+0x5c/0x64
Call Trace:
[c17ddd20] [c02452d4] kasan_report.part.0+0x298/0x72c (unreliable)
[c17ddda0] [d2509680] jffs2_rmdir+0xa4/0x1cc [jffs2]
[c17dddd0] [c026da04] vfs_rmdir+0x180/0x268
[c17dde00] [c026f4e4] do_rmdir+0x2cc/0x300
[c17ddf40] [c001a658] ret_from_syscall+0x0/0x3cThe root cause is that we don't get "jffs2_inode_info.sem" before we scan list "jffs2_inode_info.dents" in function jffs2_rmdir. This patch add codes to get "jffs2_inode_info.sem" before we scan "jffs2_inode_info.dents" to slove the UAF problem.
--- fs/jffs2/dir.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/jffs2/dir.c +5 -1
@@ -590,10 +590,14 @@ static int jffs2_rmdir (struct inode *dir_i, struct dentry *dentry)int ret;uint32_t now =JFFS2_NOW (); +mutex_lock (&f->sem);for (fd = f->dents ; fd; fd = fd->next) { -if (fd->ino) +if (fd->ino) { +mutex_unlock (&f->sem);return -ENOTEMPTY ; + } } +mutex_unlock (&f->sem); ret =jffs2_do_unlink (c, dir_f, dentry->d_name.name, dentry->d_name.len, f, now);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 53/107 ceph: fix use-after-free for fsc->mdsc
In reply to Greg Kroah-HartmanFrom: Xiubo Li <[email protected]>
[ Upstream commit a7caa88f8b72c136f9a401f498471b8a8e35370d ]
If the ceph_mdsc_init() fails, it will free the mdsc already.
--- fs/ceph/mds_client.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/ceph/mds_client.c +2 -1
@@ -4143,7 +4143,6 @@ int ceph_mdsc_init(struct ceph_fs_client *fsc)return -ENOMEM ; } - fsc->mdsc = mdsc;init_completion (&mdsc->safe_umount_waiters);init_waitqueue_head (&mdsc->session_close_wq);INIT_LIST_HEAD (&mdsc->waiting_for_map);
@@ -4195,6 +4194,8 @@ int ceph_mdsc_init(struct ceph_fs_client *fsc)strscpy (mdsc->nodename,utsname ()->nodename,sizeof (mdsc->nodename)); + + fsc->mdsc = mdsc;return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 54/107 swiotlb-xen: use vmalloc_to_page on vmalloc virt addresses
In reply to Greg Kroah-HartmanFrom: Boris Ostrovsky <[email protected]>
[ Upstream commit 8b1e868f66076490189a36d984fcce286cdd6295 ]
xen_alloc_coherent_pages might return pages for which virt_to_phys and virt_to_page don't work, e.g. ioremap'ed pages.
So in xen_swiotlb_free_coherent we can't assume that virt_to_page works. Instead add a is_vmalloc_addr check and use vmalloc_to_page on vmalloc virt addresses.
This patch fixes the following crash at boot on RPi4 (the underlying issue is not RPi4 specific):
https://marc.info/?l=xen-devel&m=158862573216800
--- drivers/xen/swiotlb-xen.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/xen/swiotlb-xen.c +7 -1
@@ -335,6 +335,7 @@ xen_swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,int order =get_order (size);phys_addr_t phys;u64 dma_mask =DMA_BIT_MASK (32 ); +struct page *page;if (hwdev && hwdev->coherent_dma_mask) dma_mask = hwdev->coherent_dma_mask;
@@ -346,9 +347,14 @@ xen_swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,/* Convert the size to actually allocated. */ size =1UL << (order +XEN_PAGE_SHIFT ); +if (is_vmalloc_addr (vaddr)) + page =vmalloc_to_page (vaddr); +else + page =virt_to_page (vaddr); +if (!WARN_ON ((dev_addr + size -1 > dma_mask) ||range_straddles_page_boundary (phys, size)) && -TestClearPageXenRemapped (virt_to_page (vaddr))) +TestClearPageXenRemapped (page))xen_destroy_contiguous_region (phys, order);xen_free_coherent_pages (hwdev, size, vaddr, (dma_addr_t )phys, attrs);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 55/107 cpufreq: intel_pstate: Fix cpuinfo_max_freq when MSR_TURBO_RATIO_LIMIT is 0
In reply to Greg Kroah-HartmanFrom: Srinivas Pandruvada <[email protected]>
[ Upstream commit 4daca379c703ff55edc065e8e5173dcfeecf0148 ]
The MSR_TURBO_RATIO_LIMIT can be 0. This is not an error. User can update this MSR via BIOS settings on some systems or can use msr tools to update. Also some systems boot with value = 0.
This results in display of cpufreq/cpuinfo_max_freq wrong. This value will be equal to cpufreq/base_frequency, even though turbo is enabled.
But platform will still function normally in HWP mode as we get max 1-core frequency from the MSR_HWP_CAPABILITIES. This MSR is already used to calculate cpu->pstate.turbo_freq, which is used for to set policy->cpuinfo.max_freq. But some other places cpu->pstate.turbo_pstate is used. For example to set policy->max.
To fix this, also update cpu->pstate.turbo_pstate when updating cpu->pstate.turbo_freq.
--- drivers/cpufreq/intel_pstate.c | 1 + 1 file changed, 1 insertion(+)
drivers/cpufreq/intel_pstate.c +1 -0
@@ -1571,6 +1571,7 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)intel_pstate_get_hwp_max (cpu->cpu, &phy_max, ¤t_max); cpu->pstate.turbo_freq = phy_max * cpu->pstate.scaling; + cpu->pstate.turbo_pstate = phy_max; }else { cpu->pstate.turbo_freq = cpu->pstate.turbo_pstate * cpu->pstate.scaling; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 56/107 scsi: libfc: Free skb in fc_disc_gpn_id_resp() for valid cases
In reply to Greg Kroah-HartmanFrom: Javed Hasan <[email protected]>
[ Upstream commit ec007ef40abb6a164d148b0dc19789a7a2de2cc8 ]
In fc_disc_gpn_id_resp(), skb is supposed to get freed in all cases except for PTR_ERR. However, in some cases it didn't.
This fix is to call fc_frame_free(fp) before function returns.
--- drivers/scsi/libfc/fc_disc.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/scsi/libfc/fc_disc.c +9 -3
@@ -581,8 +581,12 @@ static void fc_disc_gpn_id_resp(struct fc_seq *sp, struct fc_frame *fp,if (PTR_ERR (fp) == -FC_EX_CLOSED ) goto out; -if (IS_ERR (fp)) - goto redisc; +if (IS_ERR (fp)) { +mutex_lock (&disc->disc_mutex); +fc_disc_restart (disc); +mutex_unlock (&disc->disc_mutex); + goto out; + } cp =fc_frame_payload_get (fp,sizeof (*cp));if (!cp)
@@ -609,7 +613,7 @@ static void fc_disc_gpn_id_resp(struct fc_seq *sp, struct fc_frame *fp, new_rdata->disc_id = disc->disc_id;fc_rport_login (new_rdata); } - goto out; + goto free_fp; } rdata->disc_id = disc->disc_id;mutex_unlock (&rdata->rp_mutex);
@@ -626,6 +630,8 @@ redisc:fc_disc_restart (disc);mutex_unlock (&disc->disc_mutex); } +free_fp: +fc_frame_free (fp); out:kref_put (&rdata->kref, fc_rport_destroy);if (!IS_ERR (fp))
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 57/107 virtio_ring: Avoid loop when vq is broken in virtqueue_poll
In reply to Greg Kroah-HartmanFrom: Mao Wenan <[email protected]>
[ Upstream commit 481a0d7422db26fb63e2d64f0652667a5c6d0f3e ]
The loop may exist if vq->broken is true, virtqueue_get_buf_ctx_packed or virtqueue_get_buf_ctx_split will return NULL, so virtnet_poll will reschedule napi to receive packet, it will lead cpu usage(si) to 100%.
call trace as below:virtnet_poll
virtnet_receive
virtqueue_get_buf_ctx
virtqueue_get_buf_ctx_packed virtqueue_get_buf_ctx_split
virtqueue_napi_complete
virtqueue_poll //return true
virtqueue_napi_schedule //it will reschedule napi
to fix this, return false if vq is broken in virtqueue_poll.
--- drivers/virtio/virtio_ring.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/virtio/virtio_ring.c +3 -0
@@ -1960,6 +1960,9 @@ bool virtqueue_poll(struct virtqueue *_vq, unsigned last_used_idx) {struct vring_virtqueue *vq =to_vvq (_vq); +if (unlikely (vq->broken)) +return false; +virtio_mb (vq->weak_barriers);return vq->packed_ring ?virtqueue_poll_packed (_vq, last_used_idx) :virtqueue_poll_split (_vq, last_used_idx);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 58/107 media: camss: fix memory leaks on error handling paths in probe
In reply to Greg Kroah-HartmanFrom: Evgeny Novikov <[email protected]>
[ Upstream commit f45882cfb152f5d3a421fd58f177f227e44843b9 ]
camss_probe() does not free camss on error handling paths. The patch introduces an additional error label for this purpose. Besides, it removes call of v4l2_async_notifier_cleanup() from camss_of_parse_ports() since its caller, camss_probe(), cleans up all its resources itself.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/media/platform/qcom/camss/camss.c | 30 +++++++++++++++-------- 1 file changed, 20 insertions(+), 10 deletions(-)
drivers/media/platform/qcom/camss/camss.c +20 -10
@@ -504,7 +504,6 @@ static int camss_of_parse_ports(struct camss *camss)return num_subdevs; err_cleanup: -v4l2_async_notifier_cleanup (&camss->notifier);of_node_put (node);return ret; }
@@ -835,29 +834,38 @@ static int camss_probe(struct platform_device *pdev) camss->csid_num =4 ; camss->vfe_num =2 ; }else { -return -EINVAL ; + ret = -EINVAL ; + goto err_free; } camss->csiphy =devm_kcalloc (dev, camss->csiphy_num,sizeof (*camss->csiphy),GFP_KERNEL ); -if (!camss->csiphy) -return -ENOMEM ; +if (!camss->csiphy) { + ret = -ENOMEM ; + goto err_free; + } camss->csid =devm_kcalloc (dev, camss->csid_num,sizeof (*camss->csid),GFP_KERNEL ); -if (!camss->csid) -return -ENOMEM ; +if (!camss->csid) { + ret = -ENOMEM ; + goto err_free; + } camss->vfe =devm_kcalloc (dev, camss->vfe_num,sizeof (*camss->vfe),GFP_KERNEL ); -if (!camss->vfe) -return -ENOMEM ; +if (!camss->vfe) { + ret = -ENOMEM ; + goto err_free; + }v4l2_async_notifier_init (&camss->notifier); num_subdevs =camss_of_parse_ports (camss); -if (num_subdevs <0 ) -return num_subdevs; +if (num_subdevs <0 ) { + ret = num_subdevs; + goto err_cleanup; + } ret =camss_init_subdevices (camss);if (ret <0 )
@@ -936,6 +944,8 @@ err_register_entities:v4l2_device_unregister (&camss->v4l2_dev); err_cleanup:v4l2_async_notifier_cleanup (&camss->notifier); +err_free: +kfree (camss);return ret; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 59/107 tools/testing/selftests/cgroup/cgroup_util.c: cg_read_strcmp: fix null pointer dereference
In reply to Greg Kroah-HartmanFrom: Gaurav Singh <[email protected]>
[ Upstream commit d830020656c5b68ced962ed3cb51a90e0a89d4c4 ]
Haven't reproduced this issue. This PR is does a minor code cleanup.
--- tools/testing/selftests/cgroup/cgroup_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/cgroup/cgroup_util.c +1 -1
@@ -105,7 +105,7 @@ int cg_read_strcmp(const char *cgroup, const char *control,/* Handle the case of comparing against empty string */ if (!expected) - size =32 ; +return -1 ;else size =strlen (expected) +1 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 60/107 xfs: Fix UBSAN null-ptr-deref in xfs_sysfs_init
In reply to Greg Kroah-HartmanFrom: Eiichi Tsukata <[email protected]>
[ Upstream commit 96cf2a2c75567ff56195fe3126d497a2e7e4379f ]
If xfs_sysfs_init is called with parent_kobj == NULL, UBSAN shows the following warning:
UBSAN: null-ptr-deref in ./fs/xfs/xfs_sysfs.h:37:23 member access within null pointer of type 'struct xfs_kobj' Call Trace: dump_stack+0x10e/0x195 ubsan_type_mismatch_common+0x241/0x280 __ubsan_handle_type_mismatch_v1+0x32/0x40 init_xfs_fs+0x12b/0x28f do_one_initcall+0xdd/0x1d0 do_initcall_level+0x151/0x1b6 do_initcalls+0x50/0x8f do_basic_setup+0x29/0x2b kernel_init_freeable+0x19f/0x20b kernel_init+0x11/0x1e0 ret_from_fork+0x22/0x30
Fix it by checking parent_kobj before the code accesses its member.
--- fs/xfs/xfs_sysfs.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/xfs/xfs_sysfs.h +4 -2
@@ -32,9 +32,11 @@ xfs_sysfs_init(struct xfs_kobj *parent_kobj, const char *name) { + struct kobject *parent; + + parent = parent_kobj ? &parent_kobj->kobject :NULL ;init_completion (&kobj->complete); -return kobject_init_and_add (&kobj->kobject, ktype, - &parent_kobj->kobject,"%s" , name); +return kobject_init_and_add (&kobj->kobject, ktype, parent,"%s" , name); } static inline void
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 61/107 alpha: fix annotation of io{read,write}{16,32}be()
In reply to Greg Kroah-HartmanFrom: Luc Van Oostenryck <[email protected]>
[ Upstream commit bd72866b8da499e60633ff28f8a4f6e09ca78efe ]
These accessors must be used to read/write a big-endian bus. The value returned or written is native-endian.
However, these accessors are defined using be{16,32}_to_cpu() or cpu_to_be{16,32}() to make the endian conversion but these expect a __be{16,32} when none is present. Keeping them would need a force cast that would solve nothing at all.
So, do the conversion using swab{16,32}, like done in asm-generic for similar situations.
--- arch/alpha/include/asm/io.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/alpha/include/asm/io.h +4 -4
@@ -502,10 +502,10 @@ extern inline void writeq(u64 b, volatile void __iomem *addr) }#endif -#define ioread16be (p) be16_to_cpu(ioread16(p)) -#define ioread32be (p) be32_to_cpu(ioread32(p)) -#define iowrite16be (v,p) iowrite16(cpu_to_be16(v), (p)) -#define iowrite32be (v,p) iowrite32(cpu_to_be32(v), (p)) +#define ioread16be (p) swab16(ioread16(p)) +#define ioread32be (p) swab32(ioread32(p)) +#define iowrite16be (v,p) iowrite16(swab16(v), (p)) +#define iowrite32be (v,p) iowrite32(swab32(v), (p))#define inb_p inb#define inw_p inw
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 62/107 fs/signalfd.c: fix inconsistent return codes for signalfd4
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
[ Upstream commit a089e3fd5a82aea20f3d9ec4caa5f4c65cc2cfcc ]
The kernel signalfd4() syscall returns different error codes when called either in compat or native mode. This behaviour makes correct emulation in qemu and testing programs like LTP more complicated.
Fix the code to always return -in both modes- EFAULT for unaccessible user memory, and EINVAL when called with an invalid signal mask.
--- fs/signalfd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/signalfd.c +6 -4
@@ -314,9 +314,10 @@ SYSCALL_DEFINE4(signalfd4, int, ufd, sigset_t __user *, user_mask, {sigset_t mask; -if (sizemask !=sizeof (sigset_t) || -copy_from_user (&mask, user_mask,sizeof (mask))) +if (sizemask !=sizeof (sigset_t))return -EINVAL ; +if (copy_from_user (&mask, user_mask,sizeof (mask))) +return -EFAULT ;return do_signalfd4 (ufd, &mask, flags); }
@@ -325,9 +326,10 @@ SYSCALL_DEFINE3(signalfd, int, ufd, sigset_t __user *, user_mask, {sigset_t mask; -if (sizemask !=sizeof (sigset_t) || -copy_from_user (&mask, user_mask,sizeof (mask))) +if (sizemask !=sizeof (sigset_t))return -EINVAL ; +if (copy_from_user (&mask, user_mask,sizeof (mask))) +return -EFAULT ;return do_signalfd4 (ufd, &mask,0 ); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 63/107 ext4: fix potential negative array index in do_split()
In reply to Greg Kroah-HartmanFrom: Eric Sandeen <[email protected]>
[ Upstream commit 5872331b3d91820e14716632ebb56b1399b34fe1 ]
If for any reason a directory passed to do_split() does not have enough active entries to exceed half the size of the block, we can end up iterating over all "count" entries without finding a split point.
In this case, count == move, and split will be zero, and we will attempt a negative index into map[].
Guard against this by detecting this case, and falling back to split-to-half-of-count instead; in this case we will still have plenty of space (> half blocksize) in each split block.
--- fs/ext4/namei.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
fs/ext4/namei.c +13 -3
@@ -1852,7 +1852,7 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir, blocksize, hinfo, map); map -= count;dx_sort_map (map, count); -/* Split the existing block in the middle, size-wise */ +/* Ensure that neither split block is over half full */ size =0 ; move =0 ;for (i = count-1 ; i >=0 ; i--) {
@@ -1862,8 +1862,18 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir, size += map[i].size; move++; } -/* map index at which we will split */ - split = count - move; +/* +* map index at which we will split +* +* If the sum of active entries didn't exceed half the block size, just +* split it in half by count; each resulting block will have at least +* half the space free. +*/ +if (i >0 ) + split = count - move; +else + split = count/2 ; + hash2 = map[split].hash; continued = hash2 == map[split -1 ].hash; dxtrace(printk(KERN_INFO "Split block %lu at %x, %i/%i\n",
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 64/107 ext4: dont allow overlapping system zones
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
[ Upstream commit bf9a379d0980e7413d94cb18dac73db2bfc5f470 ]
Currently, add_system_zone() just silently merges two added system zones that overlap. However the overlap should not happen and it generally suggests that some unrelated metadata overlap which indicates the fs is corrupted. We should have caught such problems earlier (e.g. in ext4_check_descriptors()) but add this check as another line of defense. In later patch we also use this for stricter checking of journal inode extent tree.
--- fs/ext4/block_validity.c | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-)
fs/ext4/block_validity.c +13 -23
@@ -68,7 +68,7 @@ static int add_system_zone(struct ext4_system_blocks *system_blks, ext4_fsblk_t start_blk, unsigned int count) { -struct ext4_system_zone *new_entry =NULL , *entry; +struct ext4_system_zone *new_entry, *entry;struct rb_node **n = &system_blks->root.rb_node, *node;struct rb_node *parent =NULL , *new_node =NULL ;
@@ -79,30 +79,20 @@ static int add_system_zone(struct ext4_system_blocks *system_blks, n = &(*n)->rb_left; else if (start_blk >= (entry->start_blk + entry->count)) n = &(*n)->rb_right; - else { -if (start_blk + count > (entry->start_blk + - entry->count)) - entry->count = (start_blk + count - - entry->start_blk); - new_node = *n; - new_entry = rb_entry(new_node, struct ext4_system_zone, - node); -break ; - } + else /* Unexpected overlap of system zones. */ + return -EFSCORRUPTED; } -if (!new_entry) { - new_entry =kmem_cache_alloc (ext4_system_zone_cachep, -GFP_KERNEL ); -if (!new_entry) -return -ENOMEM ; - new_entry->start_blk = start_blk; - new_entry->count = count; - new_node = &new_entry->node; - -rb_link_node (new_node, parent, n); -rb_insert_color (new_node, &system_blks->root); - } + new_entry =kmem_cache_alloc (ext4_system_zone_cachep, +GFP_KERNEL ); +if (!new_entry) +return -ENOMEM ; + new_entry->start_blk = start_blk; + new_entry->count = count; + new_node = &new_entry->node; + +rb_link_node (new_node, parent, n); +rb_insert_color (new_node, &system_blks->root);/* Can we merge to the left? */ node =rb_prev (new_node);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 65/107 netfilter: nf_tables: nft_exthdr: the presence return value should be little-endian
In reply to Greg Kroah-HartmanFrom: Stephen Suryaputra <[email protected]>
[ Upstream commit b428336676dbca363262cc134b6218205df4f530 ]
On big-endian machine, the returned register data when the exthdr is present is not being compared correctly because little-endian is assumed. The function nft_cmp_fast_mask(), called by nft_cmp_fast_eval() and nft_cmp_fast_init(), calls cpu_to_le32().
The following dump also shows that little endian is assumed:
$ nft --debug=netlink add rule ip recordroute forward ip option rr exists counter ip [ exthdr load ipv4 1b @ 7 + 0 present => reg 1 ] [ cmp eq reg 1 0x01000000 ] [ counter pkts 0 bytes 0 ]
Lastly, debug print in nft_cmp_fast_init() and nft_cmp_fast_eval() when RR option exists in the packet shows that the comparison fails because the assumption:
nft_cmp_fast_init:189 priv->sreg=4 desc.len=8 mask=0xff000000 data.data[0]=0x10003e0 nft_cmp_fast_eval:57 regs->data[priv->sreg=4]=0x1 mask=0xff000000 priv->data=0x1000000
v2: use nft_reg_store8() instead (Florian Westphal). Also to avoid the
warnings reported by kernel test robot.
--- net/netfilter/nft_exthdr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/netfilter/nft_exthdr.c +2 -2
@@ -44,7 +44,7 @@ static void nft_exthdr_ipv6_eval(const struct nft_expr *expr, err =ipv6_find_hdr (pkt->skb, &offset, priv->type,NULL ,NULL );if (priv->flags &NFT_EXTHDR_F_PRESENT ) { - *dest = (err >=0 ); +nft_reg_store8 (dest, err >=0 );return ; }else if (err <0 ) { goto err;
@@ -141,7 +141,7 @@ static void nft_exthdr_ipv4_eval(const struct nft_expr *expr, err =ipv4_find_option (nft_net (pkt), skb, &offset, priv->type);if (priv->flags &NFT_EXTHDR_F_PRESENT ) { - *dest = (err >=0 ); +nft_reg_store8 (dest, err >=0 );return ; }else if (err <0 ) { goto err;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 66/107 spi: stm32: fixes suspend/resume management
In reply to Greg Kroah-HartmanFrom: Amelie Delaunay <[email protected]>
[ Upstream commit db96bf976a4fc65439be0b4524c0d41427d98814 ]
This patch adds pinctrl power management, and reconfigure spi controller in case of resume.
--- drivers/spi/spi-stm32.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-)
drivers/spi/spi-stm32.c +24 -3
@@ -14,6 +14,7 @@#include <linux/iopoll.h> #include <linux/module.h> #include <linux/of_platform.h> +#include <linux/pinctrl/consumer.h> #include <linux/pm_runtime.h> #include <linux/reset.h> #include <linux/spi/spi.h>
@@ -1986,6 +1987,8 @@ static int stm32_spi_remove(struct platform_device *pdev)pm_runtime_disable (&pdev->dev); +pinctrl_pm_select_sleep_state (&pdev->dev); +return 0 ; }
@@ -1997,13 +2000,18 @@ static int stm32_spi_runtime_suspend(struct device *dev)clk_disable_unprepare (spi->clk); -return 0 ; +return pinctrl_pm_select_sleep_state (dev); }static int stm32_spi_runtime_resume (struct device *dev) {struct spi_master *master =dev_get_drvdata (dev);struct stm32_spi *spi =spi_master_get_devdata (master); +int ret; + + ret =pinctrl_pm_select_default_state (dev); +if (ret) +return ret;return clk_prepare_enable (spi->clk); }
@@ -2033,10 +2041,23 @@ static int stm32_spi_resume(struct device *dev)return ret; ret =spi_master_resume (master); -if (ret) +if (ret) {clk_disable_unprepare (spi->clk); +return ret; + } - return ret; + ret =pm_runtime_get_sync (dev); +if (ret) { +dev_err (dev,"Unable to power device:%d\n" , ret); +return ret; + } + + spi->cfg->config (spi); + +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev); + + return 0; }#endif
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 67/107 ASoC: q6afe-dai: mark all widgets registers as SND_SOC_NOPM
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 56235e4bc5ae58cb8fcd9314dba4e9ab077ddda8 ]
Looks like the q6afe-dai dapm widget registers are set as "0", which is a not correct.
As this registers will be read by ASoC core during startup which will throw up errors, Fix this by making the registers as SND_SOC_NOPM as these should be never used.
With recent changes to ASoC core, every register read/write failures are reported very verbosely. Prior to this fails to reads are totally ignored, so we never saw any error messages.
--- sound/soc/qcom/qdsp6/q6afe-dai.c | 210 +++++++++++++++---------------- 1 file changed, 105 insertions(+), 105 deletions(-)
sound/soc/qcom/qdsp6/q6afe-dai.c +105 -105
@@ -1150,206 +1150,206 @@ static int q6afe_of_xlate_dai_name(struct snd_soc_component *component, }static const struct snd_soc_dapm_widget q6afe_dai_widgets[] = { -SND_SOC_DAPM_AIF_IN ("HDMI_RX" ,NULL ,0 ,0 ,0 ,0 ), -SND_SOC_DAPM_AIF_IN ("SLIMBUS_0_RX" ,NULL ,0 ,0 ,0 ,0 ), -SND_SOC_DAPM_AIF_IN ("SLIMBUS_1_RX" ,NULL ,0 ,0 ,0 ,0 ), -SND_SOC_DAPM_AIF_IN ("SLIMBUS_2_RX" ,NULL ,0 ,0 ,0 ,0 ), -SND_SOC_DAPM_AIF_IN ("SLIMBUS_3_RX" ,NULL ,0 ,0 ,0 ,0 ), -SND_SOC_DAPM_AIF_IN ("SLIMBUS_4_RX" ,NULL ,0 ,0 ,0 ,0 ), -SND_SOC_DAPM_AIF_IN ("SLIMBUS_5_RX" ,NULL ,0 ,0 ,0 ,0 ), -SND_SOC_DAPM_AIF_IN ("SLIMBUS_6_RX" ,NULL ,0 ,0 ,0 ,0 ), -SND_SOC_DAPM_AIF_OUT ("SLIMBUS_0_TX" ,NULL ,0 ,0 ,0 ,0 ), -SND_SOC_DAPM_AIF_OUT ("SLIMBUS_1_TX" ,NULL ,0 ,0 ,0 ,0 ), -SND_SOC_DAPM_AIF_OUT ("SLIMBUS_2_TX" ,NULL ,0 ,0 ,0 ,0 ), -SND_SOC_DAPM_AIF_OUT ("SLIMBUS_3_TX" ,NULL ,0 ,0 ,0 ,0 ), -SND_SOC_DAPM_AIF_OUT ("SLIMBUS_4_TX" ,NULL ,0 ,0 ,0 ,0 ), -SND_SOC_DAPM_AIF_OUT ("SLIMBUS_5_TX" ,NULL ,0 ,0 ,0 ,0 ), -SND_SOC_DAPM_AIF_OUT ("SLIMBUS_6_TX" ,NULL ,0 ,0 ,0 ,0 ), +SND_SOC_DAPM_AIF_IN ("HDMI_RX" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_IN ("SLIMBUS_0_RX" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_IN ("SLIMBUS_1_RX" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_IN ("SLIMBUS_2_RX" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_IN ("SLIMBUS_3_RX" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_IN ("SLIMBUS_4_RX" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_IN ("SLIMBUS_5_RX" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_IN ("SLIMBUS_6_RX" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_OUT ("SLIMBUS_0_TX" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_OUT ("SLIMBUS_1_TX" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_OUT ("SLIMBUS_2_TX" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_OUT ("SLIMBUS_3_TX" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_OUT ("SLIMBUS_4_TX" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_OUT ("SLIMBUS_5_TX" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_OUT ("SLIMBUS_6_TX" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("QUAT_MI2S_RX" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("QUAT_MI2S_TX" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("TERT_MI2S_RX" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("TERT_MI2S_TX" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("SEC_MI2S_RX" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("SEC_MI2S_TX" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("SEC_MI2S_RX_SD1" ,"Secondary MI2S Playback SD1" , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("PRI_MI2S_RX" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("PRI_MI2S_TX" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("PRIMARY_TDM_RX_0" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("PRIMARY_TDM_RX_1" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("PRIMARY_TDM_RX_2" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("PRIMARY_TDM_RX_3" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("PRIMARY_TDM_RX_4" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("PRIMARY_TDM_RX_5" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("PRIMARY_TDM_RX_6" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("PRIMARY_TDM_RX_7" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("PRIMARY_TDM_TX_0" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("PRIMARY_TDM_TX_1" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("PRIMARY_TDM_TX_2" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("PRIMARY_TDM_TX_3" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("PRIMARY_TDM_TX_4" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("PRIMARY_TDM_TX_5" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("PRIMARY_TDM_TX_6" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("PRIMARY_TDM_TX_7" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("SEC_TDM_RX_0" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("SEC_TDM_RX_1" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("SEC_TDM_RX_2" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("SEC_TDM_RX_3" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("SEC_TDM_RX_4" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("SEC_TDM_RX_5" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("SEC_TDM_RX_6" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("SEC_TDM_RX_7" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("SEC_TDM_TX_0" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("SEC_TDM_TX_1" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("SEC_TDM_TX_2" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("SEC_TDM_TX_3" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("SEC_TDM_TX_4" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("SEC_TDM_TX_5" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("SEC_TDM_TX_6" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("SEC_TDM_TX_7" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("TERT_TDM_RX_0" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("TERT_TDM_RX_1" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("TERT_TDM_RX_2" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("TERT_TDM_RX_3" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("TERT_TDM_RX_4" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("TERT_TDM_RX_5" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("TERT_TDM_RX_6" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("TERT_TDM_RX_7" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("TERT_TDM_TX_0" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("TERT_TDM_TX_1" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("TERT_TDM_TX_2" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("TERT_TDM_TX_3" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("TERT_TDM_TX_4" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("TERT_TDM_TX_5" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("TERT_TDM_TX_6" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("TERT_TDM_TX_7" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("QUAT_TDM_RX_0" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("QUAT_TDM_RX_1" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("QUAT_TDM_RX_2" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("QUAT_TDM_RX_3" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("QUAT_TDM_RX_4" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("QUAT_TDM_RX_5" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("QUAT_TDM_RX_6" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("QUAT_TDM_RX_7" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("QUAT_TDM_TX_0" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("QUAT_TDM_TX_1" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("QUAT_TDM_TX_2" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("QUAT_TDM_TX_3" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("QUAT_TDM_TX_4" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("QUAT_TDM_TX_5" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("QUAT_TDM_TX_6" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("QUAT_TDM_TX_7" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("QUIN_TDM_RX_0" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("QUIN_TDM_RX_1" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("QUIN_TDM_RX_2" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("QUIN_TDM_RX_3" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("QUIN_TDM_RX_4" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("QUIN_TDM_RX_5" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("QUIN_TDM_RX_6" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_IN ("QUIN_TDM_RX_7" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("QUIN_TDM_TX_0" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("QUIN_TDM_TX_1" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("QUIN_TDM_TX_2" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("QUIN_TDM_TX_3" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("QUIN_TDM_TX_4" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("QUIN_TDM_TX_5" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("QUIN_TDM_TX_6" ,NULL , -0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_AIF_OUT ("QUIN_TDM_TX_7" ,NULL , -0 ,0 ,0 ,0 ), -SND_SOC_DAPM_AIF_OUT ("DISPLAY_PORT_RX" ,"NULL" ,0 ,0 ,0 ,0 ), +0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_OUT ("DISPLAY_PORT_RX" ,"NULL" ,0 ,SND_SOC_NOPM ,0 ,0 ), };static const struct snd_soc_component_driver q6afe_dai_component = {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 68/107 ASoC: q6routing: add dummy register read/write function
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 796a58fe2b8c9b6668db00d92512ec84be663027 ]
Most of the DAPM widgets for DSP ASoC components reuse reg field of the widgets for its internal calculations, however these are not real registers. So read/writes to these numbers are not really valid. However ASoC core will read these registers to get default state during startup.
With recent changes to ASoC core, every register read/write failures are reported very verbosely. Prior to this fails to reads are totally ignored, so we never saw any error messages.
To fix this add dummy read/write function to return default value.
--- sound/soc/qcom/qdsp6/q6routing.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
sound/soc/qcom/qdsp6/q6routing.c +16 -0
@@ -996,6 +996,20 @@ static int msm_routing_probe(struct snd_soc_component *c)return 0 ; } +static unsigned int q6routing_reg_read (struct snd_soc_component *component, +unsigned int reg) +{ +/* default value */ +return 0 ; +} + +static int q6routing_reg_write (struct snd_soc_component *component, +unsigned int reg,unsigned int val) +{ +/* dummy */ +return 0 ; +} +static const struct snd_soc_component_driver msm_soc_routing_component = { .ops = &q6pcm_routing_ops, .probe = msm_routing_probe,
@@ -1004,6 +1018,8 @@ static const struct snd_soc_component_driver msm_soc_routing_component = { .num_dapm_widgets = ARRAY_SIZE(msm_qdsp6_widgets), .dapm_routes = intercon, .num_dapm_routes = ARRAY_SIZE(intercon), + .read = q6routing_reg_read, + .write = q6routing_reg_write, };static int q6pcm_routing_probe (struct platform_device *pdev)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 69/107 bpf: sock_ops sk access may stomp registers when dst_reg = src_reg
In reply to Greg Kroah-HartmanFrom: John Fastabend <[email protected]>
[ Upstream commit 84f44df664e9f0e261157e16ee1acd77cc1bb78d ]
Similar to patch ("bpf: sock_ops ctx access may stomp registers") if the src_reg = dst_reg when reading the sk field of a sock_ops struct we generate xlated code,
53: (61) r9 = *(u32 *)(r9 +28)
54: (15) if r9 == 0x0 goto pc+3
56: (79) r9 = *(u64 *)(r9 +0)
This stomps on the r9 reg to do the sk_fullsock check and then when reading the skops->sk field instead of the sk pointer we get the sk_fullsock. To fix use similar pattern noted in the previous fix and use the temp field to save/restore a register used to do sk_fullsock check.
After the fix the generated xlated code reads,
52: (7b) *(u64 *)(r9 +32) = r8
53: (61) r8 = *(u32 *)(r9 +28)
54: (15) if r9 == 0x0 goto pc+3
55: (79) r8 = *(u64 *)(r9 +32)
56: (79) r9 = *(u64 *)(r9 +0)
57: (05) goto pc+1
58: (79) r8 = *(u64 *)(r9 +32)
Here r9 register was in-use so r8 is chosen as the temporary register. In line 52 r8 is saved in temp variable and at line 54 restored in case fullsock != 0. Finally we handle fullsock == 0 case by restoring at line 58.
This adds a new macro SOCK_OPS_GET_SK it is almost possible to merge this with SOCK_OPS_GET_FIELD, but I found the extra branch logic a bit more confusing than just adding a new macro despite a bit of duplicating code.
--- net/core/filter.c | 49 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-)
net/core/filter.c +38 -11
@@ -8010,6 +8010,43 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type, offsetof(OBJ, OBJ_FIELD)); \ } while (0) +#define SOCK_OPS_GET_SK () \ + do { \ + int fullsock_reg = si->dst_reg, reg = BPF_REG_9, jmp = 1; \ + if (si->dst_reg == reg || si->src_reg == reg) \ + reg--; \ + if (si->dst_reg == reg || si->src_reg == reg) \ + reg--; \ + if (si->dst_reg == si->src_reg) { \ + *insn++ = BPF_STX_MEM(BPF_DW, si->src_reg, reg, \ + offsetof(struct bpf_sock_ops_kern, \ + temp)); \ + fullsock_reg = reg; \ + jmp += 2; \ + } \ + *insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF( \ + struct bpf_sock_ops_kern, \ + is_fullsock), \ + fullsock_reg, si->src_reg, \ + offsetof(struct bpf_sock_ops_kern, \ + is_fullsock)); \ + *insn++ = BPF_JMP_IMM(BPF_JEQ, fullsock_reg, 0, jmp); \ + if (si->dst_reg == si->src_reg) \ + *insn++ = BPF_LDX_MEM(BPF_DW, reg, si->src_reg, \ + offsetof(struct bpf_sock_ops_kern, \ + temp)); \ + *insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF( \ + struct bpf_sock_ops_kern, sk),\ + si->dst_reg, si->src_reg, \ + offsetof(struct bpf_sock_ops_kern, sk));\ + if (si->dst_reg == si->src_reg) { \ + *insn++ = BPF_JMP_A(1); \ + *insn++ = BPF_LDX_MEM(BPF_DW, reg, si->src_reg, \ + offsetof(struct bpf_sock_ops_kern, \ + temp)); \ + } \ + } while (0) +#define SOCK_OPS_GET_TCP_SOCK_FIELD (FIELD ) \ SOCK_OPS_GET_FIELD(FIELD, FIELD, struct tcp_sock)
@@ -8294,17 +8331,7 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type,SOCK_OPS_GET_TCP_SOCK_FIELD (bytes_acked);break ;case offsetof(struct bpf_sock_ops , sk): - *insn++ =BPF_LDX_MEM (BPF_FIELD_SIZEOF ( - struct bpf_sock_ops_kern, - is_fullsock), - si->dst_reg, si->src_reg, - offsetof(struct bpf_sock_ops_kern , - is_fullsock)); - *insn++ =BPF_JMP_IMM (BPF_JEQ , si->dst_reg,0 ,1 ); - *insn++ =BPF_LDX_MEM (BPF_FIELD_SIZEOF ( - struct bpf_sock_ops_kern, sk), - si->dst_reg, si->src_reg, - offsetof(struct bpf_sock_ops_kern , sk)); +SOCK_OPS_GET_SK ();break ; }return insn - insn_buf;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 70/107 can: j1939: fix kernel-infoleak in j1939_sk_sock2sockaddr_can()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 38ba8b9241f5848a49b80fddac9ab5f4692e434e ]
syzbot found that at least 2 bytes of kernel information were leaked during getsockname() on AF_CAN CAN_J1939 socket.
Since struct sockaddr_can has in fact two holes, simply clear the whole area before filling it with useful data.
BUG: KMSAN: kernel-infoleak in kmsan_copy_to_user+0x81/0x90 mm/kmsan/kmsan_hooks.c:253 CPU: 0 PID: 8466 Comm: syz-executor511 Not tainted 5.8.0-rc5-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x21c/0x280 lib/dump_stack.c:118 kmsan_report+0xf7/0x1e0 mm/kmsan/kmsan_report.c:121 kmsan_internal_check_memory+0x238/0x3d0 mm/kmsan/kmsan.c:423 kmsan_copy_to_user+0x81/0x90 mm/kmsan/kmsan_hooks.c:253 instrument_copy_to_user include/linux/instrumented.h:91 [inline] _copy_to_user+0x18e/0x260 lib/usercopy.c:39 copy_to_user include/linux/uaccess.h:186 [inline] move_addr_to_user+0x3de/0x670 net/socket.c:237 __sys_getsockname+0x407/0x5e0 net/socket.c:1909 __do_sys_getsockname net/socket.c:1920 [inline] __se_sys_getsockname+0x91/0xb0 net/socket.c:1917 __x64_sys_getsockname+0x4a/0x70 net/socket.c:1917 do_syscall_64+0xad/0x160 arch/x86/entry/common.c:386 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x440219 Code: Bad RIP value. RSP: 002b:00007ffe5ee150c8 EFLAGS: 00000246 ORIG_RAX: 0000000000000033 RAX: ffffffffffffffda RBX: 00000000004002c8 RCX: 0000000000440219 RDX: 0000000020000240 RSI: 0000000020000100 RDI: 0000000000000003 RBP: 00000000006ca018 R08: 0000000000000000 R09: 00000000004002c8 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000401a20 R13: 0000000000401ab0 R14: 0000000000000000 R15: 0000000000000000
Local variable ----address@__sys_getsockname created at:
__sys_getsockname+0x91/0x5e0 net/socket.c:1894 __sys_getsockname+0x91/0x5e0 net/socket.c:1894
Bytes 2-3 of 24 are uninitialized
Memory access of size 24 starts at ffff8880ba2c7de8 Data copied to user address 0000000020000100
--- net/can/j1939/socket.c | 5 +++++ 1 file changed, 5 insertions(+)
net/can/j1939/socket.c +5 -0
@@ -561,6 +561,11 @@ static int j1939_sk_connect(struct socket *sock, struct sockaddr *uaddr,static void j1939_sk_sock2sockaddr_can (struct sockaddr_can *addr,const struct j1939_sock *jsk,int peer) { +/* There are two holes (2 bytes and 3 bytes) to clear to avoid +* leaking kernel information to user space. +*/ +memset (addr,0 ,J1939_MIN_NAMELEN ); + addr->can_family =AF_CAN ; addr->can_ifindex = jsk->ifindex; addr->can_addr.j1939.pgn = jsk->addr.pgn;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 71/107 can: j1939: transport: j1939_simple_recv(): ignore local J1939 messages send not by J1939 stack
In reply to Greg Kroah-HartmanFrom: Oleksij Rempel <[email protected]>
[ Upstream commit b43e3a82bc432c1caaed8950e7662c143470c54c ]
In current J1939 stack implementation, we process all locally send messages as own messages. Even if it was send by CAN_RAW socket.
To reproduce it use following commands:
testj1939 -P -r can0:0x80 &
cansend can0 18238040#0123
This step will trigger false positive not critical warning:j1939_simple_recv: Received already invalidated message
With this patch we add additional check to make sure, related skb is own echo message.
--- net/can/j1939/socket.c | 1 + net/can/j1939/transport.c | 4 ++++ 2 files changed, 5 insertions(+)
net/can/j1939/socket.c +1 -0
@@ -398,6 +398,7 @@ static int j1939_sk_init(struct sock *sk)spin_lock_init (&jsk->sk_session_queue_lock);INIT_LIST_HEAD (&jsk->sk_session_queue); sk->sk_destruct = j1939_sk_sock_destruct; + sk->sk_protocol =CAN_J1939 ;return 0 ; }
net/can/j1939/transport.c +4 -0
@@ -2032,6 +2032,10 @@ void j1939_simple_recv(struct j1939_priv *priv, struct sk_buff *skb)if (!skb->sk)return ; +if (skb->sk->sk_family !=AF_CAN || + skb->sk->sk_protocol !=CAN_J1939 ) +return ; +j1939_session_list_lock (priv); session =j1939_session_get_simple (priv, skb);j1939_session_list_unlock (priv);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 72/107 can: j1939: transport: add j1939_session_skb_find_by_offset() function
In reply to Greg Kroah-HartmanFrom: Oleksij Rempel <[email protected]>
[ Upstream commit 840835c9281215341d84966a8855f267a971e6a3 ]
Sometimes it makes no sense to search the skb by pkt.dpo, since we need next the skb within the transaction block. This may happen if we have an ETP session with CTS set to less than 255 packets.
After this patch, we will be able to work with ETP sessions where the block size (ETP.CM_CTS byte 2) is less than 255 packets.
--- net/can/j1939/transport.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
net/can/j1939/transport.c +15 -7
@@ -352,17 +352,16 @@ void j1939_session_skb_queue(struct j1939_session *session,skb_queue_tail (&session->skb_queue, skb); } -static struct sk_buff *j1939_session_skb_find (struct j1939_session *session) +static struct +sk_buff *j1939_session_skb_find_by_offset (struct j1939_session *session, +unsigned int offset_start) {struct j1939_priv *priv = session->priv; +struct j1939_sk_buff_cb *do_skcb;struct sk_buff *skb =NULL ;struct sk_buff *do_skb; -struct j1939_sk_buff_cb *do_skcb; -unsigned int offset_start;unsigned long flags; - offset_start = session->pkt.dpo *7 ; -spin_lock_irqsave (&session->skb_queue.lock, flags); skb_queue_walk(&session->skb_queue, do_skb) { do_skcb =j1939_skb_to_cb (do_skb);
@@ -382,6 +381,14 @@ static struct sk_buff *j1939_session_skb_find(struct j1939_session *session)return skb; } +static struct sk_buff *j1939_session_skb_find (struct j1939_session *session) +{ +unsigned int offset_start; + + offset_start = session->pkt.dpo *7 ; +return j1939_session_skb_find_by_offset (session, offset_start); +} +/* see if we are receiver * returns 0 for broadcasts, although we will receive them */
@@ -766,7 +773,7 @@ static int j1939_session_tx_dat(struct j1939_session *session)int ret =0 ;u8 dat[8 ]; - se_skb =j1939_session_skb_find (session); + se_skb =j1939_session_skb_find_by_offset (session, session->pkt.tx *7 );if (!se_skb)return -ENOBUFS ;
@@ -1765,7 +1772,8 @@ static void j1939_xtp_rx_dat_one(struct j1939_session *session, __func__, session); goto out_session_cancel; } - se_skb =j1939_session_skb_find (session); + + se_skb =j1939_session_skb_find_by_offset (session, packet *7 );if (!se_skb) {netdev_warn (priv->ndev,"%s: 0x%p: no skb found\n" , __func__, session);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 73/107 i40e: Set RX_ONLY mode for unicast promiscuous on VLAN
In reply to Greg Kroah-HartmanFrom: Przemyslaw Patynowski <[email protected]>
[ Upstream commit 4bd5e02a2ed1575c2f65bd3c557a077dd399f0e8 ]
Trusted VF with unicast promiscuous mode set, could listen to TX traffic of other VFs.
Set unicast promiscuous mode to RX traffic, if VSI has port VLAN configured. Rename misleading I40E_AQC_SET_VSI_PROMISC_TX bit to I40E_AQC_SET_VSI_PROMISC_RX_ONLY. Aligned unicast promiscuous with VLAN to the one without VLAN.
--- .../net/ethernet/intel/i40e/i40e_adminq_cmd.h | 2 +- drivers/net/ethernet/intel/i40e/i40e_common.c | 35 ++++++++++++++----- 2 files changed, 28 insertions(+), 9 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h +1 -1
@@ -1211,7 +1211,7 @@ struct i40e_aqc_set_vsi_promiscuous_modes {#define I40E_AQC_SET_VSI_PROMISC_BROADCAST 0x04#define I40E_AQC_SET_VSI_DEFAULT 0x08#define I40E_AQC_SET_VSI_PROMISC_VLAN 0x10 -#define I40E_AQC_SET_VSI_PROMISC_TX 0x8000 +#define I40E_AQC_SET_VSI_PROMISC_RX_ONLY 0x8000__le16 seid;#define I40E_AQC_VSI_PROM_CMD_SEID_MASK 0x3FF__le16 vlan_tag;
drivers/net/ethernet/intel/i40e/i40e_common.c +27 -8
@@ -1949,6 +1949,21 @@ i40e_status i40e_aq_set_phy_debug(struct i40e_hw *hw, u8 cmd_flags,return status; } +/** +* i40e_is_aq_api_ver_ge +* @aq: pointer to AdminQ info containing HW API version to compare +* @maj: API major value +* @min: API minor value +* +* Assert whether current HW API version is greater/equal than provided. +**/ +static bool i40e_is_aq_api_ver_ge (struct i40e_adminq_info *aq,u16 maj, +u16 min) +{ +return (aq->api_maj_ver > maj || + (aq->api_maj_ver == maj && aq->api_min_ver >= min)); +} +/** * i40e_aq_add_vsi * @hw: pointer to the hw struct
@@ -2074,18 +2089,16 @@ i40e_status i40e_aq_set_vsi_unicast_promiscuous(struct i40e_hw *hw,if (set) { flags |=I40E_AQC_SET_VSI_PROMISC_UNICAST ; -if (rx_only_promisc && - (((hw->aq.api_maj_ver ==1 ) && (hw->aq.api_min_ver >=5 )) || - (hw->aq.api_maj_ver >1 ))) - flags |=I40E_AQC_SET_VSI_PROMISC_TX ; +if (rx_only_promisc &&i40e_is_aq_api_ver_ge (&hw->aq,1 ,5 )) + flags |=I40E_AQC_SET_VSI_PROMISC_RX_ONLY ; } cmd->promiscuous_flags =cpu_to_le16 (flags); cmd->valid_flags =cpu_to_le16 (I40E_AQC_SET_VSI_PROMISC_UNICAST ); -if (((hw->aq.api_maj_ver >=1 ) && (hw->aq.api_min_ver >=5 )) || - (hw->aq.api_maj_ver >1 )) - cmd->valid_flags |=cpu_to_le16 (I40E_AQC_SET_VSI_PROMISC_TX ); +if (i40e_is_aq_api_ver_ge (&hw->aq,1 ,5 )) + cmd->valid_flags |= +cpu_to_le16 (I40E_AQC_SET_VSI_PROMISC_RX_ONLY ); cmd->seid =cpu_to_le16 (seid); status =i40e_asq_send_command (hw, &desc,NULL ,0 , cmd_details);
@@ -2182,11 +2195,17 @@ enum i40e_status_code i40e_aq_set_vsi_uc_promisc_on_vlan(struct i40e_hw *hw,i40e_fill_default_direct_cmd_desc (&desc, i40e_aqc_opc_set_vsi_promiscuous_modes); -if (enable) +if (enable) { flags |=I40E_AQC_SET_VSI_PROMISC_UNICAST ; +if (i40e_is_aq_api_ver_ge (&hw->aq,1 ,5 )) + flags |=I40E_AQC_SET_VSI_PROMISC_RX_ONLY ; + } cmd->promiscuous_flags =cpu_to_le16 (flags); cmd->valid_flags =cpu_to_le16 (I40E_AQC_SET_VSI_PROMISC_UNICAST ); +if (i40e_is_aq_api_ver_ge (&hw->aq,1 ,5 )) + cmd->valid_flags |= +cpu_to_le16 (I40E_AQC_SET_VSI_PROMISC_RX_ONLY ); cmd->seid =cpu_to_le16 (seid); cmd->vlan_tag =cpu_to_le16 (vid |I40E_AQC_SET_VSI_VLAN_VALID );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 74/107 i40e: Fix crash during removing i40e driver
In reply to Greg Kroah-HartmanFrom: Grzegorz Szczurek <[email protected]>
[ Upstream commit 5b6d4a7f20b09c47ca598760f6dafd554af8b6d5 ]
Fix the reason of crashing system by add waiting time to finish reset recovery process before starting remove driver procedure. Now VSI is releasing if VSI is not in reset recovery mode. Without this fix it was possible to start remove driver if other processing command need reset recovery procedure which resulted in null pointer dereference. VSI used by the ethtool process has been cleared by remove driver process.
[ 6731.508665] BUG: kernel NULL pointer dereference, address: 0000000000000000 [ 6731.508668] #PF: supervisor read access in kernel mode [ 6731.508670] #PF: error_code(0x0000) - not-present page [ 6731.508671] PGD 0 P4D 0 [ 6731.508674] Oops: 0000 [#1] SMP PTI [ 6731.508679] Hardware name: Intel Corporation S2600WT2R/S2600WT2R, BIOS SE5C610.86B.01.01.0021.032120170601 03/21/2017 [ 6731.508694] RIP: 0010:i40e_down+0x252/0x310 [i40e] [ 6731.508696] Code: c7 78 de fa c0 e8 61 02 3a c1 66 83 bb f6 0c 00 00 00 0f 84 bf 00 00 00 45 31 e4 45 31 ff eb 03 41 89 c7 48 8b 83 98 0c 00 00 <4a> 8b 3c 20 e8 a5 79 02 00 48 83 bb d0 0c 00 00 00 74 10 48 8b 83 [ 6731.508698] RSP: 0018:ffffb75ac7b3faf0 EFLAGS: 00010246 [ 6731.508700] RAX: 0000000000000000 RBX: ffff9c9874bd5000 RCX: 0000000000000007 [ 6731.508701] RDX: 0000000000000000 RSI: 0000000000000096 RDI: ffff9c987f4d9780 [ 6731.508703] RBP: ffffb75ac7b3fb30 R08: 0000000000005b60 R09: 0000000000000004 [ 6731.508704] R10: ffffb75ac64fbd90 R11: 0000000000000001 R12: 0000000000000000 [ 6731.508706] R13: ffff9c97a08e0000 R14: ffff9c97a08e0a68 R15: 0000000000000000 [ 6731.508708] FS: 00007f2617cd2740(0000) GS:ffff9c987f4c0000(0000) knlGS:0000000000000000 [ 6731.508710] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 6731.508711] CR2: 0000000000000000 CR3: 0000001e765c4006 CR4: 00000000003606e0 [ 6731.508713] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 6731.508714] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 6731.508715] Call Trace: [ 6731.508734] i40e_vsi_close+0x84/0x90 [i40e] [ 6731.508742] i40e_quiesce_vsi.part.98+0x3c/0x40 [i40e] [ 6731.508749] i40e_pf_quiesce_all_vsi+0x55/0x60 [i40e] [ 6731.508757] i40e_prep_for_reset+0x59/0x130 [i40e] [ 6731.508765] i40e_reconfig_rss_queues+0x5a/0x120 [i40e] [ 6731.508774] i40e_set_channels+0xda/0x170 [i40e] [ 6731.508778] ethtool_set_channels+0xe9/0x150 [ 6731.508781] dev_ethtool+0x1b94/0x2920 [ 6731.508805] dev_ioctl+0xc2/0x590 [ 6731.508811] sock_do_ioctl+0xae/0x150 [ 6731.508813] sock_ioctl+0x34f/0x3c0 [ 6731.508821] ksys_ioctl+0x98/0xb0 [ 6731.508828] __x64_sys_ioctl+0x1a/0x20 [ 6731.508831] do_syscall_64+0x57/0x1c0 [ 6731.508835] entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_main.c +3 -0
@@ -15342,6 +15342,9 @@ static void i40e_remove(struct pci_dev *pdev)i40e_write_rx_ctl (hw,I40E_PFQF_HENA (0 ),0 );i40e_write_rx_ctl (hw,I40E_PFQF_HENA (1 ),0 ); +while (test_bit (__I40E_RESET_RECOVERY_PENDING, pf->state)) +usleep_range (1000 ,2000 ); +/* no more scheduling of any task */ set_bit (__I40E_SUSPENDED, pf->state);set_bit (__I40E_DOWN, pf->state);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 75/107 net: fec: correct the error path for regulator disable in probe
In reply to Greg Kroah-HartmanFrom: Fugang Duan <[email protected]>
[ Upstream commit c6165cf0dbb82ded90163dce3ac183fc7a913dc4 ]
Correct the error path for regulator disable.
--- drivers/net/ethernet/freescale/fec_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/fec_main.c +2 -2
@@ -3707,11 +3707,11 @@ fec_probe(struct platform_device *pdev) failed_irq: failed_init:fec_ptp_stop (pdev); -if (fep->reg_phy) -regulator_disable (fep->reg_phy); failed_reset:pm_runtime_put_noidle (&pdev->dev);pm_runtime_disable (&pdev->dev); +if (fep->reg_phy) +regulator_disable (fep->reg_phy); failed_regulator:clk_disable_unprepare (fep->clk_ahb); failed_clk_ahb:
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 76/107 bonding: show saner speed for broadcast mode
In reply to Greg Kroah-HartmanFrom: Jarod Wilson <[email protected]>
[ Upstream commit 4ca0d9ac3fd8f9f90b72a15d8da2aca3ffb58418 ]
Broadcast mode bonds transmit a copy of all traffic simultaneously out of all interfaces, so the "speed" of the bond isn't really the aggregate of all interfaces, but rather, the speed of the slowest active interface.
Also, the type of the speed field is u32, not unsigned long, so adjust that accordingly, as required to make min() function here without complaining about mismatching types.
--- drivers/net/bonding/bond_main.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
drivers/net/bonding/bond_main.c +18 -3
@@ -4246,13 +4246,23 @@ static netdev_tx_t bond_start_xmit(struct sk_buff *skb, struct net_device *dev)return ret; } +static u32 bond_mode_bcast_speed (struct slave *slave,u32 speed) +{ +if (speed ==0 || speed ==SPEED_UNKNOWN ) + speed = slave->speed; +else + speed =min (speed, slave->speed); + +return speed; +} +static int bond_ethtool_get_link_ksettings (struct net_device *bond_dev,struct ethtool_link_ksettings *cmd) {struct bonding *bond =netdev_priv (bond_dev); -unsigned long speed =0 ;struct list_head *iter;struct slave *slave; +u32 speed =0 ; cmd->base.duplex =DUPLEX_UNKNOWN ; cmd->base.port =PORT_OTHER ;
@@ -4264,8 +4274,13 @@ static int bond_ethtool_get_link_ksettings(struct net_device *bond_dev,*/ bond_for_each_slave (bond, slave, iter) {if (bond_slave_can_tx (slave)) { -if (slave->speed !=SPEED_UNKNOWN ) - speed += slave->speed; +if (slave->speed !=SPEED_UNKNOWN ) { +if (BOND_MODE (bond) ==BOND_MODE_BROADCAST ) + speed =bond_mode_bcast_speed (slave, + speed); +else + speed += slave->speed; + }if (cmd->base.duplex ==DUPLEX_UNKNOWN && slave->duplex !=DUPLEX_UNKNOWN ) cmd->base.duplex = slave->duplex;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 77/107 can: j1939: fix support for multipacket broadcast message
In reply to Greg Kroah-HartmanFrom: Zhang Changzhong <[email protected]>
[ Upstream commit f4fd77fd87e9b214c26bb2ebd4f90055eaea5ade ]
Currently j1939_tp_im_involved_anydir() in j1939_tp_recv() check the previously set flags J1939_ECU_LOCAL_DST and J1939_ECU_LOCAL_SRC of incoming skb, thus multipacket broadcast message was aborted by receive side because it may come from remote ECUs and have no exact dst address. Similarly, j1939_tp_cmd_recv() and j1939_xtp_rx_dat() didn't process broadcast message.
So fix it by checking and process broadcast message in j1939_tp_recv(), j1939_tp_cmd_recv() and j1939_xtp_rx_dat().
--- net/can/j1939/transport.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
net/can/j1939/transport.c +14 -3
@@ -1673,8 +1673,12 @@ static void j1939_xtp_rx_rts(struct j1939_priv *priv, struct sk_buff *skb,return ; } session =j1939_xtp_rx_rts_session_new (priv, skb); -if (!session) +if (!session) { +if (cmd ==J1939_TP_CMD_BAM &&j1939_sk_recv_match (priv, skcb)) +netdev_info (priv->ndev,"%s: failed to create TP BAM session\n" , + __func__);return ; + } }else {if (j1939_xtp_rx_rts_session_active (session, skb)) {j1939_session_put (session);
@@ -1852,6 +1856,13 @@ static void j1939_xtp_rx_dat(struct j1939_priv *priv, struct sk_buff *skb)else j1939_xtp_rx_dat_one (session, skb); } + +if (j1939_cb_is_broadcast (skcb)) { + session =j1939_session_get_by_addr (priv, &skcb->addr, false, + false); +if (session) +j1939_xtp_rx_dat_one (session, skb); + } }/* j1939 main intf */
@@ -1943,7 +1954,7 @@ static void j1939_tp_cmd_recv(struct j1939_priv *priv, struct sk_buff *skb)if (j1939_tp_im_transmitter (skcb))j1939_xtp_rx_rts (priv, skb, true); -if (j1939_tp_im_receiver (skcb)) +if (j1939_tp_im_receiver (skcb) ||j1939_cb_is_broadcast (skcb))j1939_xtp_rx_rts (priv, skb, false);break ;
@@ -2007,7 +2018,7 @@ int j1939_tp_recv(struct j1939_priv *priv, struct sk_buff *skb) {struct j1939_sk_buff_cb *skcb =j1939_skb_to_cb (skb); -if (!j1939_tp_im_involved_anydir (skcb)) +if (!j1939_tp_im_involved_anydir (skcb) && !j1939_cb_is_broadcast (skcb))return 0 ;switch (skcb->addr.pgn) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 78/107 can: j1939: cancel rxtimer on multipacket broadcast session complete
In reply to Greg Kroah-HartmanFrom: Zhang Changzhong <[email protected]>
[ Upstream commit e8b17653088f28a87c81845fa41a2d295a3b458c ]
If j1939_xtp_rx_dat_one() receive last frame of multipacket broadcast message, j1939_session_timers_cancel() should be called to cancel rxtimer.
--- net/can/j1939/transport.c | 1 + 1 file changed, 1 insertion(+)
net/can/j1939/transport.c +1 -0
@@ -1811,6 +1811,7 @@ static void j1939_xtp_rx_dat_one(struct j1939_session *session, }if (final) { +j1939_session_timers_cancel (session);j1939_session_completed (session); }else if (do_cts_eoma) {j1939_tp_set_rxtimeout (session,1250 );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 79/107 can: j1939: abort multipacket broadcast session when timeout occurs
In reply to Greg Kroah-HartmanFrom: Zhang Changzhong <[email protected]>
[ Upstream commit 2b8b2e31555cf55ba3680fb28e2b382e168d7ea1 ]
If timeout occurs, j1939_tp_rxtimer() first calls hrtimer_start() to restart rxtimer, and then calls __j1939_session_cancel() to set session->state = J1939_SESSION_WAITING_ABORT. At next timeout expiration, because of the J1939_SESSION_WAITING_ABORT session state j1939_tp_rxtimer() will call j1939_session_deactivate_activate_next() to deactivate current session, and rxtimer won't be set.
But for multipacket broadcast session, __j1939_session_cancel() don't set session->state = J1939_SESSION_WAITING_ABORT, thus current session won't be deactivate and hrtimer_start() is called to start new rxtimer again and again.
So fix it by moving session->state = J1939_SESSION_WAITING_ABORT out of if (!j1939_cb_is_broadcast(&session->skcb)) statement.
--- net/can/j1939/transport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/can/j1939/transport.c +1 -1
@@ -1074,9 +1074,9 @@ static void __j1939_session_cancel(struct j1939_session *session,lockdep_assert_held (&session->priv->active_session_list_lock); session->err =j1939_xtp_abort_to_errno (priv, err); + session->state =J1939_SESSION_WAITING_ABORT ;/* do not send aborts on incoming broadcasts */ if (!j1939_cb_is_broadcast (&session->skcb)) { - session->state =J1939_SESSION_WAITING_ABORT ;j1939_xtp_tx_abort (priv, &session->skcb, !session->transmission, err, session->skcb.addr.pgn);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 80/107 can: j1939: add rxtimer for multipacket broadcast session
In reply to Greg Kroah-HartmanFrom: Zhang Changzhong <[email protected]>
[ Upstream commit 0ae18a82686f9b9965a8ce0dd81371871b306ffe ]
According to SAE J1939/21 (Chapter 5.12.3 and APPENDIX C), for transmit side the required time interval between packets of a multipacket broadcast message is 50 to 200 ms, the responder shall use a timeout of 250ms (provides margin allowing for the maximumm spacing of 200ms). For receive side a timeout will occur when a time of greater than 750 ms elapsed between two message packets when more packets were expected.
So this patch fix and add rxtimer for multipacket broadcast session.
--- net/can/j1939/transport.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)
net/can/j1939/transport.c +20 -8
@@ -723,10 +723,12 @@ static int j1939_session_tx_rts(struct j1939_session *session)return ret; session->last_txcmd = dat[0 ]; -if (dat[0 ] ==J1939_TP_CMD_BAM ) +if (dat[0 ] ==J1939_TP_CMD_BAM ) {j1939_tp_schedule_txtimer (session,50 ); - -j1939_tp_set_rxtimeout (session,1250 ); +j1939_tp_set_rxtimeout (session,250 ); + }else { +j1939_tp_set_rxtimeout (session,1250 ); + }netdev_dbg (session->priv->ndev,"%s: 0x%p\n" , __func__, session);
@@ -1687,11 +1689,15 @@ static void j1939_xtp_rx_rts(struct j1939_priv *priv, struct sk_buff *skb, } session->last_cmd = cmd; -j1939_tp_set_rxtimeout (session,1250 ); - -if (cmd !=J1939_TP_CMD_BAM && !session->transmission) { -j1939_session_txtimer_cancel (session); -j1939_tp_schedule_txtimer (session,0 ); +if (cmd ==J1939_TP_CMD_BAM ) { +if (!session->transmission) +j1939_tp_set_rxtimeout (session,750 ); + }else { +if (!session->transmission) { +j1939_session_txtimer_cancel (session); +j1939_tp_schedule_txtimer (session,0 ); + } +j1939_tp_set_rxtimeout (session,1250 ); }j1939_session_put (session);
@@ -1742,6 +1748,7 @@ static void j1939_xtp_rx_dat_one(struct j1939_session *session,int offset;int nbytes;bool final = false; +bool remain = false;bool do_cts_eoma = false;int packet;
@@ -1804,6 +1811,8 @@ static void j1939_xtp_rx_dat_one(struct j1939_session *session, j1939_cb_is_broadcast(&session->skcb)) { if (session->pkt.rx >= session->pkt.total) final = true; + else + remain = true; } else {/* never final, an EOMA must follow */ if (session->pkt.rx >= session->pkt.last)
@@ -1813,6 +1822,9 @@ static void j1939_xtp_rx_dat_one(struct j1939_session *session,if (final) {j1939_session_timers_cancel (session);j1939_session_completed (session); + }else if (remain) { +if (!session->transmission) +j1939_tp_set_rxtimeout (session,750 ); }else if (do_cts_eoma) {j1939_tp_set_rxtimeout (session,1250 );if (!session->transmission)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 81/107 bonding: fix a potential double-unregister
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit 832707021666411d04795c564a4adea5d6b94f17 ]
When we tear down a network namespace, we unregister all the netdevices within it. So we may queue a slave device and a bonding device together in the same unregister queue.
If the only slave device is non-ethernet, it would automatically unregister the bonding device as well. Thus, we may end up unregistering the bonding device twice.
Workaround this special case by checking reg_state.
--- drivers/net/bonding/bond_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/bonding/bond_main.c +2 -1
@@ -2037,7 +2037,8 @@ static int bond_release_and_destroy(struct net_device *bond_dev,int ret; ret =__bond_release_one (bond_dev, slave_dev, false, true); -if (ret ==0 && !bond_has_slaves (bond)) { +if (ret ==0 && !bond_has_slaves (bond) && + bond_dev->reg_state !=NETREG_UNREGISTERING ) { bond_dev->priv_flags |=IFF_DISABLE_NETPOLL ;netdev_info (bond_dev,"Destroying bond\n" );bond_remove_proc_entry (bond);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 82/107 s390/runtime_instrumentation: fix storage key handling
In reply to Greg Kroah-HartmanFrom: Heiko Carstens <[email protected]>
[ Upstream commit 9eaba29c7985236e16468f4e6a49cc18cf01443e ]
The key member of the runtime instrumentation control block contains only the access key, not the complete storage key. Therefore the value must be shifted by four bits.
Note: this is only relevant for debugging purposes in case somebody compiles a kernel with a default storage access key set to a value not equal to zero.
--- arch/s390/kernel/runtime_instr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/kernel/runtime_instr.c +1 -1
@@ -57,7 +57,7 @@ static void init_runtime_instr_cb(struct runtime_instr_cb *cb) cb->k =1 ; cb->ps =1 ; cb->pc =1 ; - cb->key =PAGE_DEFAULT_KEY ; + cb->key =PAGE_DEFAULT_KEY >>4 ; cb->v =1 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 83/107 s390/ptrace: fix storage key handling
In reply to Greg Kroah-HartmanFrom: Heiko Carstens <[email protected]>
[ Upstream commit fd78c59446b8d050ecf3e0897c5a486c7de7c595 ]
The key member of the runtime instrumentation control block contains only the access key, not the complete storage key. Therefore the value must be shifted by four bits. Since existing user space does not necessarily query and set the access key correctly, just ignore the user space provided key and use the correct one.
Note: this is only relevant for debugging purposes in case somebody compiles a kernel with a default storage access key set to a value not equal to zero.
--- arch/s390/kernel/ptrace.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
arch/s390/kernel/ptrace.c +5 -2
@@ -1283,7 +1283,6 @@ static bool is_ri_cb_valid(struct runtime_instr_cb *cb) cb->pc ==1 && cb->qc ==0 && cb->reserved2 ==0 && - cb->key ==PAGE_DEFAULT_KEY && cb->reserved3 ==0 && cb->reserved4 ==0 && cb->reserved5 == 0 &&
@@ -1347,7 +1346,11 @@ static int s390_runtime_instr_set(struct task_struct *target,kfree (data);return -EINVAL ; } - +/* +* Override access key in any case, since user space should +* not be able to set it, nor should it care about it. +*/ + ri_cb.key =PAGE_DEFAULT_KEY >>4 ;preempt_disable ();if (!target->thread.ri_cb) target->thread.ri_cb = data;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 84/107 ASoC: msm8916-wcd-analog: fix register Interrupt offset
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit ff69c97ef84c9f7795adb49e9f07c9adcdd0c288 ]
For some reason interrupt set and clear register offsets are not set correctly.
This patch corrects them!
--- sound/soc/codecs/msm8916-wcd-analog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/msm8916-wcd-analog.c +2 -2
@@ -19,8 +19,8 @@#define CDC_D_REVISION1 (0xf000)#define CDC_D_PERPH_SUBTYPE (0xf005) -#define CDC_D_INT_EN_SET (0x015) -#define CDC_D_INT_EN_CLR (0x016) +#define CDC_D_INT_EN_SET (0xf015) +#define CDC_D_INT_EN_CLR (0xf016)#define MBHC_SWITCH_INT BIT(7)#define MBHC_MIC_ELECTRICAL_INS_REM_DET BIT(6)#define MBHC_BUTTON_PRESS_DET BIT(5)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 85/107 ASoC: intel: Fix memleak in sst_media_open
In reply to Greg Kroah-HartmanFrom: Dinghao Liu <[email protected]>
[ Upstream commit 062fa09f44f4fb3776a23184d5d296b0c8872eb9 ]
When power_up_sst() fails, stream needs to be freed just like when try_module_get() fails. However, current code is returning directly and ends up leaking memory.
--- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/soc/intel/atom/sst-mfld-platform-pcm.c +3 -2
@@ -331,7 +331,7 @@ static int sst_media_open(struct snd_pcm_substream *substream, ret_val =power_up_sst (stream);if (ret_val <0 ) -return ret_val; + goto out_power_up;/* Make sure, that the period size is always even */ snd_pcm_hw_constraint_step(substream->runtime, 0,
@@ -340,8 +340,9 @@ static int sst_media_open(struct snd_pcm_substream *substream,return snd_pcm_hw_constraint_integer (runtime,SNDRV_PCM_HW_PARAM_PERIODS ); out_ops: -kfree (stream);mutex_unlock (&sst_lock); +out_power_up: +kfree (stream);return ret_val; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 86/107 vfio/type1: Add proper error unwind for vfio_iommu_replay()
In reply to Greg Kroah-HartmanFrom: Alex Williamson <[email protected]>
[ Upstream commit aae7a75a821a793ed6b8ad502a5890fb8e8f172d ]
The vfio_iommu_replay() function does not currently unwind on error, yet it does pin pages, perform IOMMU mapping, and modify the vfio_dma structure to indicate IOMMU mapping. The IOMMU mappings are torn down when the domain is destroyed, but the other actions go on to cause trouble later. For example, the iommu->domain_list can be empty if we only have a non-IOMMU backed mdev attached. We don't currently check if the list is empty before getting the first entry in the list, which leads to a bogus domain pointer. If a vfio_dma entry is erroneously marked as iommu_mapped, we'll attempt to use that bogus pointer to retrieve the existing physical page addresses.
This is the scenario that uncovered this issue, attempting to hot-add a vfio-pci device to a container with an existing mdev device and DMA mappings, one of which could not be pinned, causing a failure adding the new group to the existing container and setting the conditions for a subsequent attempt to explode.
To resolve this, we can first check if the domain_list is empty so that we can reject replay of a bogus domain, should we ever encounter this inconsistent state again in the future. The real fix though is to add the necessary unwind support, which means cleaning up the current pinning if an IOMMU mapping fails, then walking back through the r-b tree of DMA entries, reading from the IOMMU which ranges are mapped, and unmapping and unpinning those ranges. To be able to do this, we also defer marking the DMA entry as IOMMU mapped until all entries are processed, in order to allow the unwind to know the disposition of each entry.
--- drivers/vfio/vfio_iommu_type1.c | 71 ++++++++++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 5 deletions(-)
drivers/vfio/vfio_iommu_type1.c +66 -5
@@ -1187,13 +1187,16 @@ static int vfio_bus_type(struct device *dev, void *data)static int vfio_iommu_replay (struct vfio_iommu *iommu,struct vfio_domain *domain) { -struct vfio_domain *d; +struct vfio_domain *d =NULL ;struct rb_node *n;unsigned long limit =rlimit (RLIMIT_MEMLOCK ) >>PAGE_SHIFT ;int ret;/* Arbitrarily pick the first domain in the list for lookups */ - d = list_first_entry(&iommu->domain_list, struct vfio_domain, next); +if (!list_empty (&iommu->domain_list)) + d =list_first_entry (&iommu->domain_list, + struct vfio_domain, next); + n =rb_first (&iommu->dma_list);for (; n; n =rb_next (n)) {
@@ -1211,6 +1214,11 @@ static int vfio_iommu_replay(struct vfio_iommu *iommu,phys_addr_t p;dma_addr_t i; +if (WARN_ON (!d)) {/* mapped w/o a domain?! */ + ret = -EINVAL ; + goto unwind; + } + phys =iommu_iova_to_phys (d->domain, iova);if (WARN_ON (!phys)) {
@@ -1240,7 +1248,7 @@ static int vfio_iommu_replay(struct vfio_iommu *iommu,if (npage <=0 ) {WARN_ON (!npage); ret = (int )npage; -return ret; + goto unwind; } phys = pfn <<PAGE_SHIFT ;
@@ -1249,14 +1257,67 @@ static int vfio_iommu_replay(struct vfio_iommu *iommu, ret =iommu_map (domain->domain, iova, phys, size, dma->prot | domain->prot); -if (ret) -return ret; +if (ret) { +if (!dma->iommu_mapped) +vfio_unpin_pages_remote (dma, iova, + phys >>PAGE_SHIFT , + size >>PAGE_SHIFT , + true); + goto unwind; + } iova += size; } + } + +/* All dmas are now mapped, defer to second tree walk for unwind */ +for (n =rb_first (&iommu->dma_list); n; n =rb_next (n)) { + struct vfio_dma *dma = rb_entry(n, struct vfio_dma, node); + dma->iommu_mapped = true; } +return 0 ; + +unwind: +for (; n; n =rb_prev (n)) { + struct vfio_dma *dma = rb_entry(n, struct vfio_dma, node); +dma_addr_t iova; + +if (dma->iommu_mapped) { +iommu_unmap (domain->domain, dma->iova, dma->size); +continue ; + } + + iova = dma->iova; +while (iova < dma->iova + dma->size) { +phys_addr_t phys, p; +size_t size; +dma_addr_t i; + + phys =iommu_iova_to_phys (domain->domain, iova); +if (!phys) { + iova +=PAGE_SIZE ; +continue ; + } + + size =PAGE_SIZE ; + p = phys + size; + i = iova + size; +while (i < dma->iova + dma->size && + p ==iommu_iova_to_phys (domain->domain, i)) { + size +=PAGE_SIZE ; + p +=PAGE_SIZE ; + i +=PAGE_SIZE ; + } + +iommu_unmap (domain->domain, iova, size); +vfio_unpin_pages_remote (dma, iova, phys >>PAGE_SHIFT , + size >>PAGE_SHIFT , true); + } + } + +return ret; }/*
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 87/107 kvm: x86: Toggling CR4.SMAP does not load PDPTEs in PAE mode
In reply to Greg Kroah-HartmanFrom: Jim Mattson <[email protected]>
[ Upstream commit 427890aff8558eb4326e723835e0eae0e6fe3102 ]
See the SDM, volume 3, section 4.4.1:
If PAE paging would be in use following an execution of MOV to CR0 or MOV to CR4 (see Section 4.1.1) and the instruction is modifying any of CR0.CD, CR0.NW, CR0.PG, CR4.PAE, CR4.PGE, CR4.PSE, or CR4.SMEP; then the PDPTEs are loaded from the address in CR3.
Message-Id: <[email protected]>
--- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/x86.c +1 -1
@@ -972,7 +972,7 @@ int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) {unsigned long old_cr4 =kvm_read_cr4 (vcpu);unsigned long pdptr_bits =X86_CR4_PGE |X86_CR4_PSE |X86_CR4_PAE | -X86_CR4_SMEP |X86_CR4_SMAP |X86_CR4_PKE ; +X86_CR4_SMEP |X86_CR4_PKE ;if (kvm_valid_cr4 (vcpu, cr4))return 1 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 88/107 kvm: x86: Toggling CR4.PKE does not load PDPTEs in PAE mode
In reply to Greg Kroah-HartmanFrom: Jim Mattson <[email protected]>
[ Upstream commit cb957adb4ea422bd758568df5b2478ea3bb34f35 ]
See the SDM, volume 3, section 4.4.1:
If PAE paging would be in use following an execution of MOV to CR0 or MOV to CR4 (see Section 4.1.1) and the instruction is modifying any of CR0.CD, CR0.NW, CR0.PG, CR4.PAE, CR4.PGE, CR4.PSE, or CR4.SMEP; then the PDPTEs are loaded from the address in CR3.
Message-Id: <[email protected]>
--- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/x86.c +1 -1
@@ -972,7 +972,7 @@ int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) {unsigned long old_cr4 =kvm_read_cr4 (vcpu);unsigned long pdptr_bits =X86_CR4_PGE |X86_CR4_PSE |X86_CR4_PAE | -X86_CR4_SMEP |X86_CR4_PKE ; +X86_CR4_SMEP ;if (kvm_valid_cr4 (vcpu, cr4))return 1 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 89/107 Revert "scsi: qla2xxx: Disable T10-DIF feature with FC-NVMe during probe"
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit dca93232b361d260413933903cd4bdbd92ebcc7f ]
FCP T10-PI and NVMe features are independent of each other. This patch allows both features to co-exist.
This reverts commit 5da05a26b8305a625bc9d537671b981795b46dab.
--- drivers/scsi/qla2xxx/qla_os.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/scsi/qla2xxx/qla_os.c +0 -4
@@ -2804,10 +2804,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)/* This may fail but that's ok */ pci_enable_pcie_error_reporting (pdev); -/* Turn off T10-DIF when FC-NVMe is enabled */ -if (ql2xnvmeenable) - ql2xenabledif =0 ; - ha =kzalloc (sizeof (struct qla_hw_data ),GFP_KERNEL );if (!ha) { ql_log_pci(ql_log_fatal, pdev, 0x0009,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 90/107 kconfig: qconf: do not limit the pop-up menu to the first row
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit fa8de0a3bf3c02e6f00b7746e7e934db522cdda9 ]
If you right-click the first row in the option tree, the pop-up menu shows up, but if you right-click the second row or below, the event is ignored due to the following check:
if (e->y() <= header()->geometry().bottom()) {Perhaps, the intention was to show the pop-menu only when the tree header was right-clicked, but this handler is not called in that case.
Since the origin of e->y() starts from the bottom of the header, this check is odd.
Going forward, you can right-click anywhere in the tree to get the pop-up menu.
--- scripts/kconfig/qconf.cc | 68 ++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 34 deletions(-)
scripts/kconfig/qconf.cc +34 -34
@@ -869,40 +869,40 @@ void ConfigList::focusInEvent(QFocusEvent *e) void ConfigList::contextMenuEvent(QContextMenuEvent *e) { - if (e->y() <= header()->geometry().bottom()) { - if (!headerPopup) { - QAction *action; - - headerPopup = new QMenu(this); - action = new QAction("Show Name", this); - action->setCheckable(true); - connect(action, SIGNAL(toggled(bool)), - parent(), SLOT(setShowName(bool))); - connect(parent(), SIGNAL(showNameChanged(bool)), - action, SLOT(setOn(bool))); - action->setChecked(showName); - headerPopup->addAction(action); - action = new QAction("Show Range", this); - action->setCheckable(true); - connect(action, SIGNAL(toggled(bool)), - parent(), SLOT(setShowRange(bool))); - connect(parent(), SIGNAL(showRangeChanged(bool)), - action, SLOT(setOn(bool))); - action->setChecked(showRange); - headerPopup->addAction(action); - action = new QAction("Show Data", this); - action->setCheckable(true); - connect(action, SIGNAL(toggled(bool)), - parent(), SLOT(setShowData(bool))); - connect(parent(), SIGNAL(showDataChanged(bool)), - action, SLOT(setOn(bool))); - action->setChecked(showData); - headerPopup->addAction(action); - } - headerPopup->exec(e->globalPos()); - e->accept(); - } else - e->ignore(); + if (!headerPopup) { + QAction *action; + + headerPopup = new QMenu(this); + action = new QAction("Show Name", this); + action->setCheckable(true); + connect(action, SIGNAL(toggled(bool)), + parent(), SLOT(setShowName(bool))); + connect(parent(), SIGNAL(showNameChanged(bool)), + action, SLOT(setOn(bool))); + action->setChecked(showName); + headerPopup->addAction(action); + + action = new QAction("Show Range", this); + action->setCheckable(true); + connect(action, SIGNAL(toggled(bool)), + parent(), SLOT(setShowRange(bool))); + connect(parent(), SIGNAL(showRangeChanged(bool)), + action, SLOT(setOn(bool))); + action->setChecked(showRange); + headerPopup->addAction(action); + + action = new QAction("Show Data", this); + action->setCheckable(true); + connect(action, SIGNAL(toggled(bool)), + parent(), SLOT(setShowData(bool))); + connect(parent(), SIGNAL(showDataChanged(bool)), + action, SLOT(setOn(bool))); + action->setChecked(showData); + headerPopup->addAction(action); + } + + headerPopup->exec(e->globalPos()); + e->accept(); } ConfigView*ConfigView::viewList;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 91/107 kconfig: qconf: fix signal connection to invalid slots
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit d85de3399f97467baa2026fbbbe587850d01ba8a ]
If you right-click in the ConfigList window, you will see the following messages in the console:
QObject::connect: No such slot QAction::setOn(bool) in scripts/kconfig/qconf.cc:888QObject::connect: (sender name: 'config')QObject::connect: No such slot QAction::setOn(bool) in scripts/kconfig/qconf.cc:897QObject::connect: (sender name: 'config')QObject::connect: No such slot QAction::setOn(bool) in scripts/kconfig/qconf.cc:906QObject::connect: (sender name: 'config')
Right, there is no such slot in QAction. I think this is a typo of setChecked.
Due to this bug, when you toggled the menu "Option->Show Name/Range/Data" the state of the context menu was not previously updated. Fix this.
--- scripts/kconfig/qconf.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
scripts/kconfig/qconf.cc +4 -4
@@ -878,7 +878,7 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e) connect(action, SIGNAL(toggled(bool)), parent(), SLOT(setShowName(bool))); connect(parent(), SIGNAL(showNameChanged(bool)), - action, SLOT(setOn(bool))); + action, SLOT(setChecked(bool))); action->setChecked(showName); headerPopup->addAction(action);
@@ -887,7 +887,7 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e) connect(action, SIGNAL(toggled(bool)), parent(), SLOT(setShowRange(bool))); connect(parent(), SIGNAL(showRangeChanged(bool)), - action, SLOT(setOn(bool))); + action, SLOT(setChecked(bool))); action->setChecked(showRange); headerPopup->addAction(action);
@@ -896,7 +896,7 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e) connect(action, SIGNAL(toggled(bool)), parent(), SLOT(setShowData(bool))); connect(parent(), SIGNAL(showDataChanged(bool)), - action, SLOT(setOn(bool))); + action, SLOT(setChecked(bool))); action->setChecked(showData); headerPopup->addAction(action); }
@@ -1228,7 +1228,7 @@ QMenu* ConfigInfoView::createStandardContextMenu(const QPoint & pos) action->setCheckable(true); connect(action, SIGNAL(toggled(bool)), SLOT(setShowDebug(bool))); - connect(this, SIGNAL(showDebugChanged(bool)), action, SLOT(setOn(bool))); + connect(this, SIGNAL(showDebugChanged(bool)), action, SLOT(setChecked(bool))); action->setChecked(showDebug()); popup->addSeparator(); popup->addAction(action);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 92/107 efi: avoid error message when booting under Xen
In reply to Greg Kroah-HartmanFrom: Juergen Gross <[email protected]>
[ Upstream commit 6163a985e50cb19d5bdf73f98e45b8af91a77658 ]
efifb_probe() will issue an error message in case the kernel is booted as Xen dom0 from UEFI as EFI_MEMMAP won't be set in this case. Avoid that message by calling efi_mem_desc_lookup() only if EFI_MEMMAP is set.
--- drivers/video/fbdev/efifb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/efifb.c +1 -1
@@ -453,7 +453,7 @@ static int efifb_probe(struct platform_device *dev) info->apertures->ranges[0 ].base = efifb_fix.smem_start; info->apertures->ranges[0 ].size = size_remap; -if (efi_enabled (EFI_BOOT ) && +if (efi_enabled (EFI_MEMMAP ) && !efi_mem_desc_lookup (efifb_fix.smem_start, &md)) {if ((efifb_fix.smem_start + efifb_fix.smem_len) > (md.phys_addr + (md.num_pages <<EFI_PAGE_SHIFT ))) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 93/107 Fix build error when CONFIG_ACPI is not set/enabled:
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit ee87e1557c42dc9c2da11c38e11b87c311569853 ]
../arch/x86/pci/xen.c: In function ‘pci_xen_init’:../arch/x86/pci/xen.c:410:2: error: implicit declaration of function ‘acpi_noirq_set’; did you mean ‘acpi_irq_get’? [-Werror=implicit-function-declaration]
acpi_noirq_set();
--- arch/x86/pci/xen.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/pci/xen.c +1 -0
@@ -26,6 +26,7 @@#include <asm/xen/pci.h> #include <asm/xen/cpuid.h> #include <asm/apic.h> +#include <asm/acpi.h> #include <asm/i8259.h> static int xen_pcifront_enable_irq (struct pci_dev *dev)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 94/107 RDMA/bnxt_re: Do not add user qps to flushlist
In reply to Greg Kroah-HartmanFrom: Selvin Xavier <[email protected]>
[ Upstream commit a812f2d60a9fb7818f9c81f967180317b52545c0 ]
Driver shall add only the kernel qps to the flush list for clean up. During async error events from the HW, driver is adding qps to this list without checking if the qp is kernel qp or not.
Add a check to avoid user qp addition to the flush list.
--- drivers/infiniband/hw/bnxt_re/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/hw/bnxt_re/main.c +2 -1
@@ -789,7 +789,8 @@ static int bnxt_re_handle_qp_async_event(struct creq_qp_event *qp_event,struct ib_event event;unsigned int flags; -if (qp->qplib_qp.state ==CMDQ_MODIFY_QP_NEW_STATE_ERR ) { +if (qp->qplib_qp.state ==CMDQ_MODIFY_QP_NEW_STATE_ERR && +rdma_is_kernel_res (&qp->ib_qp.res)) { flags =bnxt_re_lock_cqs (qp);bnxt_qplib_add_flush_qp (&qp->qplib_qp);bnxt_re_unlock_cqs (qp, flags);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 95/107 afs: Fix NULL deref in afs_dynroot_depopulate()
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit 5e0b17b026eb7c6de9baa9b0d45a51b05f05abe1 ]
If an error occurs during the construction of an afs superblock, it's possible that an error occurs after a superblock is created, but before we've created the root dentry. If the superblock has a dynamic root (ie. what's normally mounted on /afs), the afs_kill_super() will call afs_dynroot_depopulate() to unpin any created dentries - but this will oops if the root hasn't been created yet.
Fix this by skipping that bit of code if there is no root dentry.
This leads to an oops looking like:
general protection fault, ... KASAN: null-ptr-deref in range [0x0000000000000068-0x000000000000006f] ... RIP: 0010:afs_dynroot_depopulate+0x25f/0x529 fs/afs/dynroot.c:385 ... Call Trace: afs_kill_super+0x13b/0x180 fs/afs/super.c:535 deactivate_locked_super+0x94/0x160 fs/super.c:335 afs_get_tree+0x1124/0x1460 fs/afs/super.c:598 vfs_get_tree+0x89/0x2f0 fs/super.c:1547 do_new_mount fs/namespace.c:2875 [inline] path_mount+0x1387/0x2070 fs/namespace.c:3192 do_mount fs/namespace.c:3205 [inline] __do_sys_mount fs/namespace.c:3413 [inline] __se_sys_mount fs/namespace.c:3390 [inline] __x64_sys_mount+0x27f/0x300 fs/namespace.c:3390 do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x44/0xa9
which is oopsing on this line:
inode_lock(root->d_inode);
presumably because sb->s_root was NULL.
--- fs/afs/dynroot.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
fs/afs/dynroot.c +11 -9
@@ -289,15 +289,17 @@ void afs_dynroot_depopulate(struct super_block *sb) net->dynroot_sb =NULL ;mutex_unlock (&net->proc_cells_lock); -inode_lock (root->d_inode); - -/* Remove all the pins for dirs created for manually added cells */ -list_for_each_entry_safe (subdir, tmp, &root->d_subdirs, d_child) { -if (subdir->d_fsdata) { - subdir->d_fsdata =NULL ; -dput (subdir); +if (root) { +inode_lock (root->d_inode); + +/* Remove all the pins for dirs created for manually added cells */ +list_for_each_entry_safe (subdir, tmp, &root->d_subdirs, d_child) { +if (subdir->d_fsdata) { + subdir->d_fsdata =NULL ; +dput (subdir); + } } - } -inode_unlock (root->d_inode); +inode_unlock (root->d_inode); + } }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 96/107 ARM64: vdso32: Install vdso32 from vdso_install
In reply to Greg Kroah-HartmanFrom: Stephen Boyd <[email protected]>
[ Upstream commit 8d75785a814241587802655cc33e384230744f0c ]
Add the 32-bit vdso Makefile to the vdso_install rule so that 'make vdso_install' installs the 32-bit compat vdso when it is compiled.
--- arch/arm64/Makefile | 1 + arch/arm64/kernel/vdso32/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
arch/arm64/Makefile +1 -0
@@ -146,6 +146,7 @@ zinstall install: PHONY += vdso_install vdso_install: $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@ + $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso32 $@ # We use MRPROPER_FILES and CLEAN_FILES now archclean:
arch/arm64/kernel/vdso32/Makefile +1 -1
@@ -190,7 +190,7 @@ quiet_cmd_vdsosym = VDSOSYM $@ cmd_vdsosym = $(NM) $< | $(gen-vdsosym) | LC_ALL=C sort > $@ # Install commands for the unstripped file -quiet_cmd_vdso_install = INSTALL $@ +quiet_cmd_vdso_install = INSTALL32 $@ cmd_vdso_install = cp $(obj)/[email protected] $(MODLIB)/vdso/vdso32.so vdso.so: $(obj)/vdso.so.dbg
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 97/107 bonding: fix active-backup failover for current ARP slave
In reply to Greg Kroah-HartmanFrom: Jiri Wiesner <[email protected]>
[ Upstream commit 0410d07190961ac526f05085765a8d04d926545b ]
When the ARP monitor is used for link detection, ARP replies are validated for all slaves (arp_validate=3) and fail_over_mac is set to active, two slaves of an active-backup bond may get stuck in a state where both of them are active and pass packets that they receive to the bond. This state makes IPv6 duplicate address detection fail. The state is reached thus:
1. The current active slave goes down because the ARP target is not reachable.
2. The current ARP slave is chosen and made active.
3. A new slave is enslaved. This new slave becomes the current active slave and can reach the ARP target.
As a result, the current ARP slave stays active after the enslave action has finished and the log is littered with "PROBE BAD" messages:
Quoted 1 line
bond0: PROBE:
c_arpens10 && cas ens11 BAD
The workaround is to remove the slave with "going back" status from the bond and re-enslave it. This issue was encountered when DPDK PMD interfaces were being enslaved to an active-backup bond.
I would be possible to fix the issue in bond_enslave() or bond_change_active_slave() but the ARP monitor was fixed instead to keep most of the actions changing the current ARP slave in the ARP monitor code. The current ARP slave is set as inactive and backup during the commit phase. A new state, BOND_LINK_FAIL, has been introduced for slaves in the context of the ARP monitor. This allows administrators to see how slaves are rotated for sending ARP requests and attempts are made to find a new active slave.
--- drivers/net/bonding/bond_main.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/net/bonding/bond_main.c +16 -2
@@ -2778,6 +2778,9 @@ static int bond_ab_arp_inspect(struct bonding *bond)if (bond_time_in_interval (bond, last_rx,1 )) {bond_propose_link_state (slave,BOND_LINK_UP ); commit++; + }else if (slave->link ==BOND_LINK_BACK ) { +bond_propose_link_state (slave,BOND_LINK_FAIL ); + commit++; }continue ; }
@@ -2886,6 +2889,19 @@ static void bond_ab_arp_commit(struct bonding *bond)continue ; +case BOND_LINK_FAIL : +bond_set_slave_link_state (slave,BOND_LINK_FAIL , +BOND_SLAVE_NOTIFY_NOW ); +bond_set_slave_inactive_flags (slave, +BOND_SLAVE_NOTIFY_NOW ); + +/* A slave has just been enslaved and has become +* the current active slave. +*/ +if (rtnl_dereference (bond->curr_active_slave)) +RCU_INIT_POINTER (bond->current_arp_slave,NULL ); +continue ; +default : slave_err(bond->dev, slave->dev, "impossible: link_new_state %d on slave\n",
@@ -2936,8 +2952,6 @@ static bool bond_ab_arp_probe(struct bonding *bond)return should_notify_rtnl; } -bond_set_slave_inactive_flags (curr_arp_slave,BOND_SLAVE_NOTIFY_LATER ); -bond_for_each_slave_rcu (bond, slave, iter) {if (!found && !before &&bond_slave_is_up (slave)) before = slave;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 98/107 net: ena: Prevent reset after device destruction
In reply to Greg Kroah-HartmanFrom: Shay Agroskin <[email protected]>
[ Upstream commit 63d4a4c145cca2e84dc6e62d2ef5cb990c9723c2 ]
The reset work is scheduled by the timer routine whenever it detects that a device reset is required (e.g. when a keep_alive signal is missing).
When releasing device resources in ena_destroy_device() the driver cancels the scheduling of the timer routine without destroying the reset work explicitly.
This creates the following bug:
The driver is suspended and the ena_suspend() function is called
-> This function calls ena_destroy_device() to free the net device
resources
-> The driver waits for the timer routine to finish its execution and then cancels it, thus preventing from it to be called again.
If, in its final execution, the timer routine schedules a reset, the reset routine might be called afterwards,and a redundant call to ena_restore_device() would be made.
By changing the reset routine we allow it to read the device's state accurately.
This is achieved by checking whether ENA_FLAG_TRIGGER_RESET flag is set before resetting the device and making both the destruction function and the flag check are under rtnl lock.
The ENA_FLAG_TRIGGER_RESET is cleared at the end of the destruction routine. Also surround the flag check with 'likely' because we expect that the reset routine would be called only when ENA_FLAG_TRIGGER_RESET flag is set.
The destruction of the timer and reset services in __ena_shutoff() have to stay, even though the timer routine is destroyed in ena_destroy_device(). This is to avoid a case in which the reset routine is scheduled after free_netdev() in __ena_shutoff(), which would create an access to freed memory in adapter->flags.
--- drivers/net/ethernet/amazon/ena/ena_netdev.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/net/ethernet/amazon/ena/ena_netdev.c +10 -9
@@ -2835,16 +2835,14 @@ static void ena_fw_reset_device(struct work_struct *work) {struct ena_adapter *adapter = container_of(work, struct ena_adapter, reset_task); -struct pci_dev *pdev = adapter->pdev; -if (unlikely (!test_bit (ENA_FLAG_TRIGGER_RESET , &adapter->flags))) { -dev_err (&pdev->dev, -"device reset schedule while reset bit is off\n" ); -return ; - }rtnl_lock (); -ena_destroy_device (adapter, false); -ena_restore_device (adapter); + +if (likely (test_bit (ENA_FLAG_TRIGGER_RESET , &adapter->flags))) { +ena_destroy_device (adapter, false); +ena_restore_device (adapter); + } +rtnl_unlock (); }
@@ -3675,8 +3673,11 @@ static void __ena_shutoff(struct pci_dev *pdev, bool shutdown) netdev->rx_cpu_rmap = NULL; }#endif /* CONFIG_RFS_ACCEL */ -del_timer_sync (&adapter->timer_service); +/* Make sure timer and reset routine won't be called after +* freeing device resources. +*/ +del_timer_sync (&adapter->timer_service);cancel_work_sync (&adapter->reset_task);rtnl_lock ();/* lock released inside the below if-else block */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 99/107 net: gemini: Fix missing free_netdev() in error path of gemini_ethernet_port_probe()
In reply to Greg Kroah-HartmanFrom: Wang Hai <[email protected]>
[ Upstream commit cf96d977381d4a23957bade2ddf1c420b74a26b6 ]
Replace alloc_etherdev_mq with devm_alloc_etherdev_mqs. In this way, when probe fails, netdev can be freed automatically.
--- drivers/net/ethernet/cortina/gemini.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/cortina/gemini.c +1 -3
@@ -2388,7 +2388,7 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)dev_info (dev,"probe %s ID %d\n" ,dev_name (dev), id); - netdev =alloc_etherdev_mq (sizeof (*port),TX_QUEUE_NUM ); + netdev =devm_alloc_etherdev_mqs (dev,sizeof (*port),TX_QUEUE_NUM ,TX_QUEUE_NUM );if (!netdev) {dev_err (dev,"Can't allocate ethernet device #%d\n" , id);return -ENOMEM ;
@@ -2520,7 +2520,6 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev) } port->netdev =NULL ; -free_netdev (netdev);return ret; }
@@ -2529,7 +2528,6 @@ static int gemini_ethernet_port_remove(struct platform_device *pdev)struct gemini_ethernet_port *port =platform_get_drvdata (pdev);gemini_port_remove (port); -free_netdev (port->netdev);return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 100/107 hv_netvsc: Fix the queue_mapping in netvsc_vf_xmit()
In reply to Greg Kroah-HartmanFrom: Haiyang Zhang <[email protected]>
[ Upstream commit c3d897e01aef8ddc43149e4d661b86f823e3aae7 ]
netvsc_vf_xmit() / dev_queue_xmit() will call VF NIC’s ndo_select_queue or netdev_pick_tx() again. They will use skb_get_rx_queue() to get the queue number, so the “skb->queue_mapping - 1” will be used. This may cause the last queue of VF not been used.
Use skb_record_rx_queue() here, so that the skb_get_rx_queue() called later will get the correct queue number, and VF will be able to use all queues.
--- drivers/net/hyperv/netvsc_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/hyperv/netvsc_drv.c +1 -1
@@ -501,7 +501,7 @@ static int netvsc_vf_xmit(struct net_device *net, struct net_device *vf_netdev,int rc; skb->dev = vf_netdev; - skb->queue_mapping =qdisc_skb_cb (skb)->slave_dev_queue_mapping; +skb_record_rx_queue (skb,qdisc_skb_cb (skb)->slave_dev_queue_mapping); rc =dev_queue_xmit (skb);if (likely (rc ==NET_XMIT_SUCCESS || rc ==NET_XMIT_CN )) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 101/107 net: dsa: b53: check for timeout
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit 774d977abfd024e6f73484544b9abe5a5cd62de7 ]
clang static analysis reports this problem
b53_common.c:1583:13: warning: The left expression of the compound
assignment is an uninitialized value. The computed value will also be garbage
ent.port &= ~BIT(port);
~~~~~~~~ ^ent is set by a successful call to b53_arl_read(). Unsuccessful calls are caught by an switch statement handling specific returns. b32_arl_read() calls b53_arl_op_wait() which fails with the unhandled -ETIMEDOUT.
So add -ETIMEDOUT to the switch statement. Because b53_arl_op_wait() already prints out a message, do not add another one.
--- drivers/net/dsa/b53/b53_common.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/dsa/b53/b53_common.c +2 -0
@@ -1523,6 +1523,8 @@ static int b53_arl_op(struct b53_device *dev, int op, int port,return ret;switch (ret) { +case -ETIMEDOUT : +return ret;case -ENOSPC :dev_dbg (dev->dev,"{%pM,%.4d} no space left in ARL\n" , addr, vid);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 102/107 powerpc/pseries: Do not initiate shutdown when system is running on UPS
In reply to Greg Kroah-HartmanFrom: Vasant Hegde <[email protected]>
commit 90a9b102eddf6a3f987d15f4454e26a2532c1c98 upstream.
As per PAPR we have to look for both EPOW sensor value and event modifier to identify the type of event and take appropriate action.
In LoPAPR v1.1 section 10.2.2 includes table 136 "EPOW Action Codes":
SYSTEM_SHUTDOWN 3
The system must be shut down. An EPOW-aware OS logs the EPOW error log information, then schedules the system to be shut down to begin after an OS defined delay internal (default is 10 minutes.)
Then in section 10.3.2.2.8 there is table 146 "Platform Event Log Format, Version 6, EPOW Section", which includes the "EPOW Event Modifier":
For EPOW sensor value = 3
0x01 = Normal system shutdown with no additional delay 0x02 = Loss of utility power, system is running on UPS/Battery 0x03 = Loss of system critical functions, system should be shutdown 0x04 = Ambient temperature too high
All other values = reserved
We have a user space tool (rtas_errd) on LPAR to monitor for EPOW_SHUTDOWN_ON_UPS. Once it gets an event it initiates shutdown after predefined time. It also starts monitoring for any new EPOW events. If it receives "Power restored" event before predefined time it will cancel the shutdown. Otherwise after predefined time it will shutdown the system.
Commit 79872e35469b ("powerpc/pseries: All events of EPOW_SYSTEM_SHUTDOWN must initiate shutdown") changed our handling of the "on UPS/Battery" case, to immediately shutdown the system. This breaks existing setups that rely on the userspace tool to delay shutdown and let the system run on the UPS.
--- arch/powerpc/platforms/pseries/ras.c | 1 - 1 file changed, 1 deletion(-)
arch/powerpc/platforms/pseries/ras.c +0 -1
@@ -184,7 +184,6 @@ static void handle_system_shutdown(charcase EPOW_SHUTDOWN_ON_UPS :pr_emerg ("Loss of system power detected. System is running on" " UPS/battery. Check RTAS error log for details\n" ); -orderly_poweroff (true);break ;case EPOW_SHUTDOWN_LOSS_OF_CRITICAL_FUNCTIONS :
Greg Kroah-Hartman
maintainerPATCH 103/107 efi: add missed destroy_workqueue when efisubsys_init fails
In reply to Greg Kroah-HartmanFrom: Li Heng <[email protected]>
commit 98086df8b70c06234a8f4290c46064e44dafa0ed upstream.
destroy_workqueue() should be called to destroy efi_rts_wq when efisubsys_init() init resources fails.
--- drivers/firmware/efi/efi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/firmware/efi/efi.c +2 -0
@@ -345,6 +345,7 @@ static int __init efisubsys_init(void) efi_kobj =kobject_create_and_add ("efi" , firmware_kobj);if (!efi_kobj) {pr_err ("efi: Firmware registration failed.\n" ); +destroy_workqueue (efi_rts_wq);return -ENOMEM ; }
@@ -381,6 +382,7 @@ err_unregister:generic_ops_unregister (); err_put:kobject_put (efi_kobj); +destroy_workqueue (efi_rts_wq);return error; }
Greg Kroah-Hartman
maintainerPATCH 104/107 epoll: Keep a reference on files added to the check list
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
commit a9ed4a6560b8562b7e2e2bed9527e88001f7b682 upstream.
When adding a new fd to an epoll, and that this new fd is an epoll fd itself, we recursively scan the fds attached to it to detect cycles, and add non-epool files to a "check list" that gets subsequently parsed.
However, this check list isn't completely safe when deletions can happen concurrently. To sidestep the issue, make sure that a struct file placed on the check list sees its f_count increased, ensuring that a concurrent deletion won't result in the file disapearing from under our feet.
--- fs/eventpoll.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
fs/eventpoll.c +7 -2
@@ -1991,9 +1991,11 @@ static int ep_loop_check_proc(void *priv* not already there, and calling reverse_path_check() * during ep_insert(). */ -if (list_empty (&epi->ffd.file->f_tfile_llink)) +if (list_empty (&epi->ffd.file->f_tfile_llink)) { +get_file (epi->ffd.file);list_add (&epi->ffd.file->f_tfile_llink, &tfile_check_list); + } } }mutex_unlock (&ep->mtx);
@@ -2037,6 +2039,7 @@ static void clear_tfile_check_list(void) file = list_first_entry(&tfile_check_list, struct file, f_tfile_llink);list_del_init (&file->f_tfile_llink); +fput (file); }INIT_LIST_HEAD (&tfile_check_list); }
@@ -2196,9 +2199,11 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, inclear_tfile_check_list (); goto error_tgt_fput; } - }else + }else { +get_file (tf.file);list_add (&tf.file->f_tfile_llink, &tfile_check_list); + }mutex_lock_nested (&ep->mtx,0 );if (is_file_epoll (tf.file)) { tep = tf.file->private_data;
Greg Kroah-Hartman
maintainerPATCH 105/107 do_epoll_ctl(): clean the failure exits up a bit
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
commit 52c479697c9b73f628140dcdfcd39ea302d05482 upstream.
--- fs/eventpoll.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
fs/eventpoll.c +4 -6
@@ -2195,10 +2195,8 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, inmutex_lock (&epmutex);if (is_file_epoll (tf.file)) { error = -ELOOP ; -if (ep_loop_check (ep, tf.file) !=0 ) { -clear_tfile_check_list (); +if (ep_loop_check (ep, tf.file) !=0 ) goto error_tgt_fput; - } }else {get_file (tf.file); list_add(&tf.file->f_tfile_llink,
@@ -2227,8 +2225,6 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, in error =ep_insert (ep, &epds, tf.file, fd, full_check); }else error = -EEXIST ; -if (full_check) -clear_tfile_check_list ();break ;case EPOLL_CTL_DEL :if (epi)
@@ -2251,8 +2247,10 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, inmutex_unlock (&ep->mtx); error_tgt_fput: -if (full_check) +if (full_check) { +clear_tfile_check_list ();mutex_unlock (&epmutex); + }fdput (tf); error_fput:
Greg Kroah-Hartman
maintainerPATCH 106/107 mm/hugetlb: fix calculation of adjust_range_if_pmd_sharing_possible
In reply to Greg Kroah-HartmanFrom: Peter Xu <[email protected]>
commit 75802ca66354a39ab8e35822747cd08b3384a99a upstream.
This is found by code observation only.
Firstly, the worst case scenario should assume the whole range was covered by pmd sharing. The old algorithm might not work as expected for ranges like (1g-2m, 1g+2m), where the adjusted range should be (0, 1g+2m) but the expected range should be (0, 2g).
Since at it, remove the loop since it should not be required. With that, the new code should be faster too when the invalidating range is huge.
Mike said:
: With range (1g-2m, 1g+2m) within a vma (0, 2g) the existing code will only : adjust to (0, 1g+2m) which is incorrect.
:
: We should cc stable. The original reason for adjusting the range was to : prevent data corruption (getting wrong page). Since the range is not : always adjusted correctly, the potential for corruption still exists. :
: However, I am fairly confident that adjust_range_if_pmd_sharing_possible : is only gong to be called in two cases:
:
: 1) for a single page
: 2) for range == entire vma
:
: In those cases, the current code should produce the correct results. :
: To be safe, let's just cc stable.
--- mm/hugetlb.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-)
mm/hugetlb.c +10 -14
@@ -4846,25 +4846,21 @@ static bool vma_shareable(struct vm_areavoid adjust_range_if_pmd_sharing_possible (struct vm_area_struct *vma,unsigned long *start,unsigned long *end) { -unsigned long check_addr = *start; +unsigned long a_start, a_end;if (!(vma->vm_flags &VM_MAYSHARE ))return ; -for (check_addr = *start; check_addr < *end; check_addr +=PUD_SIZE ) { -unsigned long a_start = check_addr &PUD_MASK ; -unsigned long a_end = a_start +PUD_SIZE ; +/* Extend the range to be PUD aligned for a worst case scenario */ + a_start =ALIGN_DOWN (*start,PUD_SIZE ); + a_end =ALIGN (*end,PUD_SIZE ); -/* -* If sharing is possible, adjust start/end if necessary. -*/ -if (range_in_vma (vma, a_start, a_end)) { -if (a_start < *start) - *start = a_start; -if (a_end > *end) - *end = a_end; - } - } +/* +* Intersect the range with the vma range, since pmd sharing won't be +* across vma after all +*/ + *start =max (vma->vm_start, a_start); + *end =min (vma->vm_end, a_end); }/*
Greg Kroah-Hartman
maintainerPATCH 107/107 xen: dont reschedule in preemption off sections
In reply to Greg Kroah-HartmanFrom: Juergen Gross <[email protected]>
For support of long running hypercalls xen_maybe_preempt_hcall() is calling cond_resched() in case a hypercall marked as preemptible has been interrupted.
Normally this is no problem, as only hypercalls done via some ioctl()s are marked to be preemptible. In rare cases when during such a preemptible hypercall an interrupt occurs and any softirq action is started from irq_exit(), a further hypercall issued by the softirq handler will be regarded to be preemptible, too. This might lead to rescheduling in spite of the softirq handler potentially having set preempt_disable(), leading to splats like:
BUG: sleeping function called from invalid context at drivers/xen/preempt.c:37 in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 20775, name: xl INFO: lockdep is turned off. CPU: 1 PID: 20775 Comm: xl Tainted: G D W 5.4.46-1_prgmr_debug.el7.x86_64 #1 Call Trace: <IRQ> dump_stack+0x8f/0xd0 ___might_sleep.cold.76+0xb2/0x103 xen_maybe_preempt_hcall+0x48/0x70 xen_do_hypervisor_callback+0x37/0x40 RIP: e030:xen_hypercall_xen_version+0xa/0x20 Code: ... RSP: e02b:ffffc900400dcc30 EFLAGS: 00000246 RAX: 000000000004000d RBX: 0000000000000200 RCX: ffffffff8100122a RDX: ffff88812e788000 RSI: 0000000000000000 RDI: 0000000000000000 RBP: ffffffff83ee3ad0 R08: 0000000000000001 R09: 0000000000000001 R10: 0000000000000000 R11: 0000000000000246 R12: ffff8881824aa0b0 R13: 0000000865496000 R14: 0000000865496000 R15: ffff88815d040000 ? xen_hypercall_xen_version+0xa/0x20 ? xen_force_evtchn_callback+0x9/0x10 ? check_events+0x12/0x20 ? xen_restore_fl_direct+0x1f/0x20 ? _raw_spin_unlock_irqrestore+0x53/0x60 ? debug_dma_sync_single_for_cpu+0x91/0xc0 ? _raw_spin_unlock_irqrestore+0x53/0x60 ? xen_swiotlb_sync_single_for_cpu+0x3d/0x140 ? mlx4_en_process_rx_cq+0x6b6/0x1110 [mlx4_en] ? mlx4_en_poll_rx_cq+0x64/0x100 [mlx4_en] ? net_rx_action+0x151/0x4a0 ? __do_softirq+0xed/0x55b ? irq_exit+0xea/0x100 ? xen_evtchn_do_upcall+0x2c/0x40 ? xen_do_hypervisor_callback+0x29/0x40 </IRQ> ? xen_hypercall_domctl+0xa/0x20 ? xen_hypercall_domctl+0x8/0x20 ? privcmd_ioctl+0x221/0x990 [xen_privcmd] ? do_vfs_ioctl+0xa5/0x6f0 ? ksys_ioctl+0x60/0x90 ? trace_hardirqs_off_thunk+0x1a/0x20 ? __x64_sys_ioctl+0x16/0x20 ? do_syscall_64+0x62/0x250 ? entry_SYSCALL_64_after_hwframe+0x49/0xbe
Fix that by testing preempt_count() before calling cond_resched().
In kernel 5.8 this can't happen any more due to the entry code rework (more than 100 patches, so not a candidate for backporting).
The issue was introduced in kernel 4.3, so this patch should go into all stable kernels in [4.3 ... 5.7].
--- drivers/xen/preempt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/xen/preempt.c +1 -1
@@ -27,7 +27,7 @@ EXPORT_SYMBOL_GPL(xen_in_preemptible_hca asmlinkage __visible void xen_maybe_preempt_hcall(void) {if (unlikely (__this_cpu_read (xen_in_preemptible_hcall) - &&need_resched ())) { + &&need_resched () && !preempt_count ())) {/* * Clear flag as we may be rescheduled on a different * cpu.
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.61 release. There are 107 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 26 Aug 2020 08:23:34 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.61-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.4:
11 builds: 11 pass, 0 fail
26 boots: 26 pass, 0 fail
56 tests: 56 pass, 0 failLinux version: 5.4.61-rc1-g302fb8173830
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra210-p3450-0000,
tegra30-cardhu-a04Jon