July 2024 - Linux-stable-mirror

by Greg Kroah-Hartman

I'm announcing the release of the 6.1.98 kernel. All users of the 6.1 kernel series must upgrade. The updated 6.1.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.1.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts | 2 arch/powerpc/include/asm/interrupt.h | 10 arch/powerpc/include/asm/io.h | 2 arch/powerpc/include/asm/percpu.h | 10 arch/powerpc/kernel/setup_64.c | 2 arch/powerpc/kexec/core_64.c | 11 arch/powerpc/platforms/pseries/kexec.c | 8 arch/powerpc/platforms/pseries/pseries.h | 1 arch/powerpc/platforms/pseries/setup.c | 1 arch/powerpc/xmon/xmon.c | 6 arch/riscv/kernel/machine_kexec.c | 10 arch/s390/include/asm/kvm_host.h | 1 arch/s390/kvm/kvm-s390.c | 1 arch/s390/kvm/kvm-s390.h | 15 + arch/s390/kvm/priv.c | 32 ++ crypto/aead.c | 3 crypto/cipher.c | 3 drivers/base/regmap/regmap-i2c.c | 3 drivers/block/null_blk/zoned.c | 11 drivers/bluetooth/hci_qca.c | 18 + drivers/cdrom/cdrom.c | 2 drivers/clk/mediatek/clk-mt8183-mfgcfg.c | 1 drivers/clk/mediatek/clk-mtk.c | 32 +- drivers/clk/mediatek/clk-mtk.h | 5 drivers/clk/qcom/gcc-sm6350.c | 10 drivers/crypto/hisilicon/debugfs.c | 21 + drivers/firmware/dmi_scan.c | 11 drivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 3 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 8 drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 2 drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c | 8 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 8 drivers/gpu/drm/amd/include/atomfirmware.h | 2 drivers/gpu/drm/drm_panel_orientation_quirks.c | 7 drivers/gpu/drm/lima/lima_gp.c | 2 drivers/gpu/drm/lima/lima_mmu.c | 5 drivers/gpu/drm/lima/lima_pp.c | 4 drivers/gpu/drm/nouveau/nouveau_connector.c | 3 drivers/i2c/busses/i2c-i801.c | 2 drivers/i2c/busses/i2c-pnx.c | 48 --- drivers/infiniband/core/user_mad.c | 21 + drivers/input/ff-core.c | 7 drivers/media/dvb-frontends/as102_fe_types.h | 2 drivers/media/dvb-frontends/tda10048.c | 9 drivers/media/dvb-frontends/tda18271c2dd.c | 4 drivers/media/usb/dvb-usb/dib0700_devices.c | 18 + drivers/media/usb/dvb-usb/dw2102.c | 120 +++++---- drivers/media/usb/s2255/s2255drv.c | 20 - drivers/mtd/nand/raw/nand_base.c | 64 ++-- drivers/mtd/nand/raw/rockchip-nand-controller.c | 6 drivers/net/bonding/bond_options.c | 6 drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 1 drivers/net/dsa/mv88e6xxx/chip.c | 4 drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 drivers/net/ethernet/intel/e1000e/netdev.c | 132 +++++----- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_ofld.c | 37 ++ drivers/net/ethernet/mellanox/mlxsw/core_linecards.c | 1 drivers/net/ntb_netdev.c | 2 drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 10 drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 2 drivers/net/wireless/microchip/wilc1000/hif.c | 3 drivers/nfc/virtual_ncidev.c | 4 drivers/nvme/host/multipath.c | 2 drivers/nvme/host/pci.c | 3 drivers/nvme/target/core.c | 9 drivers/platform/x86/toshiba_acpi.c | 31 +- drivers/platform/x86/touchscreen_dmi.c | 36 ++ drivers/s390/crypto/pkey_api.c | 4 drivers/scsi/mpi3mr/mpi3mr_transport.c | 10 drivers/scsi/qedf/qedf_io.c | 6 drivers/spi/spi-cadence-xspi.c | 20 + drivers/tty/serial/imx.c | 2 drivers/usb/host/xhci-ring.c | 5 fs/btrfs/block-group.c | 13 fs/btrfs/scrub.c | 2 fs/f2fs/f2fs.h | 12 fs/f2fs/super.c | 27 +- fs/f2fs/sysfs.c | 14 - fs/jffs2/super.c | 1 fs/nilfs2/alloc.c | 18 + fs/nilfs2/alloc.h | 4 fs/nilfs2/dat.c | 2 fs/nilfs2/dir.c | 6 fs/nilfs2/ifile.c | 7 fs/nilfs2/nilfs.h | 10 fs/nilfs2/the_nilfs.c | 6 fs/nilfs2/the_nilfs.h | 2 fs/ntfs3/xattr.c | 5 fs/orangefs/super.c | 3 include/linux/fsnotify.h | 8 include/linux/lsm_hook_defs.h | 2 include/linux/mutex.h | 27 ++ include/linux/security.h | 5 kernel/auditfilter.c | 5 kernel/dma/map_benchmark.c | 3 kernel/exit.c | 2 kernel/locking/mutex-debug.c | 12 lib/kunit/try-catch.c | 3 mm/page-writeback.c | 32 ++ net/core/datagram.c | 19 - net/ipv4/inet_diag.c | 2 net/ipv4/tcp_input.c | 2 net/ipv4/tcp_metrics.c | 1 net/mac802154/main.c | 14 - net/netfilter/nf_tables_api.c | 3 net/sctp/socket.c | 7 scripts/link-vmlinux.sh | 2 security/apparmor/audit.c | 6 security/apparmor/include/audit.h | 2 security/integrity/ima/ima.h | 2 security/integrity/ima/ima_policy.c | 15 - security/security.c | 6 security/selinux/include/audit.h | 4 security/selinux/ss/services.c | 5 security/smack/smack_lsm.c | 4 sound/pci/hda/patch_realtek.c | 9 tools/lib/bpf/bpf_core_read.h | 1 tools/power/x86/turbostat/turbostat.c | 10 tools/testing/selftests/net/msg_zerocopy.c | 14 - 123 files changed, 902 insertions(+), 406 deletions(-) Aleksandr Mishin (1): mlxsw: core_linecards: Fix double memory deallocation in case of invalid INI file Alex Deucher (1): drm/amdgpu/atomfirmware: silence UBSAN warning Alex Hung (3): drm/amd/display: Check index msg_id before read or write drm/amd/display: Check pipe offset before setting vblank drm/amd/display: Skip finding free audio for unknown engine_id AngeloGioacchino Del Regno (1): clk: mediatek: clk-mtk: Register MFG notifier in mtk_clk_simple_probe() Armin Wolf (1): platform/x86: toshiba_acpi: Fix quickstart quirk handling Chao Yu (1): f2fs: check validation of fault attrs in f2fs_build_fault_attr() Chenghai Huang (1): crypto: hisilicon/debugfs - Fix debugfs uninit process issue Chris Mi (1): net/mlx5: E-switch, Create ingress ACL when needed Christian Borntraeger (1): KVM: s390: fix LPSWEY handling Corinna Vinschen (1): igc: fix a log entry using uninitialized netdev Damien Le Moal (1): null_blk: Do not allow runt zone with zone capacity smaller then zone size Dave Jiang (1): net: ntb_netdev: Move ntb_netdev_rx_handler() to call netif_rx() from __netif_rx() Dima Ruinskiy (1): e1000e: Fix S0ix residency on corporate systems Dmitry Antipov (1): mac802154: fix time calculation in ieee802154_configure_durations() Dragan Simic (1): arm64: dts: rockchip: Fix the DCDC_REG2 minimum voltage on Quartz64 Model B Edward Adam Davis (1): nfc/nci: Add the inconsistency check between the input data length and count Erick Archer (2): sctp: prefer struct_size over open coded arithmetic Input: ff-core - prefer struct_size over open coded arithmetic Erico Nunes (1): drm/lima: fix shared irq handling on driver remove Fedor Pchelkin (1): dma-mapping: benchmark: avoid needless copy_to_user if benchmark fails Felix Fietkau (1): wifi: mt76: replace skb_put with skb_put_zero Florian Westphal (1): netfilter: nf_tables: unconditionally flush pending work before notifier GUO Zihua (1): ima: Avoid blocking in RCU read-side critical section George Stark (1): locking/mutex: Introduce devm_mutex_init() Ghadi Elie Rahme (1): bnx2x: Fix multiple UBSAN array-index-out-of-bounds Greg Kroah-Hartman (1): Linux 6.1.98 Greg Kurz (1): powerpc/xmon: Check cpu id in commands "c#", "dp#" and "dx#" Hailey Mothershead (1): crypto: aead,cipher - zeroize key buffer after use Heiner Kallweit (1): i2c: i801: Annotate apanel_addr as __ro_after_init Holger Dengler (1): s390/pkey: Wipe sensitive data on failure Jakub Kicinski (1): tcp_metrics: validate source addr length Jan Kara (3): mm: avoid overflows in dirty throttling logic fsnotify: Do not generate events for O_PATH file descriptors Revert "mm/writeback: fix possible divide-by-zero in wb_dirty_limits(), again" Jean Delvare (1): firmware: dmi: Stop decoding on broken entry Jian-Hong Pan (1): ALSA: hda/realtek: Enable headset mic of JP-IK LEAP W502 with ALC897 Jianbo Liu (1): net/mlx5e: Add mqprio_rl cleanup and free in mlx5e_priv_cleanup() Jim Wylder (1): regmap-i2c: Subtract reg size from max_write Jimmy Assarsson (1): can: kvaser_usb: Explicitly initialize family in leafimx driver_info struct Jinliang Zheng (1): mm: optimize the redundant loop of mm_update_owner_next() John Meneghini (1): scsi: qedf: Make qedf_execute_tmf() non-preemptible John Schoenick (1): drm: panel-orientation-quirks: Add quirk for Valve Galileo Jose E. Marchesi (1): bpf: Avoid uninitialized value in BPF_CORE_READ_BITFIELD Jozef Hopko (1): wifi: wilc1000: fix ies_len type in connect path Justin Stitt (1): cdrom: rearrange last_media_change check to avoid unintentional overflow Konstantin Komarov (1): fs/ntfs3: Mark volume as dirty if xattr is broken Kundan Kumar (1): nvme: adjust multiples of NVME_CTRL_PAGE_SIZE in offset Len Brown (1): tools/power turbostat: Remember global max_die_id Lu Yao (1): btrfs: scrub: initialize ret in scrub_simple_mirror() to fix compilation warning Luca Weiss (1): clk: qcom: gcc-sm6350: Fix gpll6* & gpll7 parents Ma Jun (2): drm/amdgpu: Fix uninitialized variable warnings drm/amdgpu: Initialize timestamp for some legacy SOCs Ma Ke (1): drm/nouveau: fix null pointer dereference in nouveau_connector_get_modes Mahesh Salgaonkar (1): powerpc: Avoid nmi_enter/nmi_exit in real mode interrupt. Masahiro Yamada (1): kbuild: fix short log for AS in link-vmlinux.sh Matthias Schiffer (1): serial: imx: Raise TX trigger level to 8 Mauro Carvalho Chehab (1): media: dw2102: fix a potential buffer overflow Michael Bunk (1): media: dw2102: Don't translate i2c read into write Michael Ellerman (1): powerpc/64: Set _IO_BASE to POISON_POINTER_DELTA not 0 for CONFIG_PCI=n Michael Guralnik (1): IB/core: Implement a limit on UMAD receive List Mickaël Salaün (1): kunit: Fix timeout message Mike Marshall (1): orangefs: fix out-of-bounds fsid access Miquel Raynal (2): mtd: rawnand: Ensure ECC configuration is propagated to upper layers mtd: rawnand: Bypass a couple of sanity checks during NAND identification Naohiro Aota (1): btrfs: fix adding block group to a reclaim list and the unused list during reclaim Nathan Chancellor (2): f2fs: Add inline to f2fs_build_fault_attr() stub scsi: mpi3mr: Use proper format specifier in mpi3mr_sas_port_add() Neal Cardwell (1): UPSTREAM: tcp: fix DSACK undo in fast recovery to call tcp_try_to_open() Nicholas Piggin (1): powerpc/pseries: Fix scv instruction crash with kexec Niklas Neronin (1): usb: xhci: prevent potential failure in handle_tx_event() for Transfer events without TRB Nilay Shroff (1): nvme-multipath: find NUMA path only for online numa-node Pin-yen Lin (1): clk: mediatek: mt8183: Only enable runtime PM on mt8183-mfgcfg Piotr Wojtaszczyk (1): i2c: pnx: Fix potential deadlock warning from del_timer_sync() call in isr Ricardo Ribalda (5): media: dvb: as102-fe: Fix as10x_register_addr packing media: dvb-usb: dib0700_devices: Add missing release_firmware() media: dvb-frontends: tda18271c2dd: Remove casting during div media: s2255: Use refcount_t instead of atomic_t for num_channels media: dvb-frontends: tda10048: Fix integer overflow Ryusuke Konishi (3): nilfs2: fix inode number range checks nilfs2: add missing check for inode numbers on directory entries nilfs2: fix incorrect inode allocation from reserved inodes Sagi Grimberg (2): net: allow skb_datagram_iter to be called from any context nvmet: fix a possible leak when destroy a ctrl during qp establishment Sam Sun (1): bonding: Fix out-of-bounds read in bond_option_arp_ip_targets_set() Sasha Neftin (1): Revert "igc: fix a log entry using uninitialized netdev" Shigeru Yoshida (1): inet_diag: Initialize pad field in struct inet_diag_req_v2 Simon Horman (1): net: dsa: mv88e6xxx: Correct check for empty list Song Shuai (1): riscv: kexec: Avoid deadlock in kexec crash path Tim Huang (1): drm/amdgpu: fix uninitialized scalar variable warning Tomas Henzl (1): scsi: mpi3mr: Sanitise num_phys Val Packett (1): mtd: rawnand: rockchip: ensure NVDDR timings are rejected Wang Yong (1): jffs2: Fix potential illegal address access in jffs2_free_inode Witold Sadowski (1): spi: cadence: Ensure data lines set to low during dummy-cycle period Zijian Zhang (2): selftests: fix OOM in msg_zerocopy selftest selftests: make order checking verbose in msg_zerocopy selftest Zijun Hu (1): Bluetooth: qca: Fix BT enable failure again for QCA6390 after warm reboot hmtheboy154 (2): platform/x86: touchscreen_dmi: Add info for GlobalSpace SolT IVW 11.6" tablet platform/x86: touchscreen_dmi: Add info for the EZpad 6s Pro

7 months, 3 weeks

1
1
0 0

[PATCH] drm/i915/gt: Do not consider preemption during execlists_dequeue for gen8

by Nitin Gote

We're seeing a GPU HANG issue on a CHV platform, which was caused by bac24f59f454 ("drm/i915/execlists: Enable coarse preemption boundaries for gen8"). Gen8 platform has only timeslice and doesn't support a preemption mechanism as engines do not have a preemption timer and doesn't send an irq if the preemption timeout expires. So, add a fix to not consider preemption during dequeuing for gen8 platforms. Also move can_preemt() above need_preempt() function to resolve implicit declaration of function ‘can_preempt' error and make can_preempt() function param as const to resolve error: passing argument 1 of ‘can_preempt’ discards ‘const’ qualifier from the pointer target type. v2: Simplify can_preemt() function (Tvrtko Ursulin) Fixes: bac24f59f454 ("drm/i915/execlists: Enable coarse preemption boundaries for gen8") Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11396 Suggested-by: Andi Shyti <andi.shyti(a)intel.com> Signed-off-by: Nitin Gote <nitin.r.gote(a)intel.com> Cc: Chris Wilson <chris.p.wilson(a)linux.intel.com> CC: <stable(a)vger.kernel.org> # v5.2+ --- .../drm/i915/gt/intel_execlists_submission.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c index 21829439e686..59885d7721e4 100644 --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c @@ -294,11 +294,19 @@ static int virtual_prio(const struct intel_engine_execlists *el) return rb ? rb_entry(rb, struct ve_node, rb)->prio : INT_MIN; } +static bool can_preempt(const struct intel_engine_cs *engine) +{ + return GRAPHICS_VER(engine->i915) > 8; +} + static bool need_preempt(const struct intel_engine_cs *engine, const struct i915_request *rq) { int last_prio; + if (!can_preempt(engine)) + return false; + if (!intel_engine_has_semaphores(engine)) return false; @@ -3313,15 +3321,6 @@ static void remove_from_engine(struct i915_request *rq) i915_request_notify_execute_cb_imm(rq); } -static bool can_preempt(struct intel_engine_cs *engine) -{ - if (GRAPHICS_VER(engine->i915) > 8) - return true; - - /* GPGPU on bdw requires extra w/a; not implemented */ - return engine->class != RENDER_CLASS; -} - static void kick_execlists(const struct i915_request *rq, int prio) { struct intel_engine_cs *engine = rq->engine; -- 2.25.1

7 months, 3 weeks

2
1
0 0

FAILED: patch "[PATCH] s390: Mark psw in __load_psw_mask() as __unitialized" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y git checkout FETCH_HEAD git cherry-pick -x 7278a8fb8d032dfdc03d9b5d17e0bc451cdc1492 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024071155-mushiness-lumpiness-edc1@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^.. Possible dependencies: 7278a8fb8d03 ("s390: Mark psw in __load_psw_mask() as __unitialized") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 7278a8fb8d032dfdc03d9b5d17e0bc451cdc1492 Mon Sep 17 00:00:00 2001 From: Sven Schnelle <svens(a)linux.ibm.com> Date: Tue, 30 Apr 2024 16:30:01 +0200 Subject: [PATCH] s390: Mark psw in __load_psw_mask() as __unitialized Without __unitialized, the following code is generated when INIT_STACK_ALL_ZERO is enabled: 86: d7 0f f0 a0 f0 a0 xc 160(16,%r15), 160(%r15) 8c: e3 40 f0 a0 00 24 stg %r4, 160(%r15) 92: c0 10 00 00 00 08 larl %r1, 0xa2 98: e3 10 f0 a8 00 24 stg %r1, 168(%r15) 9e: b2 b2 f0 a0 lpswe 160(%r15) The xc is not adding any security because psw is fully initialized with the following instructions. Add __unitialized to the psw definitiation to avoid the superfluous clearing of psw. Reviewed-by: Heiko Carstens <hca(a)linux.ibm.com> Signed-off-by: Sven Schnelle <svens(a)linux.ibm.com> Signed-off-by: Alexander Gordeev <agordeev(a)linux.ibm.com> diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h index 1e2fc6d6963c..07ad5a1df878 100644 --- a/arch/s390/include/asm/processor.h +++ b/arch/s390/include/asm/processor.h @@ -314,8 +314,8 @@ static inline void __load_psw(psw_t psw) */ static __always_inline void __load_psw_mask(unsigned long mask) { + psw_t psw __uninitialized; unsigned long addr; - psw_t psw; psw.mask = mask;

7 months, 3 weeks

1
0
0 0

FAILED: patch "[PATCH] s390: Mark psw in __load_psw_mask() as __unitialized" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 7278a8fb8d032dfdc03d9b5d17e0bc451cdc1492 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024071153-cassette-savings-69dd@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 7278a8fb8d03 ("s390: Mark psw in __load_psw_mask() as __unitialized") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 7278a8fb8d032dfdc03d9b5d17e0bc451cdc1492 Mon Sep 17 00:00:00 2001 From: Sven Schnelle <svens(a)linux.ibm.com> Date: Tue, 30 Apr 2024 16:30:01 +0200 Subject: [PATCH] s390: Mark psw in __load_psw_mask() as __unitialized Without __unitialized, the following code is generated when INIT_STACK_ALL_ZERO is enabled: 86: d7 0f f0 a0 f0 a0 xc 160(16,%r15), 160(%r15) 8c: e3 40 f0 a0 00 24 stg %r4, 160(%r15) 92: c0 10 00 00 00 08 larl %r1, 0xa2 98: e3 10 f0 a8 00 24 stg %r1, 168(%r15) 9e: b2 b2 f0 a0 lpswe 160(%r15) The xc is not adding any security because psw is fully initialized with the following instructions. Add __unitialized to the psw definitiation to avoid the superfluous clearing of psw. Reviewed-by: Heiko Carstens <hca(a)linux.ibm.com> Signed-off-by: Sven Schnelle <svens(a)linux.ibm.com> Signed-off-by: Alexander Gordeev <agordeev(a)linux.ibm.com> diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h index 1e2fc6d6963c..07ad5a1df878 100644 --- a/arch/s390/include/asm/processor.h +++ b/arch/s390/include/asm/processor.h @@ -314,8 +314,8 @@ static inline void __load_psw(psw_t psw) */ static __always_inline void __load_psw_mask(unsigned long mask) { + psw_t psw __uninitialized; unsigned long addr; - psw_t psw; psw.mask = mask;

7 months, 3 weeks

1
0
0 0

FAILED: patch "[PATCH] s390: Mark psw in __load_psw_mask() as __unitialized" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x 7278a8fb8d032dfdc03d9b5d17e0bc451cdc1492 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024071154-kitten-oxidize-b3a1@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: 7278a8fb8d03 ("s390: Mark psw in __load_psw_mask() as __unitialized") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 7278a8fb8d032dfdc03d9b5d17e0bc451cdc1492 Mon Sep 17 00:00:00 2001 From: Sven Schnelle <svens(a)linux.ibm.com> Date: Tue, 30 Apr 2024 16:30:01 +0200 Subject: [PATCH] s390: Mark psw in __load_psw_mask() as __unitialized Without __unitialized, the following code is generated when INIT_STACK_ALL_ZERO is enabled: 86: d7 0f f0 a0 f0 a0 xc 160(16,%r15), 160(%r15) 8c: e3 40 f0 a0 00 24 stg %r4, 160(%r15) 92: c0 10 00 00 00 08 larl %r1, 0xa2 98: e3 10 f0 a8 00 24 stg %r1, 168(%r15) 9e: b2 b2 f0 a0 lpswe 160(%r15) The xc is not adding any security because psw is fully initialized with the following instructions. Add __unitialized to the psw definitiation to avoid the superfluous clearing of psw. Reviewed-by: Heiko Carstens <hca(a)linux.ibm.com> Signed-off-by: Sven Schnelle <svens(a)linux.ibm.com> Signed-off-by: Alexander Gordeev <agordeev(a)linux.ibm.com> diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h index 1e2fc6d6963c..07ad5a1df878 100644 --- a/arch/s390/include/asm/processor.h +++ b/arch/s390/include/asm/processor.h @@ -314,8 +314,8 @@ static inline void __load_psw(psw_t psw) */ static __always_inline void __load_psw_mask(unsigned long mask) { + psw_t psw __uninitialized; unsigned long addr; - psw_t psw; psw.mask = mask;

7 months, 3 weeks

1
0
0 0

FAILED: patch "[PATCH] s390: Mark psw in __load_psw_mask() as __unitialized" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 7278a8fb8d032dfdc03d9b5d17e0bc451cdc1492 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024071153-tanned-cobalt-76a1@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 7278a8fb8d03 ("s390: Mark psw in __load_psw_mask() as __unitialized") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 7278a8fb8d032dfdc03d9b5d17e0bc451cdc1492 Mon Sep 17 00:00:00 2001 From: Sven Schnelle <svens(a)linux.ibm.com> Date: Tue, 30 Apr 2024 16:30:01 +0200 Subject: [PATCH] s390: Mark psw in __load_psw_mask() as __unitialized Without __unitialized, the following code is generated when INIT_STACK_ALL_ZERO is enabled: 86: d7 0f f0 a0 f0 a0 xc 160(16,%r15), 160(%r15) 8c: e3 40 f0 a0 00 24 stg %r4, 160(%r15) 92: c0 10 00 00 00 08 larl %r1, 0xa2 98: e3 10 f0 a8 00 24 stg %r1, 168(%r15) 9e: b2 b2 f0 a0 lpswe 160(%r15) The xc is not adding any security because psw is fully initialized with the following instructions. Add __unitialized to the psw definitiation to avoid the superfluous clearing of psw. Reviewed-by: Heiko Carstens <hca(a)linux.ibm.com> Signed-off-by: Sven Schnelle <svens(a)linux.ibm.com> Signed-off-by: Alexander Gordeev <agordeev(a)linux.ibm.com> diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h index 1e2fc6d6963c..07ad5a1df878 100644 --- a/arch/s390/include/asm/processor.h +++ b/arch/s390/include/asm/processor.h @@ -314,8 +314,8 @@ static inline void __load_psw(psw_t psw) */ static __always_inline void __load_psw_mask(unsigned long mask) { + psw_t psw __uninitialized; unsigned long addr; - psw_t psw; psw.mask = mask;

7 months, 3 weeks

1
0
0 0

FAILED: patch "[PATCH] s390: Mark psw in __load_psw_mask() as __unitialized" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 7278a8fb8d032dfdc03d9b5d17e0bc451cdc1492 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024071152-smoked-reheat-1908@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 7278a8fb8d03 ("s390: Mark psw in __load_psw_mask() as __unitialized") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 7278a8fb8d032dfdc03d9b5d17e0bc451cdc1492 Mon Sep 17 00:00:00 2001 From: Sven Schnelle <svens(a)linux.ibm.com> Date: Tue, 30 Apr 2024 16:30:01 +0200 Subject: [PATCH] s390: Mark psw in __load_psw_mask() as __unitialized Without __unitialized, the following code is generated when INIT_STACK_ALL_ZERO is enabled: 86: d7 0f f0 a0 f0 a0 xc 160(16,%r15), 160(%r15) 8c: e3 40 f0 a0 00 24 stg %r4, 160(%r15) 92: c0 10 00 00 00 08 larl %r1, 0xa2 98: e3 10 f0 a8 00 24 stg %r1, 168(%r15) 9e: b2 b2 f0 a0 lpswe 160(%r15) The xc is not adding any security because psw is fully initialized with the following instructions. Add __unitialized to the psw definitiation to avoid the superfluous clearing of psw. Reviewed-by: Heiko Carstens <hca(a)linux.ibm.com> Signed-off-by: Sven Schnelle <svens(a)linux.ibm.com> Signed-off-by: Alexander Gordeev <agordeev(a)linux.ibm.com> diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h index 1e2fc6d6963c..07ad5a1df878 100644 --- a/arch/s390/include/asm/processor.h +++ b/arch/s390/include/asm/processor.h @@ -314,8 +314,8 @@ static inline void __load_psw(psw_t psw) */ static __always_inline void __load_psw_mask(unsigned long mask) { + psw_t psw __uninitialized; unsigned long addr; - psw_t psw; psw.mask = mask;

7 months, 3 weeks

1
0
0 0

FAILED: patch "[PATCH] s390: Mark psw in __load_psw_mask() as __unitialized" failed to apply to 6.6-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x 7278a8fb8d032dfdc03d9b5d17e0bc451cdc1492 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024071151-recital-stage-0612@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: 7278a8fb8d03 ("s390: Mark psw in __load_psw_mask() as __unitialized") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 7278a8fb8d032dfdc03d9b5d17e0bc451cdc1492 Mon Sep 17 00:00:00 2001 From: Sven Schnelle <svens(a)linux.ibm.com> Date: Tue, 30 Apr 2024 16:30:01 +0200 Subject: [PATCH] s390: Mark psw in __load_psw_mask() as __unitialized Without __unitialized, the following code is generated when INIT_STACK_ALL_ZERO is enabled: 86: d7 0f f0 a0 f0 a0 xc 160(16,%r15), 160(%r15) 8c: e3 40 f0 a0 00 24 stg %r4, 160(%r15) 92: c0 10 00 00 00 08 larl %r1, 0xa2 98: e3 10 f0 a8 00 24 stg %r1, 168(%r15) 9e: b2 b2 f0 a0 lpswe 160(%r15) The xc is not adding any security because psw is fully initialized with the following instructions. Add __unitialized to the psw definitiation to avoid the superfluous clearing of psw. Reviewed-by: Heiko Carstens <hca(a)linux.ibm.com> Signed-off-by: Sven Schnelle <svens(a)linux.ibm.com> Signed-off-by: Alexander Gordeev <agordeev(a)linux.ibm.com> diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h index 1e2fc6d6963c..07ad5a1df878 100644 --- a/arch/s390/include/asm/processor.h +++ b/arch/s390/include/asm/processor.h @@ -314,8 +314,8 @@ static inline void __load_psw(psw_t psw) */ static __always_inline void __load_psw_mask(unsigned long mask) { + psw_t psw __uninitialized; unsigned long addr; - psw_t psw; psw.mask = mask;

7 months, 3 weeks

1
0
0 0

[PATCH v2 2/6] drm/i915/dp: Don't switch the LTTPR mode on an active link

by Imre Deak

Switching to transparent mode leads to a loss of link synchronization, so prevent doing this on an active link. This happened at least on an Intel N100 system / DELL UD22 dock, the LTTPR residing either on the host or the dock. To fix the issue, keep the current mode on an active link, adjusting the LTTPR count accordingly (resetting it to 0 in transparent mode). v2: Adjust code comment during link training about reiniting the LTTPRs. (Ville) Fixes: 7b2a4ab8b0ef ("drm/i915: Switch to LTTPR transparent mode link training") Reported-and-tested-by: Gareth Yu <gareth.yu(a)intel.com> Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10902 Cc: <stable(a)vger.kernel.org> # v5.15+ Cc: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Signed-off-by: Imre Deak <imre.deak(a)intel.com> --- .../drm/i915/display/intel_dp_link_training.c | 55 ++++++++++++++++--- 1 file changed, 48 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index 1bc4ef84ff3bc..d044c8e36bb3d 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -117,10 +117,24 @@ intel_dp_set_lttpr_transparent_mode(struct intel_dp *intel_dp, bool enable) return drm_dp_dpcd_write(&intel_dp->aux, DP_PHY_REPEATER_MODE, &val, 1) == 1; } -static int intel_dp_init_lttpr(struct intel_dp *intel_dp, const u8 dpcd[DP_RECEIVER_CAP_SIZE]) +static bool intel_dp_lttpr_transparent_mode_enabled(struct intel_dp *intel_dp) +{ + return intel_dp->lttpr_common_caps[DP_PHY_REPEATER_MODE - + DP_LT_TUNABLE_PHY_REPEATER_FIELD_DATA_STRUCTURE_REV] == + DP_PHY_REPEATER_MODE_TRANSPARENT; +} + +/* + * Read the LTTPR common capabilities and switch the LTTPR PHYs to + * non-transparent mode if this is supported. Preserve the + * transparent/non-transparent mode on an active link. + * + * Return the number of detected LTTPRs in non-transparent mode or 0 if the + * LTTPRs are in transparent mode or the detection failed. + */ +static int intel_dp_init_lttpr_phys(struct intel_dp *intel_dp, const u8 dpcd[DP_RECEIVER_CAP_SIZE]) { int lttpr_count; - int i; if (!intel_dp_read_lttpr_common_caps(intel_dp, dpcd)) return 0; @@ -134,6 +148,19 @@ static int intel_dp_init_lttpr(struct intel_dp *intel_dp, const u8 dpcd[DP_RECEI if (lttpr_count == 0) return 0; + /* + * Don't change the mode on an active link, to prevent a loss of link + * synchronization. See DP Standard v2.0 3.6.7. about the LTTPR + * resetting its internal state when the mode is changed from + * non-transparent to transparent. + */ + if (intel_dp->link_trained) { + if (lttpr_count < 0 || intel_dp_lttpr_transparent_mode_enabled(intel_dp)) + goto out_reset_lttpr_count; + + return lttpr_count; + } + /* * See DP Standard v2.0 3.6.6.1. about the explicit disabling of * non-transparent mode and the disable->enable non-transparent mode @@ -154,11 +181,25 @@ static int intel_dp_init_lttpr(struct intel_dp *intel_dp, const u8 dpcd[DP_RECEI "Switching to LTTPR non-transparent LT mode failed, fall-back to transparent mode\n"); intel_dp_set_lttpr_transparent_mode(intel_dp, true); - intel_dp_reset_lttpr_count(intel_dp); - return 0; + goto out_reset_lttpr_count; } + return lttpr_count; + +out_reset_lttpr_count: + intel_dp_reset_lttpr_count(intel_dp); + + return 0; +} + +static int intel_dp_init_lttpr(struct intel_dp *intel_dp, const u8 dpcd[DP_RECEIVER_CAP_SIZE]) +{ + int lttpr_count; + int i; + + lttpr_count = intel_dp_init_lttpr_phys(intel_dp, dpcd); + for (i = 0; i < lttpr_count; i++) intel_dp_read_lttpr_phy_caps(intel_dp, dpcd, DP_PHY_LTTPR(i)); @@ -1482,10 +1523,10 @@ void intel_dp_start_link_train(struct intel_atomic_state *state, struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); struct intel_encoder *encoder = &dig_port->base; bool passed; - /* - * TODO: Reiniting LTTPRs here won't be needed once proper connector - * HW state readout is added. + * Reinit the LTTPRs here to ensure that they are switched to + * non-transparent mode. During an earlier LTTPR detection this + * could've been prevented by an active link. */ int lttpr_count = intel_dp_init_lttpr_and_dprx_caps(intel_dp); -- 2.43.3

7 months, 3 weeks

2
1
0 0

[PATCH v2 1/6] drm/i915/dp: Reset intel_dp->link_trained before retraining the link

by Imre Deak

Regularly retraining a link during an atomic commit happens with the given pipe/link already disabled and hence intel_dp->link_trained being false. Ensure this also for retraining a DP SST link via direct calls to the link training functions (vs. an actual commit as for DP MST). So far nothing depended on this, however the next patch will depend on link_trained==false for changing the LTTPR mode to non-transparent. Cc: <stable(a)vger.kernel.org> # v5.15+ Cc: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Signed-off-by: Imre Deak <imre.deak(a)intel.com> --- drivers/gpu/drm/i915/display/intel_dp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 3903f6ead6e66..59f11af3b0a1d 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -5314,6 +5314,8 @@ static int intel_dp_retrain_link(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state = to_intel_crtc_state(crtc->base.state); + intel_dp->link_trained = false; + intel_dp_check_frl_training(intel_dp); intel_dp_pcon_dsc_configure(intel_dp, crtc_state); intel_dp_start_link_train(NULL, intel_dp, crtc_state); -- 2.43.3

7 months, 3 weeks

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror July 2024