5.10.76-rc1 review
Subsystems (2)
Greg Kroah-Hartman
maintainercover 5.10.76-rc1 review
This is the start of the stable review cycle for the 5.10.76 release. There are 95 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, 27 Oct 2021 19:07:44 +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.10.76-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.10.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.10.76-rc1
Fabien Dessenne <[email protected]>
pinctrl: stm32: use valid pin identifier in stm32_pinctrl_resume()
Nick Desaulniers <[email protected]>
ARM: 9122/1: select HAVE_FUTEX_CMPXCHG
Lorenz Bauer <[email protected]>
selftests: bpf: fix backported ASSERT_FALSE
Sasha Neftin <[email protected]>
e1000e: Separate TGP board type from SPT
Steven Rostedt (VMware) <[email protected]>
tracing: Have all levels of checks prevent recursion
Yanfei Xu <[email protected]>
net: mdiobus: Fix memory leak in __mdiobus_register
Oliver Neukum <[email protected]>
usbnet: sanity check for maxpacket
Daniel Borkmann <[email protected]>
bpf, test, cgroup: Use sk_{alloc,free} for test cases
Niklas Schnelle <[email protected]>
s390/pci: fix zpci_zdev_put() on reserve
Ziyang Xuan <[email protected]>
can: isotp: isotp_sendmsg(): fix TX buffer concurrent access in isotp_sendmsg()
Dexuan Cui <[email protected]>
scsi: core: Fix shost->cmd_per_lun calculation in scsi_add_host_with_dma()
Yunsheng Lin <[email protected]>
net: hns3: fix for miscalculation of rx unused desc
Woody Lin <[email protected]>
sched/scs: Reset the shadow stack when idle_task_exit
Joy Gu <[email protected]>
scsi: qla2xxx: Fix a memory leak in an error path of qla2x00_process_els()
Mike Christie <[email protected]>
scsi: iscsi: Fix set_param() handling
Uwe Kleine-König <[email protected]>
Input: snvs_pwrkey - add clk handling
Kan Liang <[email protected]>
perf/x86/msr: Add Sapphire Rapids CPU support
Shunsuke Nakamura <[email protected]>
libperf tests: Fix test_stat_cpu
Kai Vehmanen <[email protected]>
ALSA: hda: avoid write to STATESTS if controller is in reset
Prashant Malani <[email protected]>
platform/x86: intel_scu_ipc: Update timeout value in comment
Zheyu Ma <[email protected]>
isdn: mISDN: Fix sleeping function called from invalid context
Herve Codina <[email protected]>
ARM: dts: spear3xx: Fix gmac node
Herve Codina <[email protected]>
net: stmmac: add support for dwmac 3.40a
Filipe Manana <[email protected]>
btrfs: deal with errors when checking if a dir entry exists during log replay
Takashi Iwai <[email protected]>
ALSA: hda: intel: Allow repeatedly probing on codec configuration errors
Brendan Higgins <[email protected]>
gcc-plugins/structleak: add makefile var for disabling structleak
Yunsheng Lin <[email protected]>
net: hns3: fix the max tx size according to user manual
Marek Vasut <[email protected]>
drm: mxsfb: Fix NULL pointer dereference crash on unload
Nikolay Aleksandrov <[email protected]>
net: bridge: mcast: use multicast_membership_interval for IGMPv3
Florian Westphal <[email protected]>
selftests: netfilter: remove stray bash debug line
Vegard Nossum <[email protected]>
netfilter: Kconfig: use 'default y' instead of 'm' for bool config option
Xiaolong Huang <[email protected]>
isdn: cpai: check ctr->cnr to avoid array index out of bound
Lin Ma <[email protected]>
nfc: nci: fix the UAF of rf_conn_info object
Paolo Bonzini <[email protected]>
KVM: nVMX: promptly process interrupts delivered while in guest mode
Miaohe Lin <[email protected]>
mm, slub: fix incorrect memcg slab count for bulk free
Miaohe Lin <[email protected]>
mm, slub: fix potential memoryleak in kmem_cache_open()
Miaohe Lin <[email protected]>
mm, slub: fix mismatch between reconstructed freelist depth and cnt
Michael Ellerman <[email protected]>
powerpc/idle: Don't corrupt back chain when going idle
Michael Ellerman <[email protected]>
KVM: PPC: Book3S HV: Make idle_kvm_start_guest() return 0 if it went to guest
Michael Ellerman <[email protected]>
KVM: PPC: Book3S HV: Fix stack handling in idle_kvm_start_guest()
Christopher M. Riedl <[email protected]>
powerpc64/idle: Fix SP offsets when saving GPRs
DENG Qingfang <[email protected]>
net: dsa: mt7530: correct ds->num_ports
Gaosheng Cui <[email protected]>
audit: fix possible null-pointer dereference in audit_filter_rules
Takashi Iwai <[email protected]>
ASoC: DAPM: Fix missing kctl change notifications
Steven Clarkson <[email protected]>
ALSA: hda/realtek: Add quirk for Clevo PC50HS
Brendan Grieve <[email protected]>
ALSA: usb-audio: Provide quirk for Sennheiser GSP670 Headset
Matthew Wilcox (Oracle) <[email protected]>
vfs: check fd has read access in kernel_read_file_from_fd()
Lukas Bulwahn <[email protected]>
elfcore: correct reference to CONFIG_UML
Nadav Amit <[email protected]>
userfaultfd: fix a race between writeprotect and exit_mmap()
Valentin Vidic <[email protected]>
ocfs2: mount fails with buffer overflow in strlen
Jan Kara <[email protected]>
ocfs2: fix data corruption after conversion from inline format
Jeff Layton <[email protected]>
ceph: fix handling of "meta" errors
Jeff Layton <[email protected]>
ceph: skip existing superblocks that are blocklisted or shut down when mounting
Zhang Changzhong <[email protected]>
can: j1939: j1939_xtp_rx_rts_session_new(): abort TP less than 9 bytes
Zhang Changzhong <[email protected]>
can: j1939: j1939_xtp_rx_dat_one(): cancel session if receive TP.DT with error length
Ziyang Xuan <[email protected]>
can: j1939: j1939_netdev_start(): fix UAF for rx_kref of j1939_priv
Ziyang Xuan <[email protected]>
can: j1939: j1939_tp_rxtimer(): fix errant alert in j1939_tp_rxtimer
Ziyang Xuan <[email protected]>
can: isotp: isotp_sendmsg(): add result check for wait_event_interruptible()
Marc Kleine-Budde <[email protected]>
can: isotp: isotp_sendmsg(): fix return error on FC timeout on TX path
Zheyu Ma <[email protected]>
can: peak_pci: peak_pci_remove(): fix UAF
Stephane Grosjean <[email protected]>
can: peak_usb: pcan_usb_fd_decode_status(): fix back to ERROR_ACTIVE state notification
Yoshihiro Shimoda <[email protected]>
can: rcar_can: fix suspend/resume
Vladimir Oltean <[email protected]>
net: enetc: fix ethtool counter name for PM0_TERR
Dan Johansen <[email protected]>
drm/panel: ilitek-ili9881c: Fix sync for Feixin K101-IM2BYL02 panel
Tony Nguyen <[email protected]>
ice: Add missing E810 device ids
Sasha Neftin <[email protected]>
e1000e: Fix packet loss on Tiger Lake and later
Kurt Kanzenbach <[email protected]>
net: stmmac: Fix E2E delay mechanism
Peng Li <[email protected]>
net: hns3: disable sriov before unload hclge layer
Yufeng Mo <[email protected]>
net: hns3: fix vf reset workqueue cannot exit
Yunsheng Lin <[email protected]>
net: hns3: schedule the polling again when allocation fails
Guangbin Huang <[email protected]>
net: hns3: add limit ets dwrr bandwidth cannot be 0
Guangbin Huang <[email protected]>
net: hns3: reset DWRR of unused tc to zero
Nathan Lynch <[email protected]>
powerpc/smp: do not decrement idle task preempt count in CPU offline
Randy Dunlap <[email protected]>
NIOS2: irqflags: rename a redefined register name
Aleksander Jan Bajkowski <[email protected]>
net: dsa: lantiq_gswip: fix register definition
Stephen Suryaputra <[email protected]>
ipv6: When forwarding count rx stats on the orig netdev
Leonard Crestez <[email protected]>
tcp: md5: Fix overlap between vrf and non-vrf keys
Vegard Nossum <[email protected]>
lan78xx: select CRC32
Antoine Tenart <[email protected]>
netfilter: ipvs: make global sysctl readonly in non-init netns
Xin Long <[email protected]>
netfilter: ip6t_rt: fix rt0_hdr parsing in rt_mt6
Michal Swiatkowski <[email protected]>
ice: fix getting UDP tunnel entry
Shengjiu Wang <[email protected]>
ASoC: wm8960: Fix clock configuration on slave mode
Gerald Schaefer <[email protected]>
dma-debug: fix sg checks in debug_dma_map_sg()
Juhee Kang <[email protected]>
netfilter: xt_IDLETIMER: fix panic that occurs when timer_type has garbage value
Benjamin Coddington <[email protected]>
NFSD: Keep existing listeners on portlist error
Guenter Roeck <[email protected]>
xtensa: xtfpga: Try software restart before simulating CPU reset
Max Filippov <[email protected]>
xtensa: xtfpga: use CONFIG_USE_OF instead of CONFIG_OF
Alex Deucher <[email protected]>
drm/amdgpu/display: fix dependencies for DRM_AMD_DC_SI
Jan Beulich <[email protected]>
xen/x86: prevent PVH type from getting clobbered
Johannes Thumshirn <[email protected]>
block: decode QUEUE_FLAG_HCTX_ACTIVE in debugfs output
Eugen Hristev <[email protected]>
ARM: dts: at91: sama5d2_som1_ek: disable ISC node by default
Rob Herring <[email protected]>
arm: dts: vexpress-v2p-ca9: Fix the SMB unit-address
Kamal Mostafa <[email protected]>
io_uring: fix splice_fd_in checks backport typo
Jonathan Bell <[email protected]>
xhci: add quirk for host controllers that don't update endpoint DCS
Helge Deller <[email protected]>
parisc: math-emu: Fix fall-through warnings
-------------
Diffstat:
Makefile | 4 +- arch/arm/Kconfig | 1 + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 1 - arch/arm/boot/dts/spear3xx.dtsi | 2 +- arch/arm/boot/dts/vexpress-v2m.dtsi | 2 +- arch/arm/boot/dts/vexpress-v2p-ca9.dts | 2 +- arch/nios2/include/asm/irqflags.h | 4 +- arch/nios2/include/asm/registers.h | 2 +- arch/parisc/math-emu/fpudispatch.c | 56 ++++++- arch/powerpc/kernel/idle_book3s.S | 148 +++++++++--------- arch/powerpc/kernel/smp.c | 2 - arch/powerpc/kvm/book3s_hv_rmhandlers.S | 28 ++-- arch/s390/include/asm/pci.h | 3 + arch/s390/pci/pci.c | 45 +++++- arch/s390/pci/pci_event.c | 4 +- arch/x86/events/msr.c | 1 + arch/x86/kvm/vmx/vmx.c | 17 +- arch/x86/xen/enlighten.c | 9 +- arch/xtensa/platforms/xtfpga/setup.c | 12 +- block/blk-mq-debugfs.c | 1 + drivers/gpu/drm/amd/display/Kconfig | 2 + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 6 +- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 12 +- drivers/input/keyboard/snvs_pwrkey.c | 29 ++++ drivers/isdn/capi/kcapi.c | 5 + drivers/isdn/hardware/mISDN/netjet.c | 2 +- drivers/net/can/rcar/rcar_can.c | 20 ++- drivers/net/can/sja1000/peak_pci.c | 9 +- drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 5 +- drivers/net/dsa/lantiq_gswip.c | 2 +- drivers/net/dsa/mt7530.c | 8 +- .../net/ethernet/freescale/enetc/enetc_ethtool.c | 2 +- drivers/net/ethernet/hisilicon/hns3/hnae3.c | 21 +++ drivers/net/ethernet/hisilicon/hns3/hnae3.h | 1 + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 37 +++-- drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 7 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 9 ++ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 1 + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 6 +- drivers/net/ethernet/intel/e1000e/e1000.h | 4 +- drivers/net/ethernet/intel/e1000e/ich8lan.c | 31 +++- drivers/net/ethernet/intel/e1000e/ich8lan.h | 3 + drivers/net/ethernet/intel/e1000e/netdev.c | 29 ++-- drivers/net/ethernet/intel/ice/ice_common.c | 2 + drivers/net/ethernet/intel/ice/ice_devids.h | 4 + drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 4 +- drivers/net/ethernet/intel/ice/ice_main.c | 2 + .../net/ethernet/stmicro/stmmac/dwmac-generic.c | 1 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 + drivers/net/phy/mdio_bus.c | 1 + drivers/net/usb/Kconfig | 1 + drivers/net/usb/usbnet.c | 4 + drivers/pci/hotplug/s390_pci_hpc.c | 9 +- drivers/pinctrl/stm32/pinctrl-stm32.c | 4 +- drivers/platform/x86/intel_scu_ipc.c | 2 +- drivers/scsi/hosts.c | 3 +- drivers/scsi/qla2xxx/qla_bsg.c | 2 +- drivers/scsi/scsi_transport_iscsi.c | 2 - drivers/usb/host/xhci-pci.c | 4 +- drivers/usb/host/xhci-ring.c | 26 +++- drivers/usb/host/xhci.h | 1 + fs/btrfs/tree-log.c | 47 +++--- fs/ceph/caps.c | 12 +- fs/ceph/file.c | 1 - fs/ceph/inode.c | 2 - fs/ceph/mds_client.c | 17 +- fs/ceph/super.c | 17 +- fs/ceph/super.h | 3 - fs/io_uring.c | 2 +- fs/kernel_read_file.c | 2 +- fs/nfsd/nfsctl.c | 5 +- fs/ocfs2/alloc.c | 46 ++---- fs/ocfs2/super.c | 14 +- fs/userfaultfd.c | 12 +- include/linux/elfcore.h | 2 +- include/sound/hda_codec.h | 1 + kernel/auditsc.c | 2 +- kernel/dma/debug.c | 12 +- kernel/sched/core.c | 1 + kernel/trace/ftrace.c | 4 +- kernel/trace/trace.h | 61 +++----- kernel/trace/trace_functions.c | 2 +- mm/slub.c | 17 +- net/bpf/test_run.c | 14 +- net/bridge/br_private.h | 4 +- net/can/isotp.c | 45 ++++-- net/can/j1939/j1939-priv.h | 1 + net/can/j1939/main.c | 7 +- net/can/j1939/transport.c | 14 +- net/ipv4/tcp_ipv4.c | 19 ++- net/ipv6/ip6_output.c | 3 +- net/ipv6/netfilter/ip6t_rt.c | 48 +----- net/netfilter/Kconfig | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 5 + net/netfilter/xt_IDLETIMER.c | 2 +- net/nfc/nci/rsp.c | 2 + scripts/Makefile.gcc-plugins | 4 + sound/hda/hdac_controller.c | 5 +- sound/pci/hda/hda_bind.c | 20 +-- sound/pci/hda/hda_codec.c | 1 + sound/pci/hda/hda_controller.c | 24 ++- sound/pci/hda/hda_controller.h | 2 +- sound/pci/hda/hda_intel.c | 29 +++- sound/pci/hda/hda_intel.h | 4 +- sound/pci/hda/patch_realtek.c | 1 + sound/soc/codecs/wm8960.c | 13 +- sound/soc/soc-dapm.c | 13 +- sound/usb/quirks-table.h | 32 ++++ tools/lib/perf/tests/test-evlist.c | 6 +- tools/lib/perf/tests/test-evsel.c | 6 +- .../testing/selftests/bpf/prog_tests/core_reloc.c | 2 +- tools/testing/selftests/net/forwarding/Makefile | 1 + .../net/forwarding/forwarding.config.sample | 2 + .../net/forwarding/ip6_forward_instats_vrf.sh | 172 +++++++++++++++++++++ tools/testing/selftests/net/forwarding/lib.sh | 8 + tools/testing/selftests/netfilter/nft_flowtable.sh | 1 - 118 files changed, 994 insertions(+), 479 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/95 parisc: math-emu: Fix fall-through warnings
From: Helge Deller <[email protected]>
commit 6f1fce595b78b775d7fb585c15c2dc3a6994f96e upstream.
Fix lots of fallthrough warnings, e.g.:arch/parisc/math-emu/fpudispatch.c:323:33: warning: this statement may fall through [-Wimplicit-fallthrough=]
--- arch/parisc/math-emu/fpudispatch.c | 56 +++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 3 deletions(-)
arch/parisc/math-emu/fpudispatch.c +53 -3
@@ -310,12 +310,15 @@ decode_0c(u_int ir, u_int class, u_int s r1 &= ~3 ; fpregs[t+3 ] = fpregs[r1+3 ]; fpregs[t+2 ] = fpregs[r1+2 ]; + fallthrough;case 1 :/* double */ fpregs[t+1 ] = fpregs[r1+1 ]; + fallthrough;case 0 :/* single */ fpregs[t] = fpregs[r1];return (NOEXCEPTION ); } +BUG ();case 3 :/* FABS */ switch (fmt) {case 2 :/* illegal */
@@ -325,13 +328,16 @@ decode_0c(u_int ir, u_int class, u_int s r1 &= ~3 ; fpregs[t+3 ] = fpregs[r1+3 ]; fpregs[t+2 ] = fpregs[r1+2 ]; + fallthrough;case 1 :/* double */ fpregs[t+1 ] = fpregs[r1+1 ]; + fallthrough;case 0 :/* single */ /* copy and clear sign bit */ fpregs[t] = fpregs[r1] &0x7fffffff ;return (NOEXCEPTION ); } +BUG ();case 6 :/* FNEG */ switch (fmt) {case 2 :/* illegal */
@@ -341,13 +347,16 @@ decode_0c(u_int ir, u_int class, u_int s r1 &= ~3 ; fpregs[t+3 ] = fpregs[r1+3 ]; fpregs[t+2 ] = fpregs[r1+2 ]; + fallthrough;case 1 :/* double */ fpregs[t+1 ] = fpregs[r1+1 ]; + fallthrough;case 0 :/* single */ /* copy and invert sign bit */ fpregs[t] = fpregs[r1] ^0x80000000 ;return (NOEXCEPTION ); } +BUG ();case 7 :/* FNEGABS */ switch (fmt) {case 2 :/* illegal */
@@ -357,13 +366,16 @@ decode_0c(u_int ir, u_int class, u_int s r1 &= ~3 ; fpregs[t+3 ] = fpregs[r1+3 ]; fpregs[t+2 ] = fpregs[r1+2 ]; + fallthrough;case 1 :/* double */ fpregs[t+1 ] = fpregs[r1+1 ]; + fallthrough;case 0 :/* single */ /* copy and set sign bit */ fpregs[t] = fpregs[r1] |0x80000000 ;return (NOEXCEPTION ); } +BUG ();case 4 :/* FSQRT */ switch (fmt) {case 0 :
@@ -376,6 +388,7 @@ decode_0c(u_int ir, u_int class, u_int scase 3 :/* quad not implemented */ return (MAJOR_0C_EXCP ); } +BUG ();case 5 :/* FRND */ switch (fmt) {case 0 :
@@ -389,7 +402,7 @@ decode_0c(u_int ir, u_int class, u_int sreturn (MAJOR_0C_EXCP ); } }/* end of switch (subop) */ - +BUG ();case 1 :/* class 1 */ df =extru (ir,fpdfpos,2 );/* get dest format */ if ((df &2 ) || (fmt &2 )) {
@@ -419,6 +432,7 @@ decode_0c(u_int ir, u_int class, u_int scase 3 :/* dbl/dbl */ return (MAJOR_0C_EXCP ); } +BUG ();case 1 :/* FCNVXF */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -434,6 +448,7 @@ decode_0c(u_int ir, u_int class, u_int sreturn (dbl_to_dbl_fcnvxf (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 2 :/* FCNVFX */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -449,6 +464,7 @@ decode_0c(u_int ir, u_int class, u_int sreturn (dbl_to_dbl_fcnvfx (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 3 :/* FCNVFXT */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -464,6 +480,7 @@ decode_0c(u_int ir, u_int class, u_int sreturn (dbl_to_dbl_fcnvfxt (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 5 :/* FCNVUF (PA2.0 only) */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -479,6 +496,7 @@ decode_0c(u_int ir, u_int class, u_int sreturn (dbl_to_dbl_fcnvuf (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 6 :/* FCNVFU (PA2.0 only) */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -494,6 +512,7 @@ decode_0c(u_int ir, u_int class, u_int sreturn (dbl_to_dbl_fcnvfu (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 7 :/* FCNVFUT (PA2.0 only) */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -509,10 +528,11 @@ decode_0c(u_int ir, u_int class, u_int sreturn (dbl_to_dbl_fcnvfut (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 4 :/* undefined */ return (MAJOR_0C_EXCP ); }/* end of switch subop */ - +BUG ();case 2 :/* class 2 */ fpu_type_flags=fpregs[FPU_TYPE_FLAG_POS ]; r2 =extru (ir, fpr2pos,5 ) *sizeof (double )/sizeof (u_int);
@@ -590,6 +610,7 @@ decode_0c(u_int ir, u_int class, u_int scase 3 :/* quad not implemented */ return (MAJOR_0C_EXCP ); } +BUG ();case 1 :/* FTEST */ switch (fmt) {case 0 :
@@ -609,8 +630,10 @@ decode_0c(u_int ir, u_int class, u_int scase 3 :return (MAJOR_0C_EXCP ); } +BUG (); }/* end of switch subop */ }/* end of else for PA1.0 & PA1.1 */ +BUG ();case 3 :/* class 3 */ r2 =extru (ir,fpr2pos,5 ) *sizeof (double )/sizeof (u_int);if (r2 ==0 )
@@ -633,6 +656,7 @@ decode_0c(u_int ir, u_int class, u_int scase 3 :/* quad not implemented */ return (MAJOR_0C_EXCP ); } +BUG ();case 1 :/* FSUB */ switch (fmt) {case 0 :
@@ -645,6 +669,7 @@ decode_0c(u_int ir, u_int class, u_int scase 3 :/* quad not implemented */ return (MAJOR_0C_EXCP ); } +BUG ();case 2 :/* FMPY */ switch (fmt) {case 0 :
@@ -657,6 +682,7 @@ decode_0c(u_int ir, u_int class, u_int scase 3 :/* quad not implemented */ return (MAJOR_0C_EXCP ); } +BUG ();case 3 :/* FDIV */ switch (fmt) {case 0 :
@@ -669,6 +695,7 @@ decode_0c(u_int ir, u_int class, u_int scase 3 :/* quad not implemented */ return (MAJOR_0C_EXCP ); } +BUG ();case 4 :/* FREM */ switch (fmt) {case 0 :
@@ -681,6 +708,7 @@ decode_0c(u_int ir, u_int class, u_int scase 3 :/* quad not implemented */ return (MAJOR_0C_EXCP ); } +BUG (); }/* end of class 3 switch */ }/* end of switch(class) */
@@ -736,10 +764,12 @@ u_int fpregs[];return (MAJOR_0E_EXCP );case 1 :/* double */ fpregs[t+1 ] = fpregs[r1+1 ]; + fallthrough;case 0 :/* single */ fpregs[t] = fpregs[r1];return (NOEXCEPTION ); } +BUG ();case 3 :/* FABS */ switch (fmt) {case 2 :
@@ -747,10 +777,12 @@ u_int fpregs[];return (MAJOR_0E_EXCP );case 1 :/* double */ fpregs[t+1 ] = fpregs[r1+1 ]; + fallthrough;case 0 :/* single */ fpregs[t] = fpregs[r1] &0x7fffffff ;return (NOEXCEPTION ); } +BUG ();case 6 :/* FNEG */ switch (fmt) {case 2 :
@@ -758,10 +790,12 @@ u_int fpregs[];return (MAJOR_0E_EXCP );case 1 :/* double */ fpregs[t+1 ] = fpregs[r1+1 ]; + fallthrough;case 0 :/* single */ fpregs[t] = fpregs[r1] ^0x80000000 ;return (NOEXCEPTION ); } +BUG ();case 7 :/* FNEGABS */ switch (fmt) {case 2 :
@@ -769,10 +803,12 @@ u_int fpregs[];return (MAJOR_0E_EXCP );case 1 :/* double */ fpregs[t+1 ] = fpregs[r1+1 ]; + fallthrough;case 0 :/* single */ fpregs[t] = fpregs[r1] |0x80000000 ;return (NOEXCEPTION ); } +BUG ();case 4 :/* FSQRT */ switch (fmt) {case 0 :
@@ -785,6 +821,7 @@ u_int fpregs[];case 3 :return (MAJOR_0E_EXCP ); } +BUG ();case 5 :/* FRMD */ switch (fmt) {case 0 :
@@ -798,7 +835,7 @@ u_int fpregs[];return (MAJOR_0E_EXCP ); } }/* end of switch (subop */ - +BUG ();case 1 :/* class 1 */ df =extru (ir,fpdfpos,2 );/* get dest format */ /*
@@ -826,6 +863,7 @@ u_int fpregs[];case 3 :/* dbl/dbl */ return (MAJOR_0E_EXCP ); } +BUG ();case 1 :/* FCNVXF */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -841,6 +879,7 @@ u_int fpregs[];return (dbl_to_dbl_fcnvxf (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 2 :/* FCNVFX */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -856,6 +895,7 @@ u_int fpregs[];return (dbl_to_dbl_fcnvfx (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 3 :/* FCNVFXT */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -871,6 +911,7 @@ u_int fpregs[];return (dbl_to_dbl_fcnvfxt (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 5 :/* FCNVUF (PA2.0 only) */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -886,6 +927,7 @@ u_int fpregs[];return (dbl_to_dbl_fcnvuf (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 6 :/* FCNVFU (PA2.0 only) */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -901,6 +943,7 @@ u_int fpregs[];return (dbl_to_dbl_fcnvfu (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 7 :/* FCNVFUT (PA2.0 only) */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -916,9 +959,11 @@ u_int fpregs[];return (dbl_to_dbl_fcnvfut (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 4 :/* undefined */ return (MAJOR_0C_EXCP ); }/* end of switch subop */ +BUG ();case 2 :/* class 2 */ /* * Be careful out there.
@@ -994,6 +1039,7 @@ u_int fpregs[]; } }/* end of switch subop */ }/* end of else for PA1.0 & PA1.1 */ +BUG ();case 3 :/* class 3 */ /* * Be careful out there.
@@ -1026,6 +1072,7 @@ u_int fpregs[];return (dbl_fadd (&fpregs[r1],&fpregs[r2], &fpregs[t],status)); } +BUG ();case 1 :/* FSUB */ switch (fmt) {case 0 :
@@ -1035,6 +1082,7 @@ u_int fpregs[];return (dbl_fsub (&fpregs[r1],&fpregs[r2], &fpregs[t],status)); } +BUG ();case 2 :/* FMPY or XMPYU */ /* * check for integer multiply (x bit set)
@@ -1071,6 +1119,7 @@ u_int fpregs[]; &fpregs[r2],&fpregs[t],status)); } } +BUG ();case 3 :/* FDIV */ switch (fmt) {case 0 :
@@ -1080,6 +1129,7 @@ u_int fpregs[];return (dbl_fdiv (&fpregs[r1],&fpregs[r2], &fpregs[t],status)); } +BUG ();case 4 :/* FREM */ switch (fmt) {case 0 :
Greg Kroah-Hartman
maintainerPATCH 2/95 xhci: add quirk for host controllers that dont update endpoint DCS
In reply to Greg Kroah-HartmanFrom: Jonathan Bell <[email protected]>
commit 5255660b208aebfdb71d574f3952cf48392f4306 upstream.
Seen on a VLI VL805 PCIe to USB controller. For non-stream endpoints at least, if the xHC halts on a particular TRB due to an error then the DCS field in the Out Endpoint Context maintained by the hardware is not updated with the current cycle state.
Using the quirk XHCI_EP_CTX_BROKEN_DCS and instead fetch the DCS bit from the TRB that the xHC stopped on.
[ bjorn: rebased to v5.14-rc2 ]
--- drivers/usb/host/xhci-pci.c | 4 +++- drivers/usb/host/xhci-ring.c | 26 +++++++++++++++++++++++++- drivers/usb/host/xhci.h | 1 + 3 files changed, 29 insertions(+), 2 deletions(-)
drivers/usb/host/xhci-pci.c +3 -1
@@ -276,8 +276,10 @@ static void xhci_pci_quirks(struct devic pdev->device == 0x3432) xhci->quirks |=XHCI_BROKEN_STREAMS ; -if (pdev->vendor ==PCI_VENDOR_ID_VIA && pdev->device ==0x3483 ) +if (pdev->vendor ==PCI_VENDOR_ID_VIA && pdev->device ==0x3483 ) { xhci->quirks |=XHCI_LPM_SUPPORT ; + xhci->quirks |=XHCI_EP_CTX_BROKEN_DCS ; + }if (pdev->vendor ==PCI_VENDOR_ID_ASMEDIA && pdev->device ==PCI_DEVICE_ID_ASMEDIA_1042_XHCI )
drivers/usb/host/xhci-ring.c +25 -1
@@ -562,7 +562,10 @@ void xhci_find_new_dequeue_state(structstruct xhci_virt_ep *ep = &dev->eps[ep_index];struct xhci_ring *ep_ring;struct xhci_segment *new_seg; +struct xhci_segment *halted_seg =NULL ;union xhci_trb *new_deq; +union xhci_trb *halted_trb; +int index =0 ;dma_addr_t addr;u64 hw_dequeue;bool cycle_found = false;
@@ -600,7 +603,28 @@ void xhci_find_new_dequeue_state(struct hw_dequeue =xhci_get_hw_deq (xhci, dev, ep_index, stream_id); new_seg = ep_ring->deq_seg; new_deq = ep_ring->dequeue; - state->new_cycle_state = hw_dequeue &0x1 ; + +/* +* Quirk: xHC write-back of the DCS field in the hardware dequeue +* pointer is wrong - use the cycle state of the TRB pointed to by +* the dequeue pointer. +*/ +if (xhci->quirks &XHCI_EP_CTX_BROKEN_DCS && + !(ep->ep_state &EP_HAS_STREAMS )) + halted_seg =trb_in_td (xhci, cur_td->start_seg, + cur_td->first_trb, cur_td->last_trb, + hw_dequeue & ~0xf , false); +if (halted_seg) { + index = ((dma_addr_t)(hw_dequeue & ~0xf ) - halted_seg->dma) / +sizeof (*halted_trb); + halted_trb = &halted_seg->trbs[index]; + state->new_cycle_state = halted_trb->generic.field[3 ] &0x1 ; +xhci_dbg (xhci,"Endpoint DCS = %d TRB index = %d cycle = %d\n" , + (u8)(hw_dequeue &0x1 ), index, + state->new_cycle_state); + }else { + state->new_cycle_state = hw_dequeue &0x1 ; + } state->stream_id = stream_id;/*
drivers/usb/host/xhci.h +1 -0
@@ -1884,6 +1884,7 @@ struct xhci_hcd {#define XHCI_DISABLE_SPARSE BIT_ULL(38)#define XHCI_SG_TRB_CACHE_SIZE_QUIRK BIT_ULL(39)#define XHCI_NO_SOFT_RETRY BIT_ULL(40) +#define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(42)unsigned int num_active_eps;unsigned int limit_active_eps;
Greg Kroah-Hartman
maintainerPATCH 3/95 io_uring: fix splice_fd_in checks backport typo
In reply to Greg Kroah-HartmanFrom: Kamal Mostafa <[email protected]>
The linux-5.10.y backport of commit "io_uring: add ->splice_fd_in checks" includes a typo: "|" where "||" should be. (The original upstream commit is fine.)
--- fs/io_uring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/io_uring.c +1 -1
@@ -5559,7 +5559,7 @@ static int io_timeout_remove_prep(structreturn -EINVAL ;if (unlikely (req->flags & (REQ_F_FIXED_FILE |REQ_F_BUFFER_SELECT )))return -EINVAL ; -if (sqe->ioprio || sqe->buf_index || sqe->len || sqe->timeout_flags | +if (sqe->ioprio || sqe->buf_index || sqe->len || sqe->timeout_flags || sqe->splice_fd_in)return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 4/95 arm: dts: vexpress-v2p-ca9: Fix the SMB unit-address
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 2e9edc07df2ec6f835222151fa4e536e9e54856a ]
Based on 'ranges', the 'bus@4000000' node unit-address is off by 1 '0'.
--- arch/arm/boot/dts/vexpress-v2m.dtsi | 2 +- arch/arm/boot/dts/vexpress-v2p-ca9.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/vexpress-v2m.dtsi +1 -1
@@ -19,7 +19,7 @@ */ / { - bus@4000000 { + bus@40000000 { motherboard { model = "V2M-P1"; arm,hbi = <0x190>;
arch/arm/boot/dts/vexpress-v2p-ca9.dts +1 -1
@@ -295,7 +295,7 @@ }; }; - smb: bus@4000000 { + smb: bus@40000000 { compatible = "simple-bus"; #address-cells = <2>;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 5/95 ARM: dts: at91: sama5d2_som1_ek: disable ISC node by default
In reply to Greg Kroah-HartmanFrom: Eugen Hristev <[email protected]>
[ Upstream commit 4348cc10da6377a86940beb20ad357933b8f91bb ]
Without a sensor node, the ISC will simply fail to probe, as the corresponding port node is missing.
It is then logical to disable the node in the devicetree.
If we add a port with a connection to a sensor endpoint, ISC can be enabled.
--- arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/at91-sama5d27_som1_ek.dts +0 -1
@@ -71,7 +71,6 @@ isc: isc@f0008000 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_isc_base &pinctrl_isc_data_8bit &pinctrl_isc_data_9_10 &pinctrl_isc_data_11_12>; - status = "okay"; }; qspi1: spi@f0024000 {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 6/95 block: decode QUEUE_FLAG_HCTX_ACTIVE in debugfs output
In reply to Greg Kroah-HartmanFrom: Johannes Thumshirn <[email protected]>
[ Upstream commit 1dbdd99b511c966be9147ad72991a2856ac76f22 ]
While debugging an issue we've found that $DEBUGFS/block/$disk/state doesn't decode QUEUE_FLAG_HCTX_ACTIVE but only displays its numerical value.
Add QUEUE_FLAG(HCTX_ACTIVE) to the blk_queue_flag_name array so it'll get decoded properly.
--- block/blk-mq-debugfs.c | 1 + 1 file changed, 1 insertion(+)
block/blk-mq-debugfs.c +1 -0
@@ -129,6 +129,7 @@ static const char *const blk_queue_flag_name[] = {QUEUE_FLAG_NAME (PCI_P2PDMA ),QUEUE_FLAG_NAME (ZONE_RESETALL ),QUEUE_FLAG_NAME (RQ_ALLOC_TIME ), +QUEUE_FLAG_NAME (HCTX_ACTIVE ), QUEUE_FLAG_NAME(NOWAIT), };#undef QUEUE_FLAG_NAME
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 7/95 xen/x86: prevent PVH type from getting clobbered
In reply to Greg Kroah-HartmanFrom: Jan Beulich <[email protected]>
[ Upstream commit 9172b5c4a778da1f855b2e3780b1afabb3cfd523 ]
Like xen_start_flags, xen_domain_type gets set before .bss gets cleared. Hence this variable also needs to be prevented from getting put in .bss, which is possible because XEN_NATIVE is an enumerator evaluating to zero. Any use prior to init_hvm_pv_info() setting the variable again would lead to wrong decisions; one such case is xenboot_console_setup() when called as a result of "earlyprintk=xen".
Use __ro_after_init as more applicable than either __section(".data") or __read_mostly.
--- arch/x86/xen/enlighten.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
arch/x86/xen/enlighten.c +4 -5
@@ -51,9 +51,6 @@ DEFINE_PER_CPU(struct vcpu_info, xen_vcpu_info);DEFINE_PER_CPU (uint32_t, xen_vcpu_id);EXPORT_PER_CPU_SYMBOL (xen_vcpu_id); -enum xen_domain_type xen_domain_type =XEN_NATIVE ; -EXPORT_SYMBOL_GPL (xen_domain_type); -unsigned long *machine_to_phys_mapping = (void *)MACH2PHYS_VIRT_START ;EXPORT_SYMBOL (machine_to_phys_mapping);unsigned long machine_to_phys_nr;
@@ -68,9 +65,11 @@ __read_mostly int xen_have_vector_callback;EXPORT_SYMBOL_GPL (xen_have_vector_callback);/* -* NB: needs to live in .data because it's used by xen_prepare_pvh which runs -* before clearing the bss. +* NB: These need to live in .data or alike because they're used by +* xen_prepare_pvh() which runs before clearing the bss. */ +enum xen_domain_type __ro_after_init xen_domain_type =XEN_NATIVE ; +EXPORT_SYMBOL_GPL (xen_domain_type); uint32_t xen_start_flags __section(".data") = 0;EXPORT_SYMBOL (xen_start_flags);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 8/95 drm/amdgpu/display: fix dependencies for DRM_AMD_DC_SI
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
[ Upstream commit 4702b34d1de9582df9dfa0e583ea28fff7de29df ]
Depends on DRM_AMDGPU_SI and DRM_AMD_DC
--- drivers/gpu/drm/amd/display/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/Kconfig +2 -0
@@ -33,6 +33,8 @@ config DRM_AMD_DC_HDCP config DRM_AMD_DC_SI bool "AMD DC support for Southern Islands ASICs" + depends on DRM_AMDGPU_SI + depends on DRM_AMD_DC default n help Choose this option to enable new AMD DC support for SI asics
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 9/95 xtensa: xtfpga: use CONFIG_USE_OF instead of CONFIG_OF
In reply to Greg Kroah-HartmanFrom: Max Filippov <[email protected]>
[ Upstream commit f3d7c2cdf6dc0d5402ec29c3673893b3542c5ad1 ]
Use platform data to initialize xtfpga device drivers when CONFIG_USE_OF is not selected. This fixes xtfpga networking when CONFIG_USE_OF is not selected but CONFIG_OF is.
--- arch/xtensa/platforms/xtfpga/setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/xtensa/platforms/xtfpga/setup.c +2 -2
@@ -66,7 +66,7 @@ void __init platform_calibrate_ccount(void)#endif -#ifdef CONFIG_OF +#ifdef CONFIG_USE_OF static void __init xtfpga_clk_setup (struct device_node *np) {
@@ -284,4 +284,4 @@ static int __init xtavnet_init(void)*/ arch_initcall (xtavnet_init); -#endif /* CONFIG_OF */ +#endif /* CONFIG_USE_OF */
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 10/95 xtensa: xtfpga: Try software restart before simulating CPU reset
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
[ Upstream commit 012e974501a270d8dfd4ee2039e1fdf7579c907e ]
Rebooting xtensa images loaded with the '-kernel' option in qemu does not work. When executing a reboot command, the qemu session either hangs or experiences an endless sequence of error messages.
Kernel panic - not syncing: Unrecoverable error in exception handler
Reset code jumps to the CPU restart address, but Linux can not recover from there because code and data in the kernel init sections have been discarded and overwritten at this point.
XTFPGA platforms have a means to reset the CPU by writing 0xdead into a specific FPGA IO address. When used in QEMU the kernel image loaded with the '-kernel' option gets restored to its original state allowing the machine to boot successfully.
Use that mechanism to attempt a platform reset. If it does not work, fall back to the existing mechanism.
--- arch/xtensa/platforms/xtfpga/setup.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/xtensa/platforms/xtfpga/setup.c +6 -2
@@ -51,8 +51,12 @@ void platform_power_off(void)void platform_restart (void ) { -/* Flush and reset the mmu, simulate a processor reset, and -* jump to the reset vector. */ +/* Try software reset first. */ +WRITE_ONCE (*(u32 *)XTFPGA_SWRST_VADDR ,0xdead ); + +/* If software reset did not work, flush and reset the mmu, +* simulate a processor reset, and jump to the reset vector. +*/ cpu_reset ();/* control never gets here */ }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 11/95 NFSD: Keep existing listeners on portlist error
In reply to Greg Kroah-HartmanFrom: Benjamin Coddington <[email protected]>
[ Upstream commit c20106944eb679fa3ab7e686fe5f6ba30fbc51e5 ]
If nfsd has existing listening sockets without any processes, then an error returned from svc_create_xprt() for an additional transport will remove those existing listeners. We're seeing this in practice when userspace attempts to create rpcrdma transports without having the rpcrdma modules present before creating nfsd kernel processes. Fix this by checking for existing sockets before calling nfsd_destroy().
--- fs/nfsd/nfsctl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/nfsd/nfsctl.c +4 -1
@@ -792,7 +792,10 @@ out_close:svc_xprt_put (xprt); } out_err: -nfsd_destroy (net); +if (!list_empty (&nn->nfsd_serv->sv_permsocks)) + nn->nfsd_serv->sv_nrthreads--; +else +nfsd_destroy (net);return err; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 12/95 netfilter: xt_IDLETIMER: fix panic that occurs when timer_type has garbage value
In reply to Greg Kroah-HartmanFrom: Juhee Kang <[email protected]>
[ Upstream commit 902c0b1887522a099aa4e1e6b4b476c2fe5dd13e ]
Currently, when the rule related to IDLETIMER is added, idletimer_tg timer structure is initialized by kmalloc on executing idletimer_tg_create function. However, in this process timer->timer_type is not defined to a specific value. Thus, timer->timer_type has garbage value and it occurs kernel panic. So, this commit fixes the panic by initializing timer->timer_type using kzalloc instead of kmalloc.
Test commands:
# iptables -A OUTPUT -j IDLETIMER --timeout 1 --label test
$ cat /sys/class/xt_idletimer/timers/test
KilledSplat looks like:
BUG: KASAN: user-memory-access in alarm_expires_remaining+0x49/0x70
Read of size 8 at addr 0000002e8c7bc4c8 by task cat/917
CPU: 12 PID: 917 Comm: cat Not tainted 5.14.0+ #3 79940a339f71eb14fc81aee1757a20d5bf13eb0e
Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-1ubuntu1.1 04/01/2014
Call Trace:
dump_stack_lvl+0x6e/0x9c
kasan_report.cold+0x112/0x117
? alarm_expires_remaining+0x49/0x70
__asan_load8+0x86/0xb0
alarm_expires_remaining+0x49/0x70
idletimer_tg_show+0xe5/0x19b [xt_IDLETIMER 11219304af9316a21bee5ba9d58f76a6b9bccc6d]
dev_attr_show+0x3c/0x60
sysfs_kf_seq_show+0x11d/0x1f0
? device_remove_bin_file+0x20/0x20
kernfs_seq_show+0xa4/0xb0
seq_read_iter+0x29c/0x750
kernfs_fop_read_iter+0x25a/0x2c0
? __fsnotify_parent+0x3d1/0x570
? iov_iter_init+0x70/0x90
new_sync_read+0x2a7/0x3d0
? __x64_sys_llseek+0x230/0x230
? rw_verify_area+0x81/0x150
vfs_read+0x17b/0x240
ksys_read+0xd9/0x180
? vfs_write+0x460/0x460
? do_syscall_64+0x16/0xc0
? lockdep_hardirqs_on+0x79/0x120
__x64_sys_read+0x43/0x50
do_syscall_64+0x3b/0xc0
entry_SYSCALL_64_after_hwframe+0x44/0xae
RIP: 0033:0x7f0cdc819142
Code: c0 e9 c2 fe ff ff 50 48 8d 3d 3a ca 0a 00 e8 f5 19 02 00 0f 1f 44 00 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 0f 05 <48> 3d 00 f0 ff ff 77 56 c3 0f 1f 44 00 00 48 83 ec 28 48 89 54 24
RSP: 002b:00007fff28eee5b8 EFLAGS: 00000246 ORIG_RAX: 0000000000000000
RAX: ffffffffffffffda RBX: 0000000000020000 RCX: 00007f0cdc819142
RDX: 0000000000020000 RSI: 00007f0cdc032000 RDI: 0000000000000003
RBP: 00007f0cdc032000 R08: 00007f0cdc031010 R09: 0000000000000000
R10: 0000000000000022 R11: 0000000000000246 R12: 00005607e9ee31f0
R13: 0000000000000003 R14: 0000000000020000 R15: 0000000000020000--- net/netfilter/xt_IDLETIMER.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/xt_IDLETIMER.c +1 -1
@@ -137,7 +137,7 @@ static int idletimer_tg_create(struct idletimer_tg_info *info) {int ret; - info->timer =kmalloc (sizeof (*info->timer),GFP_KERNEL ); + info->timer =kzalloc (sizeof (*info->timer),GFP_KERNEL );if (!info->timer) { ret = -ENOMEM ; goto out;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 13/95 dma-debug: fix sg checks in debug_dma_map_sg()
In reply to Greg Kroah-HartmanFrom: Gerald Schaefer <[email protected]>
[ Upstream commit 293d92cbbd2418ca2ba43fed07f1b92e884d1c77 ]
The following warning occurred sporadically on s390:
DMA-API: nvme 0006:00:00.0: device driver maps memory from kernel text or rodata [addr=0000000048cc5e2f] [len=131072]
WARNING: CPU: 4 PID: 825 at kernel/dma/debug.c:1083 check_for_illegal_area+0xa8/0x138
It is a false-positive warning, due to broken logic in debug_dma_map_sg(). check_for_illegal_area() checks for overlay of sg elements with kernel text or rodata. It is called with sg_dma_len(s) instead of s->length as parameter. After the call to ->map_sg(), sg_dma_len() will contain the length of possibly combined sg elements in the DMA address space, and not the individual sg element length, which would be s->length.
The check will then use the physical start address of an sg element, and add the DMA length for the overlap check, which could result in the false warning, because the DMA length can be larger than the actual single sg element length.
In addition, the call to check_for_illegal_area() happens in the iteration over mapped_ents, which will not include all individual sg elements if any of them were combined in ->map_sg().
Fix this by using s->length instead of sg_dma_len(s). Also put the call to check_for_illegal_area() in a separate loop, iterating over all the individual sg elements ("nents" instead of "mapped_ents").
While at it, as suggested by Robin Murphy, also move check_for_stack() inside the new loop, as it is similarly concerned with validating the individual sg elements.
--- kernel/dma/debug.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
kernel/dma/debug.c +6 -6
@@ -1300,6 +1300,12 @@ void debug_dma_map_sg(struct device *dev, struct scatterlist *sg,if (unlikely (dma_debug_disabled ()))return ; +for_each_sg (sg, s, nents, i) { +check_for_stack (dev,sg_page (s), s->offset); +if (!PageHighMem (sg_page (s))) +check_for_illegal_area (dev,sg_virt (s), s->length); + } +for_each_sg (sg, s, mapped_ents, i) { entry =dma_entry_alloc ();if (!entry)
@@ -1315,12 +1321,6 @@ void debug_dma_map_sg(struct device *dev, struct scatterlist *sg, entry->sg_call_ents = nents; entry->sg_mapped_ents = mapped_ents; -check_for_stack (dev,sg_page (s), s->offset); - -if (!PageHighMem (sg_page (s))) { -check_for_illegal_area (dev,sg_virt (s),sg_dma_len (s)); - } -check_sg_segment (dev, s);add_dma_entry (entry);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 14/95 ASoC: wm8960: Fix clock configuration on slave mode
In reply to Greg Kroah-HartmanFrom: Shengjiu Wang <[email protected]>
[ Upstream commit 6b9b546dc00797c74bef491668ce5431ff54e1e2 ]
There is a noise issue for 8kHz sample rate on slave mode. Compared with master mode, the difference is the DACDIV setting, after correcting the DACDIV, the noise is gone.
There is no noise issue for 48kHz sample rate, because the default value of DACDIV is correct for 48kHz.
So wm8960_configure_clocking() should be functional for ADC and DAC function even if it is slave mode.
In order to be compatible for old use case, just add condition for checking that sysclk is zero with slave mode.
--- sound/soc/codecs/wm8960.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
sound/soc/codecs/wm8960.c +10 -3
@@ -742,9 +742,16 @@ static int wm8960_configure_clocking(struct snd_soc_component *component)int i, j, k;int ret; -if (!(iface1 & (1 <<6 ))) { -dev_dbg (component->dev, -"Codec is slave mode, no need to configure clock\n" ); +/* +* For Slave mode clocking should still be configured, +* so this if statement should be removed, but some platform +* may not work if the sysclk is not configured, to avoid such +* compatible issue, just add '!wm8960->sysclk' condition in +* this if statement. +*/ +if (!(iface1 & (1 <<6 )) && !wm8960->sysclk) { +dev_warn (component->dev, +"slave mode, but proceeding with no clock configuration\n" );return 0 ; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 15/95 ice: fix getting UDP tunnel entry
In reply to Greg Kroah-HartmanFrom: Michal Swiatkowski <[email protected]>
[ Upstream commit e4c2efa1393c6f1fbfabf91d1d83fcb4ae691ccb ]
Correct parameters order in call to ice_tunnel_idx_to_entry function.
Entry in sparse port table is correct when the idx is 0. For idx 1 one correct entry should be skipped, for idx 2 two of them should be skipped etc. Change if condition to be true when idx is 0, which means that previous valid entry of this tunnel type were skipped.
--- drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_flex_pipe.c +2 -2
@@ -1669,7 +1669,7 @@ static u16 ice_tunnel_idx_to_entry(struct ice_hw *hw, enum ice_tunnel_type type,for (i =0 ; i < hw->tnl.count && i <ICE_TUNNEL_MAX_ENTRIES ; i++)if (hw->tnl.tbl[i].valid && hw->tnl.tbl[i].type == type && - idx--) + idx-- ==0 )return i;WARN_ON_ONCE (1 );
@@ -1829,7 +1829,7 @@ int ice_udp_tunnel_set_port(struct net_device *netdev, unsigned int table,u16 index; tnl_type = ti->type ==UDP_TUNNEL_TYPE_VXLAN ?TNL_VXLAN :TNL_GENEVE ; - index =ice_tunnel_idx_to_entry (&pf->hw, idx, tnl_type); + index =ice_tunnel_idx_to_entry (&pf->hw, tnl_type, idx); status =ice_create_tunnel (&pf->hw, index, tnl_type,ntohs (ti->port));if (status) {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 16/95 netfilter: ip6t_rt: fix rt0_hdr parsing in rt_mt6
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
[ Upstream commit a482c5e00a9b5a194085bcd372ac36141028becb ]
In rt_mt6(), when it's a nonlinear skb, the 1st skb_header_pointer() only copies sizeof(struct ipv6_rt_hdr) to _route that rh points to. The access by ((const struct rt0_hdr *)rh)->reserved will overflow the buffer. So this access should be moved below the 2nd call to skb_header_pointer().
Besides, after the 2nd skb_header_pointer(), its return value should also be checked, othersize, *rp may cause null-pointer-ref.
v1->v2:
- clean up some old debugging log.
--- net/ipv6/netfilter/ip6t_rt.c | 48 +++++------------------------------- 1 file changed, 6 insertions(+), 42 deletions(-)
net/ipv6/netfilter/ip6t_rt.c +6 -42
@@ -25,12 +25,7 @@ MODULE_AUTHOR("Andras Kis-Szabo <[email protected]>");static inline bool segsleft_match (u_int32_t min,u_int32_t max,u_int32_t id,bool invert) { -bool r; -pr_debug ("segsleft_match:%c 0x%x <= 0x%x <= 0x%x\n" , - invert ?'!' :' ' , min, id, max); - r = (id >= min && id <= max) ^ invert; -pr_debug (" result %s\n" , r ?"PASS" :"FAILED" ); -return r; +return (id >= min && id <= max) ^ invert; }static bool rt_mt6 (const struct sk_buff *skb,struct xt_action_param *par)
@@ -65,30 +60,6 @@ static bool rt_mt6(const struct sk_buff *skb, struct xt_action_param *par)return false; } -pr_debug ("IPv6 RT LEN %u %u " , hdrlen, rh->hdrlen); -pr_debug ("TYPE %04X " , rh->type); -pr_debug ("SGS_LEFT %u %02X\n" , rh->segments_left, rh->segments_left); - -pr_debug ("IPv6 RT segsleft %02X " , -segsleft_match (rtinfo->segsleft[0 ], rtinfo->segsleft[1 ], - rh->segments_left, - !!(rtinfo->invflags &IP6T_RT_INV_SGS ))); -pr_debug ("type %02X %02X %02X " , - rtinfo->rt_type, rh->type, - (!(rtinfo->flags &IP6T_RT_TYP ) || - ((rtinfo->rt_type == rh->type) ^ - !!(rtinfo->invflags &IP6T_RT_INV_TYP )))); -pr_debug ("len %02X %04X %02X " , - rtinfo->hdrlen, hdrlen, - !(rtinfo->flags &IP6T_RT_LEN ) || - ((rtinfo->hdrlen == hdrlen) ^ - !!(rtinfo->invflags &IP6T_RT_INV_LEN ))); -pr_debug ("res %02X %02X %02X " , - rtinfo->flags &IP6T_RT_RES , - ((const struct rt0_hdr *)rh)->reserved, - !((rtinfo->flags &IP6T_RT_RES ) && - (((const struct rt0_hdr *)rh)->reserved))); - ret = (segsleft_match (rtinfo->segsleft[0 ], rtinfo->segsleft[1 ], rh->segments_left, !!(rtinfo->invflags & IP6T_RT_INV_SGS))) &&
@@ -107,22 +78,22 @@ static bool rt_mt6(const struct sk_buff *skb, struct xt_action_param *par) reserved),sizeof (_reserved), &_reserved); +if (!rp) { + par->hotdrop = true; +return false; + } ret = (*rp ==0 ); } -pr_debug ("#%d " , rtinfo->addrnr);if (!(rtinfo->flags &IP6T_RT_FST )) {return ret; }else if (rtinfo->flags &IP6T_RT_FST_NSTRICT ) { -pr_debug ("Not strict " );if (rtinfo->addrnr > (unsigned int )((hdrlen -8 ) /16 )) { -pr_debug ("There isn't enough space\n" );return false; }else {unsigned int i =0 ; -pr_debug ("#%d " , rtinfo->addrnr);for (temp =0 ; temp < (unsigned int )((hdrlen -8 ) /16 ); temp++) {
@@ -138,26 +109,20 @@ static bool rt_mt6(const struct sk_buff *skb, struct xt_action_param *par)return false; } -if (ipv6_addr_equal (ap, &rtinfo->addrs[i])) { -pr_debug ("i=%d temp=%d;\n" , i, temp); +if (ipv6_addr_equal (ap, &rtinfo->addrs[i])) i++; - }if (i == rtinfo->addrnr)break ; } -pr_debug ("i=%d #%d\n" , i, rtinfo->addrnr);if (i == rtinfo->addrnr)return ret;else return false; } }else { -pr_debug ("Strict " );if (rtinfo->addrnr > (unsigned int )((hdrlen -8 ) /16 )) { -pr_debug ("There isn't enough space\n" );return false; }else { -pr_debug ("#%d " , rtinfo->addrnr);for (temp =0 ; temp < rtinfo->addrnr; temp++) { ap =skb_header_pointer (skb, ptr
@@ -173,7 +138,6 @@ static bool rt_mt6(const struct sk_buff *skb, struct xt_action_param *par)if (!ipv6_addr_equal (ap, &rtinfo->addrs[temp]))break ; } -pr_debug ("temp=%d #%d\n" , temp, rtinfo->addrnr);if (temp == rtinfo->addrnr && temp == (unsigned int )((hdrlen -8 ) /16 ))return ret;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 17/95 netfilter: ipvs: make global sysctl readonly in non-init netns
In reply to Greg Kroah-HartmanFrom: Antoine Tenart <[email protected]>
[ Upstream commit 174c376278949c44aad89c514a6b5db6cee8db59 ]
Because the data pointer of net/ipv4/vs/debug_level is not updated per netns, it must be marked as read-only in non-init netns.
--- net/netfilter/ipvs/ip_vs_ctl.c | 5 +++++ 1 file changed, 5 insertions(+)
net/netfilter/ipvs/ip_vs_ctl.c +5 -0
@@ -4090,6 +4090,11 @@ static int __net_init ip_vs_control_net_init_sysctl(struct netns_ipvs *ipvs) tbl[idx++].data = &ipvs->sysctl_conn_reuse_mode; tbl[idx++].data = &ipvs->sysctl_schedule_icmp; tbl[idx++].data = &ipvs->sysctl_ignore_tunneled; +#ifdef CONFIG_IP_VS_DEBUG +/* Global sysctls must be ro in non-init netns */ +if (!net_eq (net, &init_net)) + tbl[idx++].mode =0444 ; +#endif ipvs->sysctl_hdr =register_net_sysctl (net,"net/ipv4/vs" , tbl);if (ipvs->sysctl_hdr ==NULL ) {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 18/95 lan78xx: select CRC32
In reply to Greg Kroah-HartmanFrom: Vegard Nossum <[email protected]>
[ Upstream commit 46393d61a328d7c4e3264252dae891921126c674 ]
Fix the following build/link error by adding a dependency on the CRC32 routines:
ld: drivers/net/usb/lan78xx.o: in function `lan78xx_set_multicast':
lan78xx.c:(.text+0x48cf): undefined reference to `crc32_le'
The actual use of crc32_le() comes indirectly through ether_crc().
--- drivers/net/usb/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/net/usb/Kconfig +1 -0
@@ -117,6 +117,7 @@ config USB_LAN78XX select PHYLIB select MICROCHIP_PHY select FIXED_PHY + select CRC32 help This option adds support for Microchip LAN78XX based USB 2 & USB 3 10/100/1000 Ethernet adapters.
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 19/95 tcp: md5: Fix overlap between vrf and non-vrf keys
In reply to Greg Kroah-HartmanFrom: Leonard Crestez <[email protected]>
[ Upstream commit 86f1e3a8489f6a0232c1f3bc2bdb379f5ccdecec ]
With net.ipv4.tcp_l3mdev_accept=1 it is possible for a listen socket to accept connection from the same client address in different VRFs. It is also possible to set different MD5 keys for these clients which differ only in the tcpm_l3index field.
This appears to work when distinguishing between different VRFs but not between non-VRF and VRF connections. In particular:
* tcp_md5_do_lookup_exact will match a non-vrf key against a vrf key.
This means that adding a key with l3index != 0 after a key with l3index == 0 will cause the earlier key to be deleted. Both keys can be present if the non-vrf key is added later.
* _tcp_md5_do_lookup can match a non-vrf key before a vrf key. This
casues failures if the passwords differ.
Fix this by making tcp_md5_do_lookup_exact perform an actual exact comparison on l3index and by making __tcp_md5_do_lookup perfer vrf-bound keys above other considerations like prefixlen.
--- net/ipv4/tcp_ipv4.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
net/ipv4/tcp_ipv4.c +16 -3
@@ -1022,6 +1022,20 @@ static void tcp_v4_reqsk_destructor(struct request_sock *req)DEFINE_STATIC_KEY_FALSE (tcp_md5_needed);EXPORT_SYMBOL (tcp_md5_needed); +static bool better_md5_match (struct tcp_md5sig_key *old,struct tcp_md5sig_key *new) +{ +if (!old) +return true; + +/* l3index always overrides non-l3index */ +if (old->l3index && new->l3index ==0 ) +return false; +if (old->l3index ==0 && new->l3index) +return true; + +return old->prefixlen < new->prefixlen; +} +/* Find the Key structure for an address. */ struct tcp_md5sig_key *__tcp_md5_do_lookup(const struct sock *sk, int l3index, const union tcp_md5_addr *addr,
@@ -1059,8 +1073,7 @@ struct tcp_md5sig_key *__tcp_md5_do_lookup(const struct sock *sk, int l3index, match = false; } -if (match && (!best_match || - key->prefixlen > best_match->prefixlen)) +if (match &&better_md5_match (best_match, key)) best_match = key; }return best_match;
@@ -1090,7 +1103,7 @@ static struct tcp_md5sig_key *tcp_md5_do_lookup_exact(const struct sock *sk, lockdep_sock_is_held(sk)) {if (key->family != family)continue ; -if (key->l3index && key->l3index != l3index) +if (key->l3index != l3index)continue ;if (!memcmp (&key->addr, addr, size) && key->prefixlen == prefixlen)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 20/95 ipv6: When forwarding count rx stats on the orig netdev
In reply to Greg Kroah-HartmanFrom: Stephen Suryaputra <[email protected]>
[ Upstream commit 0857d6f8c759d95f89d0436f86cdfd189ef99f20 ]
Commit bdb7cc643fc9 ("ipv6: Count interface receive statistics on the ingress netdev") does not work when ip6_forward() executes on the skbs with vrf-enslaved netdev. Use IP6CB(skb)->iif to get to the right one.
Add a selftest script to verify.
--- net/ipv6/ip6_output.c | 3 +- .../testing/selftests/net/forwarding/Makefile | 1 + .../net/forwarding/forwarding.config.sample | 2 + .../net/forwarding/ip6_forward_instats_vrf.sh | 172 ++++++++++++++++++ tools/testing/selftests/net/forwarding/lib.sh | 8 + 5 files changed, 185 insertions(+), 1 deletion(-) create mode 100755 tools/testing/selftests/net/forwarding/ip6_forward_instats_vrf.sh
net/ipv6/ip6_output.c +2 -1
@@ -487,13 +487,14 @@ static bool ip6_pkt_too_big(const struct sk_buff *skb, unsigned int mtu)int ip6_forward (struct sk_buff *skb) { -struct inet6_dev *idev =__in6_dev_get_safely (skb->dev);struct dst_entry *dst =skb_dst (skb);struct ipv6hdr *hdr =ipv6_hdr (skb);struct inet6_skb_parm *opt =IP6CB (skb);struct net *net =dev_net (dst->dev); +struct inet6_dev *idev;u32 mtu; + idev =__in6_dev_get_safely (dev_get_by_index_rcu (net,IP6CB (skb)->iif));if (net->ipv6.devconf_all->forwarding ==0 ) goto error;
tools/testing/selftests/net/forwarding/Makefile +1 -0
@@ -9,6 +9,7 @@ TEST_PROGS = bridge_igmp.sh \ gre_inner_v4_multipath.sh \ gre_inner_v6_multipath.sh \ gre_multipath.sh \ + ip6_forward_instats_vrf.sh \ ip6gre_inner_v4_multipath.sh \ ip6gre_inner_v6_multipath.sh \ ipip_flat_gre_key.sh \
tools/testing/selftests/net/forwarding/forwarding.config.sample +2 -0
@@ -39,3 +39,5 @@ NETIF_CREATE=yes # Timeout (in seconds) before ping exits regardless of how many packets have # been sent or received PING_TIMEOUT=5 +# IPv6 traceroute utility name. +TROUTE6=traceroute6
tools/testing/selftests/net/forwarding/ip6_forward_instats_vrf.sh new file +172 -0
172 lines not on this page · raw message
tools/testing/selftests/net/forwarding/lib.sh +8 -0
@@ -674,6 +674,14 @@ qdisc_parent_stats_get() | jq '.[] | select(.parent == "'"$parent"'") | '"$selector" } +ipv6_stats_get() +{ + local dev=$1; shift + local stat=$1; shift + + cat /proc/net/dev_snmp6/$dev | grep "^$stat" | cut -f2 +} + humanize() { local speed=$1; shift
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 21/95 net: dsa: lantiq_gswip: fix register definition
In reply to Greg Kroah-HartmanFrom: Aleksander Jan Bajkowski <[email protected]>
[ Upstream commit 66d262804a2276721eac86cf18fcd61046149193 ]
I compared the register definitions with the D-Link DWR-966 GPL sources and found that the PUAFD field definition was incorrect. This definition is unused and causes no issues.
--- drivers/net/dsa/lantiq_gswip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/dsa/lantiq_gswip.c +1 -1
@@ -229,7 +229,7 @@#define GSWIP_SDMA_PCTRLp (p) (0xBC0 + ((p) * 0x6))#define GSWIP_SDMA_PCTRL_EN BIT(0)/* SDMA Port Enable */ #define GSWIP_SDMA_PCTRL_FCEN BIT(1)/* Flow Control Enable */ -#define GSWIP_SDMA_PCTRL_PAUFWD BIT(1)/* Pause Frame Forwarding */ +#define GSWIP_SDMA_PCTRL_PAUFWD BIT(3)/* Pause Frame Forwarding */ #define GSWIP_TABLE_ACTIVE_VLAN 0x01#define GSWIP_TABLE_VLAN_MAPPING 0x02
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 22/95 NIOS2: irqflags: rename a redefined register name
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 4cce60f15c04d69eff6ffc539ab09137dbe15070 ]
Both arch/nios2/ and drivers/mmc/host/tmio_mmc.c define a macro with the name "CTL_STATUS". Change the one in arch/nios2/ to be "CTL_FSTATUS" (flags status) to eliminate the build warning.
In file included from ../drivers/mmc/host/tmio_mmc.c:22:drivers/mmc/host/tmio_mmc.h:31: warning: "CTL_STATUS" redefined
31 | #define CTL_STATUS 0x1carch/nios2/include/asm/registers.h:14: note: this is the location of the previous definition
14 | #define CTL_STATUS 0
--- arch/nios2/include/asm/irqflags.h | 4 ++-- arch/nios2/include/asm/registers.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/nios2/include/asm/irqflags.h +2 -2
@@ -9,7 +9,7 @@static inline unsigned long arch_local_save_flags (void ) { -return RDCTL (CTL_STATUS ); +return RDCTL (CTL_FSTATUS ); }/*
@@ -18,7 +18,7 @@ static inline unsigned long arch_local_save_flags(void)*/ static inline void arch_local_irq_restore (unsigned long flags) { -WRCTL (CTL_STATUS , flags); +WRCTL (CTL_FSTATUS , flags); }static inline void arch_local_irq_disable (void )
arch/nios2/include/asm/registers.h +1 -1
@@ -11,7 +11,7 @@#endif /* control register numbers */ -#define CTL_STATUS 0 +#define CTL_FSTATUS 0#define CTL_ESTATUS 1#define CTL_BSTATUS 2#define CTL_IENABLE 3
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 23/95 powerpc/smp: do not decrement idle task preempt count in CPU offline
In reply to Greg Kroah-HartmanFrom: Nathan Lynch <[email protected]>
[ Upstream commit 787252a10d9422f3058df9a4821f389e5326c440 ]
With PREEMPT_COUNT=y, when a CPU is offlined and then onlined again, we get:
BUG: scheduling while atomic: swapper/1/0/0x00000000 no locks held by swapper/1/0. CPU: 1 PID: 0 Comm: swapper/1 Not tainted 5.15.0-rc2+ #100 Call Trace: dump_stack_lvl+0xac/0x108 __schedule_bug+0xac/0xe0 __schedule+0xcf8/0x10d0 schedule_idle+0x3c/0x70 do_idle+0x2d8/0x4a0 cpu_startup_entry+0x38/0x40 start_secondary+0x2ec/0x3a0 start_secondary_prolog+0x10/0x14
This is because powerpc's arch_cpu_idle_dead() decrements the idle task's preempt count, for reasons explained in commit a7c2bb8279d2 ("powerpc:
Re-enable preemption before cpu_die()"), specifically "start_secondary() expects a preempt_count() of 0."
However, since commit 2c669ef6979c ("powerpc/preempt: Don't touch the idle task's preempt_count during hotplug") and commit f1a0a376ca0c ("sched/core:
Initialize the idle task with preemption disabled"), that justification no longer holds.
The idle task isn't supposed to re-enable preemption, so remove the vestigial preempt_enable() from the CPU offline path.
Tested with pseries and powernv in qemu, and pseries on PowerVM.
--- arch/powerpc/kernel/smp.c | 2 -- 1 file changed, 2 deletions(-)
arch/powerpc/kernel/smp.c +0 -2
@@ -1578,8 +1578,6 @@ void __cpu_die(unsigned int cpu)void arch_cpu_idle_dead (void ) { -sched_preempt_enable_no_resched (); -/* * Disable on the down path. This will be re-enabled by * start_secondary() via start_secondary_resume() below
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 24/95 net: hns3: reset DWRR of unused tc to zero
In reply to Greg Kroah-HartmanFrom: Guangbin Huang <[email protected]>
[ Upstream commit b63fcaab959807282e9822e659034edf95fc8bd1 ]
Currently, DWRR of tc will be initialized to a fixed value when this tc is enabled, but it is not been reset to 0 when this tc is disabled. It cause a problem that the DWRR of unused tc is not 0 after using tc tool to add and delete multi-tc parameters.
For examples, after enabling 4 TCs and restoring to 1 TC by follow tc commands:
$ tc qdisc add dev eth0 root mqprio num_tc 4 map 0 1 2 3 0 1 2 3 queues \ 8@0 8@8 8@16 8@24 hw 1 mode channel $ tc qdisc del dev eth0 root
Now there is just one TC is enabled for eth0, but the tc info querying by debugfs is shown as follow:
$ cat /mnt/hns3/0000:7d:00.0/tm/tc_sch_info enabled tc number: 1 weight_offset: 14 TC MODE WEIGHT 0 dwrr 100 1 dwrr 100 2 dwrr 100 3 dwrr 100 4 dwrr 0 5 dwrr 0 6 dwrr 0 7 dwrr 0
This patch fixes it by resetting DWRR of tc to 0 when tc is disabled.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c +2 -0
@@ -671,6 +671,8 @@ static void hclge_tm_pg_info_init(struct hclge_dev *hdev) hdev->tm_info.pg_info[i].tc_bit_map = hdev->hw_tc_map;for (k =0 ; k < hdev->tm_info.num_tc; k++) hdev->tm_info.pg_info[i].tc_dwrr[k] =BW_PERCENT ; +for (; k <HNAE3_MAX_TC ; k++) + hdev->tm_info.pg_info[i].tc_dwrr[k] =0 ; } }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 25/95 net: hns3: add limit ets dwrr bandwidth cannot be 0
In reply to Greg Kroah-HartmanFrom: Guangbin Huang <[email protected]>
[ Upstream commit 731797fdffa3d083db536e2fdd07ceb050bb40b1 ]
If ets dwrr bandwidth of tc is set to 0, the hardware will switch to SP mode. In this case, this tc may occupy all the tx bandwidth if it has huge traffic, so it violates the purpose of the user setting.
To fix this problem, limit the ets dwrr bandwidth must greater than 0.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c +9 -0
@@ -134,6 +134,15 @@ static int hclge_ets_validate(struct hclge_dev *hdev, struct ieee_ets *ets, *changed = true;break ;case IEEE_8021QAZ_TSA_ETS : +/* The hardware will switch to sp mode if bandwidth is +* 0, so limit ets bandwidth must be greater than 0. +*/ +if (!ets->tc_tx_bw[i]) { +dev_err (&hdev->pdev->dev, +"tc%u ets bw cannot be 0\n" , i); +return -EINVAL ; + } +if (hdev->tm_info.tc_info[i].tc_sch_mode !=HCLGE_SCH_MODE_DWRR ) *changed = true;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 26/95 net: hns3: schedule the polling again when allocation fails
In reply to Greg Kroah-HartmanFrom: Yunsheng Lin <[email protected]>
[ Upstream commit 68752b24f51a71d4f350a764d890b670f59062c5 ]
Currently when there is a rx page allocation failure, it is possible that polling may be stopped if there is no more packet to be reveiced, which may cause queue stall problem under memory pressure.
This patch makes sure polling is scheduled again when there is any rx page allocation failure, and polling will try to allocate receive buffers until it succeeds.
Now the allocation retry is added, it is unnecessary to do the rx page allocation at the end of rx cleaning, so remove it. And reset the unused_count to zero after calling hns3_nic_alloc_rx_buffers() to avoid calling hns3_nic_alloc_rx_buffers() repeatedly under memory pressure.
--- .../net/ethernet/hisilicon/hns3/hns3_enet.c | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +12 -10
@@ -2637,7 +2637,8 @@ static int hns3_desc_unused(struct hns3_enet_ring *ring)return ((ntc >= ntu) ?0 : ring->desc_num) + ntc - ntu; } -static void hns3_nic_alloc_rx_buffers (struct hns3_enet_ring *ring, +/* Return true if there is any allocation failure */ +static bool hns3_nic_alloc_rx_buffers (struct hns3_enet_ring *ring,int cleand_count) {struct hns3_desc_cb *desc_cb;
@@ -2662,7 +2663,10 @@ static void hns3_nic_alloc_rx_buffers(struct hns3_enet_ring *ring,hns3_rl_err (ring_to_netdev (ring),"alloc rx buffer failed: %d\n" , ret); -break ; + +writel (i, ring->tqp->io_base + +HNS3_RING_RX_RING_HEAD_REG ); +return true; }hns3_replace_buffer (ring, ring->next_to_use, &res_cbs);
@@ -2675,6 +2679,7 @@ static void hns3_nic_alloc_rx_buffers(struct hns3_enet_ring *ring, }writel (i, ring->tqp->io_base +HNS3_RING_RX_RING_HEAD_REG ); +return false; }static bool hns3_page_is_reusable (struct page *page)
@@ -3218,6 +3223,7 @@ int hns3_clean_rx_ring(struct hns3_enet_ring *ring, int budget, {#define RCB_NOF_ALLOC_RX_BUFF_ONCE 16int unused_count =hns3_desc_unused (ring); +bool failure = false;int recv_pkts =0 ;int err;
@@ -3226,9 +3232,9 @@ int hns3_clean_rx_ring(struct hns3_enet_ring *ring, int budget,while (recv_pkts < budget) {/* Reuse or realloc buffers */ if (unused_count >=RCB_NOF_ALLOC_RX_BUFF_ONCE ) { -hns3_nic_alloc_rx_buffers (ring, unused_count); - unused_count =hns3_desc_unused (ring) - - ring->pending_buf; + failure = failure || +hns3_nic_alloc_rx_buffers (ring, unused_count); + unused_count =0 ; }/* Poll one pkt */
@@ -3247,11 +3253,7 @@ int hns3_clean_rx_ring(struct hns3_enet_ring *ring, int budget, } out: -/* Make all data has been write before submit */ -if (unused_count >0 ) -hns3_nic_alloc_rx_buffers (ring, unused_count); - -return recv_pkts; +return failure ? budget : recv_pkts; }static bool hns3_get_new_flow_lvl (struct hns3_enet_ring_group *ring_group)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 27/95 net: hns3: fix vf reset workqueue cannot exit
In reply to Greg Kroah-HartmanFrom: Yufeng Mo <[email protected]>
[ Upstream commit 1385cc81baeb3bd8cbbbcdc1557f038ac1712529 ]
The task of VF reset is performed through the workqueue. It checks the value of hdev->reset_pending to determine whether to exit the loop. However, the value of hdev->reset_pending may also be assigned by the interrupt function hclgevf_misc_irq_handle(), which may cause the loop fail to exit and keep occupying the workqueue. This loop is not necessary, so remove it and the workqueue will be rescheduled if the reset needs to be retried or a new reset occurs.
--- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +3 -3
@@ -2160,9 +2160,9 @@ static void hclgevf_reset_service_task(struct hclgevf_dev *hdev) hdev->reset_attempts =0 ; hdev->last_reset_time = jiffies; -while ((hdev->reset_type = -hclgevf_get_reset_level (hdev, &hdev->reset_pending)) - !=HNAE3_NONE_RESET ) + hdev->reset_type = +hclgevf_get_reset_level (hdev, &hdev->reset_pending); +if (hdev->reset_type !=HNAE3_NONE_RESET )hclgevf_reset (hdev); }else if (test_and_clear_bit (HCLGEVF_RESET_REQUESTED , &hdev->reset_state)) {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 28/95 net: hns3: disable sriov before unload hclge layer
In reply to Greg Kroah-HartmanFrom: Peng Li <[email protected]>
[ Upstream commit 0dd8a25f355b4df2d41c08df1716340854c7d4c5 ]
HNS3 driver includes hns3.ko, hnae3.ko and hclge.ko. hns3.ko includes network stack and pci_driver, hclge.ko includes HW device action, algo_ops and timer task, hnae3.ko includes some register function.
When SRIOV is enable and hclge.ko is removed, HW device is unloaded but VF still exists, PF will not reply VF mbx messages, and cause errors.
This patch fix it by disable SRIOV before remove hclge.ko.
--- drivers/net/ethernet/hisilicon/hns3/hnae3.c | 21 +++++++++++++++++++ drivers/net/ethernet/hisilicon/hns3/hnae3.h | 1 + .../hisilicon/hns3/hns3pf/hclge_main.c | 1 + 3 files changed, 23 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hnae3.c +21 -0
@@ -10,6 +10,27 @@ static LIST_HEAD(hnae3_ae_algo_list);static LIST_HEAD (hnae3_client_list);static LIST_HEAD (hnae3_ae_dev_list); +void hnae3_unregister_ae_algo_prepare (struct hnae3_ae_algo *ae_algo) +{ +const struct pci_device_id *pci_id; +struct hnae3_ae_dev *ae_dev; + +if (!ae_algo) +return ; + +list_for_each_entry (ae_dev, &hnae3_ae_dev_list, node) { +if (!hnae3_get_bit (ae_dev->flag,HNAE3_DEV_INITED_B )) +continue ; + + pci_id =pci_match_id (ae_algo->pdev_id_table, ae_dev->pdev); +if (!pci_id) +continue ; +if (IS_ENABLED (CONFIG_PCI_IOV )) +pci_disable_sriov (ae_dev->pdev); + } +} +EXPORT_SYMBOL (hnae3_unregister_ae_algo_prepare); +/* we are keeping things simple and using single lock for all the * list. This is a non-critical code so other updations, if happen * in parallel, can wait.
drivers/net/ethernet/hisilicon/hns3/hnae3.h +1 -0
@@ -754,6 +754,7 @@ struct hnae3_handle {int hnae3_register_ae_dev (struct hnae3_ae_dev *ae_dev);void hnae3_unregister_ae_dev (struct hnae3_ae_dev *ae_dev); +void hnae3_unregister_ae_algo_prepare (struct hnae3_ae_algo *ae_algo);void hnae3_unregister_ae_algo (struct hnae3_ae_algo *ae_algo);void hnae3_register_ae_algo (struct hnae3_ae_algo *ae_algo);
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +1 -0
@@ -11518,6 +11518,7 @@ static int hclge_init(void)static void hclge_exit (void ) { +hnae3_unregister_ae_algo_prepare (&ae_algo);hnae3_unregister_ae_algo (&ae_algo);destroy_workqueue (hclge_wq); }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 29/95 net: stmmac: Fix E2E delay mechanism
In reply to Greg Kroah-HartmanFrom: Kurt Kanzenbach <[email protected]>
[ Upstream commit 3cb958027cb8b78d3ee639ce9af54c2ef1bf964f ]
When utilizing End to End delay mechanism, the following error messages show up:
|root@ehl1:~# ptp4l --tx_timestamp_timeout=50 -H -i eno2 -E -m |ptp4l[950.573]: selected /dev/ptp3 as PTP clock |ptp4l[950.586]: port 1: INITIALIZING to LISTENING on INIT_COMPLETE |ptp4l[950.586]: port 0: INITIALIZING to LISTENING on INIT_COMPLETE |ptp4l[952.879]: port 1: new foreign master 001395.fffe.4897b4-1 |ptp4l[956.879]: selected best master clock 001395.fffe.4897b4 |ptp4l[956.879]: port 1: assuming the grand master role |ptp4l[956.879]: port 1: LISTENING to GRAND_MASTER on RS_GRAND_MASTER |ptp4l[962.017]: port 1: received DELAY_REQ without timestamp |ptp4l[962.273]: port 1: received DELAY_REQ without timestamp |ptp4l[963.090]: port 1: received DELAY_REQ without timestamp
Commit f2fb6b6275eb ("net: stmmac: enable timestamp snapshot for required PTP packets in dwmac v5.10a") already addresses this problem for the dwmac v5.10. However, same holds true for all dwmacs above version v4.10. Correct the check accordingly. Afterwards everything works as expected.
Tested on Intel Atom(R) x6414RE Processor.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -1
@@ -605,7 +605,7 @@ static int stmmac_hwtstamp_set(struct net_device *dev, struct ifreq *ifr) config.rx_filter =HWTSTAMP_FILTER_PTP_V2_EVENT ; ptp_v2 =PTP_TCR_TSVER2ENA ; snap_type_sel =PTP_TCR_SNAPTYPSEL_1 ; -if (priv->synopsys_id !=DWMAC_CORE_5_10 ) +if (priv->synopsys_id <DWMAC_CORE_4_10 ) ts_event_en =PTP_TCR_TSEVNTENA ; ptp_over_ipv4_udp =PTP_TCR_TSIPV4ENA ; ptp_over_ipv6_udp =PTP_TCR_TSIPV6ENA ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 30/95 e1000e: Fix packet loss on Tiger Lake and later
In reply to Greg Kroah-HartmanFrom: Sasha Neftin <[email protected]>
[ Upstream commit 639e298f432fb058a9496ea16863f53b1ce935fe ]
Update the HW MAC initialization flow. Do not gate DMA clock from the modPHY block. Keeping this clock will prevent dropped packets sent in burst mode on the Kumeran interface.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=213651
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=213377
--- drivers/net/ethernet/intel/e1000e/ich8lan.c | 11 ++++++++++- drivers/net/ethernet/intel/e1000e/ich8lan.h | 3 +++ 2 files changed, 13 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/e1000e/ich8lan.c +10 -1
@@ -4811,7 +4811,7 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)static s32 e1000_init_hw_ich8lan (struct e1000_hw *hw) {struct e1000_mac_info *mac = &hw->mac; -u32 ctrl_ext, txdctl, snoop; +u32 ctrl_ext, txdctl, snoop, fflt_dbg;s32 ret_val;u16 i;
@@ -4870,6 +4870,15 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw) snoop = (u32 )~(PCIE_NO_SNOOP_ALL );e1000e_set_pcie_no_snoop (hw, snoop); +/* Enable workaround for packet loss issue on TGP PCH +* Do not gate DMA clock from the modPHY block +*/ +if (mac->type >= e1000_pch_tgp) { + fflt_dbg =er32 (FFLT_DBG ); + fflt_dbg |=E1000_FFLT_DBG_DONT_GATE_WAKE_DMA_CLK ; +ew32 (FFLT_DBG , fflt_dbg); + } + ctrl_ext =er32 (CTRL_EXT ); ctrl_ext |=E1000_CTRL_EXT_RO_DIS ;ew32 (CTRL_EXT , ctrl_ext);
drivers/net/ethernet/intel/e1000e/ich8lan.h +3 -0
@@ -286,6 +286,9 @@/* Proprietary Latency Tolerance Reporting PCI Capability */ #define E1000_PCI_LTR_CAP_LPT 0xA8 +/* Don't gate wake DMA clock */ +#define E1000_FFLT_DBG_DONT_GATE_WAKE_DMA_CLK 0x1000 +void e1000e_write_protect_nvm_ich8lan (struct e1000_hw *hw);void e1000e_set_kmrn_lock_loss_workaround_ich8lan (struct e1000_hw *hw,bool state);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 31/95 ice: Add missing E810 device ids
In reply to Greg Kroah-HartmanFrom: Tony Nguyen <[email protected]>
[ Upstream commit 7dcf78b870be6418d72bb1c4d4924bf0f5ca5052 ]
As part of support for E810 XXV devices, some device ids were inadvertently left out. Add those missing ids.
--- drivers/net/ethernet/intel/ice/ice_common.c | 2 ++ drivers/net/ethernet/intel/ice/ice_devids.h | 4 ++++ drivers/net/ethernet/intel/ice/ice_main.c | 2 ++ 3 files changed, 8 insertions(+)
drivers/net/ethernet/intel/ice/ice_common.c +2 -0
@@ -24,6 +24,8 @@ static enum ice_status ice_set_mac_type(struct ice_hw *hw)case ICE_DEV_ID_E810C_BACKPLANE :case ICE_DEV_ID_E810C_QSFP :case ICE_DEV_ID_E810C_SFP : +case ICE_DEV_ID_E810_XXV_BACKPLANE : +case ICE_DEV_ID_E810_XXV_QSFP :case ICE_DEV_ID_E810_XXV_SFP : hw->mac_type =ICE_MAC_E810 ;break ;
drivers/net/ethernet/intel/ice/ice_devids.h +4 -0
@@ -21,6 +21,10 @@#define ICE_DEV_ID_E810C_QSFP 0x1592/* Intel(R) Ethernet Controller E810-C for SFP */ #define ICE_DEV_ID_E810C_SFP 0x1593 +/* Intel(R) Ethernet Controller E810-XXV for backplane */ +#define ICE_DEV_ID_E810_XXV_BACKPLANE 0x1599 +/* Intel(R) Ethernet Controller E810-XXV for QSFP */ +#define ICE_DEV_ID_E810_XXV_QSFP 0x159A/* Intel(R) Ethernet Controller E810-XXV for SFP */ #define ICE_DEV_ID_E810_XXV_SFP 0x159B/* Intel(R) Ethernet Connection E823-C for backplane */
drivers/net/ethernet/intel/ice/ice_main.c +2 -0
@@ -4773,6 +4773,8 @@ static const struct pci_device_id ice_pci_tbl[] = { { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810C_BACKPLANE), 0 }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810C_QSFP), 0 }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810C_SFP), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810_XXV_BACKPLANE), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810_XXV_QSFP), 0 }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810_XXV_SFP), 0 }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E823C_BACKPLANE), 0 }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E823C_QSFP), 0 },
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 32/95 drm/panel: ilitek-ili9881c: Fix sync for Feixin K101-IM2BYL02 panel
In reply to Greg Kroah-HartmanFrom: Dan Johansen <[email protected]>
[ Upstream commit 772970620a839141835eaf2bc507d957b10adcca ]
This adjusts sync values according to the datasheet
--- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/panel/panel-ilitek-ili9881c.c +6 -6
@@ -590,14 +590,14 @@ static const struct drm_display_mode k101_im2byl02_default_mode = { .clock = 69700, .hdisplay = 800, - .hsync_start = 800 + 6, - .hsync_end = 800 + 6 + 15, - .htotal = 800 + 6 + 15 + 16, + .hsync_start = 800 + 52, + .hsync_end = 800 + 52 + 8, + .htotal = 800 + 52 + 8 + 48, .vdisplay = 1280, - .vsync_start = 1280 + 8, - .vsync_end = 1280 + 8 + 48, - .vtotal = 1280 + 8 + 48 + 52, + .vsync_start = 1280 + 16, + .vsync_end = 1280 + 16 + 6, + .vtotal = 1280 + 16 + 6 + 15, .width_mm = 135, .height_mm = 217,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 33/95 net: enetc: fix ethtool counter name for PM0_TERR
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit fb8dc5fc8cbdfd62ecd16493848aee2f42ed84d9 ]
There are two counters named "MAC tx frames", one of them is actually incorrect. The correct name for that counter should be "MAC tx error frames", which is symmetric to the existing "MAC rx error frames".
--- drivers/net/ethernet/freescale/enetc/enetc_ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/freescale/enetc/enetc_ethtool.c +1 -1
@@ -157,7 +157,7 @@ static const struct { { ENETC_PM0_TFRM, "MAC tx frames" }, { ENETC_PM0_TFCS, "MAC tx fcs errors" }, { ENETC_PM0_TVLAN, "MAC tx VLAN frames" }, - { ENETC_PM0_TERR, "MAC tx frames" }, + { ENETC_PM0_TERR, "MAC tx frame errors" }, { ENETC_PM0_TUCA, "MAC tx unicast frames" }, { ENETC_PM0_TMCA, "MAC tx multicast frames" }, { ENETC_PM0_TBCA, "MAC tx broadcast frames" },
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 34/95 can: rcar_can: fix suspend/resume
In reply to Greg Kroah-HartmanFrom: Yoshihiro Shimoda <[email protected]>
commit f7c05c3987dcfde9a4e8c2d533db013fabebca0d upstream.
If the driver was not opened, rcar_can_suspend() should not call clk_disable() because the clock was not enabled.
--- drivers/net/can/rcar/rcar_can.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/net/can/rcar/rcar_can.c +12 -8
@@ -846,10 +846,12 @@ static int __maybe_unused rcar_can_suspestruct rcar_can_priv *priv =netdev_priv (ndev);u16 ctlr; -if (netif_running (ndev)) { -netif_stop_queue (ndev); -netif_device_detach (ndev); - } +if (!netif_running (ndev)) +return 0 ; + +netif_stop_queue (ndev); +netif_device_detach (ndev); + ctlr =readw (&priv->regs->ctlr); ctlr |=RCAR_CAN_CTLR_CANM_HALT ;writew (ctlr, &priv->regs->ctlr);
@@ -868,6 +870,9 @@ static int __maybe_unused rcar_can_resumu16 ctlr;int err; +if (!netif_running (ndev)) +return 0 ; + err =clk_enable (priv->clk);if (err) {netdev_err (ndev,"clk_enable() failed, error %d\n" , err);
@@ -881,10 +886,9 @@ static int __maybe_unused rcar_can_resumwritew (ctlr, &priv->regs->ctlr); priv->can.state =CAN_STATE_ERROR_ACTIVE ; -if (netif_running (ndev)) { -netif_device_attach (ndev); -netif_start_queue (ndev); - } +netif_device_attach (ndev); +netif_start_queue (ndev); +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 35/95 can: peak_usb: pcan_usb_fd_decode_status(): fix back to ERROR_ACTIVE state notification
In reply to Greg Kroah-HartmanFrom: Stephane Grosjean <[email protected]>
commit 3d031abc7e7249573148871180c28ecedb5e27df upstream.
This corrects the lack of notification of a return to ERROR_ACTIVE state for USB - CANFD devices from PEAK-System.
--- drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/can/usb/peak_usb/pcan_usb_fd.c +2 -3
@@ -551,11 +551,10 @@ static int pcan_usb_fd_decode_status(str }else if (sm->channel_p_w_b &PUCAN_BUS_WARNING ) { new_state =CAN_STATE_ERROR_WARNING ; }else { -/* no error bit (so, no error skb, back to active state) */ - dev->can.state =CAN_STATE_ERROR_ACTIVE ; +/* back to (or still in) ERROR_ACTIVE state */ + new_state =CAN_STATE_ERROR_ACTIVE ; pdev->bec.txerr =0 ; pdev->bec.rxerr =0 ; -return 0 ; }/* state hasn't changed */
Greg Kroah-Hartman
maintainerPATCH 36/95 can: peak_pci: peak_pci_remove(): fix UAF
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
commit 949fe9b35570361bc6ee2652f89a0561b26eec98 upstream.
When remove the module peek_pci, referencing 'chan' again after releasing 'dev' will cause UAF.
Fix this by releasing 'dev' later.
The following log reveals it:
[ 35.961814 ] BUG: KASAN: use-after-free in peak_pci_remove+0x16f/0x270 [peak_pci] [ 35.963414 ] Read of size 8 at addr ffff888136998ee8 by task modprobe/5537 [ 35.965513 ] Call Trace: [ 35.965718 ] dump_stack_lvl+0xa8/0xd1 [ 35.966028 ] print_address_description+0x87/0x3b0 [ 35.966420 ] kasan_report+0x172/0x1c0 [ 35.966725 ] ? peak_pci_remove+0x16f/0x270 [peak_pci] [ 35.967137 ] ? trace_irq_enable_rcuidle+0x10/0x170 [ 35.967529 ] ? peak_pci_remove+0x16f/0x270 [peak_pci] [ 35.967945 ] __asan_report_load8_noabort+0x14/0x20 [ 35.968346 ] peak_pci_remove+0x16f/0x270 [peak_pci] [ 35.968752 ] pci_device_remove+0xa9/0x250
--- drivers/net/can/sja1000/peak_pci.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/net/can/sja1000/peak_pci.c +4 -5
@@ -731,16 +731,15 @@ static void peak_pci_remove(struct pci_dstruct net_device *prev_dev = chan->prev_dev;dev_info (&pdev->dev,"removing device %s\n" , dev->name); +/* do that only for first channel */ +if (!prev_dev && chan->pciec_card) +peak_pciec_remove (chan->pciec_card);unregister_sja1000dev (dev);free_sja1000dev (dev); dev = prev_dev; -if (!dev) { -/* do that only for first channel */ -if (chan->pciec_card) -peak_pciec_remove (chan->pciec_card); +if (!dev)break ; - } priv =netdev_priv (dev); chan = priv->priv; }
Greg Kroah-Hartman
maintainerPATCH 37/95 can: isotp: isotp_sendmsg(): fix return error on FC timeout on TX path
In reply to Greg Kroah-HartmanFrom: Marc Kleine-Budde <[email protected]>
commit d674a8f123b4096d85955c7eaabec688f29724c9 upstream.
When the a large chunk of data send and the receiver does not send a Flow Control frame back in time, the sendmsg() does not return a error code, but the number of bytes sent corresponding to the size of the packet.
If a timeout occurs the isotp_tx_timer_handler() is fired, sets sk->sk_err and calls the sk->sk_error_report() function. It was wrongly expected that the error would be propagated to user space in every case. For isotp_sendmsg() blocking on wait_event_interruptible() this is not the case.
This patch fixes the problem by checking if sk->sk_err is set and returning the error to user space.
--- net/can/isotp.c | 3 +++ 1 file changed, 3 insertions(+)
net/can/isotp.c +3 -0
@@ -953,6 +953,9 @@ static int isotp_sendmsg(struct socket *if (wait_tx_done) {/* wait for complete transmission of current pdu */ wait_event_interruptible (so->wait, so->tx.state ==ISOTP_IDLE ); + +if (sk->sk_err) +return -sk->sk_err; }return size;
Greg Kroah-Hartman
maintainerPATCH 38/95 can: isotp: isotp_sendmsg(): add result check for wait_event_interruptible()
In reply to Greg Kroah-HartmanFrom: Ziyang Xuan <[email protected]>
commit 9acf636215a6ce9362fe618e7da4913b8bfe84c8 upstream.
Using wait_event_interruptible() to wait for complete transmission, but do not check the result of wait_event_interruptible() which can be interrupted. It will result in TX buffer has multiple accessors and the later process interferes with the previous process.
Following is one of the problems reported by syzbot.
=============================================================
WARNING: CPU: 0 PID: 0 at net/can/isotp.c:840 isotp_tx_timer_handler+0x2e0/0x4c0 CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.13.0-rc7+ #68 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1ubuntu1 04/01/2014 RIP: 0010:isotp_tx_timer_handler+0x2e0/0x4c0 Call Trace: <IRQ> ? isotp_setsockopt+0x390/0x390 __hrtimer_run_queues+0xb8/0x610 hrtimer_run_softirq+0x91/0xd0 ? rcu_read_lock_sched_held+0x4d/0x80 __do_softirq+0xe8/0x553 irq_exit_rcu+0xf8/0x100 sysvec_apic_timer_interrupt+0x9e/0xc0 </IRQ> asm_sysvec_apic_timer_interrupt+0x12/0x20
Add result check for wait_event_interruptible() in isotp_sendmsg() to avoid multiple accessers for tx buffer.
--- net/can/isotp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/can/isotp.c +3 -1
@@ -863,7 +863,9 @@ static int isotp_sendmsg(struct socket *return -EAGAIN ;/* wait for complete transmission of current pdu */ -wait_event_interruptible (so->wait, so->tx.state ==ISOTP_IDLE ); + err =wait_event_interruptible (so->wait, so->tx.state ==ISOTP_IDLE ); +if (err) +return err; }if (!size || size >MAX_MSG_LENGTH )
Greg Kroah-Hartman
maintainerPATCH 39/95 can: j1939: j1939_tp_rxtimer(): fix errant alert in j1939_tp_rxtimer
In reply to Greg Kroah-HartmanFrom: Ziyang Xuan <[email protected]>
commit b504a884f6b5a77dac7d580ffa08e482f70d1a30 upstream.
When the session state is J1939_SESSION_DONE, j1939_tp_rxtimer() will give an alert "rx timeout, send abort", but do nothing actually. Move the alert into session active judgment condition, it is more reasonable.
One of the scenarios is that j1939_tp_rxtimer() execute followed by j1939_xtp_rx_abort_one(). After j1939_xtp_rx_abort_one(), the session state is J1939_SESSION_DONE, then j1939_tp_rxtimer() give an alert.
--- net/can/j1939/transport.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/can/j1939/transport.c +2 -3
@@ -1230,12 +1230,11 @@ static enum hrtimer_restart j1939_tp_rxt session->err = -ETIME ;j1939_session_deactivate (session); }else { -netdev_alert (priv->ndev,"%s: 0x%p: rx timeout, send abort\n" , - __func__, session); -j1939_session_list_lock (session->priv);if (session->state >=J1939_SESSION_ACTIVE && session->state <J1939_SESSION_ACTIVE_MAX ) { +netdev_alert (priv->ndev,"%s: 0x%p: rx timeout, send abort\n" , + __func__, session);j1939_session_get (session); hrtimer_start(&session->rxtimer, ms_to_ktime(J1939_XTP_ABORT_TIMEOUT_MS),
Greg Kroah-Hartman
maintainerPATCH 40/95 can: j1939: j1939_netdev_start(): fix UAF for rx_kref of j1939_priv
In reply to Greg Kroah-HartmanFrom: Ziyang Xuan <[email protected]>
commit d9d52a3ebd284882f5562c88e55991add5d01586 upstream.
It will trigger UAF for rx_kref of j1939_priv as following.
cpu0 cpu1j1939_sk_bind(socket0, ndev0, ...)j1939_netdev_start
j1939_sk_bind(socket1, ndev0, ...)
j1939_netdev_start
j1939_priv_set
j1939_priv_get_by_ndev_lockedj1939_jsk_add
.....j1939_netdev_stopkref_put_lock(&priv->rx_kref, ...)
kref_get(&priv->rx_kref, ...)
REFCOUNT_WARN("addition on 0;...")====================================================refcount_t: addition on 0; use-after-free.
WARNING: CPU: 1 PID: 20874 at lib/refcount.c:25 refcount_warn_saturate+0x169/0x1e0 RIP: 0010:refcount_warn_saturate+0x169/0x1e0 Call Trace: j1939_netdev_start+0x68b/0x920 j1939_sk_bind+0x426/0xeb0 ? security_socket_bind+0x83/0xb0
The rx_kref's kref_get() and kref_put() should use j1939_netdev_lock to protect.
--- net/can/j1939/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/can/j1939/main.c +5 -2
@@ -249,11 +249,14 @@ struct j1939_priv *j1939_netdev_start(ststruct j1939_priv *priv, *priv_new;int ret; - priv =j1939_priv_get_by_ndev (ndev); +spin_lock (&j1939_netdev_lock); + priv =j1939_priv_get_by_ndev_locked (ndev);if (priv) {kref_get (&priv->rx_kref); +spin_unlock (&j1939_netdev_lock);return priv; } +spin_unlock (&j1939_netdev_lock); priv =j1939_priv_create (ndev);if (!priv)
@@ -269,10 +272,10 @@ struct j1939_priv *j1939_netdev_start(st/* Someone was faster than us, use their priv and roll * back our's. */ +kref_get (&priv_new->rx_kref);spin_unlock (&j1939_netdev_lock);dev_put (ndev);kfree (priv); -kref_get (&priv_new->rx_kref);return priv_new; }j1939_priv_set (ndev, priv);
Greg Kroah-Hartman
maintainerPATCH 41/95 can: j1939: j1939_xtp_rx_dat_one(): cancel session if receive TP.DT with error length
In reply to Greg Kroah-HartmanFrom: Zhang Changzhong <[email protected]>
commit 379743985ab6cfe2cbd32067cf4ed497baca6d06 upstream.
According to SAE-J1939-21, the data length of TP.DT must be 8 bytes, so cancel session when receive unexpected TP.DT message.
--- net/can/j1939/transport.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/can/j1939/transport.c +5 -2
@@ -1770,6 +1770,7 @@ static void j1939_xtp_rx_dpo(struct j193static void j1939_xtp_rx_dat_one (struct j1939_session *session,struct sk_buff *skb) { +enum j1939_xtp_abort abort =J1939_XTP_ABORT_FAULT ;struct j1939_priv *priv = session->priv;struct j1939_sk_buff_cb *skcb;struct sk_buff *se_skb =NULL ;
@@ -1784,9 +1785,11 @@ static void j1939_xtp_rx_dat_one(struct skcb =j1939_skb_to_cb (skb); dat = skb->data; -if (skb->len <=1 ) +if (skb->len !=8 ) {/* makes no sense */ + abort =J1939_XTP_ABORT_UNEXPECTED_DATA ; goto out_session_cancel; + }switch (session->last_cmd) {case 0xff :
@@ -1884,7 +1887,7 @@ static void j1939_xtp_rx_dat_one(struct out_session_cancel:kfree_skb (se_skb);j1939_session_timers_cancel (session); -j1939_session_cancel (session,J1939_XTP_ABORT_FAULT ); +j1939_session_cancel (session, abort);j1939_session_put (session); }
Greg Kroah-Hartman
maintainerPATCH 42/95 can: j1939: j1939_xtp_rx_rts_session_new(): abort TP less than 9 bytes
In reply to Greg Kroah-HartmanFrom: Zhang Changzhong <[email protected]>
commit a4fbe70c5cb746441d56b28cf88161d9e0e25378 upstream.
The receiver should abort TP if 'total message size' in TP.CM_RTS and TP.CM_BAM is less than 9 or greater than 1785 [1], but currently the j1939 stack only checks the upper bound and the receiver will accept the following broadcast message:
vcan1 18ECFF00 [8] 20 08 00 02 FF 00 23 01 vcan1 18EBFF00 [8] 01 00 00 00 00 00 00 00 vcan1 18EBFF00 [8] 02 00 FF FF FF FF FF FF
This patch adds check for the lower bound and abort illegal TP.
[1] SAE-J1939-82 A.3.4 Row 2 and A.3.6 Row 6.
--- net/can/j1939/j1939-priv.h | 1 + net/can/j1939/transport.c | 2 ++ 2 files changed, 3 insertions(+)
net/can/j1939/j1939-priv.h +1 -0
@@ -326,6 +326,7 @@ int j1939_session_activate(struct j1939_void j1939_tp_schedule_txtimer (struct j1939_session *session,int msec);void j1939_session_timers_cancel (struct j1939_session *session); +#define J1939_MIN_TP_PACKET_SIZE 9#define J1939_MAX_TP_PACKET_SIZE (7 * 0xff)#define J1939_MAX_ETP_PACKET_SIZE (7 * 0x00ffffff)
net/can/j1939/transport.c +2 -0
@@ -1596,6 +1596,8 @@ j1939_session *j1939_xtp_rx_rts_session_ abort =J1939_XTP_ABORT_FAULT ; else if (len > priv->tp_max_packet_size) abort =J1939_XTP_ABORT_RESOURCE ; + else if (len < J1939_MIN_TP_PACKET_SIZE) + abort =J1939_XTP_ABORT_FAULT ; }if (abort !=J1939_XTP_NO_ABORT ) {
Greg Kroah-Hartman
maintainerPATCH 43/95 ceph: skip existing superblocks that are blocklisted or shut down when mounting
In reply to Greg Kroah-HartmanFrom: Jeff Layton <[email protected]>
commit 98d0a6fb7303a6f4a120b8b8ed05b86ff5db53e8 upstream.
Currently when mounting, we may end up finding an existing superblock that corresponds to a blocklisted MDS client. This means that the new mount ends up being unusable.
If we've found an existing superblock with a client that is already blocklisted, and the client is not configured to recover on its own, fail the match. Ditto if the superblock has been forcibly unmounted.
While we're in here, also rename "other" to the more conventional "fsc".
Cc: [email protected]
URL: https://bugzilla.redhat.com/show_bug.cgi?id=1901499
--- fs/ceph/super.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
fs/ceph/super.c +14 -3
@@ -997,16 +997,16 @@ static int ceph_compare_super(struct supstruct ceph_fs_client *new = fc->s_fs_info;struct ceph_mount_options *fsopt = new->mount_options;struct ceph_options *opt = new->client->options; -struct ceph_fs_client *other =ceph_sb_to_client (sb); +struct ceph_fs_client *fsc =ceph_sb_to_client (sb);dout ("ceph_compare_super %p\n" , sb); -if (compare_mount_options (fsopt, opt, other)) { +if (compare_mount_options (fsopt, opt, fsc)) {dout ("monitor(s)/mount options don't match\n" );return 0 ; }if ((opt->flags &CEPH_OPT_FSID ) && -ceph_fsid_compare (&opt->fsid, &other->client->fsid)) { +ceph_fsid_compare (&opt->fsid, &fsc->client->fsid)) {dout ("fsid doesn't match\n" );return 0 ; }
@@ -1014,6 +1014,17 @@ static int ceph_compare_super(struct supdout ("flags differ\n" );return 0 ; } + +if (fsc->blocklisted && !ceph_test_mount_opt (fsc,CLEANRECOVER )) { +dout ("client is blocklisted (and CLEANRECOVER is not set)\n" ); +return 0 ; + } + +if (fsc->mount_state ==CEPH_MOUNT_SHUTDOWN ) { +dout ("client has been forcibly unmounted\n" ); +return 0 ; + } +return 1 ; }
Greg Kroah-Hartman
maintainerPATCH 44/95 ceph: fix handling of "meta" errors
In reply to Greg Kroah-HartmanFrom: Jeff Layton <[email protected]>
commit 1bd85aa65d0e7b5e4d09240f492f37c569fdd431 upstream.
Currently, we check the wb_err too early for directories, before all of the unsafe child requests have been waited on. In order to fix that we need to check the mapping->wb_err later nearer to the end of ceph_fsync.
We also have an overly-complex method for tracking errors after blocklisting. The errors recorded in cleanup_session_requests go to a completely separate field in the inode, but we end up reporting them the same way we would for any other error (in fsync).
There's no real benefit to tracking these errors in two different places, since the only reporting mechanism for them is in fsync, and we'd need to advance them both every time.
Given that, we can just remove i_meta_err, and convert the places that used it to instead just use mapping->wb_err instead. That also fixes the original problem by ensuring that we do a check_and_advance of the wb_err at the end of the fsync op.
Cc: [email protected]
URL: https://tracker.ceph.com/issues/52864
--- fs/ceph/caps.c | 12 +++--------- fs/ceph/file.c | 1 - fs/ceph/inode.c | 2 -- fs/ceph/mds_client.c | 17 +++++------------ fs/ceph/super.h | 3 --- 5 files changed, 8 insertions(+), 27 deletions(-)
fs/ceph/caps.c +3 -9
@@ -2334,7 +2334,6 @@ static int unsafe_request_wait(struct inint ceph_fsync (struct file *file,loff_t start,loff_t end,int datasync) { -struct ceph_file_info *fi = file->private_data;struct inode *inode = file->f_mapping->host;struct ceph_inode_info *ci =ceph_inode (inode);u64 flush_tid;
@@ -2369,14 +2368,9 @@ int ceph_fsync(struct file *file, loff_tif (err <0 ) ret = err; -if (errseq_check (&ci->i_meta_err,READ_ONCE (fi->meta_err))) { -spin_lock (&file->f_lock); - err =errseq_check_and_advance (&ci->i_meta_err, - &fi->meta_err); -spin_unlock (&file->f_lock); -if (err <0 ) - ret = err; - } + err =file_check_and_advance_wb_err (file); +if (err <0 ) + ret = err; out:dout ("fsync %p%s result=%d\n" , inode, datasync ?" datasync" :"" , ret);return ret;
fs/ceph/file.c +0 -1
@@ -233,7 +233,6 @@ static int ceph_init_file_info(struct inspin_lock_init (&fi->rw_contexts_lock);INIT_LIST_HEAD (&fi->rw_contexts); - fi->meta_err =errseq_sample (&ci->i_meta_err); fi->filp_gen =READ_ONCE (ceph_inode_to_client (inode)->filp_gen);return 0 ;
fs/ceph/inode.c +0 -2
@@ -529,8 +529,6 @@ struct inode *ceph_alloc_inode(struct suceph_fscache_inode_init (ci); - ci->i_meta_err =0 ; -return &ci->vfs_inode; }
fs/ceph/mds_client.c +5 -12
@@ -1481,7 +1481,6 @@ static void cleanup_session_requests(str {struct ceph_mds_request *req;struct rb_node *p; -struct ceph_inode_info *ci;dout ("cleanup_session_requests mds%d\n" , session->s_mds);mutex_lock (&mdsc->mutex);
@@ -1490,16 +1489,10 @@ static void cleanup_session_requests(str struct ceph_mds_request, r_unsafe_item);pr_warn_ratelimited (" dropping unsafe request %llu\n" , req->r_tid); -if (req->r_target_inode) { -/* dropping unsafe change of inode's attributes */ - ci =ceph_inode (req->r_target_inode); -errseq_set (&ci->i_meta_err, -EIO ); - } -if (req->r_unsafe_dir) { -/* dropping unsafe directory operation */ - ci =ceph_inode (req->r_unsafe_dir); -errseq_set (&ci->i_meta_err, -EIO ); - } +if (req->r_target_inode) +mapping_set_error (req->r_target_inode->i_mapping, -EIO ); +if (req->r_unsafe_dir) +mapping_set_error (req->r_unsafe_dir->i_mapping, -EIO );__unregister_request (mdsc, req); }/* zero r_attempts, so kick_requests() will re-send requests */
@@ -1668,7 +1661,7 @@ static int remove_session_caps_cb(structspin_unlock (&mdsc->cap_dirty_lock);if (dirty_dropped) { -errseq_set (&ci->i_meta_err, -EIO ); +mapping_set_error (inode->i_mapping, -EIO ); if (ci->i_wrbuffer_ref_head == 0 && ci->i_wr_ref == 0 &&
fs/ceph/super.h +0 -3
@@ -430,8 +430,6 @@ struct ceph_inode_info {struct fscache_cookie *fscache;u32 i_fscache_gen;#endif -errseq_t i_meta_err; -struct inode vfs_inode;/* at end */ };
@@ -773,7 +771,6 @@ struct ceph_file_info {spinlock_t rw_contexts_lock;struct list_head rw_contexts; -errseq_t meta_err;u32 filp_gen;atomic_t num_locks; };
Greg Kroah-Hartman
maintainerPATCH 45/95 ocfs2: fix data corruption after conversion from inline format
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit 5314454ea3ff6fc746eaf71b9a7ceebed52888fa upstream.
Commit 6dbf7bb55598 ("fs: Don't invalidate page buffers in block_write_full_page()") uncovered a latent bug in ocfs2 conversion from inline inode format to a normal inode format.
The code in ocfs2_convert_inline_data_to_extents() attempts to zero out the whole cluster allocated for file data by grabbing, zeroing, and dirtying all pages covering this cluster. However these pages are beyond i_size, thus writeback code generally ignores these dirty pages and no blocks were ever actually zeroed on the disk.
This oversight was fixed by commit 693c241a5f6a ("ocfs2: No need to zero pages past i_size.") for standard ocfs2 write path, inline conversion path was apparently forgotten; the commit log also has a reasoning why the zeroing actually is not needed.
After commit 6dbf7bb55598, things became worse as writeback code stopped invalidating buffers on pages beyond i_size and thus these pages end up with clean PageDirty bit but with buffers attached to these pages being still dirty. So when a file is converted from inline format, then writeback triggers, and then the file is grown so that these pages become valid, the invalid dirtiness state is preserved, mark_buffer_dirty() does nothing on these pages (buffers are already dirty) but page is never written back because it is clean. So data written to these pages is lost once pages are reclaimed.
Simple reproducer for the problem is:
xfs_io -f -c "pwrite 0 2000" -c "pwrite 2000 2000" -c "fsync" \
-c "pwrite 4000 2000" ocfs2_fileAfter unmounting and mounting the fs again, you can observe that end of 'ocfs2_file' has lost its contents.
Fix the problem by not doing the pointless zeroing during conversion from inline format similarly as in the standard write path.
[[email protected]: fix whitespace, per Joseph]
--- fs/ocfs2/alloc.c | 46 ++++++++++++---------------------------------- 1 file changed, 12 insertions(+), 34 deletions(-)
fs/ocfs2/alloc.c +12 -34
@@ -7047,7 +7047,7 @@ void ocfs2_set_inode_data_inline(structint ocfs2_convert_inline_data_to_extents (struct inode *inode,struct buffer_head *di_bh) { -int ret, i, has_data, num_pages =0 ; +int ret, has_data, num_pages =0 ;int need_free =0 ;u32 bit_off, num;handle_t *handle;
@@ -7056,26 +7056,17 @@ int ocfs2_convert_inline_data_to_extentsstruct ocfs2_super *osb =OCFS2_SB (inode->i_sb);struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;struct ocfs2_alloc_context *data_ac =NULL ; -struct page **pages =NULL ; -loff_t end = osb->s_clustersize; +struct page *page =NULL ;struct ocfs2_extent_tree et;int did_quota =0 ; has_data =i_size_read (inode) ?1 :0 ;if (has_data) { - pages =kcalloc (ocfs2_pages_per_cluster (osb->sb), -sizeof (struct page *),GFP_NOFS ); -if (pages ==NULL ) { - ret = -ENOMEM ; -mlog_errno (ret); -return ret; - } - ret =ocfs2_reserve_clusters (osb,1 , &data_ac);if (ret) {mlog_errno (ret); - goto free_pages; + goto out; } }
@@ -7095,7 +7086,8 @@ int ocfs2_convert_inline_data_to_extents }if (has_data) { -unsigned int page_end; +unsigned int page_end =min_t (unsigned,PAGE_SIZE , + osb->s_clustersize);u64 phys; ret = dquot_alloc_space_nodirty(inode,
@@ -7119,15 +7111,8 @@ int ocfs2_convert_inline_data_to_extents*/ block = phys =ocfs2_clusters_to_blocks (inode->i_sb, bit_off); -/* -* Non sparse file systems zero on extend, so no need -* to do that now. -*/ -if (!ocfs2_sparse_alloc (osb) && -PAGE_SIZE < osb->s_clustersize) - end =PAGE_SIZE ; - - ret =ocfs2_grab_eof_pages (inode,0 , end, pages, &num_pages); + ret =ocfs2_grab_eof_pages (inode,0 , page_end, &page, + &num_pages);if (ret) {mlog_errno (ret); need_free =1 ;
@@ -7138,20 +7123,15 @@ int ocfs2_convert_inline_data_to_extents* This should populate the 1st page for us and mark * it up to date. */ - ret =ocfs2_read_inline_data (inode, pages[0 ], di_bh); + ret =ocfs2_read_inline_data (inode, page, di_bh);if (ret) {mlog_errno (ret); need_free =1 ; goto out_unlock; } - page_end =PAGE_SIZE ; -if (PAGE_SIZE > osb->s_clustersize) - page_end = osb->s_clustersize; - -for (i =0 ; i < num_pages; i++) -ocfs2_map_and_dirty_page (inode, handle,0 , page_end, - pages[i], i >0 , &phys); +ocfs2_map_and_dirty_page (inode, handle,0 , page_end, page,0 , + &phys); }spin_lock (&oi->ip_lock);
@@ -7182,8 +7162,8 @@ int ocfs2_convert_inline_data_to_extents } out_unlock: -if (pages) -ocfs2_unlock_and_free_pages (pages, num_pages); +if (page) +ocfs2_unlock_and_free_pages (&page, num_pages); out_commit:if (ret <0 && did_quota)
@@ -7207,8 +7187,6 @@ out_commit: out:if (data_ac)ocfs2_free_alloc_context (data_ac); -free_pages: -kfree (pages);return ret; }
Greg Kroah-Hartman
maintainerPATCH 46/95 ocfs2: mount fails with buffer overflow in strlen
In reply to Greg Kroah-HartmanFrom: Valentin Vidic <[email protected]>
commit b15fa9224e6e1239414525d8d556d824701849fc upstream.
Starting with kernel 5.11 built with CONFIG_FORTIFY_SOURCE mouting an ocfs2 filesystem with either o2cb or pcmk cluster stack fails with the trace below. Problem seems to be that strings for cluster stack and cluster name are not guaranteed to be null terminated in the disk representation, while strlcpy assumes that the source string is always null terminated. This causes a read outside of the source string triggering the buffer overflow detection.
detected buffer overflow in strlen
------------[ cut here ]------------
kernel BUG at lib/string.c:1149!
invalid opcode: 0000 [#1] SMP PTI
CPU: 1 PID: 910 Comm: mount.ocfs2 Not tainted 5.14.0-1-amd64 #1
Debian 5.14.6-2
RIP: 0010:fortify_panic+0xf/0x11
...
Call Trace:
ocfs2_initialize_super.isra.0.cold+0xc/0x18 [ocfs2]
ocfs2_fill_super+0x359/0x19b0 [ocfs2]
mount_bdev+0x185/0x1b0
legacy_get_tree+0x27/0x40
vfs_get_tree+0x25/0xb0
path_mount+0x454/0xa20
__x64_sys_mount+0x103/0x140
do_syscall_64+0x3b/0xc0
entry_SYSCALL_64_after_hwframe+0x44/0xae--- fs/ocfs2/super.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
fs/ocfs2/super.c +10 -4
@@ -2171,11 +2171,17 @@ static int ocfs2_initialize_super(struct }if (ocfs2_clusterinfo_valid (osb)) { +/* +* ci_stack and ci_cluster in ocfs2_cluster_info may not be null +* terminated, so make sure no overflow happens here by using +* memcpy. Destination strings will always be null terminated +* because osb is allocated using kzalloc. +*/ osb->osb_stackflags =OCFS2_RAW_SB (di)->s_cluster_info.ci_stackflags; -strlcpy (osb->osb_cluster_stack, +memcpy (osb->osb_cluster_stack,OCFS2_RAW_SB (di)->s_cluster_info.ci_stack, -OCFS2_STACK_LABEL_LEN +1 ); +OCFS2_STACK_LABEL_LEN );if (strlen (osb->osb_cluster_stack) !=OCFS2_STACK_LABEL_LEN ) {mlog (ML_ERROR , "couldn't mount because of an invalid "
@@ -2184,9 +2190,9 @@ static int ocfs2_initialize_super(struct status = -EINVAL ; goto bail; } -strlcpy (osb->osb_cluster_name, +memcpy (osb->osb_cluster_name,OCFS2_RAW_SB (di)->s_cluster_info.ci_cluster, -OCFS2_CLUSTER_NAME_LEN +1 ); +OCFS2_CLUSTER_NAME_LEN ); }else {/* The empty string is identical with classic tools that * don't know about s_cluster_info. */
Greg Kroah-Hartman
maintainerPATCH 47/95 userfaultfd: fix a race between writeprotect and exit_mmap()
In reply to Greg Kroah-HartmanFrom: Nadav Amit <[email protected]>
commit cb185d5f1ebf900f4ae3bf84cee212e6dd035aca upstream.
A race is possible when a process exits, its VMAs are removed by exit_mmap() and at the same time userfaultfd_writeprotect() is called.
The race was detected by KASAN on a development kernel, but it appears to be possible on vanilla kernels as well.
Use mmget_not_zero() to prevent the race as done in other userfaultfd operations.
--- fs/userfaultfd.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
fs/userfaultfd.c +9 -3
@@ -1794,9 +1794,15 @@ static int userfaultfd_writeprotect(struif (mode_wp && mode_dontwake)return -EINVAL ; - ret =mwriteprotect_range (ctx->mm, uffdio_wp.range.start, - uffdio_wp.range.len, mode_wp, - &ctx->mmap_changing); +if (mmget_not_zero (ctx->mm)) { + ret =mwriteprotect_range (ctx->mm, uffdio_wp.range.start, + uffdio_wp.range.len, mode_wp, + &ctx->mmap_changing); +mmput (ctx->mm); + }else { +return -ESRCH ; + } +if (ret)return ret;
Greg Kroah-Hartman
maintainerPATCH 48/95 elfcore: correct reference to CONFIG_UML
In reply to Greg Kroah-HartmanFrom: Lukas Bulwahn <[email protected]>
commit b0e901280d9860a0a35055f220e8e457f300f40a upstream.
Commit 6e7b64b9dd6d ("elfcore: fix building with clang") introduces special handling for two architectures, ia64 and User Mode Linux. However, the wrong name, i.e., CONFIG_UM, for the intended Kconfig symbol for User-Mode Linux was used.
Although the directory for User Mode Linux is ./arch/um; the Kconfig symbol for this architecture is called CONFIG_UML.
Luckily, ./scripts/checkkconfigsymbols.py warns on non-existing configs:
UM
Referencing files: include/linux/elfcore.h
Similar symbols: UML, NUMA
Correct the name of the config to the intended one.
--- include/linux/elfcore.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/elfcore.h +1 -1
@@ -104,7 +104,7 @@ static inline int elf_core_copy_task_fpr#endif } -#if defined(CONFIG_UM ) || defined(CONFIG_IA64 ) +#if (defined(CONFIG_UML ) && defined(CONFIG_X86_32 )) || defined(CONFIG_IA64 )/* * These functions parameterize elf_core_dump in fs/binfmt_elf.c to write out * extra segments containing the gate DSO contents. Dumping its
Greg Kroah-Hartman
maintainerPATCH 49/95 vfs: check fd has read access in kernel_read_file_from_fd()
In reply to Greg Kroah-HartmanFrom: Matthew Wilcox (Oracle) <[email protected]>
commit 032146cda85566abcd1c4884d9d23e4e30a07e9a upstream.
If we open a file without read access and then pass the fd to a syscall whose implementation calls kernel_read_file_from_fd(), we get a warning from __kernel_read():
if (WARN_ON_ONCE(!(file->f_mode & FMODE_READ)))
This currently affects both finit_module() and kexec_file_load(), but it could affect other syscalls in the future.
--- fs/kernel_read_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/kernel_read_file.c +1 -1
@@ -178,7 +178,7 @@ int kernel_read_file_from_fd(int fd, lofstruct fd f =fdget (fd);int ret = -EBADF ; -if (!f.file) +if (!f.file || !(f.file->f_mode &FMODE_READ )) goto out; ret =kernel_read_file (f.file, offset, buf, buf_size, file_size, id);
Greg Kroah-Hartman
maintainerPATCH 50/95 ALSA: usb-audio: Provide quirk for Sennheiser GSP670 Headset
In reply to Greg Kroah-HartmanFrom: Brendan Grieve <[email protected]>
commit 3c414eb65c294719a91a746260085363413f91c1 upstream.
As per discussion at: https://github.com/szszoke/sennheiser-gsp670-pulseaudio-profile/issues/13
The GSP670 has 2 playback and 1 recording device that by default are detected in an incompatible order for alsa. This may have been done to make it compatible for the console by the manufacturer and only affects the latest firmware which uses its own ID.
This quirk will resolve this by reordering the channels.
--- sound/usb/quirks-table.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
sound/usb/quirks-table.h +32 -0
@@ -3698,6 +3698,38 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge } } }, +{ +/* +* Sennheiser GSP670 +* Change order of interfaces loaded +*/ + USB_DEVICE(0x1395, 0x0300), + .bInterfaceClass = USB_CLASS_PER_INTERFACE, + .driver_info = (unsigned long ) &(const struct snd_usb_audio_quirk ) { + .ifnum =QUIRK_ANY_INTERFACE , + .type =QUIRK_COMPOSITE , + .data = &(const struct snd_usb_audio_quirk []) { +// Communication + { + .ifnum =3 , + .type =QUIRK_AUDIO_STANDARD_INTERFACE + }, +// Recording + { + .ifnum =4 , + .type =QUIRK_AUDIO_STANDARD_INTERFACE + }, +// Main + { + .ifnum =1 , + .type =QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum =-1 + } + } + } +}, #undef USB_DEVICE_VENDOR_SPEC #undef USB_AUDIO_DEVICE
Greg Kroah-Hartman
maintainerPATCH 51/95 ALSA: hda/realtek: Add quirk for Clevo PC50HS
In reply to Greg Kroah-HartmanFrom: Steven Clarkson <[email protected]>
commit aef454b40288158b850aab13e3d2a8c406779401 upstream.
Apply existing PCI quirk to the Clevo PC50HS and related models to fix audio output on the built in speakers.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -2547,6 +2547,7 @@ static const struct snd_pci_quirk alc882SND_PCI_QUIRK (0x1558 ,0x65d2 ,"Clevo PB51R[CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x65e1 ,"Clevo PB51[ED][DF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x65e5 ,"Clevo PC50D[PRS](?:-D|-G)?" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), +SND_PCI_QUIRK (0x1558 ,0x65f1 ,"Clevo PC50HS" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x67d1 ,"Clevo PB71[ER][CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x67e1 ,"Clevo PB71[DE][CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), SND_PCI_QUIRK(0x1558, 0x67e5, "Clevo PC70D[PRS](?:-D|-G)?", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
Greg Kroah-Hartman
maintainerPATCH 52/95 ASoC: DAPM: Fix missing kctl change notifications
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 5af82c81b2c49cfb1cad84d9eb6eab0e3d1c4842 upstream.
The put callback of a kcontrol is supposed to return 1 when the value is changed, and this will be notified to user-space. However, some DAPM kcontrols always return 0 (except for errors), hence the user-space misses the update of a control value.
This patch corrects the behavior by properly returning 1 when the value gets updated.
--- sound/soc/soc-dapm.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
sound/soc/soc-dapm.c +8 -5
@@ -2559,6 +2559,7 @@ static int snd_soc_dapm_set_pin(struct s const char *pin, int status) {struct snd_soc_dapm_widget *w =dapm_find_widget (dapm, pin, true); +int ret =0 ;dapm_assert_locked (dapm);
@@ -2571,13 +2572,14 @@ static int snd_soc_dapm_set_pin(struct sdapm_mark_dirty (w,"pin configuration" );dapm_widget_invalidate_input_paths (w);dapm_widget_invalidate_output_paths (w); + ret =1 ; } w->connected = status;if (status ==0 ) w->force =0 ; -return 0 ; +return ret; }/**
@@ -3582,14 +3584,15 @@ int snd_soc_dapm_put_pin_switch(struct s {struct snd_soc_card *card =snd_kcontrol_chip (kcontrol);const char *pin = (const char *)kcontrol->private_value; +int ret;if (ucontrol->value.integer.value[0 ]) -snd_soc_dapm_enable_pin (&card->dapm, pin); + ret =snd_soc_dapm_enable_pin (&card->dapm, pin);else -snd_soc_dapm_disable_pin (&card->dapm, pin); + ret =snd_soc_dapm_disable_pin (&card->dapm, pin);snd_soc_dapm_sync (&card->dapm); -return 0 ; +return ret; }EXPORT_SYMBOL_GPL (snd_soc_dapm_put_pin_switch);
@@ -4035,7 +4038,7 @@ static int snd_soc_dapm_dai_link_put(str rtd->params_select = ucontrol->value.enumerated.item[0 ]; -return 0 ; +return 1 ; } static void
Greg Kroah-Hartman
maintainerPATCH 53/95 audit: fix possible null-pointer dereference in audit_filter_rules
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
commit 6e3ee990c90494561921c756481d0e2125d8b895 upstream.
Fix possible null-pointer dereference in audit_filter_rules.
audit_filter_rules() error: we previously assumed 'ctx' could be null
--- kernel/auditsc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/auditsc.c +1 -1
@@ -653,7 +653,7 @@ static int audit_filter_rules(struct tas result =audit_comparator (audit_loginuid_set (tsk), f->op, f->val);break ;case AUDIT_SADDR_FAM : -if (ctx->sockaddr) +if (ctx && ctx->sockaddr) result =audit_comparator (ctx->sockaddr->ss_family, f->op, f->val);break ;
Greg Kroah-Hartman
maintainerPATCH 54/95 net: dsa: mt7530: correct ds->num_ports
In reply to Greg Kroah-HartmanFrom: DENG Qingfang <[email protected]>
commit 342afce10d6f61c443c95e244f812d4766f73f53 upstream.
Setting ds->num_ports to DSA_MAX_PORTS made DSA core allocate unnecessary dsa_port's and call mt7530_port_disable for non-existent ports.
Set it to MT7530_NUM_PORTS to fix that, and dsa_is_user_port check in port_enable/disable is no longer required.
--- drivers/net/dsa/mt7530.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/net/dsa/mt7530.c +1 -7
@@ -981,9 +981,6 @@ mt7530_port_enable(struct dsa_switch *ds {struct mt7530_priv *priv = ds->priv; -if (!dsa_is_user_port (ds, port)) -return 0 ; -mutex_lock (&priv->reg_mutex);/* Allow the user port gets connected to the cpu port and also
@@ -1006,9 +1003,6 @@ mt7530_port_disable(struct dsa_switch *d {struct mt7530_priv *priv = ds->priv; -if (!dsa_is_user_port (ds, port)) -return ; -mutex_lock (&priv->reg_mutex);/* Clear up all port matrix which could be restored in the next
@@ -2593,7 +2587,7 @@ mt7530_probe(struct mdio_device *mdiodevreturn -ENOMEM ; priv->ds->dev = &mdiodev->dev; - priv->ds->num_ports =DSA_MAX_PORTS ; + priv->ds->num_ports =MT7530_NUM_PORTS ;/* Use medatek,mcm property to distinguish hardware type that would * casues a little bit differences on power-on sequence.
Greg Kroah-Hartman
maintainerPATCH 55/95 powerpc64/idle: Fix SP offsets when saving GPRs
In reply to Greg Kroah-HartmanFrom: Christopher M. Riedl <[email protected]>
commit 73287caa9210ded6066833195f4335f7f688a46b upstream.
The idle entry/exit code saves/restores GPRs in the stack "red zone" (Protected Zone according to PowerPC64 ELF ABI v2). However, the offset used for the first GPR is incorrect and overwrites the back chain - the Protected Zone actually starts below the current SP. In practice this is probably not an issue, but it's still incorrect so fix it.
Also expand the comments to explain why using the stack "red zone" instead of creating a new stackframe is appropriate here.
--- arch/powerpc/kernel/idle_book3s.S | 138 ++++++++++++++++++++------------------ 1 file changed, 73 insertions(+), 65 deletions(-)
arch/powerpc/kernel/idle_book3s.S +73 -65
@@ -52,28 +52,32 @@ _GLOBAL(isa300_idle_stop_mayloss) std r1,PACAR1(r13) mflr r4 mfcr r5 - /* use stack red zone rather than a new frame for saving regs */ - std r2,-8*0(r1) - std r14,-8*1(r1) - std r15,-8*2(r1) - std r16,-8*3(r1) - std r17,-8*4(r1) - std r18,-8*5(r1) - std r19,-8*6(r1) - std r20,-8*7(r1) - std r21,-8*8(r1) - std r22,-8*9(r1) - std r23,-8*10(r1) - std r24,-8*11(r1) - std r25,-8*12(r1) - std r26,-8*13(r1) - std r27,-8*14(r1) - std r28,-8*15(r1) - std r29,-8*16(r1) - std r30,-8*17(r1) - std r31,-8*18(r1) - std r4,-8*19(r1) - std r5,-8*20(r1) + /* + * Use the stack red zone rather than a new frame for saving regs since + * in the case of no GPR loss the wakeup code branches directly back to + * the caller without deallocating the stack frame first. + */ + std r2,-8*1(r1) + std r14,-8*2(r1) + std r15,-8*3(r1) + std r16,-8*4(r1) + std r17,-8*5(r1) + std r18,-8*6(r1) + std r19,-8*7(r1) + std r20,-8*8(r1) + std r21,-8*9(r1) + std r22,-8*10(r1) + std r23,-8*11(r1) + std r24,-8*12(r1) + std r25,-8*13(r1) + std r26,-8*14(r1) + std r27,-8*15(r1) + std r28,-8*16(r1) + std r29,-8*17(r1) + std r30,-8*18(r1) + std r31,-8*19(r1) + std r4,-8*20(r1) + std r5,-8*21(r1) /* 168 bytes */ PPC_STOP b . /* catch bugs */
@@ -89,8 +93,8 @@ _GLOBAL(isa300_idle_stop_mayloss) */ _GLOBAL(idle_return_gpr_loss) ld r1,PACAR1(r13) - ld r4,-8*19(r1) - ld r5,-8*20(r1) + ld r4,-8*20(r1) + ld r5,-8*21(r1) mtlr r4 mtcr r5 /*
@@ -98,25 +102,25 @@ _GLOBAL(idle_return_gpr_loss) * from PACATOC. This could be avoided for that less common case * if KVM saved its r2. */ - ld r2,-8*0(r1) - ld r14,-8*1(r1) - ld r15,-8*2(r1) - ld r16,-8*3(r1) - ld r17,-8*4(r1) - ld r18,-8*5(r1) - ld r19,-8*6(r1) - ld r20,-8*7(r1) - ld r21,-8*8(r1) - ld r22,-8*9(r1) - ld r23,-8*10(r1) - ld r24,-8*11(r1) - ld r25,-8*12(r1) - ld r26,-8*13(r1) - ld r27,-8*14(r1) - ld r28,-8*15(r1) - ld r29,-8*16(r1) - ld r30,-8*17(r1) - ld r31,-8*18(r1) + ld r2,-8*1(r1) + ld r14,-8*2(r1) + ld r15,-8*3(r1) + ld r16,-8*4(r1) + ld r17,-8*5(r1) + ld r18,-8*6(r1) + ld r19,-8*7(r1) + ld r20,-8*8(r1) + ld r21,-8*9(r1) + ld r22,-8*10(r1) + ld r23,-8*11(r1) + ld r24,-8*12(r1) + ld r25,-8*13(r1) + ld r26,-8*14(r1) + ld r27,-8*15(r1) + ld r28,-8*16(r1) + ld r29,-8*17(r1) + ld r30,-8*18(r1) + ld r31,-8*19(r1) blr /*
@@ -154,28 +158,32 @@ _GLOBAL(isa206_idle_insn_mayloss) std r1,PACAR1(r13) mflr r4 mfcr r5 - /* use stack red zone rather than a new frame for saving regs */ - std r2,-8*0(r1) - std r14,-8*1(r1) - std r15,-8*2(r1) - std r16,-8*3(r1) - std r17,-8*4(r1) - std r18,-8*5(r1) - std r19,-8*6(r1) - std r20,-8*7(r1) - std r21,-8*8(r1) - std r22,-8*9(r1) - std r23,-8*10(r1) - std r24,-8*11(r1) - std r25,-8*12(r1) - std r26,-8*13(r1) - std r27,-8*14(r1) - std r28,-8*15(r1) - std r29,-8*16(r1) - std r30,-8*17(r1) - std r31,-8*18(r1) - std r4,-8*19(r1) - std r5,-8*20(r1) + /* + * Use the stack red zone rather than a new frame for saving regs since + * in the case of no GPR loss the wakeup code branches directly back to + * the caller without deallocating the stack frame first. + */ + std r2,-8*1(r1) + std r14,-8*2(r1) + std r15,-8*3(r1) + std r16,-8*4(r1) + std r17,-8*5(r1) + std r18,-8*6(r1) + std r19,-8*7(r1) + std r20,-8*8(r1) + std r21,-8*9(r1) + std r22,-8*10(r1) + std r23,-8*11(r1) + std r24,-8*12(r1) + std r25,-8*13(r1) + std r26,-8*14(r1) + std r27,-8*15(r1) + std r28,-8*16(r1) + std r29,-8*17(r1) + std r30,-8*18(r1) + std r31,-8*19(r1) + std r4,-8*20(r1) + std r5,-8*21(r1) cmpwi r3,PNV_THREAD_NAP bne 1f IDLE_STATE_ENTER_SEQ_NORET(PPC_NAP)
Greg Kroah-Hartman
maintainerPATCH 56/95 KVM: PPC: Book3S HV: Fix stack handling in idle_kvm_start_guest()
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
commit 9b4416c5095c20e110c82ae602c254099b83b72f upstream.
In commit 10d91611f426 ("powerpc/64s: Reimplement book3s idle code in C") kvm_start_guest() became idle_kvm_start_guest(). The old code allocated a stack frame on the emergency stack, but didn't use the frame to store anything, and also didn't store anything in its caller's frame.
idle_kvm_start_guest() on the other hand is written more like a normal C function, it creates a frame on entry, and also stores CR/LR into its callers frame (per the ABI). The problem is that there is no caller frame on the emergency stack.
The emergency stack for a given CPU is allocated with:
paca_ptrs[i]->emergency_sp = alloc_stack(limit, i) + THREAD_SIZE;
So emergency_sp actually points to the first address above the emergency stack allocation for a given CPU, we must not store above it without first decrementing it to create a frame. This is different to the regular kernel stack, paca->kstack, which is initialised to point at an initial frame that is ready to use.
idle_kvm_start_guest() stores the backchain, CR and LR all of which write outside the allocation for the emergency stack. It then creates a stack frame and saves the non-volatile registers. Unfortunately the frame it creates is not large enough to fit the non-volatiles, and so the saving of the non-volatile registers also writes outside the emergency stack allocation.
The end result is that we corrupt whatever is at 0-24 bytes, and 112-248 bytes above the emergency stack allocation.
In practice this has gone unnoticed because the memory immediately above the emergency stack happens to be used for other stack allocations, either another CPUs mc_emergency_sp or an IRQ stack. See the order of calls to irqstack_early_init() and emergency_stack_init().
The low addresses of another stack are the top of that stack, and so are only used if that stack is under extreme pressue, which essentially never happens in practice - and if it did there's a high likelyhood we'd crash due to that stack overflowing.
Still, we shouldn't be corrupting someone else's stack, and it is purely luck that we aren't corrupting something else.
To fix it we save CR/LR into the caller's frame using the existing r1 on entry, we then create a SWITCH_FRAME_SIZE frame (which has space for pt_regs) on the emergency stack with the backchain pointing to the existing stack, and then finally we switch to the new frame on the emergency stack.
--- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
arch/powerpc/kvm/book3s_hv_rmhandlers.S +10 -9
@@ -292,13 +292,15 @@ kvm_novcpu_exit: * r3 contains the SRR1 wakeup value, SRR1 is trashed. */ _GLOBAL(idle_kvm_start_guest) - ld r4,PACAEMERGSP(r13) mfcr r5 mflr r0 - std r1,0(r4) - std r5,8(r4) - std r0,16(r4) - subi r1,r4,STACK_FRAME_OVERHEAD + std r5, 8(r1) // Save CR in caller's frame + std r0, 16(r1) // Save LR in caller's frame + // Create frame on emergency stack + ld r4, PACAEMERGSP(r13) + stdu r1, -SWITCH_FRAME_SIZE(r4) + // Switch to new frame on emergency stack + mr r1, r4 SAVE_NVGPRS(r1) /*
@@ -444,10 +446,9 @@ kvm_no_guest: /* set up r3 for return */ mfspr r3,SPRN_SRR1 REST_NVGPRS(r1) - addi r1, r1, STACK_FRAME_OVERHEAD - ld r0, 16(r1) - ld r5, 8(r1) - ld r1, 0(r1) + ld r1, 0(r1) // Switch back to caller stack + ld r0, 16(r1) // Reload LR + ld r5, 8(r1) // Reload CR mtlr r0 mtcr r5 blr
Greg Kroah-Hartman
maintainerPATCH 57/95 KVM: PPC: Book3S HV: Make idle_kvm_start_guest() return 0 if it went to guest
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
commit cdeb5d7d890e14f3b70e8087e745c4a6a7d9f337 upstream.
We call idle_kvm_start_guest() from power7_offline() if the thread has been requested to enter KVM. We pass it the SRR1 value that was returned from power7_idle_insn() which tells us what sort of wakeup we're processing.
Depending on the SRR1 value we pass in, the KVM code might enter the guest, or it might return to us to do some host action if the wakeup requires it.
If idle_kvm_start_guest() is able to handle the wakeup, and enter the guest it is supposed to indicate that by returning a zero SRR1 value to us.
That was the behaviour prior to commit 10d91611f426 ("powerpc/64s:
Reimplement book3s idle code in C"), however in that commit the handling of SRR1 was reworked, and the zeroing behaviour was lost.
Returning from idle_kvm_start_guest() without zeroing the SRR1 value can confuse the host offline code, causing the guest to crash and other weirdness.
--- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
arch/powerpc/kvm/book3s_hv_rmhandlers.S +7 -2
@@ -301,6 +301,7 @@ _GLOBAL(idle_kvm_start_guest) stdu r1, -SWITCH_FRAME_SIZE(r4) // Switch to new frame on emergency stack mr r1, r4 + std r3, 32(r1) // Save SRR1 wakeup value SAVE_NVGPRS(r1) /*
@@ -352,6 +353,10 @@ kvm_unsplit_wakeup: kvm_secondary_got_guest: + // About to go to guest, clear saved SRR1 + li r0, 0 + std r0, 32(r1) + /* Set HSTATE_DSCR(r13) to something sensible */ ld r6, PACA_DSCR_DEFAULT(r13) std r6, HSTATE_DSCR(r13)
@@ -443,8 +448,8 @@ kvm_no_guest: mfspr r4, SPRN_LPCR rlwimi r4, r3, 0, LPCR_PECE0 | LPCR_PECE1 mtspr SPRN_LPCR, r4 - /* set up r3 for return */ - mfspr r3,SPRN_SRR1 + // Return SRR1 wakeup value, or 0 if we went into the guest + ld r3, 32(r1) REST_NVGPRS(r1) ld r1, 0(r1) // Switch back to caller stack ld r0, 16(r1) // Reload LR
Greg Kroah-Hartman
maintainerPATCH 58/95 powerpc/idle: Dont corrupt back chain when going idle
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
commit 496c5fe25c377ddb7815c4ce8ecfb676f051e9b6 upstream.
In isa206_idle_insn_mayloss() we store various registers into the stack red zone, which is allowed.
However inside the IDLE_STATE_ENTER_SEQ_NORET macro we save r2 again, to 0(r1), which corrupts the stack back chain.
We used to do the same in isa206_idle_insn_mayloss() itself, but we fixed that in 73287caa9210 ("powerpc64/idle: Fix SP offsets when saving GPRs"), however we missed that the macro also corrupts the back chain.
Corrupting the back chain is bad for debuggability but doesn't necessarily cause a bug.
However we recently changed the stack handling in some KVM code, and it now relies on the stack back chain being valid when it returns. The corruption causes that code to return with r1 pointing somewhere in kernel data, at some point LR is restored from the stack and we branch to NULL or somewhere else invalid.
Only affects Power8 hosts running KVM guests, with dynamic_mt_modes enabled (which it is by default).
The fixes tag below points to the commit that changed the KVM stack handling, exposing this bug. The actual corruption of the back chain has always existed since 948cf67c4726 ("powerpc: Add NAP mode support on Power7 in HV mode").
--- arch/powerpc/kernel/idle_book3s.S | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/powerpc/kernel/idle_book3s.S +6 -4
@@ -126,14 +126,16 @@ _GLOBAL(idle_return_gpr_loss) /* * This is the sequence required to execute idle instructions, as * specified in ISA v2.07 (and earlier). MSR[IR] and MSR[DR] must be 0. - * - * The 0(r1) slot is used to save r2 in isa206, so use that here. + * We have to store a GPR somewhere, ptesync, then reload it, and create + * a false dependency on the result of the load. It doesn't matter which + * GPR we store, or where we store it. We have already stored r2 to the + * stack at -8(r1) in isa206_idle_insn_mayloss, so use that. */ #define IDLE_STATE_ENTER_SEQ_NORET(IDLE_INST) \ /* Magic NAP/SLEEP/WINKLE mode enter sequence */ \ - std r2,0(r1); \ + std r2,-8(r1); \ ptesync; \ - ld r2,0(r1); \ + ld r2,-8(r1); \ 236: cmpd cr0,r2,r2; \ bne 236b; \ IDLE_INST; \
Greg Kroah-Hartman
maintainerPATCH 59/95 mm, slub: fix mismatch between reconstructed freelist depth and cnt
In reply to Greg Kroah-HartmanFrom: Miaohe Lin <[email protected]>
commit 899447f669da76cc3605665e1a95ee877bc464cc upstream.
If object's reuse is delayed, it will be excluded from the reconstructed freelist. But we forgot to adjust the cnt accordingly. So there will be a mismatch between reconstructed freelist depth and cnt. This will lead to free_debug_processing() complaining about freelist count or a incorrect slub inuse count.
--- mm/slub.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
mm/slub.c +9 -2
@@ -1543,7 +1543,8 @@ static __always_inline bool slab_free_ho }static inline bool slab_free_freelist_hook (struct kmem_cache *s, -void **head,void **tail) +void **head,void **tail, +int *cnt) {void *object;
@@ -1578,6 +1579,12 @@ static inline bool slab_free_freelist_ho *head = object;if (!*tail) *tail = object; + }else { +/* +* Adjust the reconstructed freelist depth +* accordingly if object's reuse is delayed. +*/ + --(*cnt); } }while (object != old_tail);
@@ -3137,7 +3144,7 @@ static __always_inline void slab_free(st* With KASAN enabled slab_free_freelist_hook modifies the freelist * to remove objects, whose reuse must be delayed. */ -if (slab_free_freelist_hook (s, &head, &tail)) +if (slab_free_freelist_hook (s, &head, &tail, &cnt))do_slab_free (s, page, head, tail, cnt, addr); }
Greg Kroah-Hartman
maintainerPATCH 60/95 mm, slub: fix potential memoryleak in kmem_cache_open()
In reply to Greg Kroah-HartmanFrom: Miaohe Lin <[email protected]>
commit 9037c57681d25e4dcc442d940d6dbe24dd31f461 upstream.
In error path, the random_seq of slub cache might be leaked. Fix this by using __kmem_cache_release() to release all the relevant resources.
--- mm/slub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/slub.c +1 -1
@@ -3832,8 +3832,8 @@ static int kmem_cache_open(struct kmem_cif (alloc_kmem_cache_cpus (s))return 0 ; -free_kmem_cache_nodes (s); error: +__kmem_cache_release (s);return -EINVAL ; }
Greg Kroah-Hartman
maintainerPATCH 61/95 mm, slub: fix incorrect memcg slab count for bulk free
In reply to Greg Kroah-HartmanFrom: Miaohe Lin <[email protected]>
commit 3ddd60268c24bcac9d744404cc277e9dc52fe6b6 upstream.
kmem_cache_free_bulk() will call memcg_slab_free_hook() for all objects when doing bulk free. So we shouldn't call memcg_slab_free_hook() again for bulk free to avoid incorrect memcg slab count.
--- mm/slub.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
mm/slub.c +3 -1
@@ -3100,7 +3100,9 @@ static __always_inline void do_slab_freestruct kmem_cache_cpu *c;unsigned long tid; -memcg_slab_free_hook (s, &head,1 ); +/* memcg_slab_free_hook() is already called for bulk free. */ +if (!tail) +memcg_slab_free_hook (s, &head,1 ); redo:/* * Determine the currently cpus per cpu slab.
Greg Kroah-Hartman
maintainerPATCH 62/95 KVM: nVMX: promptly process interrupts delivered while in guest mode
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit 3a25dfa67fe40f3a2690af2c562e0947a78bd6a0 upstream.
Since commit c300ab9f08df ("KVM: x86: Replace late check_nested_events() hack with more precise fix") there is no longer the certainty that check_nested_events() tries to inject an external interrupt vmexit to L1 on every call to vcpu_enter_guest. Therefore, even in that case we need to set KVM_REQ_EVENT. This ensures that inject_pending_event() is called, and from there kvm_check_nested_events().
--- arch/x86/kvm/vmx/vmx.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
arch/x86/kvm/vmx/vmx.c +6 -11
@@ -6316,18 +6316,13 @@ static int vmx_sync_pir_to_irr(struct kv/* * If we are running L2 and L1 has a new pending interrupt -* which can be injected, we should re-evaluate -* what should be done with this new L1 interrupt. -* If L1 intercepts external-interrupts, we should -* exit from L2 to L1. Otherwise, interrupt should be -* delivered directly to L2. +* which can be injected, this may cause a vmexit or it may +* be injected into L2. Either way, this interrupt will be +* processed via KVM_REQ_EVENT, not RVI, because we do not use +* virtual interrupt delivery to inject L1 interrupts into L2. */ -if (is_guest_mode (vcpu) && max_irr_updated) { -if (nested_exit_on_intr (vcpu)) -kvm_vcpu_exiting_guest_mode (vcpu); -else -kvm_make_request (KVM_REQ_EVENT , vcpu); - } +if (is_guest_mode (vcpu) && max_irr_updated) +kvm_make_request (KVM_REQ_EVENT , vcpu); }else { max_irr =kvm_lapic_find_highest_irr (vcpu); }
Greg Kroah-Hartman
maintainerPATCH 63/95 nfc: nci: fix the UAF of rf_conn_info object
In reply to Greg Kroah-HartmanFrom: Lin Ma <[email protected]>
commit 1b1499a817c90fd1ce9453a2c98d2a01cca0e775 upstream.
The nci_core_conn_close_rsp_packet() function will release the conn_info with given conn_id. However, it needs to set the rf_conn_info to NULL to prevent other routines like nci_rf_intf_activated_ntf_packet() to trigger the UAF.
--- net/nfc/nci/rsp.c | 2 ++ 1 file changed, 2 insertions(+)
net/nfc/nci/rsp.c +2 -0
@@ -277,6 +277,8 @@ static void nci_core_conn_close_rsp_pack ndev->cur_conn_id);if (conn_info) {list_del (&conn_info->list); +if (conn_info == ndev->rf_conn_info) + ndev->rf_conn_info =NULL ;devm_kfree (&ndev->nfc_dev->dev, conn_info); } }
Greg Kroah-Hartman
maintainerPATCH 64/95 isdn: cpai: check ctr->cnr to avoid array index out of bound
In reply to Greg Kroah-HartmanFrom: Xiaolong Huang <[email protected]>
commit 1f3e2e97c003f80c4b087092b225c8787ff91e4d upstream.
The cmtp_add_connection() would add a cmtp session to a controller and run a kernel thread to process cmtp.
__module_get(THIS_MODULE); session->task = kthread_run(cmtp_session, session, "kcmtpd_ctr_%d", session->num);
During this process, the kernel thread would call detach_capi_ctr() to detach a register controller. if the controller
was not attached yet, detach_capi_ctr() would
trigger an array-index-out-bounds bug.
[ 46.866069][ T6479] UBSAN: array-index-out-of-bounds in drivers/isdn/capi/kcapi.c:483:21 [ 46.867196][ T6479] index -1 is out of range for type 'capi_ctr *[32]' [ 46.867982][ T6479] CPU: 1 PID: 6479 Comm: kcmtpd_ctr_0 Not tainted 5.15.0-rc2+ #8 [ 46.869002][ T6479] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.14.0-2 04/01/2014 [ 46.870107][ T6479] Call Trace: [ 46.870473][ T6479] dump_stack_lvl+0x57/0x7d [ 46.870974][ T6479] ubsan_epilogue+0x5/0x40 [ 46.871458][ T6479] __ubsan_handle_out_of_bounds.cold+0x43/0x48 [ 46.872135][ T6479] detach_capi_ctr+0x64/0xc0 [ 46.872639][ T6479] cmtp_session+0x5c8/0x5d0 [ 46.873131][ T6479] ? __init_waitqueue_head+0x60/0x60 [ 46.873712][ T6479] ? cmtp_add_msgpart+0x120/0x120 [ 46.874256][ T6479] kthread+0x147/0x170 [ 46.874709][ T6479] ? set_kthread_struct+0x40/0x40 [ 46.875248][ T6479] ret_from_fork+0x1f/0x30 [ 46.875773][ T6479]
--- drivers/isdn/capi/kcapi.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/isdn/capi/kcapi.c +5 -0
@@ -480,6 +480,11 @@ int detach_capi_ctr(struct capi_ctr *ctrctr_down (ctr,CAPI_CTR_DETACHED ); +if (ctr->cnr <1 || ctr->cnr -1 >=CAPI_MAXCONTR ) { + err = -EINVAL ; + goto unlock_out; + } +if (capi_controller[ctr->cnr -1 ] != ctr) { err = -EINVAL ; goto unlock_out;
Greg Kroah-Hartman
maintainerPATCH 65/95 netfilter: Kconfig: use default y instead of m for bool config option
In reply to Greg Kroah-HartmanFrom: Vegard Nossum <[email protected]>
commit 77076934afdcd46516caf18ed88b2f88025c9ddb upstream.
This option, NF_CONNTRACK_SECMARK, is a bool, so it can never be 'm'.
--- net/netfilter/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/Kconfig +1 -1
@@ -94,7 +94,7 @@ config NF_CONNTRACK_MARK config NF_CONNTRACK_SECMARK bool 'Connection tracking security mark support' depends on NETWORK_SECMARK - default m if NETFILTER_ADVANCED=n + default y if NETFILTER_ADVANCED=n help This option enables security markings to be applied to connections. Typically they are copied to connections from
Greg Kroah-Hartman
maintainerPATCH 66/95 selftests: netfilter: remove stray bash debug line
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
commit 3e6ed7703dae6838c104d73d3e76e9b79f5c0528 upstream.
This should not be there.
--- tools/testing/selftests/netfilter/nft_flowtable.sh | 1 - 1 file changed, 1 deletion(-)
tools/testing/selftests/netfilter/nft_flowtable.sh +0 -1
@@ -199,7 +199,6 @@ fi # test basic connectivity if ! ip netns exec ns1 ping -c 1 -q 10.0.2.99 > /dev/null; then echo "ERROR: ns1 cannot reach ns2" 1>&2 - bash exit 1 fi
Greg Kroah-Hartman
maintainerPATCH 67/95 net: bridge: mcast: use multicast_membership_interval for IGMPv3
In reply to Greg Kroah-HartmanFrom: Nikolay Aleksandrov <[email protected]>
commit fac3cb82a54a4b7c49c932f96ef196cf5774344c upstream.
When I added IGMPv3 support I decided to follow the RFC for computing the GMI dynamically:
" 8.4. Group Membership Interval
The Group Membership Interval is the amount of time that must pass before a multicast router decides there are no more members of a group or a particular source on a network.
This value MUST be ((the Robustness Variable) times (the Query Interval)) plus (one Query Response Interval)."
But that actually is inconsistent with how the bridge used to compute it for IGMPv2, where it was user-configurable that has a correct default value but it is up to user-space to maintain it. This would make it consistent with the other timer values which are also maintained correct by the user instead of being dynamically computed. It also changes back to the previous user-expected GMI behaviour for IGMPv3 queries which were supported before IGMPv3 was added. Note that to properly compute it dynamically we would need to add support for "Robustness Variable" which is currently missing.
--- net/bridge/br_private.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
net/bridge/br_private.h +1 -3
@@ -931,9 +931,7 @@ static inline unsigned long br_multicaststatic inline unsigned long br_multicast_gmi (const struct net_bridge *br) { -/* use the RFC default of 2 for QRV */ -return 2 * br->multicast_query_interval + - br->multicast_query_response_interval; +return br->multicast_membership_interval; }#else static inline int br_multicast_rcv(struct net_bridge *br,
Greg Kroah-Hartman
maintainerPATCH 68/95 drm: mxsfb: Fix NULL pointer dereference crash on unload
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
commit 3cfc183052c3dbf8eae57b6c1685dab00ed3db4a upstream.
The mxsfb->crtc.funcs may already be NULL when unloading the driver, in which case calling mxsfb_irq_disable() via drm_irq_uninstall() from mxsfb_unload() leads to NULL pointer dereference.
Since all we care about is masking the IRQ and mxsfb->base is still valid, just use that to clear and mask the IRQ.
--- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/mxsfb/mxsfb_drv.c +5 -1
@@ -268,7 +268,11 @@ static void mxsfb_irq_disable(struct drmstruct mxsfb_drm_private *mxsfb = drm->dev_private;mxsfb_enable_axi_clk (mxsfb); - mxsfb->crtc.funcs->disable_vblank (&mxsfb->crtc); + +/* Disable and clear VBLANK IRQ */ +writel (CTRL1_CUR_FRAME_DONE_IRQ_EN , mxsfb->base +LCDC_CTRL1 +REG_CLR ); +writel (CTRL1_CUR_FRAME_DONE_IRQ , mxsfb->base +LCDC_CTRL1 +REG_CLR ); +mxsfb_disable_axi_clk (mxsfb); }
Greg Kroah-Hartman
maintainerPATCH 69/95 net: hns3: fix the max tx size according to user manual
In reply to Greg Kroah-HartmanFrom: Yunsheng Lin <[email protected]>
commit adfb7b4966c0c4c63a791f202b8b3837b07a9ece upstream.
Currently the max tx size supported by the hw is calculated by using the max BD num supported by the hw. According to the hw user manual, the max tx size is fixed value for both non-TSO and TSO skb.
This patch updates the max tx size according to the manual.
--- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 7 ++----- drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +2 -5
@@ -1283,7 +1283,6 @@ void hns3_shinfo_pack(struct skb_shared_static int hns3_skb_linearize (struct hns3_enet_ring *ring,struct sk_buff *skb, -u8 max_non_tso_bd_num,unsigned int bd_num) {/* 'bd_num == UINT_MAX' means the skb' fraglist has a
@@ -1300,8 +1299,7 @@ static int hns3_skb_linearize(struct hns* will not help. */ if (skb->len >HNS3_MAX_TSO_SIZE || - (!skb_is_gso (skb) && skb->len > -HNS3_MAX_NON_TSO_SIZE (max_non_tso_bd_num))) { + (!skb_is_gso (skb) && skb->len >HNS3_MAX_NON_TSO_SIZE )) {u64_stats_update_begin (&ring->syncp); ring->stats.hw_limitation++;u64_stats_update_end (&ring->syncp);
@@ -1336,8 +1334,7 @@ static int hns3_nic_maybe_stop_tx(struct goto out; } -if (hns3_skb_linearize (ring, skb, max_non_tso_bd_num, - bd_num)) +if (hns3_skb_linearize (ring, skb, bd_num))return -ENOMEM ; bd_num =hns3_tx_bd_count (skb->len);
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h +2 -4
@@ -170,11 +170,9 @@ enum hns3_nic_state {#define HNS3_MAX_BD_SIZE 65535#define HNS3_MAX_TSO_BD_NUM 63U -#define HNS3_MAX_TSO_SIZE \ - (HNS3_MAX_BD_SIZE * HNS3_MAX_TSO_BD_NUM) +#define HNS3_MAX_TSO_SIZE 1048576U +#define HNS3_MAX_NON_TSO_SIZE 9728U -#define HNS3_MAX_NON_TSO_SIZE (max_non_tso_bd_num) \ - (HNS3_MAX_BD_SIZE * (max_non_tso_bd_num))#define HNS3_VECTOR_GL0_OFFSET 0x100#define HNS3_VECTOR_GL1_OFFSET 0x200
Greg Kroah-Hartman
maintainerPATCH 70/95 gcc-plugins/structleak: add makefile var for disabling structleak
In reply to Greg Kroah-HartmanFrom: Brendan Higgins <[email protected]>
[ Upstream commit 554afc3b9797511e3245864e32aebeb6abbab1e3 ]
KUnit and structleak don't play nice, so add a makefile variable for enabling structleak when it complains.
--- scripts/Makefile.gcc-plugins | 4 ++++ 1 file changed, 4 insertions(+)
scripts/Makefile.gcc-plugins +4 -0
@@ -19,6 +19,10 @@ gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF) \ += -fplugin-arg-structleak_plugin-byref gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL) \ += -fplugin-arg-structleak_plugin-byref-all +ifdef CONFIG_GCC_PLUGIN_STRUCTLEAK + DISABLE_STRUCTLEAK_PLUGIN += -fplugin-arg-structleak_plugin-disable +endif +export DISABLE_STRUCTLEAK_PLUGIN gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK) \ += -DSTRUCTLEAK_PLUGIN
Signature · 1 line
2.33.0
Re: [PATCH 5.10 70/95] gcc-plugins/structleak: add makefile var for disabling structleak
Hi!
Quoted 4 lines
[ Upstream commit
554afc3b9797511e3245864e32aebeb6abbab1e3]KUnit and structleak don't play nice, so add a makefile variable for enabling structleak when it complains.
AFAICT, this patch does nothing useful in 5.10. Unlike mainline, DISABLE_STRUCTLEAK_PLUGIN is not used elsewhere in the tree.
Best regards,
Pavel
Quoted 12 lines
+++ b/scripts/Makefile.gcc-plugins
scripts/Makefile.gcc-plugins +4
-0@@ -19,6 +19,10 @@ gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF) \ += -fplugin-arg-structleak_plugin-byref gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL) \ += -fplugin-arg-structleak_plugin-byref-all +ifdef CONFIG_GCC_PLUGIN_STRUCTLEAK + DISABLE_STRUCTLEAK_PLUGIN += -fplugin-arg-structleak_plugin-disable +endif +export DISABLE_STRUCTLEAK_PLUGIN gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK) \ += -DSTRUCTLEAK_PLUGIN
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Re: [PATCH 5.10 70/95] gcc-plugins/structleak: add makefile var for disabling structleak
Quoted 10 lines · Pavel Machek
Hi!
Quoted 4 lines
[ Upstream commit
554afc3b9797511e3245864e32aebeb6abbab1e3]KUnit and structleak don't play nice, so add a makefile variable for enabling structleak when it complains.
AFAICT, this patch does nothing useful in 5.10. Unlike mainline,
DISABLE_STRUCTLEAK_PLUGINis not used elsewhere in the tree.
The related patches that Greg picked up use this makefile variable.
Cheers
Quoted 18 lines
Best regards,
Pavelscripts/Makefile.gcc-plugins gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF) \ · line 28
Quoted 12 lines
+++ b/scripts/Makefile.gcc-plugins
scripts/Makefile.gcc-plugins +4
-0@@ -19,6 +19,10 @@ gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF) \ += -fplugin-arg-structleak_plugin-byref gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL) \ += -fplugin-arg-structleak_plugin-byref-all +ifdef CONFIG_GCC_PLUGIN_STRUCTLEAK + DISABLE_STRUCTLEAK_PLUGIN += -fplugin-arg-structleak_plugin-disable +endif +export DISABLE_STRUCTLEAK_PLUGIN gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK) \ += -DSTRUCTLEAK_PLUGIN--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Re: [PATCH 5.10 70/95] gcc-plugins/structleak: add makefile var for disabling structleak
Hi!
Quoted 9 lines
Quoted 7 lines
Quoted 4 lines
[ Upstream commit
554afc3b9797511e3245864e32aebeb6abbab1e3]KUnit and structleak don't play nice, so add a makefile variable for enabling structleak when it complains.
AFAICT, this patch does nothing useful in 5.10. Unlike mainline,
DISABLE_STRUCTLEAK_PLUGINis not used elsewhere in the tree.The related patches that Greg picked up use this makefile variable.
I don't think so, not in 5.10. Can you double-check?
pavel@duo:~/cip/krc$ grep -ri DISABLE_STRUCTLEAK_PLUGIN . ./scripts/Makefile.gcc-plugins: DISABLE_STRUCTLEAK_PLUGIN += -fplugin-arg-structleak_plugin-disable ./scripts/Makefile.gcc-plugins:export DISABLE_STRUCTLEAK_PLUGIN pavel@duo:~/cip/krc$ commit b67ee9a213819f2c817e3d344c2fc186f299a4f5 (HEAD, origin/queue/5.10) Author: Fabien Dessenne <[email protected]> Date: Fri Oct 8 14:25:17 2021 +0200
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Greg Kroah-Hartman
maintainerPATCH 71/95 ALSA: hda: intel: Allow repeatedly probing on codec configuration errors
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit c0f1886de7e173865f1a0fa7680a1c07954a987f ]
It seems that a few recent AMD systems show the codec configuration errors at the early boot, while loading the driver at a later stage works magically. Although the root cause of the error isn't clear, it's certainly not bad to allow retrying the codec probe in such a case if that helps.
This patch adds the capability for retrying the probe upon codec probe errors on the certain AMD platforms. The probe_work is changed to a delayed work, and at the secondary call, it'll jump to the codec probing.
Note that, not only adding the re-probing, this includes the behavior changes in the codec configuration function. Namely, snd_hda_codec_configure() won't unregister the codec at errors any longer. Instead, its caller, azx_codec_configure() unregisters the codecs with the probe failures *if* any codec has been successfully configured. If all codec probe failed, it doesn't unregister but let it re-probed -- which is the most case we're seeing and this patch tries to improve.
Even if the driver doesn't re-probe or give up, it will go to the "free-all" error path, hence the leftover codecs shall be disabled / deleted in anyway.
--- include/sound/hda_codec.h | 1 + sound/pci/hda/hda_bind.c | 20 +++++++++++--------- sound/pci/hda/hda_codec.c | 1 + sound/pci/hda/hda_controller.c | 24 ++++++++++++++++-------- sound/pci/hda/hda_controller.h | 2 +- sound/pci/hda/hda_intel.c | 29 +++++++++++++++++++++++------ sound/pci/hda/hda_intel.h | 4 +++- 7 files changed, 56 insertions(+), 25 deletions(-)
include/sound/hda_codec.h +1 -0
@@ -225,6 +225,7 @@ struct hda_codec {#endif /* misc flags */ + unsigned int configured:1; /* codec was configured */ unsigned int in_freeing:1; /* being released */ unsigned int registered:1; /* codec was registered */ unsigned int display_power_control:1; /* needs display power */
sound/pci/hda/hda_bind.c +11 -9
@@ -301,29 +301,31 @@ int snd_hda_codec_configure(struct hda_codec *codec) {int err; +if (codec->configured) +return 0 ; +if (is_generic_config (codec)) codec->probe_id =HDA_CODEC_ID_GENERIC ;else codec->probe_id =0 ; - err =snd_hdac_device_register (&codec->core); -if (err <0 ) -return err; +if (!device_is_registered (&codec->core.dev)) { + err =snd_hdac_device_register (&codec->core); +if (err <0 ) +return err; + }if (!codec->preset)codec_bind_module (codec);if (!codec->preset) { err =codec_bind_generic (codec);if (err <0 ) { -codec_err (codec,"Unable to bind the codec\n" ); - goto error; +codec_dbg (codec,"Unable to bind the codec\n" ); +return err; } } + codec->configured =1 ;return 0 ; - - error: -snd_hdac_device_unregister (&codec->core); -return err; }EXPORT_SYMBOL_GPL (snd_hda_codec_configure);
sound/pci/hda/hda_codec.c +1 -0
@@ -791,6 +791,7 @@ void snd_hda_codec_cleanup_for_unbind(struct hda_codec *codec)snd_array_free (&codec->nids);remove_conn_list (codec);snd_hdac_regmap_exit (&codec->core); + codec->configured =0 ; }EXPORT_SYMBOL_GPL (snd_hda_codec_cleanup_for_unbind);
sound/pci/hda/hda_controller.c +16 -8
@@ -25,6 +25,7 @@#include <sound/core.h> #include <sound/initval.h> #include "hda_controller.h" +#include "hda_local.h" #define CREATE_TRACE_POINTS #include "hda_controller_trace.h"
@@ -1259,17 +1260,24 @@ EXPORT_SYMBOL_GPL(azx_probe_codecs);int azx_codec_configure (struct azx *chip) {struct hda_codec *codec, *next; +int success =0 ; -/* use _safe version here since snd_hda_codec_configure() deregisters -* the device upon error and deletes itself from the bus list. -*/ -list_for_each_codec_safe (codec, next, &chip->bus) { -snd_hda_codec_configure (codec); +list_for_each_codec (codec, &chip->bus) { +if (!snd_hda_codec_configure (codec)) + success++; } -if (!azx_bus (chip)->num_codecs) -return -ENODEV ; -return 0 ; +if (success) { +/* unregister failed codecs if any codec has been probed */ +list_for_each_codec_safe (codec, next, &chip->bus) { +if (!codec->configured) { +codec_err (codec,"Unable to configure, disabling\n" ); +snd_hdac_device_unregister (&codec->core); + } + } + } + +return success ?0 : -ENODEV ; }EXPORT_SYMBOL_GPL (azx_codec_configure);
sound/pci/hda/hda_controller.h +1 -1
@@ -41,7 +41,7 @@/* 24 unused */ #define AZX_DCAPS_COUNT_LPIB_DELAY (1 << 25)/* Take LPIB as delay */ #define AZX_DCAPS_PM_RUNTIME (1 << 26)/* runtime PM support */ -/* 27 unused */ +#define AZX_DCAPS_RETRY_PROBE (1 << 27)/* retry probe if no codec is configured */ #define AZX_DCAPS_CORBRP_SELF_CLEAR (1 << 28)/* CORBRP clears itself after reset */ #define AZX_DCAPS_NO_MSI64 (1 << 29)/* Stick to 32-bit MSIs */ #define AZX_DCAPS_SEPARATE_STREAM_TAG (1 << 30)/* capture and playback use separate stream tag */
sound/pci/hda/hda_intel.c +23 -6
@@ -341,7 +341,8 @@ enum {/* quirks for AMD SB */ #define AZX_DCAPS_PRESET_AMD_SB \ (AZX_DCAPS_NO_TCSEL | AZX_DCAPS_AMD_WORKAROUND |\ - AZX_DCAPS_SNOOP_TYPE(ATI) | AZX_DCAPS_PM_RUNTIME) + AZX_DCAPS_SNOOP_TYPE(ATI) | AZX_DCAPS_PM_RUNTIME |\ + AZX_DCAPS_RETRY_PROBE)/* quirks for Nvidia */ #define AZX_DCAPS_PRESET_NVIDIA \
@@ -1758,7 +1759,7 @@ static void azx_check_snoop_available(struct azx *chip)static void azx_probe_work (struct work_struct *work) { - struct hda_intel *hda = container_of(work, struct hda_intel, probe_work); + struct hda_intel *hda = container_of(work, struct hda_intel, probe_work.work);azx_probe_continue (&hda->chip); }
@@ -1867,7 +1868,7 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, }/* continue probing in work context as may trigger request module */ -INIT_WORK (&hda->probe_work, azx_probe_work); +INIT_DELAYED_WORK (&hda->probe_work, azx_probe_work); *rchip = chip;
@@ -2202,7 +2203,7 @@ static int azx_probe(struct pci_dev *pci,#endif if (schedule_probe) -schedule_work (&hda->probe_work); +schedule_delayed_work (&hda->probe_work,0 ); dev++;if (chip->disabled)
@@ -2290,6 +2291,11 @@ static int azx_probe_continue(struct azx *chip)int dev = chip->dev_index;int err; +if (chip->disabled || hda->init_failed) +return -EIO ; +if (hda->probe_retry) + goto probe_retry; +to_hda_bus (bus)->bus_probing =1 ; hda->probe_continued =1 ;
@@ -2351,10 +2357,20 @@ static int azx_probe_continue(struct azx *chip) #endif }#endif + + probe_retry:if (bus->codec_mask && !(probe_only[dev] &1 )) { err =azx_codec_configure (chip); -if (err <0 ) +if (err) { +if ((chip->driver_caps &AZX_DCAPS_RETRY_PROBE ) && + ++hda->probe_retry <60 ) { +schedule_delayed_work (&hda->probe_work, +msecs_to_jiffies (1000 )); +return 0 ;/* keep things up */ + } +dev_err (chip->card->dev,"Cannot probe codecs, giving up\n" ); goto out_free; + } } err =snd_card_register (chip->card);
@@ -2384,6 +2400,7 @@ out_free:display_power (chip, false);complete_all (&hda->probe_wait);to_hda_bus (bus)->bus_probing =0 ; + hda->probe_retry =0 ;return 0 ; }
@@ -2409,7 +2426,7 @@ static void azx_remove(struct pci_dev *pci)* device during cancel_work_sync() call. */ device_unlock (&pci->dev); -cancel_work_sync (&hda->probe_work); +cancel_delayed_work_sync (&hda->probe_work);device_lock (&pci->dev);snd_card_free (card);
sound/pci/hda/hda_intel.h +3 -1
@@ -14,7 +14,7 @@ struct hda_intel {/* sync probing */ struct completion probe_wait; -struct work_struct probe_work; +struct delayed_work probe_work;/* card list (for power_save trigger) */ struct list_head list;
@@ -30,6 +30,8 @@ struct hda_intel { unsigned int freed:1; /* resources already released */ bool need_i915_power:1; /* the hda controller needs i915 power */ + + int probe_retry; /* being probe-retry */ };#endif
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 72/95 btrfs: deal with errors when checking if a dir entry exists during log replay
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
[ Upstream commit 77a5b9e3d14cbce49ceed2766b2003c034c066dc ]
Currently inode_in_dir() ignores errors returned from btrfs_lookup_dir_index_item() and from btrfs_lookup_dir_item(), treating any errors as if the directory entry does not exists in the fs/subvolume tree, which is obviously not correct, as we can get errors such as -EIO when reading extent buffers while searching the fs/subvolume's tree.
Fix that by making inode_in_dir() return the errors and making its only caller, add_inode_ref(), deal with returned errors as well.
--- fs/btrfs/tree-log.c | 47 ++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 18 deletions(-)
fs/btrfs/tree-log.c +29 -18
@@ -894,9 +894,11 @@ out: }/* -* helper function to see if a given name and sequence number found -* in an inode back reference are already in a directory and correctly -* point to this inode +* See if a given name and sequence number found in an inode back reference are +* already in a directory and correctly point to this inode. +* +* Returns: < 0 on error, 0 if the directory entry does not exists and 1 if it +* exists. */ static noinline int inode_in_dir(struct btrfs_root *root, struct btrfs_path *path,
@@ -905,29 +907,35 @@ static noinline int inode_in_dir(struct btrfs_root *root, {struct btrfs_dir_item *di;struct btrfs_key location; -int match =0 ; +int ret =0 ; di =btrfs_lookup_dir_index_item (NULL , root, path, dirid, index, name, name_len,0 ); -if (di && !IS_ERR (di)) { +if (IS_ERR (di)) { +if (PTR_ERR (di) != -ENOENT ) + ret =PTR_ERR (di); + goto out; + }else if (di) {btrfs_dir_item_key_to_cpu (path->nodes[0 ], di, &location);if (location.objectid != objectid) goto out; - }else + }else { goto out; -btrfs_release_path (path); + } +btrfs_release_path (path); di =btrfs_lookup_dir_item (NULL , root, path, dirid, name, name_len,0 ); -if (di && !IS_ERR (di)) { -btrfs_dir_item_key_to_cpu (path->nodes[0 ], di, &location); -if (location.objectid != objectid) - goto out; - }else +if (IS_ERR (di)) { + ret =PTR_ERR (di); goto out; - match =1 ; + }else if (di) { +btrfs_dir_item_key_to_cpu (path->nodes[0 ], di, &location); +if (location.objectid == objectid) + ret =1 ; + } out:btrfs_release_path (path); -return match; +return ret; }/*
@@ -1477,10 +1485,12 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,if (ret) goto out; -/* if we already have a perfect match, we're done */ -if (!inode_in_dir (root, path,btrfs_ino (BTRFS_I (dir)), -btrfs_ino (BTRFS_I (inode)), ref_index, - name, namelen)) { + ret =inode_in_dir (root, path,btrfs_ino (BTRFS_I (dir)), +btrfs_ino (BTRFS_I (inode)), ref_index, + name, namelen); +if (ret <0 ) { + goto out; + }else if (ret ==0 ) {/* * look for a conflicting back reference in the * metadata. if we find one we have to unlink that name
@@ -1538,6 +1548,7 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,btrfs_update_inode (trans, root, inode); } +/* Else, ret == 1, we already have a perfect match, we're done. */ ref_ptr = (unsigned long )(ref_ptr + ref_struct_size) + namelen;kfree (name);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 73/95 net: stmmac: add support for dwmac 3.40a
In reply to Greg Kroah-HartmanFrom: Herve Codina <[email protected]>
[ Upstream commit 9cb1d19f47fafad7dcf7c8564e633440c946cfd7 ]
dwmac 3.40a is an old ip version that can be found on SPEAr3xx soc.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c | 1 + drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 ++++++++ 2 files changed, 9 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c +1 -0
@@ -71,6 +71,7 @@ err_remove_config_dt:static const struct of_device_id dwmac_generic_match[] = { { .compatible ="st,spear600-gmac" }, + { .compatible ="snps,dwmac-3.40a" }, { .compatible ="snps,dwmac-3.50a" }, { .compatible ="snps,dwmac-3.610" }, { .compatible ="snps,dwmac-3.70a" },
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +8 -0
@@ -508,6 +508,14 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac) plat->pmt =1 ; } +if (of_device_is_compatible (np,"snps,dwmac-3.40a" )) { + plat->has_gmac =1 ; + plat->enh_desc =1 ; + plat->tx_coe =1 ; + plat->bugged_jumbo =1 ; + plat->pmt =1 ; + } + if (of_device_is_compatible(np, "snps,dwmac-4.00") || of_device_is_compatible(np, "snps,dwmac-4.10a") || of_device_is_compatible(np, "snps,dwmac-4.20a") ||
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 74/95 ARM: dts: spear3xx: Fix gmac node
In reply to Greg Kroah-HartmanFrom: Herve Codina <[email protected]>
[ Upstream commit 6636fec29cdf6665bd219564609e8651f6ddc142 ]
On SPEAr3xx, ethernet driver is not compatible with the SPEAr600 one.
Indeed, SPEAr3xx uses an earlier version of this IP (v3.40) and needs some driver tuning compare to SPEAr600.
The v3.40 IP support was added to stmmac driver and this patch fixes this issue and use the correct compatible string for SPEAr3xx
--- arch/arm/boot/dts/spear3xx.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/spear3xx.dtsi +1 -1
@@ -47,7 +47,7 @@ }; gmac: eth@e0800000 { - compatible = "st,spear600-gmac"; + compatible = "snps,dwmac-3.40a"; reg = <0xe0800000 0x8000>; interrupts = <23 22>; interrupt-names = "macirq", "eth_wake_irq";
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 75/95 isdn: mISDN: Fix sleeping function called from invalid context
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit 6510e80a0b81b5d814e3aea6297ba42f5e76f73c ]
The driver can call card->isac.release() function from an atomic context.
Fix this by calling this function after releasing the lock.
The following log reveals it:
[ 44.168226 ] BUG: sleeping function called from invalid context at kernel/workqueue.c:3018 [ 44.168941 ] in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 5475, name: modprobe [ 44.169574 ] INFO: lockdep is turned off. [ 44.169899 ] irq event stamp: 0 [ 44.170160 ] hardirqs last enabled at (0): [<0000000000000000>] 0x0 [ 44.170627 ] hardirqs last disabled at (0): [<ffffffff814209ed>] copy_process+0x132d/0x3e00 [ 44.171240 ] softirqs last enabled at (0): [<ffffffff81420a1a>] copy_process+0x135a/0x3e00 [ 44.171852 ] softirqs last disabled at (0): [<0000000000000000>] 0x0 [ 44.172318 ] Preemption disabled at: [ 44.172320 ] [<ffffffffa009b0a9>] nj_release+0x69/0x500 [netjet] [ 44.174441 ] Call Trace: [ 44.174630 ] dump_stack_lvl+0xa8/0xd1 [ 44.174912 ] dump_stack+0x15/0x17 [ 44.175166 ] ___might_sleep+0x3a2/0x510 [ 44.175459 ] ? nj_release+0x69/0x500 [netjet] [ 44.175791 ] __might_sleep+0x82/0xe0 [ 44.176063 ] ? start_flush_work+0x20/0x7b0 [ 44.176375 ] start_flush_work+0x33/0x7b0 [ 44.176672 ] ? trace_irq_enable_rcuidle+0x85/0x170 [ 44.177034 ] ? kasan_quarantine_put+0xaa/0x1f0 [ 44.177372 ] ? kasan_quarantine_put+0xaa/0x1f0 [ 44.177711 ] __flush_work+0x11a/0x1a0 [ 44.177991 ] ? flush_work+0x20/0x20 [ 44.178257 ] ? lock_release+0x13c/0x8f0 [ 44.178550 ] ? __kasan_check_write+0x14/0x20 [ 44.178872 ] ? do_raw_spin_lock+0x148/0x360 [ 44.179187 ] ? read_lock_is_recursive+0x20/0x20 [ 44.179530 ] ? __kasan_check_read+0x11/0x20 [ 44.179846 ] ? do_raw_spin_unlock+0x55/0x900 [ 44.180168 ] ? ____kasan_slab_free+0x116/0x140 [ 44.180505 ] ? _raw_spin_unlock_irqrestore+0x41/0x60 [ 44.180878 ] ? skb_queue_purge+0x1a3/0x1c0 [ 44.181189 ] ? kfree+0x13e/0x290 [ 44.181438 ] flush_work+0x17/0x20 [ 44.181695 ] mISDN_freedchannel+0xe8/0x100 [ 44.182006 ] isac_release+0x210/0x260 [mISDNipac] [ 44.182366 ] nj_release+0xf6/0x500 [netjet] [ 44.182685 ] nj_remove+0x48/0x70 [netjet] [ 44.182989 ] pci_device_remove+0xa9/0x250
--- drivers/isdn/hardware/mISDN/netjet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/isdn/hardware/mISDN/netjet.c +1 -1
@@ -949,8 +949,8 @@ nj_release(struct tiger_hw *card)nj_disable_hwirq (card);mode_tiger (&card->bc[0 ],ISDN_P_NONE );mode_tiger (&card->bc[1 ],ISDN_P_NONE ); - card->isac.release (&card->isac);spin_unlock_irqrestore (&card->lock, flags); + card->isac.release (&card->isac);release_region (card->base, card->base_s); card->base_s =0 ; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 76/95 platform/x86: intel_scu_ipc: Update timeout value in comment
In reply to Greg Kroah-HartmanFrom: Prashant Malani <[email protected]>
[ Upstream commit a0c5814b9933f25ecb6de169483c5b88cf632bca ]
The comment decribing the IPC timeout hadn't been updated when the actual timeout was changed from 3 to 5 seconds in
commit a7d53dbbc70a ("platform/x86: intel_scu_ipc: Increase virtual timeout from 3 to 5 seconds") .
Since the value is anyway updated to 10s now, take this opportunity to update the value in the comment too.
--- drivers/platform/x86/intel_scu_ipc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/intel_scu_ipc.c +1 -1
@@ -247,7 +247,7 @@ static inline int busy_loop(struct intel_scu_ipc_dev *scu)return -ETIMEDOUT ; } -/* Wait till ipc ioc interrupt is received or timeout in 3 HZ */ +/* Wait till ipc ioc interrupt is received or timeout in 10 HZ */ static inline int ipc_wait_for_interrupt (struct intel_scu_ipc_dev *scu) {int status;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 77/95 ALSA: hda: avoid write to STATESTS if controller is in reset
In reply to Greg Kroah-HartmanFrom: Kai Vehmanen <[email protected]>
[ Upstream commit b37a15188eae9d4c49c5bb035e0c8d4058e4d9b3 ]
The snd_hdac_bus_reset_link() contains logic to clear STATESTS register before performing controller reset. This code dates back to an old bugfix in commit e8a7f136f5ed ("[ALSA] hda-intel - Improve HD-audio codec probing robustness"). Originally the code was added to azx_reset().
The code was moved around in commit a41d122449be ("ALSA: hda - Embed bus into controller object") and ended up to snd_hdac_bus_reset_link() and called primarily via snd_hdac_bus_init_chip().
The logic to clear STATESTS is correct when snd_hdac_bus_init_chip() is called when controller is not in reset. In this case, STATESTS can be cleared. This can be useful e.g. when forcing a controller reset to retry codec probe. A normal non-power-on reset will not clear the bits.
However, this old logic is problematic when controller is already in reset. The HDA specification states that controller must be taken out of reset before writing to registers other than GCTL.CRST (1.0a spec, 3.3.7). The write to STATESTS in snd_hdac_bus_reset_link() will be lost if the controller is already in reset per the HDA specification mentioned.
This has been harmless on older hardware. On newer generation of Intel PCIe based HDA controllers, if configured to report issues, this write will emit an unsupported request error. If ACPI Platform Error Interface (APEI) is enabled in kernel, this will end up to kernel log.
Fix the code in snd_hdac_bus_reset_link() to only clear the STATESTS if the function is called when controller is not in reset. Otherwise clearing the bits is not possible and should be skipped.
--- sound/hda/hdac_controller.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/hda/hdac_controller.c +3 -2
@@ -421,8 +421,9 @@ int snd_hdac_bus_reset_link(struct hdac_bus *bus, bool full_reset)if (!full_reset) goto skip_reset; -/* clear STATESTS */ -snd_hdac_chip_writew (bus,STATESTS ,STATESTS_INT_MASK ); +/* clear STATESTS if not in reset */ +if (snd_hdac_chip_readb (bus,GCTL ) &AZX_GCTL_RESET ) +snd_hdac_chip_writew (bus,STATESTS ,STATESTS_INT_MASK );/* reset controller */ snd_hdac_bus_enter_link_reset (bus);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 78/95 libperf tests: Fix test_stat_cpu
In reply to Greg Kroah-HartmanFrom: Shunsuke Nakamura <[email protected]>
[ Upstream commit 3ff6d64e68abc231955d216236615918797614ae ]
The cpu argument of perf_evsel__read() must specify the cpu index.
perf_cpu_map__for_each_cpu() is for iterating the cpu number (not index) and is thus not appropriate for use with perf_evsel__read().
So, if there is an offline CPU, the cpu number specified in the argument may point out of range because the cpu number and the cpu index are different.
Fix test_stat_cpu().
Testing it:
# make tests -C tools/lib/perf/ make: Entering directory '/home/nakamura/kernel_src/linux-5.15-rc4_fix/tools/lib/perf' running static: - running tests/test-cpumap.c...OK - running tests/test-threadmap.c...OK - running tests/test-evlist.c...OK - running tests/test-evsel.c...OK running dynamic: - running tests/test-cpumap.c...OK - running tests/test-threadmap.c...OK - running tests/test-evlist.c...OK - running tests/test-evsel.c...OK make: Leaving directory '/home/nakamura/kernel_src/linux-5.15-rc4_fix/tools/lib/perf'
--- tools/lib/perf/tests/test-evlist.c | 6 +++--- tools/lib/perf/tests/test-evsel.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
tools/lib/perf/tests/test-evlist.c +3 -3
@@ -38,7 +38,7 @@ static int test_stat_cpu(void) .type = PERF_TYPE_SOFTWARE, .config = PERF_COUNT_SW_TASK_CLOCK, }; -int err, cpu, tmp; +int err, idx; cpus =perf_cpu_map__new (NULL );__T ("failed to create cpus" , cpus);
@@ -64,10 +64,10 @@ static int test_stat_cpu(void)perf_evlist__for_each_evsel (evlist, evsel) { cpus =perf_evsel__cpus (evsel); -perf_cpu_map__for_each_cpu (cpu, tmp, cpus) { +for (idx =0 ; idx <perf_cpu_map__nr (cpus); idx++) {struct perf_counts_values counts = { .val =0 }; -perf_evsel__read (evsel, cpu,0 , &counts); +perf_evsel__read (evsel, idx,0 , &counts);__T ("failed to read value for evsel" , counts.val !=0 ); } }
tools/lib/perf/tests/test-evsel.c +3 -3
@@ -21,7 +21,7 @@ static int test_stat_cpu(void) .type = PERF_TYPE_SOFTWARE, .config = PERF_COUNT_SW_CPU_CLOCK, }; -int err, cpu, tmp; +int err, idx; cpus =perf_cpu_map__new (NULL );__T ("failed to create cpus" , cpus);
@@ -32,10 +32,10 @@ static int test_stat_cpu(void) err =perf_evsel__open (evsel, cpus,NULL );__T ("failed to open evsel" , err ==0 ); -perf_cpu_map__for_each_cpu (cpu, tmp, cpus) { +for (idx =0 ; idx <perf_cpu_map__nr (cpus); idx++) {struct perf_counts_values counts = { .val =0 }; -perf_evsel__read (evsel, cpu,0 , &counts); +perf_evsel__read (evsel, idx,0 , &counts);__T ("failed to read value for evsel" , counts.val !=0 ); }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 79/95 perf/x86/msr: Add Sapphire Rapids CPU support
In reply to Greg Kroah-HartmanFrom: Kan Liang <[email protected]>
[ Upstream commit 71920ea97d6d1d800ee8b51951dc3fda3f5dc698 ]
SMI_COUNT MSR is supported on Sapphire Rapids CPU.
--- arch/x86/events/msr.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/events/msr.c +1 -0
@@ -68,6 +68,7 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_BROADWELL_D :case INTEL_FAM6_BROADWELL_G :case INTEL_FAM6_BROADWELL_X : +case INTEL_FAM6_SAPPHIRERAPIDS_X :case INTEL_FAM6_ATOM_SILVERMONT :case INTEL_FAM6_ATOM_SILVERMONT_D :
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 80/95 Input: snvs_pwrkey - add clk handling
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit d997cc1715df7b6c3df798881fb9941acf0079f8 ]
On i.MX7S and i.MX8M* (but not i.MX6*) the pwrkey device has an associated clock. Accessing the registers requires that this clock is enabled. Binding the driver on at least i.MX7S and i.MX8MP while not having the clock enabled results in a complete hang of the machine. (This usually only happens if snvs_pwrkey is built as a module and the rtc-snvs driver isn't already bound because at bootup the required clk is on and only gets disabled when the clk framework disables unused clks late during boot.)
This completes the fix in commit 135be16d3505 ("ARM: dts: imx7s: add snvs clock to pwrkey").
--- drivers/input/keyboard/snvs_pwrkey.c | 29 ++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
drivers/input/keyboard/snvs_pwrkey.c +29 -0
@@ -3,6 +3,7 @@// Driver for the IMX SNVS ON/OFF Power Key // Copyright (C) 2015 Freescale Semiconductor, Inc. All Rights Reserved. +#include <linux/clk.h> #include <linux/device.h> #include <linux/err.h> #include <linux/init.h>
@@ -99,6 +100,11 @@ static irqreturn_t imx_snvs_pwrkey_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } +static void imx_snvs_pwrkey_disable_clk (void *data) +{ +clk_disable_unprepare (data); +} +static void imx_snvs_pwrkey_act (void *pdata) {struct pwrkey_drv_data *pd = pdata;
@@ -111,6 +117,7 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)struct pwrkey_drv_data *pdata;struct input_dev *input;struct device_node *np; +struct clk *clk;int error;u32 vid;
@@ -134,6 +141,28 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)dev_warn (&pdev->dev,"KEY_POWER without setting in dts\n" ); } + clk =devm_clk_get_optional (&pdev->dev,NULL ); +if (IS_ERR (clk)) { +dev_err (&pdev->dev,"Failed to get snvs clock (%pe)\n" , clk); +return PTR_ERR (clk); + } + + error =clk_prepare_enable (clk); +if (error) { +dev_err (&pdev->dev,"Failed to enable snvs clock (%pe)\n" , +ERR_PTR (error)); +return error; + } + + error =devm_add_action_or_reset (&pdev->dev, + imx_snvs_pwrkey_disable_clk, clk); +if (error) { +dev_err (&pdev->dev, +"Failed to register clock cleanup handler (%pe)\n" , +ERR_PTR (error)); +return error; + } + pdata->wakeup =of_property_read_bool (np,"wakeup-source" ); pdata->irq =platform_get_irq (pdev,0 );
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 81/95 scsi: iscsi: Fix set_param() handling
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit 187a580c9e7895978dcd1e627b9c9e7e3d13ca96 ]
In commit 9e67600ed6b8 ("scsi: iscsi: Fix race condition between login and sync thread") we meant to add a check where before we call ->set_param() we make sure the iscsi_cls_connection is bound. The problem is that between versions 4 and 5 of the patch the deletion of the unchecked set_param() call was dropped so we ended up with 2 calls. As a result we can still hit a crash where we access the unbound connection on the first call.
This patch removes that first call.
--- drivers/scsi/scsi_transport_iscsi.c | 2 -- 1 file changed, 2 deletions(-)
drivers/scsi/scsi_transport_iscsi.c +0 -2
@@ -2907,8 +2907,6 @@ iscsi_set_param(struct iscsi_transport *transport, struct iscsi_uevent *ev) session->recovery_tmo = value;break ;default : - err = transport->set_param (conn, ev->u.set_param.param, - data, ev->u.set_param.len);if ((conn->state ==ISCSI_CONN_BOUND ) || (conn->state ==ISCSI_CONN_UP )) { err = transport->set_param(conn, ev->u.set_param.param,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 82/95 scsi: qla2xxx: Fix a memory leak in an error path of qla2x00_process_els()
In reply to Greg Kroah-HartmanFrom: Joy Gu <[email protected]>
[ Upstream commit 7fb223d0ad801f633c78cbe42b1d1b55f5d163ad ]
Commit 8c0eb596baa5 ("[SCSI] qla2xxx: Fix a memory leak in an error path of qla2x00_process_els()"), intended to change:
bsg_job->request->msgcode == FC_BSG_HST_ELS_NOLOGIN
to:
bsg_job->request->msgcode != FC_BSG_RPT_ELS
but changed it to:
bsg_job->request->msgcode == FC_BSG_RPT_ELS
instead.
Change the == to a != to avoid leaking the fcport structure or freeing unallocated memory.
--- drivers/scsi/qla2xxx/qla_bsg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_bsg.c +1 -1
@@ -414,7 +414,7 @@ done_unmap_sg: goto done_free_fcport; done_free_fcport: -if (bsg_request->msgcode ==FC_BSG_RPT_ELS ) +if (bsg_request->msgcode !=FC_BSG_RPT_ELS )qla2x00_free_fcport (fcport); done:return rval;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 83/95 sched/scs: Reset the shadow stack when idle_task_exit
In reply to Greg Kroah-HartmanFrom: Woody Lin <[email protected]>
[ Upstream commit 63acd42c0d4942f74710b11c38602fb14dea7320 ]
Commit f1a0a376ca0c ("sched/core: Initialize the idle task with preemption disabled") removed the init_idle() call from idle_thread_get(). This was the sole call-path on hotplug that resets the Shadow Call Stack (scs) Stack Pointer (sp).
Not resetting the scs-sp leads to scs overflow after enough hotplug cycles. Therefore add an explicit scs_task_reset() to the hotplug code to make sure the scs-sp does get reset on hotplug.
--- kernel/sched/core.c | 1 + 1 file changed, 1 insertion(+)
kernel/sched/core.c +1 -0
@@ -6677,6 +6677,7 @@ void idle_task_exit(void)finish_arch_post_lock_switch (); } +scs_task_reset (current);/* finish_cpu(), as ran on the BP, will clean up the active_mm state */ }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 84/95 net: hns3: fix for miscalculation of rx unused desc
In reply to Greg Kroah-HartmanFrom: Yunsheng Lin <[email protected]>
[ Upstream commit 9f9f0f19994b42b3e5e8735d41b9c5136828a76c ]
rx unused desc is the desc that need attatching new buffer before refilling to hw to receive new packet, the number of desc need attatching new buffer is calculated using next_to_use and next_to_clean. when next_to_use == next_to_clean, currently hns3 driver assumes that all the desc has the buffer attatched, but 'next_to_use == next_to_clean' also means all the desc need attatching new buffer if hw has comsumed all the desc and the driver has not attatched any buffer to the desc yet.
This patch adds 'refill' in desc_cb to indicate whether a new buffer has been refilled to a desc.
--- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 8 ++++++++ drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 1 + 2 files changed, 9 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +8 -0
@@ -2421,6 +2421,7 @@ static void hns3_buffer_detach(struct hns3_enet_ring *ring, int i) {hns3_unmap_buffer (ring, &ring->desc_cb[i]); ring->desc[i].addr =0 ; + ring->desc_cb[i].refill =0 ; } static void hns3_free_buffer_detach(struct hns3_enet_ring *ring, int i,
@@ -2498,6 +2499,7 @@ static int hns3_alloc_and_attach_buffer(struct hns3_enet_ring *ring, int i)return ret; ring->desc[i].addr =cpu_to_le64 (ring->desc_cb[i].dma); + ring->desc_cb[i].refill =1 ;return 0 ; }
@@ -2528,12 +2530,14 @@ static void hns3_replace_buffer(struct hns3_enet_ring *ring, int i,hns3_unmap_buffer (ring, &ring->desc_cb[i]); ring->desc_cb[i] = *res_cb; ring->desc[i].addr =cpu_to_le64 (ring->desc_cb[i].dma); + ring->desc_cb[i].refill =1 ; ring->desc[i].rx.bd_base_info =0 ; }static void hns3_reuse_buffer (struct hns3_enet_ring *ring,int i) { ring->desc_cb[i].reuse_flag =0 ; + ring->desc_cb[i].refill =1 ; ring->desc[i].addr =cpu_to_le64 (ring->desc_cb[i].dma + ring->desc_cb[i].page_offset); ring->desc[i].rx.bd_base_info =0 ;
@@ -2631,6 +2635,9 @@ static int hns3_desc_unused(struct hns3_enet_ring *ring)int ntc = ring->next_to_clean;int ntu = ring->next_to_use; +if (unlikely (ntc == ntu && !ring->desc_cb[ntc].refill)) +return ring->desc_num; +return ((ntc >= ntu) ?0 : ring->desc_num) + ntc - ntu; }
@@ -2907,6 +2914,7 @@ static void hns3_rx_ring_move_fw(struct hns3_enet_ring *ring) { ring->desc[ring->next_to_clean].rx.bd_base_info &=cpu_to_le32 (~BIT (HNS3_RXD_VLD_B )); + ring->desc_cb[ring->next_to_clean].refill =0 ; ring->next_to_clean +=1 ;if (unlikely (ring->next_to_clean == ring->desc_num))
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h +1 -0
@@ -283,6 +283,7 @@ struct hns3_desc_cb {u32 length;/* length of the buffer */ u16 reuse_flag; +u16 refill;/* desc type, used by the ring user to mark the type of the priv data */ u16 type;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 85/95 scsi: core: Fix shost->cmd_per_lun calculation in scsi_add_host_with_dma()
In reply to Greg Kroah-HartmanFrom: Dexuan Cui <[email protected]>
commit 50b6cb3516365cb69753b006be2b61c966b70588 upstream.
After commit ea2f0f77538c ("scsi: core: Cap scsi_host cmd_per_lun at can_queue"), a 416-CPU VM running on Hyper-V hangs during boot because the hv_storvsc driver sets scsi_driver.can_queue to an integer value that exceeds SHRT_MAX, and hence scsi_add_host_with_dma() sets shost->cmd_per_lun to a negative "short" value.
Use min_t(int, ...) to work around the issue.
--- drivers/scsi/hosts.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/hosts.c +2 -1
@@ -220,7 +220,8 @@ int scsi_add_host_with_dma(struct Scsi_H goto fail; } - shost->cmd_per_lun =min_t (short, shost->cmd_per_lun, +/* Use min_t(int, ...) in case shost->can_queue exceeds SHRT_MAX */ + shost->cmd_per_lun =min_t (int, shost->cmd_per_lun, shost->can_queue); error =scsi_init_sense_cache (shost);
Greg Kroah-Hartman
maintainerPATCH 86/95 can: isotp: isotp_sendmsg(): fix TX buffer concurrent access in isotp_sendmsg()
In reply to Greg Kroah-HartmanFrom: Ziyang Xuan <[email protected]>
commit 43a08c3bdac4cb42eff8fe5e2278bffe0c5c3daa upstream.
When isotp_sendmsg() concurrent, tx.state of all TX processes can be ISOTP_IDLE. The conditions so->tx.state != ISOTP_IDLE and wq_has_sleeper(&so->wait) can not protect TX buffer from being accessed by multiple TX processes.
We can use cmpxchg() to try to modify tx.state to ISOTP_SENDING firstly. If the modification of the previous process succeed, the later process must wait tx.state to ISOTP_IDLE firstly. Thus, we can ensure TX buffer is accessed by only one process at the same time. And we should also restore the original tx.state at the subsequent error processes.
--- net/can/isotp.c | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-)
net/can/isotp.c +27 -13
@@ -121,7 +121,7 @@ enum {struct tpcon {int idx;int len; -u8 state; +u32 state;u8 bs;u8 sn;u8 ll_dl;
@@ -846,6 +846,7 @@ static int isotp_sendmsg(struct socket * {struct sock *sk = sock->sk;struct isotp_sock *so =isotp_sk (sk); +u32 old_state = so->tx.state;struct sk_buff *skb;struct net_device *dev;struct canfd_frame *cf;
@@ -858,39 +859,45 @@ static int isotp_sendmsg(struct socket *return -EADDRNOTAVAIL ;/* we do not support multiple buffers - for now */ -if (so->tx.state !=ISOTP_IDLE ||wq_has_sleeper (&so->wait)) { -if (msg->msg_flags &MSG_DONTWAIT ) -return -EAGAIN ; +if (cmpxchg (&so->tx.state,ISOTP_IDLE ,ISOTP_SENDING ) !=ISOTP_IDLE || +wq_has_sleeper (&so->wait)) { +if (msg->msg_flags &MSG_DONTWAIT ) { + err = -EAGAIN ; + goto err_out; + }/* wait for complete transmission of current pdu */ err =wait_event_interruptible (so->wait, so->tx.state ==ISOTP_IDLE );if (err) -return err; + goto err_out; } -if (!size || size >MAX_MSG_LENGTH ) -return -EINVAL ; +if (!size || size >MAX_MSG_LENGTH ) { + err = -EINVAL ; + goto err_out; + } err =memcpy_from_msg (so->tx.buf, msg, size);if (err <0 ) -return err; + goto err_out; dev =dev_get_by_index (sock_net (sk), so->ifindex); -if (!dev) -return -ENXIO ; +if (!dev) { + err = -ENXIO ; + goto err_out; + } skb =sock_alloc_send_skb (sk, so->ll.mtu +sizeof (struct can_skb_priv ), msg->msg_flags &MSG_DONTWAIT , &err);if (!skb) {dev_put (dev); -return err; + goto err_out; }can_skb_reserve (skb);can_skb_prv (skb)->ifindex = dev->ifindex;can_skb_prv (skb)->skbcnt =0 ; - so->tx.state =ISOTP_SENDING ; so->tx.len = size; so->tx.idx =0 ;
@@ -949,7 +956,7 @@ static int isotp_sendmsg(struct socket *if (err) {pr_notice_once ("can-isotp: %s: can_send_ret %d\n" , __func__, err); -return err; + goto err_out; }if (wait_tx_done) {
@@ -961,6 +968,13 @@ static int isotp_sendmsg(struct socket * }return size; + +err_out: + so->tx.state = old_state; +if (so->tx.state ==ISOTP_IDLE ) +wake_up_interruptible (&so->wait); + +return err; } static int isotp_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
Greg Kroah-Hartman
maintainerPATCH 87/95 s390/pci: fix zpci_zdev_put() on reserve
In reply to Greg Kroah-HartmanFrom: Niklas Schnelle <[email protected]>
commit a46044a92add6a400f4dada7b943b30221f7cc80 upstream.
Since commit 2a671f77ee49 ("s390/pci: fix use after free of zpci_dev") the reference count of a zpci_dev is incremented between pcibios_add_device() and pcibios_release_device() which was supposed to prevent the zpci_dev from being freed while the common PCI code has access to it. It was missed however that the handling of zPCI availability events assumed that once zpci_zdev_put() was called no later availability event would still see the device. With the previously mentioned commit however this assumption no longer holds and we must make sure that we only drop the initial long-lived reference the zPCI subsystem holds exactly once.
Do so by introducing a zpci_device_reserved() function that handles when a device is reserved. Here we make sure the zpci_dev will not be considered for further events by removing it from the zpci_list.
This also means that the device actually stays in the ZPCI_FN_STATE_RESERVED state between the time we know it has been reserved and the final reference going away. We thus need to consider it a real state instead of just a conceptual state after the removal. The final cleanup of PCI resources, removal from zbus, and destruction of the IOMMU stays in zpci_release_device() to make sure holders of the reference do see valid data until the release.
--- arch/s390/include/asm/pci.h | 3 ++ arch/s390/pci/pci.c | 45 ++++++++++++++++++++++++++++++++----- arch/s390/pci/pci_event.c | 4 +-- drivers/pci/hotplug/s390_pci_hpc.c | 9 ------- 4 files changed, 46 insertions(+), 15 deletions(-)
arch/s390/include/asm/pci.h +3 -0
@@ -205,6 +205,9 @@ int zpci_create_device(u32 fid, u32 fh,void zpci_remove_device (struct zpci_dev *zdev,bool set_error);int zpci_enable_device (struct zpci_dev *);int zpci_disable_device (struct zpci_dev *); +void zpci_device_reserved (struct zpci_dev *zdev); +bool zpci_is_device_configured (struct zpci_dev *zdev); +int zpci_register_ioat (struct zpci_dev *,u8 ,u64 ,u64 ,u64 );int zpci_unregister_ioat (struct zpci_dev *,u8 );void zpci_remove_reserved_devices (void );
arch/s390/pci/pci.c +40 -5
69 lines not on this page · raw message
arch/s390/pci/pci_event.c +2 -2
@@ -146,7 +146,7 @@ static void __zpci_event_availability(st zdev->state =ZPCI_FN_STATE_STANDBY ;if (!clp_get_state (ccdf->fid, &state) && state ==ZPCI_FN_STATE_RESERVED ) { -zpci_zdev_put (zdev); +zpci_device_reserved (zdev); }break ;case 0x0306 :/* 0x308 or 0x302 for multiple devices */
@@ -156,7 +156,7 @@ static void __zpci_event_availability(stcase 0x0308 :/* Standby -> Reserved */ if (!zdev)break ; -zpci_zdev_put (zdev); +zpci_device_reserved (zdev);break ;default :break ;
drivers/pci/hotplug/s390_pci_hpc.c +1 -8
@@ -109,14 +109,7 @@ static int get_power_status(struct hotpl struct zpci_dev *zdev = container_of(hotplug_slot, struct zpci_dev, hotplug_slot); -switch (zdev->state) { -case ZPCI_FN_STATE_STANDBY : - *value =0 ; -break ; -default : - *value =1 ; -break ; - } + *value =zpci_is_device_configured (zdev) ?1 :0 ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 88/95 bpf, test, cgroup: Use sk_{alloc,free} for test cases
In reply to Greg Kroah-HartmanFrom: Daniel Borkmann <[email protected]>
commit 435b08ec0094ac1e128afe6cfd0d9311a8c617a7 upstream.
BPF test infra has some hacks in place which kzalloc() a socket and perform minimum init via sock_net_set() and sock_init_data(). As a result, the sk's skcd->cgroup is NULL since it didn't go through proper initialization as it would have been the case from sk_alloc(). Rather than re-adding a NULL test in sock_cgroup_ptr() just for this, use sk_{alloc,free}() pair for the test socket. The latter also allows to get rid of the bpf_sk_storage_free() special case.
--- net/bpf/test_run.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
net/bpf/test_run.c +9 -5
@@ -481,6 +481,12 @@ static void convert_skb_to___skb(struct __skb->gso_segs =skb_shinfo (skb)->gso_segs; } +static struct proto bpf_dummy_proto = { + .name ="bpf_dummy" , + .owner =THIS_MODULE , + .obj_size =sizeof (struct sock ), +}; +int bpf_prog_test_run_skb (struct bpf_prog *prog,const union bpf_attr *kattr,union bpf_attr __user *uattr) {
@@ -525,20 +531,19 @@ int bpf_prog_test_run_skb(struct bpf_probreak ; } - sk =kzalloc (sizeof (struct sock ),GFP_USER ); + sk =sk_alloc (net,AF_UNSPEC ,GFP_USER , &bpf_dummy_proto,1 );if (!sk) {kfree (data);kfree (ctx);return -ENOMEM ; } -sock_net_set (sk, net);sock_init_data (NULL , sk); skb =build_skb (data,0 );if (!skb) {kfree (data);kfree (ctx); -kfree (sk); +sk_free (sk);return -ENOMEM ; } skb->sk = sk;
@@ -611,8 +616,7 @@ out:if (dev && dev != net->loopback_dev)dev_put (dev);kfree_skb (skb); -bpf_sk_storage_free (sk); -kfree (sk); +sk_free (sk);kfree (ctx);return ret; }
Greg Kroah-Hartman
maintainerPATCH 89/95 usbnet: sanity check for maxpacket
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
commit 397430b50a363d8b7bdda00522123f82df6adc5e upstream.
maxpacket of 0 makes no sense and oopses as we need to divide by it. Give up.
V2: fixed typo in log and stylistic issues
--- drivers/net/usb/usbnet.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/usb/usbnet.c +4 -0
@@ -1755,6 +1755,10 @@ usbnet_probe (struct usb_interface *udevif (!dev->rx_urb_size) dev->rx_urb_size = dev->hard_mtu; dev->maxpacket =usb_maxpacket (dev->udev, dev->out,1 ); +if (dev->maxpacket ==0 ) { +/* that is a broken device */ + goto out4; + }/* let userspace know we have a random address */ if (ether_addr_equal (net->dev_addr, node_id))
Greg Kroah-Hartman
maintainerPATCH 90/95 net: mdiobus: Fix memory leak in __mdiobus_register
In reply to Greg Kroah-HartmanFrom: Yanfei Xu <[email protected]>
commit ab609f25d19858513919369ff3d9a63c02cd9e2e upstream.
Once device_register() failed, we should call put_device() to decrement reference count for cleanup. Or it will cause memory leak.
BUG: memory leak
unreferenced object 0xffff888114032e00 (size 256):
comm "kworker/1:3", pid 2960, jiffies 4294943572 (age 15.920s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 08 2e 03 14 81 88 ff ff ................
08 2e 03 14 81 88 ff ff 90 76 65 82 ff ff ff ff .........ve.....
backtrace:
[<ffffffff8265cfab>] kmalloc include/linux/slab.h:591 [inline]
[<ffffffff8265cfab>] kzalloc include/linux/slab.h:721 [inline]
[<ffffffff8265cfab>] device_private_init drivers/base/core.c:3203 [inline]
[<ffffffff8265cfab>] device_add+0x89b/0xdf0 drivers/base/core.c:3253
[<ffffffff828dd643>] __mdiobus_register+0xc3/0x450 drivers/net/phy/mdio_bus.c:537
[<ffffffff828cb835>] __devm_mdiobus_register+0x75/0xf0 drivers/net/phy/mdio_devres.c:87
[<ffffffff82b92a00>] ax88772_init_mdio drivers/net/usb/asix_devices.c:676 [inline]
[<ffffffff82b92a00>] ax88772_bind+0x330/0x480 drivers/net/usb/asix_devices.c:786
[<ffffffff82baa33f>] usbnet_probe+0x3ff/0xdf0 drivers/net/usb/usbnet.c:1745
[<ffffffff82c36e17>] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396
[<ffffffff82661d17>] call_driver_probe drivers/base/dd.c:517 [inline]
[<ffffffff82661d17>] really_probe.part.0+0xe7/0x380 drivers/base/dd.c:596
[<ffffffff826620bc>] really_probe drivers/base/dd.c:558 [inline]
[<ffffffff826620bc>] __driver_probe_device+0x10c/0x1e0 drivers/base/dd.c:751
[<ffffffff826621ba>] driver_probe_device+0x2a/0x120 drivers/base/dd.c:781
[<ffffffff82662a26>] __device_attach_driver+0xf6/0x140 drivers/base/dd.c:898
[<ffffffff8265eca7>] bus_for_each_drv+0xb7/0x100 drivers/base/bus.c:427
[<ffffffff826625a2>] __device_attach+0x122/0x260 drivers/base/dd.c:969
[<ffffffff82660916>] bus_probe_device+0xc6/0xe0 drivers/base/bus.c:487
[<ffffffff8265cd0b>] device_add+0x5fb/0xdf0 drivers/base/core.c:3359
[<ffffffff82c343b9>] usb_set_configuration+0x9d9/0xb90 drivers/usb/core/message.c:2170
[<ffffffff82c4473c>] usb_generic_driver_probe+0x8c/0xc0 drivers/usb/core/generic.c:238
BUG: memory leak
unreferenced object 0xffff888116f06900 (size 32):
comm "kworker/0:2", pid 2670, jiffies 4294944448 (age 7.160s)
hex dump (first 32 bytes):
75 73 62 2d 30 30 31 3a 30 30 33 00 00 00 00 00 usb-001:003.....
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffff81484516>] kstrdup+0x36/0x70 mm/util.c:60
[<ffffffff814845a3>] kstrdup_const+0x53/0x80 mm/util.c:83
[<ffffffff82296ba2>] kvasprintf_const+0xc2/0x110 lib/kasprintf.c:48
[<ffffffff82358d4b>] kobject_set_name_vargs+0x3b/0xe0 lib/kobject.c:289
[<ffffffff826575f3>] dev_set_name+0x63/0x90 drivers/base/core.c:3147
[<ffffffff828dd63b>] __mdiobus_register+0xbb/0x450 drivers/net/phy/mdio_bus.c:535
[<ffffffff828cb835>] __devm_mdiobus_register+0x75/0xf0 drivers/net/phy/mdio_devres.c:87
[<ffffffff82b92a00>] ax88772_init_mdio drivers/net/usb/asix_devices.c:676 [inline]
[<ffffffff82b92a00>] ax88772_bind+0x330/0x480 drivers/net/usb/asix_devices.c:786
[<ffffffff82baa33f>] usbnet_probe+0x3ff/0xdf0 drivers/net/usb/usbnet.c:1745
[<ffffffff82c36e17>] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396
[<ffffffff82661d17>] call_driver_probe drivers/base/dd.c:517 [inline]
[<ffffffff82661d17>] really_probe.part.0+0xe7/0x380 drivers/base/dd.c:596
[<ffffffff826620bc>] really_probe drivers/base/dd.c:558 [inline]
[<ffffffff826620bc>] __driver_probe_device+0x10c/0x1e0 drivers/base/dd.c:751
[<ffffffff826621ba>] driver_probe_device+0x2a/0x120 drivers/base/dd.c:781
[<ffffffff82662a26>] __device_attach_driver+0xf6/0x140 drivers/base/dd.c:898
[<ffffffff8265eca7>] bus_for_each_drv+0xb7/0x100 drivers/base/bus.c:427
[<ffffffff826625a2>] __device_attach+0x122/0x260 drivers/base/dd.c:969--- drivers/net/phy/mdio_bus.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/phy/mdio_bus.c +1 -0
@@ -544,6 +544,7 @@ int __mdiobus_register(struct mii_bus *b err =device_register (&bus->dev);if (err) {pr_err ("mii_bus %s failed to register\n" , bus->id); +put_device (&bus->dev);return -EINVAL ; }
Greg Kroah-Hartman
maintainerPATCH 91/95 tracing: Have all levels of checks prevent recursion
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (VMware) <[email protected]>
commit ed65df63a39a3f6ed04f7258de8b6789e5021c18 upstream.
While writing an email explaining the "bit = 0" logic for a discussion on making ftrace_test_recursion_trylock() disable preemption, I discovered a path that makes the "not do the logic if bit is zero" unsafe.
The recursion logic is done in hot paths like the function tracer. Thus, any code executed causes noticeable overhead. Thus, tricks are done to try to limit the amount of code executed. This included the recursion testing logic.
Having recursion testing is important, as there are many paths that can end up in an infinite recursion cycle when tracing every function in the kernel. Thus protection is needed to prevent that from happening.
Because it is OK to recurse due to different running context levels (e.g. an interrupt preempts a trace, and then a trace occurs in the interrupt handler), a set of bits are used to know which context one is in (normal, softirq, irq and NMI). If a recursion occurs in the same level, it is prevented*.
Then there are infrastructure levels of recursion as well. When more than one callback is attached to the same function to trace, it calls a loop function to iterate over all the callbacks. Both the callbacks and the loop function have recursion protection. The callbacks use the "ftrace_test_recursion_trylock()" which has a "function" set of context bits to test, and the loop function calls the internal trace_test_and_set_recursion() directly, with an "internal" set of bits.
If an architecture does not implement all the features supported by ftrace then the callbacks are never called directly, and the loop function is called instead, which will implement the features of ftrace.
Since both the loop function and the callbacks do recursion protection, it was seemed unnecessary to do it in both locations. Thus, a trick was made to have the internal set of recursion bits at a more significant bit location than the function bits. Then, if any of the higher bits were set, the logic of the function bits could be skipped, as any new recursion would first have to go through the loop function.
This is true for architectures that do not support all the ftrace features, because all functions being traced must first go through the loop function before going to the callbacks. But this is not true for architectures that support all the ftrace features. That's because the loop function could be called due to two callbacks attached to the same function, but then a recursion function inside the callback could be called that does not share any other callback, and it will be called directly.
i.e.
traced_function_1: [ more than one callback tracing it ]
call loop_func
loop_func:
trace_recursion set internal bit
call callback
callback:
trace_recursion [ skipped because internal bit is set, return 0 ] call traced_function_2
traced_function_2: [ only traced by above callback ]
call callback
callback:
trace_recursion [ skipped because internal bit is set, return 0 ] call traced_function_2
[ wash, rinse, repeat, BOOM! out of shampoo! ]
Thus, the "bit == 0 skip" trick is not safe, unless the loop function is call for all functions.
Since we want to encourage architectures to implement all ftrace features, having them slow down due to this extra logic may encourage the maintainers to update to the latest ftrace features. And because this logic is only safe for them, remove it completely.
[*] There is on layer of recursion that is allowed, and that is to allow
for the transition between interrupt context (normal -> softirq ->
irq -> NMI), because a trace may occur before the context update is
visible to the trace recursion logic.--- kernel/trace/ftrace.c | 4 +- kernel/trace/trace.h | 61 +++++++++++++---------------------------- kernel/trace/trace_functions.c | 2 - 3 files changed, 23 insertions(+), 44 deletions(-)
kernel/trace/ftrace.c +2 -2
@@ -6985,7 +6985,7 @@ __ftrace_ops_list_func(unsigned long ip,struct ftrace_ops *op;int bit; - bit =trace_test_and_set_recursion (TRACE_LIST_START ,TRACE_LIST_MAX ); + bit =trace_test_and_set_recursion (TRACE_LIST_START );if (bit <0 )return ;
@@ -7060,7 +7060,7 @@ static void ftrace_ops_assist_func(unsig {int bit; - bit =trace_test_and_set_recursion (TRACE_LIST_START ,TRACE_LIST_MAX ); + bit =trace_test_and_set_recursion (TRACE_LIST_START );if (bit <0 )return ;
kernel/trace/trace.h +20 -41
133 lines not on this page · raw message
kernel/trace/trace_functions.c +1 -1
@@ -144,7 +144,7 @@ function_trace_call(unsigned long ip, un pc =preempt_count ();preempt_disable_notrace (); - bit =trace_test_and_set_recursion (TRACE_FTRACE_START ,TRACE_FTRACE_MAX ); + bit =trace_test_and_set_recursion (TRACE_FTRACE_START );if (bit <0 ) goto out;
Greg Kroah-Hartman
maintainerPATCH 92/95 e1000e: Separate TGP board type from SPT
In reply to Greg Kroah-HartmanFrom: Sasha Neftin <[email protected]>
[ Upstream commit 280db5d420090a24e4e41f9ddcbf37920a598572 ]
We have the same LAN controller on different PCHs. Separate TGP board type from SPT which will allow for specific fixes to be applied for TGP platforms.
--- drivers/net/ethernet/intel/e1000e/e1000.h | 4 ++- drivers/net/ethernet/intel/e1000e/ich8lan.c | 20 ++++++++++++++ drivers/net/ethernet/intel/e1000e/netdev.c | 29 +++++++++++---------- 3 files changed, 38 insertions(+), 15 deletions(-)
drivers/net/ethernet/intel/e1000e/e1000.h +3 -1
@@ -113,7 +113,8 @@ enum e1000_boards { board_pch2lan, board_pch_lpt, board_pch_spt, - board_pch_cnp + board_pch_cnp, + board_pch_tgp }; struct e1000_ps_page {
@@ -499,6 +500,7 @@ extern const struct e1000_info e1000_pch2_info;extern const struct e1000_info e1000_pch_lpt_info;extern const struct e1000_info e1000_pch_spt_info;extern const struct e1000_info e1000_pch_cnp_info; +extern const struct e1000_info e1000_pch_tgp_info;extern const struct e1000_info e1000_es2_info;void e1000e_ptp_init (struct e1000_adapter *adapter);
drivers/net/ethernet/intel/e1000e/ich8lan.c +20 -0
@@ -5999,3 +5999,23 @@ const struct e1000_info e1000_pch_cnp_info = { .phy_ops = &ich8_phy_ops, .nvm_ops = &spt_nvm_ops, }; + +const struct e1000_info e1000_pch_tgp_info = { + .mac = e1000_pch_tgp, + .flags =FLAG_IS_ICH + |FLAG_HAS_WOL + |FLAG_HAS_HW_TIMESTAMP + |FLAG_HAS_CTRLEXT_ON_LOAD + |FLAG_HAS_AMT + |FLAG_HAS_FLASH + |FLAG_HAS_JUMBO_FRAMES + |FLAG_APME_IN_WUC , + .flags2 =FLAG2_HAS_PHY_STATS + |FLAG2_HAS_EEE , + .pba =26 , + .max_hw_frame_size =9022 , + .get_variants = e1000_get_variants_ich8lan, + .mac_ops = &ich8_mac_ops, + .phy_ops = &ich8_phy_ops, + .nvm_ops = &spt_nvm_ops, +};
drivers/net/ethernet/intel/e1000e/netdev.c +15 -14
@@ -50,6 +50,7 @@ static const struct e1000_info *e1000_info_tbl[] = { [board_pch_lpt] = &e1000_pch_lpt_info, [board_pch_spt] = &e1000_pch_spt_info, [board_pch_cnp] = &e1000_pch_cnp_info, + [board_pch_tgp] = &e1000_pch_tgp_info, };struct e1000_reg_info {
@@ -7837,20 +7838,20 @@ static const struct pci_device_id e1000_pci_tbl[] = { { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_V11), board_pch_cnp }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_LM12), board_pch_spt }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_V12), board_pch_spt }, - { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM13), board_pch_cnp }, - { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V13), board_pch_cnp }, - { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM14), board_pch_cnp }, - { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V14), board_pch_cnp }, - { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM15), board_pch_cnp }, - { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V15), board_pch_cnp }, - { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM16), board_pch_cnp }, - { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V16), board_pch_cnp }, - { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM17), board_pch_cnp }, - { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V17), board_pch_cnp }, - { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM18), board_pch_cnp }, - { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V18), board_pch_cnp }, - { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM19), board_pch_cnp }, - { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V19), board_pch_cnp }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM13), board_pch_tgp }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V13), board_pch_tgp }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM14), board_pch_tgp }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V14), board_pch_tgp }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM15), board_pch_tgp }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V15), board_pch_tgp }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM16), board_pch_tgp }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V16), board_pch_tgp }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM17), board_pch_tgp }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V17), board_pch_tgp }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM18), board_pch_tgp }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V18), board_pch_tgp }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM19), board_pch_tgp }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V19), board_pch_tgp }, { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */ };
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 93/95 selftests: bpf: fix backported ASSERT_FALSE
In reply to Greg Kroah-HartmanFrom: Lorenz Bauer <[email protected]>
Commit 183d9ebd449c ("selftests/bpf: Fix core_reloc test runner") causes builds of selftests/bpf to fail on 5.10.y since the branch doesn't have the ASSERT_FALSE macro yet. Replace ASSERT_FALSE with ASSERT_EQ.
--- tools/testing/selftests/bpf/prog_tests/core_reloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/core_reloc.c +1 -1
@@ -857,7 +857,7 @@ void test_core_reloc(void) goto cleanup; } -if (!ASSERT_FALSE (test_case->fails,"obj_load_should_fail" )) +if (!ASSERT_EQ (test_case->fails, false,"obj_load_should_fail" )) goto cleanup; equal = memcmp(data->out, test_case->output,
Greg Kroah-Hartman
maintainerPATCH 94/95 ARM: 9122/1: select HAVE_FUTEX_CMPXCHG
In reply to Greg Kroah-HartmanFrom: Nick Desaulniers <[email protected]>
commit 9d417cbe36eee7afdd85c2e871685f8dab7c2dba upstream.
tglx notes:
This function [futex_detect_cmpxchg] is only needed when an architecture has to runtime discover whether the CPU supports it or not. ARM has unconditional support for this, so the obvious thing to do is the below.
Fixes linkage failure from Clang randconfigs:
kernel/futex.o:(.text.fixup+0x5c): relocation truncated to fit: R_ARM_JUMP24 against `.init.text' and boot failures for CONFIG_THUMB2_KERNEL.
Comments from Nick Desaulniers:
See-also: 03b8c7b623c8 ("futex: Allow architectures to skip futex_atomic_cmpxchg_inatomic() test")
--- arch/arm/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/Kconfig +1 -0
@@ -87,6 +87,7 @@ config ARM select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL && !CC_IS_CLANG select HAVE_FUNCTION_TRACER if !XIP_KERNEL + select HAVE_FUTEX_CMPXCHG if FUTEX select HAVE_GCC_PLUGINS select HAVE_HW_BREAKPOINT if PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7) select HAVE_IDE if PCI || ISA || PCMCIA
Greg Kroah-Hartman
maintainerPATCH 95/95 pinctrl: stm32: use valid pin identifier in stm32_pinctrl_resume()
In reply to Greg Kroah-HartmanFrom: Fabien Dessenne <[email protected]>
commit c370bb474016ab9edfdabd7c08a88dd13a71ddbd upstream.
When resuming from low power, the driver attempts to restore the configuration of some pins. This is done by a call to:
stm32_pinctrl_restore_gpio_regs(struct stm32_pinctrl *pctl, u32 pin)
where 'pin' must be a valid pin value (i.e. matching some 'groups->pin'). Fix the current implementation which uses some wrong 'pin' value.
--- drivers/pinctrl/stm32/pinctrl-stm32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/stm32/pinctrl-stm32.c +2 -2
@@ -1645,8 +1645,8 @@ int __maybe_unused stm32_pinctrl_resume(struct stm32_pinctrl_group *g = pctl->groups;int i; -for (i = g->pin; i < g->pin + pctl->ngroups; i++) -stm32_pinctrl_restore_gpio_regs (pctl, i); +for (i =0 ; i < pctl->ngroups; i++, g++) +stm32_pinctrl_restore_gpio_regs (pctl, g->pin);return 0 ; }
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.76 release. There are 95 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, 27 Oct 2021 19:07:44 +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.10.76-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels:
Signature · 1 line
Florian
Hi!
Quoted 4 lines
This is the start of the stable review cycle for the 5.10.76 release. There are 95 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.
CIP testing did not find any problems here:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-5.10.y
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.76 release. There are 95 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, 27 Oct 2021 19:07:44 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.76-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.76 release. There are 95 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, 27 Oct 2021 19:07:44 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.76-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
5.10.76-rc1 Successfully Compiled and booted on my Raspberry PI 4b (8g) (bcm2711)
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.76 release. There are 95 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, 27 Oct 2021 19:07:44 +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.10.76-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
## Build
* kernel: 5.10.76-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-5.10.y
* git commit: e2430f94799e6bf1f96aeaca998817fed82e9afe
* git describe: v5.10.75-96-ge2430f94799e
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.10.y/build/v5.10.75-96-ge2430f94799e
## No regressions (compared to v5.10.75-88-g629133650a80)
## No fixes (compared to v5.10.75-88-g629133650a80)
## Test result summary
total: 88300, pass: 74672, fail: 525, skip: 12272, xfail: 831
## Build Summary
* arc: 10 total, 10 passed, 0 failed
* arm: 289 total, 289 passed, 0 failed
* arm64: 39 total, 39 passed, 0 failed
* dragonboard-410c: 1 total, 1 passed, 0 failed
* hi6220-hikey: 1 total, 1 passed, 0 failed
* i386: 38 total, 38 passed, 0 failed
* juno-r2: 1 total, 1 passed, 0 failed
* mips: 37 total, 37 passed, 0 failed
* parisc: 12 total, 12 passed, 0 failed
* powerpc: 36 total, 36 passed, 0 failed
* riscv: 24 total, 24 passed, 0 failed
* s390: 18 total, 18 passed, 0 failed
* sh: 24 total, 24 passed, 0 failed
* sparc: 12 total, 12 passed, 0 failed
* x15: 1 total, 1 passed, 0 failed
* x86: 1 total, 1 passed, 0 failed
* x86_64: 39 total, 39 passed, 0 failed
## Test suites summary
* fwts
* igt-gpu-tools
* kselftest-android
* kselftest-arm64
* kselftest-arm64/arm64.btitest.bti_c_func
* kselftest-arm64/arm64.btitest.bti_j_func
* kselftest-arm64/arm64.btitest.bti_jc_func
* kselftest-arm64/arm64.btitest.bti_none_func
* kselftest-arm64/arm64.btitest.nohint_func
* kselftest-arm64/arm64.btitest.paciasp_func
* kselftest-arm64/arm64.nobtitest.bti_c_func
* kselftest-arm64/arm64.nobtitest.bti_j_func
* kselftest-arm64/arm64.nobtitest.bti_jc_func
* kselftest-arm64/arm64.nobtitest.bti_none_func
* kselftest-arm64/arm64.nobtitest.nohint_func
* kselftest-arm64/arm64.nobtitest.paciasp_func
* kselftest-bpf
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-drivers
* kselftest-efivarfs
* kselftest-filesystems
* kselftest-firmware
* kselftest-fpu
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kexec
* kselftest-kvm
* kselftest-lib
* kselftest-livepatch
* kselftest-membarrier
* kselftest-memfd
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-splice
* kselftest-static_keys
* kselftest-sync
* kselftest-sysctl
* kselftest-tc-testing
* kselftest-timens
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-vm
* kselftest-x86
* kselftest-zram
* kunit
* kvm-unit-tests
* libhugetlbfs
* linux-log-parser
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-controllers-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-open-posix-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-tracing-tests
* network-basic-tests
* packetdrill
* perf
* rcutorture
* ssuite
* v4l2-compliance
--
Linaro LKFT
https://lkft.linaro.org
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.76 release. There are 95 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, 27 Oct 2021 19:07:44 +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.10.76-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.10:
10 builds: 10 pass, 0 fail
28 boots: 28 pass, 0 fail
75 tests: 75 pass, 0 failLinux version: 5.10.76-rc1-ge2430f94799e
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Jon
Hi Greg,
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.76 release. There are 95 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, 27 Oct 2021 19:07:44 +0000. Anything received after that time might be too late.
Build test:
mips (gcc version 11.2.1 20211012): 63 configs -> no new failure arm (gcc version 11.2.1 20211012): 105 configs -> no new failure arm64 (gcc version 11.2.1 20211012): 3 configs -> no failure x86_64 (gcc version 10.2.1 20210110): 4 configs -> no failure
Boot test:x86_64: Booted on my test laptop. No regression.x86_64: Booted on qemu. No regression. [1]
arm64: Booted on rpi4b (4GB model). No regression. [2]
[1]. https://openqa.qa.codethink.co.uk/tests/310
[2]. https://openqa.qa.codethink.co.uk/tests/307
--
Regards
Sudip
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.76 release. There are 95 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, 27 Oct 2021 19:07:44 +0000. Anything received after that time might be too late.
Build results:
total: 159 pass: 159 fail: 0 Qemu test results: total: 472 pass: 472 fail: 0
Guenter