September 2024 - Linux-stable-mirror

[PATCH 5.10.y] udf: Fold udf_getblk() into udf_bread()

by Sergey Shtylyov

From: Jan Kara <jack(a)suse.cz> udf_getblk() has a single call site. Fold it there. [Sergey: moved back to using udf_get_block() and buffer_{mapped|new}().] Signed-off-by: Jan Kara <jack(a)suse.cz> Signed-off-by: Sergey Shtylyov <s.shtylyov(a)omp.ru> --- This patch prevents NULL pointer dereference in case sb_getblk() fails... fs/udf/inode.c | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) Index: linux-stable/fs/udf/inode.c =================================================================== --- linux-stable.orig/fs/udf/inode.c +++ linux-stable/fs/udf/inode.c @@ -458,30 +458,6 @@ abort: return err; } -static struct buffer_head *udf_getblk(struct inode *inode, udf_pblk_t block, - int create, int *err) -{ - struct buffer_head *bh; - struct buffer_head dummy; - - dummy.b_state = 0; - dummy.b_blocknr = -1000; - *err = udf_get_block(inode, block, &dummy, create); - if (!*err && buffer_mapped(&dummy)) { - bh = sb_getblk(inode->i_sb, dummy.b_blocknr); - if (buffer_new(&dummy)) { - lock_buffer(bh); - memset(bh->b_data, 0x00, inode->i_sb->s_blocksize); - set_buffer_uptodate(bh); - unlock_buffer(bh); - mark_buffer_dirty_inode(bh, inode); - } - return bh; - } - - return NULL; -} - /* Extend the file with new blocks totaling 'new_block_bytes', * return the number of extents added */ @@ -1197,10 +1173,27 @@ struct buffer_head *udf_bread(struct ino int create, int *err) { struct buffer_head *bh = NULL; + struct buffer_head dummy; + + dummy.b_state = 0; + dummy.b_blocknr = -1000; + *err = udf_get_block(inode, block, &dummy, create); + if (*err || !buffer_mapped(&dummy)) + return NULL; - bh = udf_getblk(inode, block, create, err); - if (!bh) + bh = sb_getblk(inode->i_sb, dummy.b_blocknr); + if (!bh) { + *err = -ENOMEM; return NULL; + } + if (buffer_new(&dummy)) { + lock_buffer(bh); + memset(bh->b_data, 0x00, inode->i_sb->s_blocksize); + set_buffer_uptodate(bh); + unlock_buffer(bh); + mark_buffer_dirty_inode(bh, inode); + return bh; + } if (buffer_uptodate(bh)) return bh;

8 months, 3 weeks

1
0
0 0

stable request for kernel 6.1/6.6 for commit f3c89983cb4f ("block: Fix where bio IO priority gets set")

by Jinpu Wang

Hi Greg, hi Sasha, Please applied f3c89983cb4f ("block: Fix where bio IO priority gets set") to stable 6.1+, it applies cleanly to v6.1.110/v6.6.51. Thx! Jinpu Wang @ IONOS

8 months, 3 weeks

1
0
0 0

Request to revert "wifi: cfg80211: check wiphy mutex is held for wdev mutex" from 5.15/6.1/6.6

by Fedor Pchelkin

Hi, Upstream commit 1474bc87fe57 ("wifi: cfg80211: check wiphy mutex is held for wdev mutex") has been backported recently to 5.15/6.1/6.6 stable branches. After that we started seeing numerous lockdep assertion splats in these kernels originating from different parts of wireless stack where wdev_lock() is called. There is also a huge pile of them already found in Syzbot [1,2,3]. Digging more into the issue it appears that the blamed commit is a part of a much larger series [4] with locking cleanups and improvements for the whole wireless subsystem. The series was merged at 6.7. The cover letter for the series says: There's a kind of pointless commit in there that adds some wiphy locking assertions to the wdev as an intermediate step, I can remove that if you think that's better. We ran with it at that intermediate stage for a while to test things. So backporting this commit to stable branches without taking the series as a whole is pointless and just leads to bogus lockdep assertion splats there. The series itself is an improvement and cleanup work and therefore is not considered as material for old stable kernels. The solution which comes to mind is to revert this backported patch from the affected stable branches. Namely: - 5.15 https://lore.kernel.org/stable/20240901160825.013135421@linuxfoundation.org/ - 6.1 https://lore.kernel.org/stable/20240827143842.546537850@linuxfoundation.org/ - 6.6 https://lore.kernel.org/stable/20240827143846.794100356@linuxfoundation.org/ The intention why it was suddenly backported to these branches a year after merge-to-upstream is not clear actually: there are no stable or Fixes tags in commit message, and I don't find any public request for explicit backport on mailing lists. Please let me know if you can revert the commits yourself or I have to prepare and send them to you. [1]: https://syzkaller.appspot.com/bug?extid=310a1a9715fc1c9ead61 [2]: https://syzkaller.appspot.com/bug?extid=b730e8b6bc76d07fe10b [3]: https://syzkaller.appspot.com/bug?extid=09501cf606ec2823fafa [4]: https://lore.kernel.org/linux-wireless/20230828115927.116700-41-johannes@si… -- Thanks, Fedor

8 months, 3 weeks

1
0
0 0

Linux 6.10.11

by Greg Kroah-Hartman

I'm announcing the release of the 6.10.11 kernel. All users of the 6.10 kernel series must upgrade. The updated 6.10.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.10.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 ------------ Documentation/netlink/specs/mptcp_pm.yaml | 1 Makefile | 2 arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 2 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 36 ++ arch/powerpc/kernel/setup-common.c | 1 arch/powerpc/mm/mem.c | 2 arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 6 arch/riscv/mm/cacheflush.c | 12 arch/s390/Kconfig | 13 + arch/s390/boot/startup.c | 3 arch/x86/hyperv/hv_init.c | 5 arch/x86/include/asm/mshyperv.h | 1 arch/x86/kernel/cpu/mshyperv.c | 20 + drivers/clk/sophgo/clk-cv18xx-ip.c | 2 drivers/clocksource/hyperv_timer.c | 16 + drivers/cxl/acpi.c | 40 +++ drivers/cxl/core/region.c | 23 + drivers/cxl/cxl.h | 3 drivers/cxl/cxlmem.h | 2 drivers/dma-buf/heaps/cma_heap.c | 2 drivers/firmware/qcom/qcom_qseecom_uefisecapp.c | 4 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 5 drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 76 ++++++ drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.h | 11 drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 63 ++++- drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.h | 6 drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 1 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 1 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.h | 1 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 57 ---- drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h | 7 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 1 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 3 drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 20 - drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 20 - drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_phy.c | 55 +--- drivers/gpu/drm/amd/include/atomfirmware.h | 4 drivers/gpu/drm/drm_panel_orientation_quirks.c | 12 drivers/gpu/drm/drm_syncobj.c | 17 + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h | 2 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c | 2 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp102.c | 1 drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 2 drivers/gpu/drm/xe/xe_bo.c | 6 drivers/gpu/drm/xe/xe_drm_client.c | 45 +++ drivers/gpu/drm/xe/xe_gsc.c | 4 drivers/gpu/drm/xe/xe_wa.c | 10 drivers/hid/hid-asus.c | 3 drivers/hid/hid-ids.h | 3 drivers/hid/hid-multitouch.c | 33 ++ drivers/hwmon/pmbus/pmbus.h | 6 drivers/hwmon/pmbus/pmbus_core.c | 17 + drivers/input/mouse/synaptics.c | 1 drivers/input/serio/i8042-acpipnpio.h | 9 drivers/input/touchscreen/ads7846.c | 2 drivers/input/touchscreen/edt-ft5x06.c | 6 drivers/md/dm-integrity.c | 4 drivers/misc/eeprom/digsy_mtc_eeprom.c | 2 drivers/net/dsa/ocelot/felix_vsc9959.c | 11 drivers/net/ethernet/faraday/ftgmac100.h | 2 drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 9 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 drivers/net/ethernet/intel/ice/ice_lib.c | 15 - drivers/net/ethernet/intel/ice/ice_switch.c | 4 drivers/net/ethernet/intel/igb/igb_main.c | 17 + drivers/net/ethernet/jme.c | 10 drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 3 drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 59 +++- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 10 drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c | 4 drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 51 ++-- drivers/net/ethernet/mellanox/mlx5/core/main.c | 1 drivers/net/ethernet/mellanox/mlx5/core/qos.c | 7 drivers/net/ethernet/wangxun/libwx/wx_type.h | 6 drivers/net/phy/dp83822.c | 35 +- drivers/net/phy/vitesse.c | 14 - drivers/net/usb/ipheth.c | 18 - drivers/net/wireless/mediatek/mt76/mt7921/main.c | 2 drivers/perf/riscv_pmu_sbi.c | 7 drivers/pinctrl/intel/pinctrl-meteorlake.c | 1 drivers/platform/surface/surface_aggregator_registry.c | 58 ++++ drivers/platform/x86/asus-wmi.c | 16 + drivers/platform/x86/panasonic-laptop.c | 58 +++- drivers/soundwire/stream.c | 8 drivers/spi/spi-geni-qcom.c | 17 - drivers/spi/spi-nxp-fspi.c | 5 drivers/spi/spi-zynqmp-gqspi.c | 30 +- drivers/staging/media/atomisp/pci/sh_css_frac.h | 26 +- drivers/usb/typec/ucsi/ucsi.c | 44 ++- drivers/usb/typec/ucsi/ucsi.h | 1 fs/bcachefs/extents.c | 23 + fs/bcachefs/fs-io-buffered.c | 149 +++--------- fs/bcachefs/fs.c | 8 fs/bcachefs/fs.h | 7 fs/bcachefs/fsck.c | 18 + fs/btrfs/inode.c | 1 fs/nfs/delegation.c | 15 - fs/nfs/nfs4proc.c | 9 fs/nfs/pnfs.c | 5 fs/smb/client/cifsencrypt.c | 2 fs/smb/server/mgmt/share_config.c | 15 - fs/smb/server/mgmt/share_config.h | 4 fs/smb/server/mgmt/tree_connect.c | 9 fs/smb/server/mgmt/tree_connect.h | 4 fs/smb/server/smb2pdu.c | 11 fs/smb/server/smb_common.c | 9 fs/smb/server/smb_common.h | 2 include/linux/mlx5/mlx5_ifc.h | 12 include/linux/virtio_net.h | 3 kernel/cgroup/cpuset.c | 33 +- kernel/trace/trace_kprobe.c | 25 +- kernel/trace/trace_osnoise.c | 10 mm/memory.c | 27 +- net/hsr/hsr_device.c | 67 ++++- net/hsr/hsr_forward.c | 37 ++ net/hsr/hsr_framereg.c | 12 net/hsr/hsr_framereg.h | 2 net/hsr/hsr_main.h | 4 net/hsr/hsr_netlink.c | 1 net/ipv4/fou_core.c | 4 net/mptcp/pm_netlink.c | 13 - net/netfilter/nft_socket.c | 7 scripts/kconfig/merge_config.sh | 2 sound/soc/codecs/peb2466.c | 3 sound/soc/intel/common/soc-acpi-intel-lnl-match.c | 1 sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 1 sound/soc/meson/axg-card.c | 3 tools/testing/selftests/bpf/prog_tests/sockmap_listen.c | 3 tools/testing/selftests/net/lib/csum.c | 16 + tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 134 files changed, 1308 insertions(+), 550 deletions(-) Alex Deucher (1): drm/amdgpu/atomfirmware: Silence UBSAN warning Alexander Gordeev (1): s390/mm: Pin identity mapping base to zero Alexandre Ghiti (1): drivers: perf: Fix smp_processor_id() use in preemptible code Alison Schofield (1): cxl: Restore XOR'd position bits during address translation Anders Roxell (1): scripts: kconfig: merge_config: config files: add a trailing newline Andy Shevchenko (1): eeprom: digsy_mtc: Fix 93xx46 driver probe failure AngeloGioacchino Del Regno (1): drm/mediatek: Set sensible cursor width/height values to fix crash Anirudh Rayabharam (Microsoft) (1): x86/hyperv: fix kexec crash due to VP assist page corruption Arseniy Krasnov (1): ASoC: meson: axg-card: fix 'use-after-free' Asbjørn Sloth Tønnesen (1): netlink: specs: mptcp: fix port endianness Bard Liao (2): ASoC: Intel: soc-acpi-intel-lnl-match: add missing empty item ASoC: Intel: soc-acpi-intel-mtl-match: add missing empty item Ben Skeggs (1): drm/nouveau/fb: restore init() for ramgp102 Benjamin Poirier (1): net/mlx5: Fix bridge mode operations when there are no VFs Bert Karwatzki (1): wifi: mt76: mt7921: fix NULL pointer access in mt7921_ipv6_addr_change Bouke Sybren Haarsma (2): drm: panel-orientation-quirks: Add quirk for Ayn Loki Zero drm: panel-orientation-quirks: Add quirk for Ayn Loki Max Carolina Jubran (3): net/mlx5: Explicitly set scheduling element and TSAR type net/mlx5: Add missing masks and QoS bit masks for scheduling elements net/mlx5: Verify support for scheduling element and TSAR type Charlie Jenkins (1): riscv: Disable preemption while handling PR_RISCV_CTX_SW_FENCEI_OFF ChenXiaoSong (1): smb/server: fix return value of smb2_open() Christophe Leroy (1): powerpc/mm: Fix boot warning with hugepages and CONFIG_DEBUG_VIRTUAL Cosmin Ratiu (1): net/mlx5: Correct TASR typo into TSAR Cruise (1): drm/amd/display: Disable error correction if it's not supported Dan Carpenter (1): firmware: qcom: uefisecapp: Fix deadlock in qcuefi_acquire() Daniele Ceraolo Spurio (2): drm/xe: fix WA 14018094691 drm/xe: use devm instead of drmm for managed bo David (Ming Qiang) Wu (2): drm/amd/amdgpu: apply command submission parser for JPEG v1 drm/amd/amdgpu: apply command submission parser for JPEG v2+ David Howells (1): cifs: Fix signature miscalculation Dexuan Cui (1): clocksource: hyper-v: Use lapic timer in a TDX VM without paravisor Dmitry Savin (1): HID: multitouch: Add support for GT7868Q Edward Adam Davis (1): mptcp: pm: Fix uaf in __timer_delete_sync FUKAUMI Naoki (1): arm64: dts: rockchip: fix PMIC interrupt pin in pinctrl for ROCK Pi E Felix Kaechele (1): Input: edt-ft5x06 - add support for FocalTech FT8201 Florian Westphal (1): netfilter: nft_socket: fix sk refcount leaks Foster Snowhill (4): usbnet: ipheth: remove extraneous rx URB length check usbnet: ipheth: drop RX URBs with no payload usbnet: ipheth: do not stop RX on failing RX callback usbnet: ipheth: fix carrier detection in modes 1 and 4 Greg Kroah-Hartman (1): Linux 6.10.11 Han Xu (1): spi: nxp-fspi: fix the KASAN report out-of-bounds bug Hans de Goede (2): platform/x86: panasonic-laptop: Fix SINF array out of bounds accesses platform/x86: panasonic-laptop: Allocate 1 entry extra in the sinf array Heikki Krogerus (1): usb: typec: ucsi: Fix cable registration Ilya Bakoulin (1): drm/amd/display: Fix FEC_READY write on DP LT Jacky Chou (1): net: ftgmac100: Enable TX interrupt to avoid TX timeout Jacob Keller (1): ice: fix accounting for filters shared by multiple VSIs Jameson Thies (2): usb: typec: ucsi: Always set number of alternate modes usb: typec: ucsi: Only set number of plug altmodes after registration Jani Nikula (1): drm/xe/display: fix compat IS_DISPLAY_STEP() range end Jeff Layton (1): btrfs: update target inode's ctime on unlink Jeongjun Park (1): net: hsr: prevent NULL pointer dereference in hsr_proxy_announce() Jiawen Wu (1): net: libwx: fix number of Rx and Tx descriptors Jinjie Ruan (2): spi: geni-qcom: Undo runtime PM changes at driver exit time spi: geni-qcom: Fix incorrect free_irq() sequence Jonathan Denose (1): Input: synaptics - enable SMBus for HP Elitebook 840 G2 Kent Overstreet (3): bcachefs: Fix bch2_extents_match() false positive bcachefs: Revert lockless buffered IO path bcachefs: Don't delete open files in online fsck Krzysztof Kozlowski (1): soundwire: stream: Revert "soundwire: stream: fix programming slave ports for non-continous port maps" Li Qiang (1): clk/sophgo: Using BUG() instead of unreachable() in mmux_get_parent_id() Linus Torvalds (1): mm: avoid leaving partial pfn mappings around in error case Lorenzo Stoakes (1): minmax: reduce min/max macro expansion in atomisp driver Lukasz Majewski (1): net: hsr: Send supervisory frames to HSR network with ProxyNodeTable data Luke D. Jones (2): hid-asus: add ROG Ally X prod ID to quirk list platform/x86: asus-wmi: Add quirk for ROG Ally X Maher Sanalla (1): net/mlx5: Update the list of the PCI supported devices Marek Vasut (1): Input: ads7846 - ratelimit the spi_sync error message Martyna Szapar-Mudlaw (1): ice: Fix lldp packets dropping after changing the number of channels Masami Hiramatsu (Google) (1): tracing/kprobes: Fix build error when find_module() is not available Matthew Auld (2): drm/xe/client: fix deadlock in show_meminfo() drm/xe/client: add missing bo locking in show_meminfo() Matthieu Baerts (NGI0) (1): selftests: mptcp: join: restrict fullmesh endp on 1st sf Maximilian Luz (5): platform/surface: aggregator_registry: Add Support for Surface Pro 10 platform/surface: aggregator_registry: Add support for Surface Laptop Go 3 platform/surface: aggregator_registry: Add support for Surface Laptop Studio 2 platform/surface: aggregator_registry: Add fan and thermal sensor support for Surface Laptop 5 platform/surface: aggregator_registry: Add support for Surface Laptop 6 Michal Luczaj (1): selftests/bpf: Support SOCK_STREAM in unix_inet_redir_to_connected() Michal Schmidt (1): ice: fix VSI lists confusion when adding VLANs Mika Westerberg (1): pinctrl: meteorlake: Add Arrow Lake-H/U ACPI ID Mikulas Patocka (1): dm-integrity: fix a race condition when accessing recalc_sector Moon Yeounsu (1): net: ethernet: use ip_hdrlen() instead of bit shift Muhammad Usama Anjum (1): fou: fix initialization of grc Namjae Jeon (2): ksmbd: override fsids for share path check ksmbd: override fsids for smb2_query_info() Naveen Mamindlapalli (1): octeontx2-af: Modify SMQ flush sequence to drop packets Ngai-Mint Kwan (1): drm/xe/xe2lpm: Extend Wa_16021639441 Nikita Zhandarovich (1): drm/i915/guc: prevent a possible int overflow in wq offsets Patryk Biel (1): hwmon: (pmbus) Conditionally clear individual status bits for pmbus rev >= 1.2 Pawel Dembicki (1): net: phy: vitesse: repair vsc73xx autonegotiation Peiyang Wang (1): net: hns3: use correct release function during uninitialization Quentin Schulz (2): arm64: dts: rockchip: fix eMMC/SPI corruption when audio has been used on RK3399 Puma arm64: dts: rockchip: override BIOS_DISABLE signal via GPIO hog on RK3399 Puma Rob Clark (1): drm/msm/adreno: Fix error return if missing firmware-name Sean Anderson (3): spi: zynqmp-gqspi: Scale timeout by data size selftests: net: csum: Fix checksums for packets with non-zero padding net: dpaa: Pad packets to ETH_ZLEN Shahar Shitrit (2): net/mlx5e: Add missing link modes to ptys2ethtool_map net/mlx5e: Add missing link mode to ptys2ext_ethtool_map Sriram Yagnaraman (1): igb: Always call igb_xdp_ring_update_tail() under Tx lock Steven Rostedt (1): tracing/osnoise: Fix build when timerlat is not enabled Su Hui (1): ASoC: codecs: avoid possible garbage value in peb2466_reg_read() T.J. Mercier (2): drm/syncobj: Fix syncobj leak in drm_syncobj_eventfd_ioctl dma-buf: heaps: Fix off-by-one in CMA heap fault handler Takashi Iwai (1): Input: i8042 - add Fujitsu Lifebook E756 to i8042 quirk table Tobias Jakobi (2): drm/amd/display: Avoid race between dcn10_set_drr() and dc_state_destruct() drm/amd/display: Avoid race between dcn35_set_drr() and dc_state_destruct() Tomas Paukrt (1): net: phy: dp83822: Fix NULL pointer dereference on DP83825 devices Trond Myklebust (2): NFSv4: Fix clearing of layout segments in layoutreturn NFS: Avoid unnecessary rescanning of the per-server delegation list Waiman Long (1): cgroup/cpuset: Eliminate unncessary sched domains rebuilds in hotplug Willem de Bruijn (1): net: tighten bad gso csum offset check in virtio_net_hdr Xiaoliang Yang (1): net: dsa: felix: ignore pending status of TAS module when it's disabled Xingyu Wu (1): riscv: dts: starfive: jh7110-common: Fix lower rate of CPUfreq by setting PLL0 rate to 1.5GHz Yinjie Yao (1): drm/amdgpu: Update kmd_fw_shared for VCN5 peng guo (1): cxl/core: Fix incorrect vendor debug UUID define

8 months, 3 weeks

1
1
0 0

Linux 6.6.52

by Greg Kroah-Hartman

I'm announcing the release of the 6.6.52 kernel. All users of the 6.6 kernel series must upgrade. The updated 6.6.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.6.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/rk3328-rock-pi-e.dts | 2 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 36 +++ arch/powerpc/kernel/setup-common.c | 1 arch/powerpc/mm/mem.c | 2 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi | 4 arch/x86/hyperv/hv_init.c | 5 arch/x86/include/asm/mshyperv.h | 1 arch/x86/kernel/cpu/mshyperv.c | 4 drivers/cxl/cxlmem.h | 2 drivers/dma-buf/heaps/cma_heap.c | 2 drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 76 ++++++++ drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.h | 11 + drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_phy.c | 55 ++---- drivers/gpu/drm/amd/include/atomfirmware.h | 4 drivers/gpu/drm/drm_panel_orientation_quirks.c | 12 + drivers/gpu/drm/drm_syncobj.c | 17 + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h | 2 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c | 2 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp102.c | 1 drivers/hid/hid-ids.h | 2 drivers/hid/hid-multitouch.c | 33 +++ drivers/hwmon/pmbus/pmbus.h | 6 drivers/hwmon/pmbus/pmbus_core.c | 17 + drivers/iio/adc/ad7124.c | 58 ++---- drivers/infiniband/hw/mlx5/main.c | 2 drivers/input/mouse/synaptics.c | 1 drivers/input/serio/i8042-acpipnpio.h | 9 drivers/input/touchscreen/ads7846.c | 2 drivers/md/dm-integrity.c | 4 drivers/misc/eeprom/digsy_mtc_eeprom.c | 2 drivers/net/dsa/ocelot/felix_vsc9959.c | 11 - drivers/net/ethernet/faraday/ftgmac100.h | 2 drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 9 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 drivers/net/ethernet/intel/ice/ice_lib.c | 15 - drivers/net/ethernet/intel/ice/ice_switch.c | 4 drivers/net/ethernet/intel/igb/igb_main.c | 17 + drivers/net/ethernet/jme.c | 10 - drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 3 drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 59 +++++- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 10 + drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c | 4 drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 51 +++-- drivers/net/ethernet/mellanox/mlx5/core/main.c | 1 drivers/net/ethernet/mellanox/mlx5/core/port.c | 2 drivers/net/ethernet/mellanox/mlx5/core/qos.c | 7 drivers/net/ethernet/xilinx/xilinx_axienet.h | 3 drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 8 drivers/net/phy/vitesse.c | 14 - drivers/net/usb/ipheth.c | 18 + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 2 drivers/nvmem/core.c | 13 + drivers/nvmem/u-boot-env.c | 91 +++++----- drivers/pinctrl/intel/pinctrl-meteorlake.c | 1 drivers/platform/surface/surface_aggregator_registry.c | 8 drivers/platform/x86/panasonic-laptop.c | 58 +++++- drivers/soundwire/stream.c | 8 drivers/spi/spi-geni-qcom.c | 17 - drivers/spi/spi-nxp-fspi.c | 5 drivers/staging/media/atomisp/pci/sh_css_frac.h | 26 ++ fs/btrfs/inode.c | 1 fs/nfs/delegation.c | 15 - fs/nfs/nfs4proc.c | 9 fs/nfs/pnfs.c | 5 fs/smb/client/cifsencrypt.c | 2 fs/smb/server/mgmt/share_config.c | 15 + fs/smb/server/mgmt/share_config.h | 4 fs/smb/server/mgmt/tree_connect.c | 9 fs/smb/server/mgmt/tree_connect.h | 4 fs/smb/server/smb2pdu.c | 11 - fs/smb/server/smb_common.c | 9 fs/smb/server/smb_common.h | 2 include/linux/mlx5/mlx5_ifc.h | 12 + include/linux/mlx5/port.h | 2 include/linux/nvmem-consumer.h | 1 include/linux/property.h | 8 include/linux/virtio_net.h | 3 kernel/trace/trace_osnoise.c | 10 - mm/memory.c | 27 ++ net/ipv4/fou_core.c | 4 net/mptcp/pm_netlink.c | 13 - net/netfilter/nft_socket.c | 7 scripts/kconfig/merge_config.sh | 2 sound/soc/codecs/peb2466.c | 3 sound/soc/meson/axg-card.c | 3 tools/testing/selftests/bpf/prog_tests/sockmap_listen.c | 3 tools/testing/selftests/net/csum.c | 16 + tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 91 files changed, 741 insertions(+), 325 deletions(-) Alex Deucher (1): drm/amdgpu/atomfirmware: Silence UBSAN warning Anders Roxell (1): scripts: kconfig: merge_config: config files: add a trailing newline Andy Shevchenko (1): eeprom: digsy_mtc: Fix 93xx46 driver probe failure Anirudh Rayabharam (Microsoft) (1): x86/hyperv: fix kexec crash due to VP assist page corruption Arseniy Krasnov (1): ASoC: meson: axg-card: fix 'use-after-free' Ben Skeggs (1): drm/nouveau/fb: restore init() for ramgp102 Benjamin Poirier (1): net/mlx5: Fix bridge mode operations when there are no VFs Bert Karwatzki (1): wifi: mt76: mt7921: fix NULL pointer access in mt7921_ipv6_addr_change Bouke Sybren Haarsma (2): drm: panel-orientation-quirks: Add quirk for Ayn Loki Zero drm: panel-orientation-quirks: Add quirk for Ayn Loki Max Carolina Jubran (3): net/mlx5: Explicitly set scheduling element and TSAR type net/mlx5: Add missing masks and QoS bit masks for scheduling elements net/mlx5: Verify support for scheduling element and TSAR type ChenXiaoSong (1): smb/server: fix return value of smb2_open() Christophe Leroy (1): powerpc/mm: Fix boot warning with hugepages and CONFIG_DEBUG_VIRTUAL Cosmin Ratiu (1): net/mlx5: Correct TASR typo into TSAR Cruise (1): drm/amd/display: Disable error correction if it's not supported David (Ming Qiang) Wu (1): drm/amd/amdgpu: apply command submission parser for JPEG v1 David Howells (1): cifs: Fix signature miscalculation Dmitry Savin (1): HID: multitouch: Add support for GT7868Q Dumitru Ceclan (1): iio: adc: ad7124: fix DT configuration parsing Edward Adam Davis (1): mptcp: pm: Fix uaf in __timer_delete_sync FUKAUMI Naoki (1): arm64: dts: rockchip: fix PMIC interrupt pin in pinctrl for ROCK Pi E Florian Westphal (1): netfilter: nft_socket: fix sk refcount leaks Foster Snowhill (4): usbnet: ipheth: remove extraneous rx URB length check usbnet: ipheth: drop RX URBs with no payload usbnet: ipheth: do not stop RX on failing RX callback usbnet: ipheth: fix carrier detection in modes 1 and 4 Greg Kroah-Hartman (1): Linux 6.6.52 Han Xu (1): spi: nxp-fspi: fix the KASAN report out-of-bounds bug Hans de Goede (2): platform/x86: panasonic-laptop: Fix SINF array out of bounds accesses platform/x86: panasonic-laptop: Allocate 1 entry extra in the sinf array Ilya Bakoulin (1): drm/amd/display: Fix FEC_READY write on DP LT Jacky Chou (1): net: ftgmac100: Enable TX interrupt to avoid TX timeout Jacob Keller (1): ice: fix accounting for filters shared by multiple VSIs Jeff Layton (1): btrfs: update target inode's ctime on unlink Jinjie Ruan (2): spi: geni-qcom: Undo runtime PM changes at driver exit time spi: geni-qcom: Fix incorrect free_irq() sequence John Thomson (1): nvmem: u-boot-env: error if NVMEM device is too small Jonathan Cameron (3): device property: Add cleanup.h based fwnode_handle_put() scope based cleanup. device property: Introduce device_for_each_child_node_scoped() iio: adc: ad7124: Switch from of specific to fwnode based property handling Jonathan Denose (1): Input: synaptics - enable SMBus for HP Elitebook 840 G2 Krzysztof Kozlowski (1): soundwire: stream: Revert "soundwire: stream: fix programming slave ports for non-continous port maps" Linus Torvalds (1): mm: avoid leaving partial pfn mappings around in error case Lorenzo Stoakes (1): minmax: reduce min/max macro expansion in atomisp driver Maher Sanalla (1): net/mlx5: Update the list of the PCI supported devices Marek Vasut (1): Input: ads7846 - ratelimit the spi_sync error message Martyna Szapar-Mudlaw (1): ice: Fix lldp packets dropping after changing the number of channels Matthieu Baerts (NGI0) (1): selftests: mptcp: join: restrict fullmesh endp on 1st sf Maximilian Luz (2): platform/surface: aggregator_registry: Add Support for Surface Pro 10 platform/surface: aggregator_registry: Add support for Surface Laptop Go 3 Michal Luczaj (1): selftests/bpf: Support SOCK_STREAM in unix_inet_redir_to_connected() Michal Schmidt (1): ice: fix VSI lists confusion when adding VLANs Mika Westerberg (1): pinctrl: meteorlake: Add Arrow Lake-H/U ACPI ID Mikulas Patocka (1): dm-integrity: fix a race condition when accessing recalc_sector Moon Yeounsu (1): net: ethernet: use ip_hdrlen() instead of bit shift Muhammad Usama Anjum (1): fou: fix initialization of grc Namjae Jeon (2): ksmbd: override fsids for share path check ksmbd: override fsids for smb2_query_info() Naveen Mamindlapalli (1): octeontx2-af: Modify SMQ flush sequence to drop packets Nikita Zhandarovich (1): drm/i915/guc: prevent a possible int overflow in wq offsets Patrisious Haddad (1): IB/mlx5: Rename 400G_8X speed to comply to naming convention Patryk Biel (1): hwmon: (pmbus) Conditionally clear individual status bits for pmbus rev >= 1.2 Pawel Dembicki (1): net: phy: vitesse: repair vsc73xx autonegotiation Peiyang Wang (1): net: hns3: use correct release function during uninitialization Quentin Schulz (2): arm64: dts: rockchip: fix eMMC/SPI corruption when audio has been used on RK3399 Puma arm64: dts: rockchip: override BIOS_DISABLE signal via GPIO hog on RK3399 Puma Rafał Miłecki (4): nvmem: core: add nvmem_dev_size() helper nvmem: u-boot-env: use nvmem_add_one_cell() nvmem subsystem helper nvmem: u-boot-env: use nvmem device helpers nvmem: u-boot-env: improve coding style Rob Clark (1): drm/msm/adreno: Fix error return if missing firmware-name Sean Anderson (3): net: xilinx: axienet: Fix race in axienet_stop selftests: net: csum: Fix checksums for packets with non-zero padding net: dpaa: Pad packets to ETH_ZLEN Shahar Shitrit (2): net/mlx5e: Add missing link modes to ptys2ethtool_map net/mlx5e: Add missing link mode to ptys2ext_ethtool_map Sriram Yagnaraman (1): igb: Always call igb_xdp_ring_update_tail() under Tx lock Steven Rostedt (1): tracing/osnoise: Fix build when timerlat is not enabled Su Hui (1): ASoC: codecs: avoid possible garbage value in peb2466_reg_read() T.J. Mercier (2): drm/syncobj: Fix syncobj leak in drm_syncobj_eventfd_ioctl dma-buf: heaps: Fix off-by-one in CMA heap fault handler Takashi Iwai (1): Input: i8042 - add Fujitsu Lifebook E756 to i8042 quirk table Trond Myklebust (2): NFSv4: Fix clearing of layout segments in layoutreturn NFS: Avoid unnecessary rescanning of the per-server delegation list Willem de Bruijn (1): net: tighten bad gso csum offset check in virtio_net_hdr William Qiu (1): riscv: dts: starfive: add assigned-clock* to limit frquency Xiaoliang Yang (1): net: dsa: felix: ignore pending status of TAS module when it's disabled peng guo (1): cxl/core: Fix incorrect vendor debug UUID define

8 months, 3 weeks

1
1
0 0

Linux 6.1.111

by Greg Kroah-Hartman

I'm announcing the release of the 6.1.111 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/rk3328-rock-pi-e.dts | 2 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 36 ++- arch/powerpc/kernel/setup-common.c | 1 arch/powerpc/mm/mem.c | 2 drivers/cxl/cxlmem.h | 2 drivers/dma-buf/heaps/cma_heap.c | 2 drivers/gpu/drm/amd/include/atomfirmware.h | 4 drivers/gpu/drm/drm_panel_orientation_quirks.c | 12 + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 drivers/hid/hid-ids.h | 2 drivers/hid/hid-multitouch.c | 33 ++ drivers/hwmon/pmbus/pmbus.h | 6 drivers/hwmon/pmbus/pmbus_core.c | 17 + drivers/input/mouse/synaptics.c | 1 drivers/input/serio/i8042-acpipnpio.h | 9 drivers/input/touchscreen/ads7846.c | 2 drivers/md/dm-integrity.c | 4 drivers/misc/eeprom/digsy_mtc_eeprom.c | 2 drivers/net/ethernet/faraday/ftgmac100.h | 2 drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 9 drivers/net/ethernet/intel/ice/ice_switch.c | 2 drivers/net/ethernet/intel/igb/igb_main.c | 17 + drivers/net/ethernet/jme.c | 10 drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 15 + drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 177 +++++++++++++++- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 4 drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c | 4 drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 51 ++-- drivers/net/ethernet/mellanox/mlx5/core/main.c | 1 drivers/net/ethernet/mellanox/mlx5/core/qos.c | 7 drivers/net/ethernet/xilinx/xilinx_axienet.h | 3 drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 8 drivers/net/phy/vitesse.c | 14 - drivers/net/usb/ipheth.c | 5 drivers/pinctrl/intel/pinctrl-meteorlake.c | 1 drivers/platform/surface/surface_aggregator_registry.c | 8 drivers/platform/x86/panasonic-laptop.c | 58 ++++- drivers/soc/ti/omap_prm.c | 2 drivers/soundwire/stream.c | 8 drivers/spi/spi-geni-qcom.c | 22 - drivers/spi/spi-nxp-fspi.c | 5 drivers/staging/media/atomisp/pci/sh_css_frac.h | 26 +- fs/btrfs/inode.c | 1 fs/nfs/delegation.c | 15 - fs/nfs/nfs4proc.c | 9 fs/nfs/pnfs.c | 5 fs/ntfs3/attrlist.c | 4 fs/ntfs3/bitmap.c | 4 fs/ntfs3/frecord.c | 4 fs/ntfs3/super.c | 2 fs/smb/server/mgmt/share_config.c | 15 + fs/smb/server/mgmt/share_config.h | 4 fs/smb/server/mgmt/tree_connect.c | 9 fs/smb/server/mgmt/tree_connect.h | 4 fs/smb/server/smb2pdu.c | 11 fs/smb/server/smb_common.c | 9 fs/smb/server/smb_common.h | 2 include/linux/mlx5/mlx5_ifc.h | 12 - include/linux/virtio_net.h | 3 mm/memory.c | 27 +- net/ipv4/fou.c | 4 net/mptcp/pm_netlink.c | 13 - net/netfilter/nft_socket.c | 7 scripts/kconfig/merge_config.sh | 2 sound/soc/meson/axg-card.c | 3 tools/testing/selftests/bpf/prog_tests/sockmap_listen.c | 3 68 files changed, 603 insertions(+), 173 deletions(-) Alex Deucher (1): drm/amdgpu/atomfirmware: Silence UBSAN warning Anders Roxell (1): scripts: kconfig: merge_config: config files: add a trailing newline Andy Shevchenko (1): eeprom: digsy_mtc: Fix 93xx46 driver probe failure Arseniy Krasnov (1): ASoC: meson: axg-card: fix 'use-after-free' Benjamin Poirier (1): net/mlx5: Fix bridge mode operations when there are no VFs Bouke Sybren Haarsma (2): drm: panel-orientation-quirks: Add quirk for Ayn Loki Zero drm: panel-orientation-quirks: Add quirk for Ayn Loki Max Carolina Jubran (3): net/mlx5: Explicitly set scheduling element and TSAR type net/mlx5: Add missing masks and QoS bit masks for scheduling elements net/mlx5: Verify support for scheduling element and TSAR type ChenXiaoSong (1): smb/server: fix return value of smb2_open() Christophe Leroy (1): powerpc/mm: Fix boot warning with hugepages and CONFIG_DEBUG_VIRTUAL Cosmin Ratiu (1): net/mlx5: Correct TASR typo into TSAR Dmitry Savin (1): HID: multitouch: Add support for GT7868Q Edward Adam Davis (1): mptcp: pm: Fix uaf in __timer_delete_sync FUKAUMI Naoki (1): arm64: dts: rockchip: fix PMIC interrupt pin in pinctrl for ROCK Pi E Florian Westphal (1): netfilter: nft_socket: fix sk refcount leaks Foster Snowhill (1): usbnet: ipheth: fix carrier detection in modes 1 and 4 Greg Kroah-Hartman (1): Linux 6.1.111 Han Xu (1): spi: nxp-fspi: fix the KASAN report out-of-bounds bug Hans de Goede (2): platform/x86: panasonic-laptop: Fix SINF array out of bounds accesses platform/x86: panasonic-laptop: Allocate 1 entry extra in the sinf array Jacky Chou (1): net: ftgmac100: Enable TX interrupt to avoid TX timeout Jacob Keller (1): ice: fix accounting for filters shared by multiple VSIs Jeff Layton (1): btrfs: update target inode's ctime on unlink Jinjie Ruan (2): spi: geni-qcom: Undo runtime PM changes at driver exit time spi: geni-qcom: Fix incorrect free_irq() sequence Jonathan Denose (1): Input: synaptics - enable SMBus for HP Elitebook 840 G2 Konstantin Komarov (1): fs/ntfs3: Use kvfree to free memory allocated by kvmalloc Krzysztof Kozlowski (1): soundwire: stream: Revert "soundwire: stream: fix programming slave ports for non-continous port maps" Kunwu Chan (1): pmdomain: ti: Add a null pointer check to the omap_prm_domain_init Linus Torvalds (1): mm: avoid leaving partial pfn mappings around in error case Lorenzo Stoakes (1): minmax: reduce min/max macro expansion in atomisp driver Maher Sanalla (1): net/mlx5: Update the list of the PCI supported devices Marek Vasut (1): Input: ads7846 - ratelimit the spi_sync error message Maximilian Luz (2): platform/surface: aggregator_registry: Add Support for Surface Pro 10 platform/surface: aggregator_registry: Add support for Surface Laptop Go 3 Michal Luczaj (1): selftests/bpf: Support SOCK_STREAM in unix_inet_redir_to_connected() Mika Westerberg (1): pinctrl: meteorlake: Add Arrow Lake-H/U ACPI ID Mikulas Patocka (1): dm-integrity: fix a race condition when accessing recalc_sector Moon Yeounsu (1): net: ethernet: use ip_hdrlen() instead of bit shift Muhammad Usama Anjum (1): fou: fix initialization of grc Namjae Jeon (2): ksmbd: override fsids for share path check ksmbd: override fsids for smb2_query_info() Naveen Mamindlapalli (2): octeontx2-af: Set XOFF on other child transmit schedulers during SMQ flush octeontx2-af: Modify SMQ flush sequence to drop packets Nikita Zhandarovich (1): drm/i915/guc: prevent a possible int overflow in wq offsets Patryk Biel (1): hwmon: (pmbus) Conditionally clear individual status bits for pmbus rev >= 1.2 Pawel Dembicki (1): net: phy: vitesse: repair vsc73xx autonegotiation Quentin Schulz (2): arm64: dts: rockchip: fix eMMC/SPI corruption when audio has been used on RK3399 Puma arm64: dts: rockchip: override BIOS_DISABLE signal via GPIO hog on RK3399 Puma Rob Clark (1): drm/msm/adreno: Fix error return if missing firmware-name Sean Anderson (2): net: xilinx: axienet: Fix race in axienet_stop net: dpaa: Pad packets to ETH_ZLEN Shahar Shitrit (1): net/mlx5e: Add missing link modes to ptys2ethtool_map Sriram Yagnaraman (1): igb: Always call igb_xdp_ring_update_tail() under Tx lock T.J. Mercier (1): dma-buf: heaps: Fix off-by-one in CMA heap fault handler Takashi Iwai (1): Input: i8042 - add Fujitsu Lifebook E756 to i8042 quirk table Trond Myklebust (2): NFSv4: Fix clearing of layout segments in layoutreturn NFS: Avoid unnecessary rescanning of the per-server delegation list Uwe Kleine-König (1): spi: geni-qcom: Convert to platform remove callback returning void Willem de Bruijn (1): net: tighten bad gso csum offset check in virtio_net_hdr peng guo (1): cxl/core: Fix incorrect vendor debug UUID define

8 months, 3 weeks

1
1
0 0

[PATCH 1/5] drm/i915/gem: fix bitwise and logical AND mixup

by Jani Nikula

CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND is an int, defaulting to 250. When the wakeref is non-zero, it's either -1 or a dynamically allocated pointer, depending on CONFIG_DRM_I915_DEBUG_RUNTIME_PM. It's likely that the code works by coincidence with the bitwise AND, but with CONFIG_DRM_I915_DEBUG_RUNTIME_PM=y, there's the off chance that the condition evaluates to false, and intel_wakeref_auto() doesn't get called. Switch to the intended logical AND. Fixes: ad74457a6b5a ("drm/i915/dgfx: Release mmap on rpm suspend") Cc: Matthew Auld <matthew.auld(a)intel.com> Cc: Rodrigo Vivi <rodrigo.vivi(a)intel.com> Cc: Anshuman Gupta <anshuman.gupta(a)intel.com> Cc: Andi Shyti <andi.shyti(a)linux.intel.com> Cc: <stable(a)vger.kernel.org> # v6.1+ Signed-off-by: Jani Nikula <jani.nikula(a)intel.com> --- drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c index 5c72462d1f57..c157ade48c39 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c @@ -1131,7 +1131,7 @@ static vm_fault_t vm_fault_ttm(struct vm_fault *vmf) GEM_WARN_ON(!i915_ttm_cpu_maps_iomem(bo->resource)); } - if (wakeref & CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND) + if (wakeref && CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND) intel_wakeref_auto(&to_i915(obj->base.dev)->runtime_pm.userfault_wakeref, msecs_to_jiffies_timeout(CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND)); -- 2.39.2

8 months, 3 weeks

4
4
0 0

AMD Family 0x1a RAPL reading fixes

by Mario Limonciello

Hi, There were some fixes for RAPL reading issues recently on some AMD systems. Can you please bring this commit to 6.6.y, 6.10.y and 6.11.y? commit 166df51097a2 ("powercap/intel_rapl: Add support for AMD family 1Ah") Can you also please bring this commit to 6.10.y and 6.11.y? commit 26096aed255f ("powercap/intel_rapl: Fix the energy-pkg event for AMD CPUs") Thanks!

8 months, 3 weeks

1
0
0 0

[PATCH v2] drm/panic: Fix uninitialized spinlock acquisition with CONFIG_DRM_PANIC=n

by Lyude Paul

It turns out that if you happen to have a kernel config where CONFIG_DRM_PANIC is disabled and spinlock debugging is enabled, along with KMS being enabled - we'll end up trying to acquire an uninitialized spin_lock with drm_panic_lock() when we try to do a commit: rvkms rvkms.0: [drm:drm_atomic_commit] committing 0000000068d2ade1 INFO: trying to register non-static key. The code is fine but needs lockdep annotation, or maybe you didn't initialize this object before use? turning off the locking correctness validator. CPU: 4 PID: 1347 Comm: modprobe Not tainted 6.10.0-rc1Lyude-Test+ #272 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS edk2-20240524-3.fc40 05/24/2024 Call Trace: <TASK> dump_stack_lvl+0x77/0xa0 assign_lock_key+0x114/0x120 register_lock_class+0xa8/0x2c0 __lock_acquire+0x7d/0x2bd0 ? __vmap_pages_range_noflush+0x3a8/0x550 ? drm_atomic_helper_swap_state+0x2ad/0x3a0 lock_acquire+0xec/0x290 ? drm_atomic_helper_swap_state+0x2ad/0x3a0 ? lock_release+0xee/0x310 _raw_spin_lock_irqsave+0x4e/0x70 ? drm_atomic_helper_swap_state+0x2ad/0x3a0 drm_atomic_helper_swap_state+0x2ad/0x3a0 drm_atomic_helper_commit+0xb1/0x270 drm_atomic_commit+0xaf/0xe0 ? __pfx___drm_printfn_info+0x10/0x10 drm_client_modeset_commit_atomic+0x1a1/0x250 drm_client_modeset_commit_locked+0x4b/0x180 drm_client_modeset_commit+0x27/0x50 __drm_fb_helper_restore_fbdev_mode_unlocked+0x76/0x90 drm_fb_helper_set_par+0x38/0x40 fbcon_init+0x3c4/0x690 visual_init+0xc0/0x120 do_bind_con_driver+0x409/0x4c0 do_take_over_console+0x233/0x280 do_fb_registered+0x11f/0x210 fbcon_fb_registered+0x2c/0x60 register_framebuffer+0x248/0x2a0 __drm_fb_helper_initial_config_and_unlock+0x58a/0x720 drm_fbdev_generic_client_hotplug+0x6e/0xb0 drm_client_register+0x76/0xc0 _RNvXs_CsHeezP08sTT_5rvkmsNtB4_5RvkmsNtNtCs1cdwasc6FUb_6kernel8platform6Driver5probe+0xed2/0x1060 [rvkms] ? _RNvMs_NtCs1cdwasc6FUb_6kernel8platformINtB4_7AdapterNtCsHeezP08sTT_5rvkms5RvkmsE14probe_callbackBQ_+0x2b/0x70 [rvkms] ? acpi_dev_pm_attach+0x25/0x110 ? platform_probe+0x6a/0xa0 ? really_probe+0x10b/0x400 ? __driver_probe_device+0x7c/0x140 ? driver_probe_device+0x22/0x1b0 ? __device_attach_driver+0x13a/0x1c0 ? __pfx___device_attach_driver+0x10/0x10 ? bus_for_each_drv+0x114/0x170 ? __device_attach+0xd6/0x1b0 ? bus_probe_device+0x9e/0x120 ? device_add+0x288/0x4b0 ? platform_device_add+0x75/0x230 ? platform_device_register_full+0x141/0x180 ? rust_helper_platform_device_register_simple+0x85/0xb0 ? _RNvMs2_NtCs1cdwasc6FUb_6kernel8platformNtB5_6Device13create_simple+0x1d/0x60 ? _RNvXs0_CsHeezP08sTT_5rvkmsNtB5_5RvkmsNtCs1cdwasc6FUb_6kernel6Module4init+0x11e/0x160 [rvkms] ? 0xffffffffc083f000 ? init_module+0x20/0x1000 [rvkms] ? kernfs_xattr_get+0x3e/0x80 ? do_one_initcall+0x148/0x3f0 ? __lock_acquire+0x5ef/0x2bd0 ? __lock_acquire+0x5ef/0x2bd0 ? __lock_acquire+0x5ef/0x2bd0 ? put_cpu_partial+0x51/0x1d0 ? lock_acquire+0xec/0x290 ? put_cpu_partial+0x51/0x1d0 ? lock_release+0xee/0x310 ? put_cpu_partial+0x51/0x1d0 ? fs_reclaim_acquire+0x69/0xf0 ? lock_acquire+0xec/0x290 ? fs_reclaim_acquire+0x69/0xf0 ? kfree+0x22f/0x340 ? lock_release+0xee/0x310 ? kmalloc_trace_noprof+0x48/0x340 ? do_init_module+0x22/0x240 ? kmalloc_trace_noprof+0x155/0x340 ? do_init_module+0x60/0x240 ? __se_sys_finit_module+0x2e0/0x3f0 ? do_syscall_64+0xa4/0x180 ? syscall_exit_to_user_mode+0x108/0x140 ? do_syscall_64+0xb0/0x180 ? vma_end_read+0xd0/0xe0 ? do_user_addr_fault+0x309/0x640 ? clear_bhb_loop+0x45/0xa0 ? clear_bhb_loop+0x45/0xa0 ? clear_bhb_loop+0x45/0xa0 ? entry_SYSCALL_64_after_hwframe+0x76/0x7e </TASK> Fix this by stubbing these macros out when this config option isn't enabled, along with fixing the unused variable warning that introduces. Signed-off-by: Lyude Paul <lyude(a)redhat.com> Reviewed-by: Daniel Vetter <daniel.vetter(a)ffwll.ch> Fixes: e2a1cda3e0c7 ("drm/panic: Add drm panic locking") Cc: <stable(a)vger.kernel.org> # v6.10+ --- V2: * Use static inline instead of macros so we don't need __maybe_unused --- drivers/gpu/drm/drm_atomic_helper.c | 2 +- include/drm/drm_panic.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 43cdf39019a44..5186d2114a503 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3015,7 +3015,7 @@ int drm_atomic_helper_swap_state(struct drm_atomic_state *state, bool stall) { int i, ret; - unsigned long flags; + unsigned long flags = 0; struct drm_connector *connector; struct drm_connector_state *old_conn_state, *new_conn_state; struct drm_crtc *crtc; diff --git a/include/drm/drm_panic.h b/include/drm/drm_panic.h index 54085d5d05c34..f4e1fa9ae607a 100644 --- a/include/drm/drm_panic.h +++ b/include/drm/drm_panic.h @@ -64,6 +64,8 @@ struct drm_scanout_buffer { }; +#ifdef CONFIG_DRM_PANIC + /** * drm_panic_trylock - try to enter the panic printing critical section * @dev: struct drm_device @@ -149,4 +151,16 @@ struct drm_scanout_buffer { #define drm_panic_unlock(dev, flags) \ raw_spin_unlock_irqrestore(&(dev)->mode_config.panic_lock, flags) +#else + +static inline bool drm_panic_trylock(struct drm_device *dev, unsigned long flags) +{ + return true; +} + +static inline void drm_panic_lock(struct drm_device *dev, unsigned long flags) {} +static inline void drm_panic_unlock(struct drm_device *dev, unsigned long flags) {} + +#endif + #endif /* __DRM_PANIC_H__ */ base-commit: bf05aeac230e390a5aee4bd3dc978b0c4d7e745f -- 2.46.0

8 months, 3 weeks

2
2
0 0

[PATCH] ACPI: video: Add backlight=native quirk for Dell OptiPlex 5480 AIO

by Hans de Goede

Dell All In One (AIO) models released after 2017 may use a backlight controller board connected to an UART. In DSDT this uart port will be defined as: Name (_HID, "DELL0501") Name (_CID, EisaId ("PNP0501") The Dell OptiPlex 5480 AIO has an ACPI device for one if its UARTs with the above _HID + _CID. Loading the dell-uart-backlight driver fails with the following errors: [ 18.261353] dell_uart_backlight serial0-0: Timed out waiting for response. [ 18.261356] dell_uart_backlight serial0-0: error -ETIMEDOUT: getting firmware version [ 18.261359] dell_uart_backlight serial0-0: probe with driver dell_uart_backlight failed with error -110 Indicating that there is no backlight controller board attached to the UART, while the GPU's native backlight control method does work. Add a quirk to use the GPU's native backlight control method on this model. Fixes: cd8e468efb4f ("ACPI: video: Add Dell UART backlight controller detection") Cc: All applicable <stable(a)vger.kernel.org> Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- drivers/acpi/video_detect.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c index b70e84e8049a..015bd8e66c1c 100644 --- a/drivers/acpi/video_detect.c +++ b/drivers/acpi/video_detect.c @@ -844,6 +844,15 @@ static const struct dmi_system_id video_detect_dmi_table[] = { * controller board in their ACPI tables (and may even have one), but * which need native backlight control nevertheless. */ + { + /* https://github.com/zabbly/linux/issues/26 */ + .callback = video_detect_force_native, + /* Dell OptiPlex 5480 AIO */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 5480 AIO"), + }, + }, { /* https://bugzilla.redhat.com/show_bug.cgi?id=2303936 */ .callback = video_detect_force_native, -- 2.46.0

8 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror September 2024