September 2024 - Linux-stable-mirror

[PATCH 1/3] perf/x86/intel: Fix ARCH_PERFMON_NUM_COUNTER_LEAF

by kan.liang＠linux.intel.com

From: Kan Liang <kan.liang(a)linux.intel.com> The EAX of the CPUID Leaf 023H enumerates the mask of valid sub-leaves. To tell the availability of the sub-leaf 1 (enumerate the counter mask), perf should check the bit 1 (0x2) of EAS, rather than bit 0 (0x1). The error is not user-visible on bare metal. Because the sub-leaf 0 and the sub-leaf 1 are always available. However, it may bring issues in a virtualization environment when a VMM only enumerates the sub-leaf 0. Fixes: eb467aaac21e ("perf/x86/intel: Support Architectural PerfMon Extension leaf") Signed-off-by: Kan Liang <kan.liang(a)linux.intel.com> Cc: stable(a)vger.kernel.org --- arch/x86/events/intel/core.c | 4 ++-- arch/x86/include/asm/perf_event.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index 342f8b1a2f93..123ed1d60118 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -4900,8 +4900,8 @@ static void update_pmu_cap(struct x86_hybrid_pmu *pmu) if (ebx & ARCH_PERFMON_EXT_EQ) pmu->config_mask |= ARCH_PERFMON_EVENTSEL_EQ; - if (sub_bitmaps & ARCH_PERFMON_NUM_COUNTER_LEAF_BIT) { - cpuid_count(ARCH_PERFMON_EXT_LEAF, ARCH_PERFMON_NUM_COUNTER_LEAF, + if (sub_bitmaps & ARCH_PERFMON_NUM_COUNTER_LEAF) { + cpuid_count(ARCH_PERFMON_EXT_LEAF, ARCH_PERFMON_NUM_COUNTER_LEAF_BIT, &eax, &ebx, &ecx, &edx); pmu->cntr_mask64 = eax; pmu->fixed_cntr_mask64 = ebx; diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h index e3b5e8e96fb3..1d4ce655aece 100644 --- a/arch/x86/include/asm/perf_event.h +++ b/arch/x86/include/asm/perf_event.h @@ -191,7 +191,7 @@ union cpuid10_edx { #define ARCH_PERFMON_EXT_UMASK2 0x1 #define ARCH_PERFMON_EXT_EQ 0x2 #define ARCH_PERFMON_NUM_COUNTER_LEAF_BIT 0x1 -#define ARCH_PERFMON_NUM_COUNTER_LEAF 0x1 +#define ARCH_PERFMON_NUM_COUNTER_LEAF BIT(ARCH_PERFMON_NUM_COUNTER_LEAF_BIT) /* * Intel Architectural LBR CPUID detection/enumeration details: -- 2.38.1

2 weeks, 4 days

1
0
0 0

Batimat Expo 2024

by Clara Skylar

Hey, Would you be interested in acquiring an visitors list of Batimat Expo 2024? We have 95,000 verified contact list. List Contains: Contact Name, Title, Phone Number, Fax Number, Physical address, Company Name, Company URL, Employee Size, Revenue Size, Industry, and more… Interested? I will share you more details and pricing for the same. Kind Regards, Clara Skylar Senior Marketing Executive If you do not wish to receive our emails, please reply with "Not Interested."

2 weeks, 4 days

1
0
0 0

[PATCH v2 1/6] 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. v2: Use != to avoid clang -Wconstant-logical-operand (Nathan) 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: Nathan Chancellor <nathan(a)kernel.org> Cc: <stable(a)vger.kernel.org> # v6.1+ Reviewed-by: Matthew Auld <matthew.auld(a)intel.com> # v1 Reviewed-by: Andi Shyti <andi.shyti(a)linux.intel.com> # v1 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..b22e2019768f 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 != 0) intel_wakeref_auto(&to_i915(obj->base.dev)->runtime_pm.userfault_wakeref, msecs_to_jiffies_timeout(CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND)); -- 2.39.2

2 weeks, 4 days

3
5
0 0

Linux 6.11.1

by Greg Kroah-Hartman

I'm announcing the release of the 6.11.1 kernel. All users of the 6.11 kernel series must upgrade. The updated 6.11.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.11.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 drivers/accel/drm_accel.c | 110 ++-------------------------------- drivers/bluetooth/btintel_pcie.c | 2 drivers/cpufreq/amd-pstate.c | 5 + drivers/gpu/drm/drm_drv.c | 97 ++++++++++++++--------------- drivers/gpu/drm/drm_file.c | 2 drivers/gpu/drm/drm_internal.h | 4 - drivers/nvme/host/nvme.h | 5 + drivers/nvme/host/pci.c | 18 ++--- drivers/powercap/intel_rapl_common.c | 35 +++++++++- drivers/usb/class/usbtmc.c | 2 drivers/usb/serial/pl2303.c | 1 drivers/usb/serial/pl2303.h | 4 + include/drm/drm_accel.h | 18 ----- include/drm/drm_file.h | 5 + net/netfilter/nft_socket.c | 4 - sound/soc/amd/acp/acp-legacy-common.c | 5 + sound/soc/amd/acp/amd.h | 2 18 files changed, 128 insertions(+), 193 deletions(-) Dan Carpenter (2): netfilter: nft_socket: Fix a NULL vs IS_ERR() bug in nft_socket_cgroup_subtree_level() powercap: intel_rapl: Change an error pointer to NULL Dhananjay Ugwekar (3): powercap/intel_rapl: Add support for AMD family 1Ah powercap/intel_rapl: Fix the energy-pkg event for AMD CPUs cpufreq/amd-pstate: Add the missing cpufreq_cpu_put() Edward Adam Davis (1): USB: usbtmc: prevent kernel-usb-infoleak Greg Kroah-Hartman (1): Linux 6.11.1 Junhao Xie (1): USB: serial: pl2303: add device id for Macrosilicon MS3020 Keith Busch (1): nvme-pci: qdepth 1 quirk Kiran K (1): Bluetooth: btintel_pcie: Allocate memory for driver private data Michał Winiarski (3): drm: Use XArray instead of IDR for minors accel: Use XArray instead of IDR for minors drm: Expand max DRM device number to full MINORBITS Vijendar Mukunda (1): ASoC: amd: acp: add ZSC control register programming sequence

2 weeks, 4 days

1
1
0 0

Linux 6.10.12

by Greg Kroah-Hartman

I'm announcing the release of the 6.10.12 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 ------------ Makefile | 2 arch/loongarch/include/asm/hw_irq.h | 2 arch/loongarch/include/asm/kvm_vcpu.h | 1 arch/loongarch/kernel/irq.c | 3 arch/loongarch/kvm/timer.c | 7 arch/loongarch/kvm/vcpu.c | 2 arch/microblaze/mm/init.c | 5 arch/x86/kernel/cpu/mshyperv.c | 1 drivers/accel/drm_accel.c | 110 --------------- drivers/bluetooth/btintel_pcie.c | 2 drivers/clk/qcom/gcc-sm8650.c | 56 +++---- drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 3 drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 10 - drivers/gpu/drm/drm_drv.c | 97 ++++++------- drivers/gpu/drm/drm_file.c | 2 drivers/gpu/drm/drm_internal.h | 4 drivers/hwmon/asus-ec-sensors.c | 2 drivers/net/can/m_can/m_can.c | 16 +- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 42 +++-- drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.c | 2 drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c | 2 drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c | 14 + drivers/net/can/spi/mcp251xfd/mcp251xfd-tef.c | 2 drivers/net/can/spi/mcp251xfd/mcp251xfd-timestamp.c | 7 drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 1 drivers/net/ethernet/faraday/ftgmac100.c | 26 ++- drivers/net/ethernet/intel/ice/ice_lib.c | 4 drivers/net/ethernet/intel/ice/ice_main.c | 4 drivers/net/ethernet/intel/ice/ice_xsk.c | 6 drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 2 drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 2 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 9 + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 2 drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 31 ++-- drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 3 drivers/nvme/host/nvme.h | 5 drivers/nvme/host/pci.c | 18 +- drivers/pinctrl/pinctrl-at91.c | 5 drivers/platform/x86/amd/pmf/pmf-quirks.c | 2 drivers/platform/x86/asus-nb-wmi.c | 20 ++ drivers/platform/x86/asus-wmi.h | 1 drivers/platform/x86/x86-android-tablets/dmi.c | 1 drivers/powercap/intel_rapl_common.c | 35 ++++ drivers/scsi/lpfc/lpfc_bsg.c | 2 drivers/spi/spi-bcm63xx.c | 1 drivers/spi/spidev.c | 2 drivers/usb/class/usbtmc.c | 2 drivers/usb/serial/pl2303.c | 1 drivers/usb/serial/pl2303.h | 4 fs/ocfs2/xattr.c | 27 ++- fs/smb/client/connect.c | 14 + include/drm/drm_accel.h | 18 -- include/drm/drm_file.h | 5 net/mac80211/tx.c | 4 net/netfilter/nft_socket.c | 41 +++++ sound/pci/hda/patch_hdmi.c | 1 sound/pci/hda/patch_realtek.c | 76 ++++++---- sound/soc/amd/acp/acp-sof-mach.c | 2 sound/soc/amd/yc/acp6x-mach.c | 7 sound/soc/au1x/db1200.c | 1 sound/soc/codecs/chv3-codec.c | 1 sound/soc/codecs/tda7419.c | 1 sound/soc/google/chv3-i2s.c | 1 sound/soc/intel/common/soc-acpi-intel-cht-match.c | 1 sound/soc/intel/keembay/kmb_platform.c | 1 sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 1 sound/soc/mediatek/mt8188/mt8188-mt6359.c | 17 +- sound/soc/sof/mediatek/mt8195/mt8195.c | 3 tools/hv/Makefile | 2 69 files changed, 449 insertions(+), 358 deletions(-) Albert Jakieła (1): ASoC: SOF: mediatek: Add missing board compatible Benjamin Berg (1): wifi: iwlwifi: lower message level for FW buffer destination Bibo Mao (1): LoongArch: KVM: Invalidate guest steal time address on vCPU reset Dan Carpenter (2): netfilter: nft_socket: Fix a NULL vs IS_ERR() bug in nft_socket_cgroup_subtree_level() powercap: intel_rapl: Change an error pointer to NULL Daniel Gabay (2): wifi: iwlwifi: mvm: fix iwl_mvm_scan_fits() calculation wifi: iwlwifi: mvm: fix iwl_mvm_max_scan_ie_fw_cmd_room() Dhananjay Ugwekar (2): powercap/intel_rapl: Add support for AMD family 1Ah powercap/intel_rapl: Fix the energy-pkg event for AMD CPUs Dmitry Antipov (1): wifi: mac80211: free skb on error path in ieee80211_beacon_get_ap() Edward Adam Davis (1): USB: usbtmc: prevent kernel-usb-infoleak Emmanuel Grumbach (3): wifi: iwlwifi: mvm: pause TCM when the firmware is stopped wifi: iwlwifi: mvm: don't wait for tx queues if firmware is dead wifi: iwlwifi: clear trans->state earlier upon error Fabio Estevam (1): spi: spidev: Add an entry for elgin,jg10309-01 Ferry Meng (2): ocfs2: add bounds checking to ocfs2_xattr_find_entry() ocfs2: strict bound check before memcmp in ocfs2_xattr_find_entry() Florian Westphal (1): netfilter: nft_socket: make cgroupsv2 matching work with namespaces Geert Uytterhoeven (1): spi: spidev: Add missing spi_device_id for jg10309-01 Greg Kroah-Hartman (1): Linux 6.10.12 Hans de Goede (2): platform/x86: x86-android-tablets: Make Lenovo Yoga Tab 3 X90F DMI match less strict ASoC: Intel: soc-acpi-cht: Make Lenovo Yoga Tab 3 X90F DMI match less strict Hongbo Li (2): ASoC: allow module autoloading for table db1200_pids ASoC: allow module autoloading for table board_ids Huacai Chen (1): LoongArch: Define ARCH_IRQ_INIT_FLAGS as IRQ_NOPROBE Jacky Chou (1): net: ftgmac100: Ensure tx descriptor updates are visible Junhao Xie (1): USB: serial: pl2303: add device id for Macrosilicon MS3020 Kai Vehmanen (1): ALSA: hda: add HDMI codec ID for Intel PTL Kailang Yang (2): ALSA: hda/realtek - Fixed ALC256 headphone no sound ALSA: hda/realtek - FIxed ALC285 headphone no sound Keith Busch (1): nvme-pci: qdepth 1 quirk Kenneth Feng (1): drm/amd/pm: fix the pp_dpm_pcie issue on smu v14.0.2/3 Kiran K (1): Bluetooth: btintel_pcie: Allocate memory for driver private data Larysa Zaremba (1): ice: check for XDP rings instead of bpf program when unconfiguring Liao Chen (5): ASoC: intel: fix module autoloading ASoC: google: fix module autoloading ASoC: tda7419: fix module autoloading ASoC: fix module autoloading spi: bcm63xx: Enable module autoloading Luke D. Jones (1): platform/x86/amd: pmf: Make ASUS GA403 quirk generic Marc Kleine-Budde (3): can: mcp251xfd: mcp251xfd_ring_init(): check TX-coalescing configuration can: mcp251xfd: properly indent labels can: mcp251xfd: move mcp251xfd_timestamp_start()/stop() into mcp251xfd_chip_start/stop() Markus Schneider-Pargmann (1): can: m_can: Limit coalescing to peripheral instances Markuss Broks (1): ASoC: amd: yc: Add a quirk for MSI Bravo 17 (D7VEK) Mathieu Fenniak (1): platform/x86: asus-wmi: Fix spurious rfkill on UX8406MA Michael Kelley (1): x86/hyperv: Set X86_FEATURE_TSC_KNOWN_FREQ when Hyper-V provides frequency Michał Winiarski (3): drm: Use XArray instead of IDR for minors accel: Use XArray instead of IDR for minors drm: Expand max DRM device number to full MINORBITS Mike Rapoport (1): microblaze: don't treat zero reserved memory regions as error Neil Armstrong (1): clk: qcom: gcc-sm8650: Don't use shared clk_ops for QUPs Paulo Alcantara (1): smb: client: fix hang in wait_for_response() for negproto Ross Brown (1): hwmon: (asus-ec-sensors) remove VRM temp X570-E GAMING Sherry Yang (1): scsi: lpfc: Fix overflow build issue Thomas Blocher (1): pinctrl: at91: make it work with current gpiolib YR Yang (1): ASoC: mediatek: mt8188: Mark AFE_DAC_CON0 register as volatile Zhang Yi (1): ASoC: mediatek: mt8188-mt6359: Modify key hongchi.peng (1): drm: komeda: Fix an issue related to normalized zpos zhang jiao (1): tools: hv: rm .*.cmd when make clean

2 weeks, 4 days

1
1
0 0

Linux 6.6.53

by Greg Kroah-Hartman

I'm announcing the release of the 6.6.53 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/loongarch/include/asm/hw_irq.h | 2 arch/loongarch/kernel/irq.c | 3 arch/microblaze/mm/init.c | 5 arch/x86/kernel/cpu/mshyperv.c | 1 arch/x86/mm/init.c | 16 -- block/blk-core.c | 10 + block/blk-mq.c | 10 - drivers/accel/drm_accel.c | 110 --------------- drivers/gpio/gpiolib-cdev.c | 12 - drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 10 - drivers/gpu/drm/drm_drv.c | 97 ++++++------- drivers/gpu/drm/drm_file.c | 2 drivers/gpu/drm/drm_internal.h | 4 drivers/hwmon/asus-ec-sensors.c | 2 drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 42 +++-- drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.c | 2 drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c | 2 drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c | 14 + drivers/net/can/spi/mcp251xfd/mcp251xfd-tef.c | 2 drivers/net/can/spi/mcp251xfd/mcp251xfd-timestamp.c | 7 drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 1 drivers/net/ethernet/faraday/ftgmac100.c | 26 ++- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 2 drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 2 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 9 + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 2 drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 31 ++-- drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 3 drivers/nvme/host/nvme.h | 5 drivers/nvme/host/pci.c | 18 +- drivers/pinctrl/pinctrl-at91.c | 5 drivers/platform/x86/x86-android-tablets/dmi.c | 1 drivers/powercap/intel_rapl_common.c | 1 drivers/scsi/lpfc/lpfc_bsg.c | 2 drivers/spi/spi-bcm63xx.c | 1 drivers/spi/spidev.c | 2 drivers/usb/class/usbtmc.c | 2 drivers/usb/serial/pl2303.c | 1 drivers/usb/serial/pl2303.h | 4 fs/ocfs2/xattr.c | 27 ++- fs/smb/client/connect.c | 14 + include/drm/drm_accel.h | 18 -- include/drm/drm_file.h | 5 include/net/netfilter/nf_tables.h | 13 + net/mac80211/tx.c | 4 net/netfilter/nf_tables_api.c | 5 net/netfilter/nft_lookup.c | 1 net/netfilter/nft_set_pipapo.c | 6 net/netfilter/nft_socket.c | 41 +++++ net/wireless/core.h | 8 - sound/pci/hda/patch_hdmi.c | 1 sound/pci/hda/patch_realtek.c | 76 ++++++---- sound/soc/amd/acp/acp-sof-mach.c | 2 sound/soc/amd/yc/acp6x-mach.c | 7 sound/soc/au1x/db1200.c | 1 sound/soc/codecs/chv3-codec.c | 1 sound/soc/codecs/tda7419.c | 1 sound/soc/google/chv3-i2s.c | 1 sound/soc/intel/common/soc-acpi-intel-cht-match.c | 1 sound/soc/intel/keembay/kmb_platform.c | 1 sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 1 sound/soc/sof/mediatek/mt8195/mt8195.c | 3 tools/hv/Makefile | 2 64 files changed, 383 insertions(+), 330 deletions(-) Albert Jakieła (1): ASoC: SOF: mediatek: Add missing board compatible Benjamin Berg (1): wifi: iwlwifi: lower message level for FW buffer destination Dan Carpenter (1): netfilter: nft_socket: Fix a NULL vs IS_ERR() bug in nft_socket_cgroup_subtree_level() Daniel Gabay (2): wifi: iwlwifi: mvm: fix iwl_mvm_scan_fits() calculation wifi: iwlwifi: mvm: fix iwl_mvm_max_scan_ie_fw_cmd_room() Dhananjay Ugwekar (1): powercap/intel_rapl: Add support for AMD family 1Ah Dmitry Antipov (1): wifi: mac80211: free skb on error path in ieee80211_beacon_get_ap() Edward Adam Davis (1): USB: usbtmc: prevent kernel-usb-infoleak Emmanuel Grumbach (3): wifi: iwlwifi: mvm: pause TCM when the firmware is stopped wifi: iwlwifi: mvm: don't wait for tx queues if firmware is dead wifi: iwlwifi: clear trans->state earlier upon error Fabio Estevam (1): spi: spidev: Add an entry for elgin,jg10309-01 Ferry Meng (2): ocfs2: add bounds checking to ocfs2_xattr_find_entry() ocfs2: strict bound check before memcmp in ocfs2_xattr_find_entry() Florian Westphal (1): netfilter: nft_socket: make cgroupsv2 matching work with namespaces Geert Uytterhoeven (1): spi: spidev: Add missing spi_device_id for jg10309-01 Greg Kroah-Hartman (1): Linux 6.6.53 Hans de Goede (2): platform/x86: x86-android-tablets: Make Lenovo Yoga Tab 3 X90F DMI match less strict ASoC: Intel: soc-acpi-cht: Make Lenovo Yoga Tab 3 X90F DMI match less strict Hongbo Li (2): ASoC: allow module autoloading for table db1200_pids ASoC: allow module autoloading for table board_ids Hongyu Jin (1): block: Fix where bio IO priority gets set Huacai Chen (1): LoongArch: Define ARCH_IRQ_INIT_FLAGS as IRQ_NOPROBE Jacky Chou (1): net: ftgmac100: Ensure tx descriptor updates are visible Junhao Xie (1): USB: serial: pl2303: add device id for Macrosilicon MS3020 Kai Vehmanen (1): ALSA: hda: add HDMI codec ID for Intel PTL Kailang Yang (2): ALSA: hda/realtek - Fixed ALC256 headphone no sound ALSA: hda/realtek - FIxed ALC285 headphone no sound Keith Busch (1): nvme-pci: qdepth 1 quirk Kent Gibson (1): gpiolib: cdev: Ignore reconfiguration without direction Liao Chen (5): ASoC: intel: fix module autoloading ASoC: google: fix module autoloading ASoC: tda7419: fix module autoloading ASoC: fix module autoloading spi: bcm63xx: Enable module autoloading Marc Kleine-Budde (3): can: mcp251xfd: mcp251xfd_ring_init(): check TX-coalescing configuration can: mcp251xfd: properly indent labels can: mcp251xfd: move mcp251xfd_timestamp_start()/stop() into mcp251xfd_chip_start/stop() Markuss Broks (1): ASoC: amd: yc: Add a quirk for MSI Bravo 17 (D7VEK) Michael Kelley (1): x86/hyperv: Set X86_FEATURE_TSC_KNOWN_FREQ when Hyper-V provides frequency Michał Winiarski (3): drm: Use XArray instead of IDR for minors accel: Use XArray instead of IDR for minors drm: Expand max DRM device number to full MINORBITS Mike Rapoport (1): microblaze: don't treat zero reserved memory regions as error Pablo Neira Ayuso (2): netfilter: nft_set_pipapo: walk over current view on netlink dump netfilter: nf_tables: missing iterator type in lookup walk Paulo Alcantara (1): smb: client: fix hang in wait_for_response() for negproto Ping-Ke Shih (1): Revert "wifi: cfg80211: check wiphy mutex is held for wdev mutex" Ross Brown (1): hwmon: (asus-ec-sensors) remove VRM temp X570-E GAMING Sherry Yang (1): scsi: lpfc: Fix overflow build issue Thomas Blocher (1): pinctrl: at91: make it work with current gpiolib Tony Luck (1): x86/mm: Switch to new Intel CPU model defines YR Yang (1): ASoC: mediatek: mt8188: Mark AFE_DAC_CON0 register as volatile hongchi.peng (1): drm: komeda: Fix an issue related to normalized zpos zhang jiao (1): tools: hv: rm .*.cmd when make clean

2 weeks, 4 days

1
1
0 0

Linux 6.1.112

by Greg Kroah-Hartman

I'm announcing the release of the 6.1.112 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/loongarch/include/asm/hw_irq.h | 2 arch/loongarch/kernel/irq.c | 3 arch/microblaze/mm/init.c | 5 arch/x86/kernel/cpu/mshyperv.c | 1 arch/x86/mm/init.c | 16 block/blk-core.c | 10 block/blk-mq.c | 10 drivers/gpio/gpiolib-cdev.c | 12 drivers/gpio/gpiolib.c | 3 drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 10 drivers/hwmon/asus-ec-sensors.c | 2 drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 42 +- drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.c | 2 drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c | 2 drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c | 14 drivers/net/can/spi/mcp251xfd/mcp251xfd-tef.c | 2 drivers/net/can/spi/mcp251xfd/mcp251xfd-timestamp.c | 7 drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 1 drivers/net/ethernet/faraday/ftgmac100.c | 26 + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 2 drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 2 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 9 drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 2 drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 23 - drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 3 drivers/pinctrl/pinctrl-at91.c | 5 drivers/powercap/intel_rapl_msr.c | 12 drivers/scsi/lpfc/lpfc_bsg.c | 2 drivers/spi/spi-bcm63xx.c | 1 drivers/spi/spidev.c | 2 drivers/usb/class/usbtmc.c | 2 drivers/usb/serial/pl2303.c | 1 drivers/usb/serial/pl2303.h | 4 fs/btrfs/block-rsv.c | 14 fs/btrfs/block-rsv.h | 12 fs/btrfs/delayed-ref.h | 21 + fs/ocfs2/xattr.c | 27 + fs/smb/client/connect.c | 14 fs/xfs/libxfs/xfs_ag.c | 19 - fs/xfs/libxfs/xfs_alloc.c | 69 +++ fs/xfs/libxfs/xfs_bmap.c | 16 fs/xfs/libxfs/xfs_bmap.h | 2 fs/xfs/libxfs/xfs_bmap_btree.c | 19 - fs/xfs/libxfs/xfs_btree.c | 18 - fs/xfs/libxfs/xfs_fs.h | 2 fs/xfs/libxfs/xfs_ialloc.c | 17 fs/xfs/libxfs/xfs_log_format.h | 9 fs/xfs/libxfs/xfs_sb.c | 56 +++ fs/xfs/libxfs/xfs_trans_inode.c | 113 ------ fs/xfs/xfs_attr_inactive.c | 1 fs/xfs/xfs_bmap_util.c | 18 - fs/xfs/xfs_buf_item.c | 88 +++-- fs/xfs/xfs_dquot.c | 1 fs/xfs/xfs_export.c | 14 fs/xfs/xfs_extent_busy.c | 1 fs/xfs/xfs_fsmap.c | 1 fs/xfs/xfs_fsops.c | 13 fs/xfs/xfs_icache.c | 58 ++- fs/xfs/xfs_icache.h | 4 fs/xfs/xfs_inode.c | 260 +++++++++++++-- fs/xfs/xfs_inode.h | 36 +- fs/xfs/xfs_inode_item.c | 149 ++++++++ fs/xfs/xfs_inode_item.h | 1 fs/xfs/xfs_itable.c | 11 fs/xfs/xfs_log.c | 47 -- fs/xfs/xfs_log_recover.c | 19 - fs/xfs/xfs_mount.h | 11 fs/xfs/xfs_notify_failure.c | 15 fs/xfs/xfs_qm.c | 72 +++- fs/xfs/xfs_super.c | 1 fs/xfs/xfs_trace.h | 46 ++ fs/xfs/xfs_trans.c | 9 include/net/netfilter/nf_tables.h | 13 net/mac80211/tx.c | 4 net/netfilter/nf_tables_api.c | 5 net/netfilter/nft_lookup.c | 1 net/netfilter/nft_set_pipapo.c | 6 net/netfilter/nft_socket.c | 41 ++ net/wireless/core.h | 8 sound/pci/hda/patch_realtek.c | 76 ++-- sound/soc/amd/acp/acp-sof-mach.c | 2 sound/soc/au1x/db1200.c | 1 sound/soc/codecs/tda7419.c | 1 sound/soc/intel/common/soc-acpi-intel-cht-match.c | 1 sound/soc/intel/keembay/kmb_platform.c | 1 sound/soc/sof/mediatek/mt8195/mt8195.c | 3 tools/hv/Makefile | 2 tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 89 files changed, 1254 insertions(+), 461 deletions(-) Albert Jakieła (1): ASoC: SOF: mediatek: Add missing board compatible Benjamin Berg (1): wifi: iwlwifi: lower message level for FW buffer destination Dan Carpenter (1): netfilter: nft_socket: Fix a NULL vs IS_ERR() bug in nft_socket_cgroup_subtree_level() Daniel Gabay (1): wifi: iwlwifi: mvm: fix iwl_mvm_scan_fits() calculation Darrick J. Wong (8): xfs: fix uninitialized variable access xfs: load uncached unlinked inodes into memory on demand xfs: fix negative array access in xfs_getbmap xfs: use i_prev_unlinked to distinguish inodes that are not on the unlinked list xfs: reload entire unlinked bucket lists xfs: make inode unlinked bucket recovery work with quotacheck xfs: fix reloading entire unlinked bucket lists xfs: set bnobt/cntbt numrecs correctly when formatting new AGs Dave Chinner (13): xfs: dquot shrinker doesn't check for XFS_DQFLAG_FREEING xfs: don't use BMBT btree split workers for IO completion xfs: fix low space alloc deadlock xfs: prefer free inodes at ENOSPC over chunk allocation xfs: block reservation too large for minleft allocation xfs: quotacheck failure can race with background inode inactivation xfs: buffer pins need to hold a buffer reference xfs: defered work could create precommits xfs: fix AGF vs inode cluster buffer deadlock xfs: collect errors from inodegc for unlinked inode recovery xfs: remove WARN when dquot cache insertion fails xfs: fix unlink vs cluster buffer instantiation race xfs: journal geometry is not properly bounds checked Dmitry Antipov (1): wifi: mac80211: free skb on error path in ieee80211_beacon_get_ap() Edward Adam Davis (1): USB: usbtmc: prevent kernel-usb-infoleak Emmanuel Grumbach (3): wifi: iwlwifi: mvm: pause TCM when the firmware is stopped wifi: iwlwifi: mvm: don't wait for tx queues if firmware is dead wifi: iwlwifi: clear trans->state earlier upon error Fabio Estevam (1): spi: spidev: Add an entry for elgin,jg10309-01 Ferry Meng (2): ocfs2: add bounds checking to ocfs2_xattr_find_entry() ocfs2: strict bound check before memcmp in ocfs2_xattr_find_entry() Filipe Manana (1): btrfs: calculate the right space for delayed refs when updating global reserve Florian Westphal (1): netfilter: nft_socket: make cgroupsv2 matching work with namespaces Geert Uytterhoeven (1): spi: spidev: Add missing spi_device_id for jg10309-01 Greg Kroah-Hartman (1): Linux 6.1.112 Hagar Hemdan (1): gpio: prevent potential speculation leaks in gpio_device_get_desc() Hans de Goede (1): ASoC: Intel: soc-acpi-cht: Make Lenovo Yoga Tab 3 X90F DMI match less strict Hongbo Li (2): ASoC: allow module autoloading for table db1200_pids ASoC: allow module autoloading for table board_ids Hongyu Jin (1): block: Fix where bio IO priority gets set Huacai Chen (1): LoongArch: Define ARCH_IRQ_INIT_FLAGS as IRQ_NOPROBE Jacky Chou (1): net: ftgmac100: Ensure tx descriptor updates are visible Junhao Xie (1): USB: serial: pl2303: add device id for Macrosilicon MS3020 Kailang Yang (2): ALSA: hda/realtek - Fixed ALC256 headphone no sound ALSA: hda/realtek - FIxed ALC285 headphone no sound Kent Gibson (1): gpiolib: cdev: Ignore reconfiguration without direction Liao Chen (3): ASoC: intel: fix module autoloading ASoC: tda7419: fix module autoloading spi: bcm63xx: Enable module autoloading Long Li (1): xfs: fix ag count overflow during growfs Marc Kleine-Budde (3): can: mcp251xfd: mcp251xfd_ring_init(): check TX-coalescing configuration can: mcp251xfd: properly indent labels can: mcp251xfd: move mcp251xfd_timestamp_start()/stop() into mcp251xfd_chip_start/stop() Matthieu Baerts (NGI0) (1): selftests: mptcp: join: restrict fullmesh endp on 1st sf Michael Kelley (1): x86/hyperv: Set X86_FEATURE_TSC_KNOWN_FREQ when Hyper-V provides frequency Mike Rapoport (1): microblaze: don't treat zero reserved memory regions as error Pablo Neira Ayuso (2): netfilter: nft_set_pipapo: walk over current view on netlink dump netfilter: nf_tables: missing iterator type in lookup walk Paulo Alcantara (1): smb: client: fix hang in wait_for_response() for negproto Ping-Ke Shih (1): Revert "wifi: cfg80211: check wiphy mutex is held for wdev mutex" Ross Brown (1): hwmon: (asus-ec-sensors) remove VRM temp X570-E GAMING Sherry Yang (1): scsi: lpfc: Fix overflow build issue Shiyang Ruan (2): xfs: fix the calculation for "end" and "length" xfs: correct calculation for agend and blockcount Sumeet Pawnikar (1): powercap: RAPL: fix invalid initialization for pl4_supported field Thomas Blocher (1): pinctrl: at91: make it work with current gpiolib Tony Luck (1): x86/mm: Switch to new Intel CPU model defines Wengang Wang (1): xfs: fix extent busy updating Wu Guanghao (1): xfs: Fix deadlock on xfs_inodegc_worker Ye Bin (1): xfs: fix BUG_ON in xfs_getbmap() hongchi.peng (1): drm: komeda: Fix an issue related to normalized zpos zhang jiao (1): tools: hv: rm .*.cmd when make clean

2 weeks, 4 days

1
1
0 0

[PATCH] KVM: PPC: Book3S HV: Reset LPCR_MER before running a vCPU to avoid spurious interrupts

by Gautam Menghani

Reset LPCR_MER bit before running a vCPU to ensure that it is not set if there are no pending interrupts. Running a vCPU with LPCR_MER bit set and no pending interrupts results in L2 vCPU getting an infinite flood of spurious interrupts. The 'if check' in kvmhv_run_single_vcpu() sets the LPCR_MER bit if there are pending interrupts. The spurious flood problem can be observed in 2 cases: 1. Crashing the guest while interrupt heavy workload is running a. Start a L2 guest and run an interrupt heavy workload (eg: ipistorm) b. While the workload is running, crash the guest (make sure kdump is configured) c. Any one of the vCPUs of the guest will start getting an infinite flood of spurious interrupts. 2. Running LTP stress tests in multiple guests at the same time a. Start 4 L2 guests. b. Start running LTP stress tests on all 4 guests at same time. c. In some time, any one/more of the vCPUs of any of the guests will start getting an infinite flood of spurious interrupts. The root cause of both the above issues is the same: 1. A NMI is sent to a running vCPU that had LPCR_MER bit set. 2. In the NMI path, all registers are refreshed, i.e, H_GUEST_GET_STATE is called for all the registers. 3. When H_GUEST_GET_STATE is called for lpcr, the vcpu->arch.vcore->lpcr of that vCPU at L1 level gets updated with LPCR_MER set to 1, and this new value is always used whenever that vCPU runs, regardless of whether there was a pending interrupt. 4. Since LPCR_MER is set, the vCPU in L2 always jumps to the external interrupt handler, and this cycle never ends. Fix the spurious flood by making sure LPCR_MER is always reset before running a vCPU. Fixes: ec0f6639fa88 ("KVM: PPC: Book3S HV nestedv2: Ensure LPCR_MER bit is passed to the L0") Cc: stable(a)vger.kernel.org # v6.8+ Signed-off-by: Gautam Menghani <gautam(a)linux.ibm.com> --- arch/powerpc/kvm/book3s_hv.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 8f7d7e37bc8c..3cc2f1691001 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -98,6 +98,13 @@ /* Used to indicate that a guest passthrough interrupt needs to be handled */ #define RESUME_PASSTHROUGH (RESUME_GUEST | RESUME_FLAG_ARCH2) +/* Clear LPCR_MER bit - If we run a L2 vCPU with LPCR_MER bit set but no pending external + * interrupts, we end up getting a flood of spurious interrupts in L2 KVM guests. To avoid + * that, reset LPCR_MER and let the 'if check' for pending interrupts in kvmhv_run_single_vcpu() + * set LPCR_MER if there are pending interrupts. + */ +#define kvmppc_reset_lpcr_mer(vcpu) (vcpu->arch.vcore->lpcr &= ~LPCR_MER) + /* Used as a "null" value for timebase values */ #define TB_NIL (~(u64)0) @@ -5091,7 +5098,7 @@ static int kvmppc_vcpu_run_hv(struct kvm_vcpu *vcpu) accumulate_time(vcpu, &vcpu->arch.guest_entry); if (cpu_has_feature(CPU_FTR_ARCH_300)) r = kvmhv_run_single_vcpu(vcpu, ~(u64)0, - vcpu->arch.vcore->lpcr); + kvmppc_reset_lpcr_mer(vcpu)); else r = kvmppc_run_vcpu(vcpu); -- 2.46.0

2 weeks, 4 days

1
0
0 0

[PATCH v1] bpf: Prevent infinite loops with bpf_redirect_peer

by Jordan Rife

It is possible to create cycles using bpf_redirect_peer which lead to an an infinite loop inside __netif_receive_skb_core. The simplest way to illustrate this is by attaching a TC program to the ingress hook on both sides of a veth or netkit device pair which redirects to its own peer, although other cycles are possible. This patch places an upper limit on the number of iterations allowed inside __netif_receive_skb_core to prevent this. Signed-off-by: Jordan Rife <jrife(a)google.com> Fixes: 9aa1206e8f48 ("bpf: Add redirect_peer helper") Cc: stable(a)vger.kernel.org --- net/core/dev.c | 11 +++- net/core/dev.h | 1 + .../selftests/bpf/prog_tests/tc_redirect.c | 51 +++++++++++++++++++ .../selftests/bpf/progs/test_tc_peer.c | 13 +++++ 4 files changed, 75 insertions(+), 1 deletion(-) diff --git a/net/core/dev.c b/net/core/dev.c index cd479f5f22f6..753f8d27f47c 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5455,6 +5455,7 @@ static int __netif_receive_skb_core(struct sk_buff **pskb, bool pfmemalloc, struct net_device *orig_dev; bool deliver_exact = false; int ret = NET_RX_DROP; + int loops = 0; __be16 type; net_timestamp_check(!READ_ONCE(net_hotdata.tstamp_prequeue), skb); @@ -5521,8 +5522,16 @@ static int __netif_receive_skb_core(struct sk_buff **pskb, bool pfmemalloc, nf_skip_egress(skb, true); skb = sch_handle_ingress(skb, &pt_prev, &ret, orig_dev, &another); - if (another) + if (another) { + loops++; + if (unlikely(loops == RX_LOOP_LIMIT)) { + ret = NET_RX_DROP; + net_crit_ratelimited("bpf: loop limit reached on datapath, buggy bpf program?\n"); + goto out; + } + goto another_round; + } if (!skb) goto out; diff --git a/net/core/dev.h b/net/core/dev.h index 5654325c5b71..28d1cf2f9069 100644 --- a/net/core/dev.h +++ b/net/core/dev.h @@ -150,6 +150,7 @@ struct napi_struct *napi_by_id(unsigned int napi_id); void kick_defer_list_purge(struct softnet_data *sd, unsigned int cpu); #define XMIT_RECURSION_LIMIT 8 +#define RX_LOOP_LIMIT 8 #ifndef CONFIG_PREEMPT_RT static inline bool dev_xmit_recursion(void) diff --git a/tools/testing/selftests/bpf/prog_tests/tc_redirect.c b/tools/testing/selftests/bpf/prog_tests/tc_redirect.c index c85798966aec..db1b36090d6c 100644 --- a/tools/testing/selftests/bpf/prog_tests/tc_redirect.c +++ b/tools/testing/selftests/bpf/prog_tests/tc_redirect.c @@ -1081,6 +1081,55 @@ static void test_tc_redirect_peer(struct netns_setup_result *setup_result) close_netns(nstoken); } +static void test_tc_redirect_peer_loop(struct netns_setup_result *setup_result) +{ + LIBBPF_OPTS(bpf_tc_hook, qdisc_src_fwd); + LIBBPF_OPTS(bpf_tc_hook, qdisc_src); + struct test_tc_peer *skel; + struct nstoken *nstoken; + int err; + + /* Set up an infinite redirect loop using bpf_redirect_peer with ingress + * hooks on either side of a veth/netkit pair redirecting to its own + * peer. This should not lock up the kernel. + */ + nstoken = open_netns(NS_SRC); + if (!ASSERT_OK_PTR(nstoken, "setns src")) + return; + + skel = test_tc_peer__open(); + if (!ASSERT_OK_PTR(skel, "test_tc_peer__open")) + goto done; + + skel->rodata->IFINDEX_SRC = setup_result->ifindex_src; + skel->rodata->IFINDEX_SRC_FWD = setup_result->ifindex_src_fwd; + + err = test_tc_peer__load(skel); + if (!ASSERT_OK(err, "test_tc_peer__load")) + goto done; + + QDISC_CLSACT_CREATE(&qdisc_src, setup_result->ifindex_src); + XGRESS_FILTER_ADD(&qdisc_src, BPF_TC_INGRESS, skel->progs.tc_src_self, 0); + close_netns(nstoken); + + nstoken = open_netns(NS_FWD); + if (!ASSERT_OK_PTR(nstoken, "setns fwd")) + return; + QDISC_CLSACT_CREATE(&qdisc_src_fwd, setup_result->ifindex_src_fwd); + XGRESS_FILTER_ADD(&qdisc_src_fwd, BPF_TC_INGRESS, skel->progs.tc_src_fwd_self, 0); + + if (!ASSERT_OK(set_forwarding(false), "disable forwarding")) + goto done; + + SYS_NOFAIL("ip netns exec " NS_SRC " %s -c 1 -W 1 -q %s > /dev/null", + ping_command(AF_INET), IP4_DST); +fail: +done: + if (skel) + test_tc_peer__destroy(skel); + close_netns(nstoken); +} + static int tun_open(char *name) { struct ifreq ifr; @@ -1280,6 +1329,8 @@ static void *test_tc_redirect_run_tests(void *arg) RUN_TEST(tc_redirect_peer, MODE_VETH); RUN_TEST(tc_redirect_peer, MODE_NETKIT); RUN_TEST(tc_redirect_peer_l3, MODE_VETH); + RUN_TEST(tc_redirect_peer_loop, MODE_VETH); + RUN_TEST(tc_redirect_peer_loop, MODE_NETKIT); RUN_TEST(tc_redirect_peer_l3, MODE_NETKIT); RUN_TEST(tc_redirect_neigh, MODE_VETH); RUN_TEST(tc_redirect_neigh_fib, MODE_VETH); diff --git a/tools/testing/selftests/bpf/progs/test_tc_peer.c b/tools/testing/selftests/bpf/progs/test_tc_peer.c index 365eacb5dc34..9b8a00ccad42 100644 --- a/tools/testing/selftests/bpf/progs/test_tc_peer.c +++ b/tools/testing/selftests/bpf/progs/test_tc_peer.c @@ -10,6 +10,7 @@ #include <bpf/bpf_helpers.h> +volatile const __u32 IFINDEX_SRC_FWD; volatile const __u32 IFINDEX_SRC; volatile const __u32 IFINDEX_DST; @@ -34,6 +35,18 @@ int tc_src(struct __sk_buff *skb) return bpf_redirect_peer(IFINDEX_DST, 0); } +SEC("tc") +int tc_src_self(struct __sk_buff *skb) +{ + return bpf_redirect_peer(IFINDEX_SRC, 0); +} + +SEC("tc") +int tc_src_fwd_self(struct __sk_buff *skb) +{ + return bpf_redirect_peer(IFINDEX_SRC_FWD, 0); +} + SEC("tc") int tc_dst_l3(struct __sk_buff *skb) { -- 2.46.1.824.gd892dcdcdd-goog

2 weeks, 4 days

3
3
0 0

[PATCH] staging: Fix atomicity violation in get_serial_info()

by Qiu-ji Chen

Atomicity violation occurs during consecutive reads of the members of gb_tty. Consider a scenario where, because the consecutive reads of gb_tty members are not protected by a lock, the value of gb_tty may still be changing during the read process. gb_tty->port.close_delay and gb_tty->port.closing_wait are updated together, such as in the set_serial_info() function. If during the read process, gb_tty->port.close_delay and gb_tty->port.closing_wait are still being updated, it is possible that gb_tty->port.close_delay is updated while gb_tty->port.closing_wait is not. In this case, the code first reads gb_tty->port.close_delay and then gb_tty->port.closing_wait. A new gb_tty->port.close_delay and an old gb_tty->port.closing_wait could be read. Such values, whether before or after the update, should not coexist as they represent an intermediate state. This could result in a mismatch of the values read for gb_tty->minor, gb_tty->port.close_delay, and gb_tty->port.closing_wait, which in turn could cause ss->close_delay and ss->closing_wait to be mismatched. To address this issue, we have enclosed all sequential read operations of the gb_tty variable within a lock. This ensures that the value of gb_tty remains unchanged throughout the process, guaranteeing its validity. This possible bug is found by an experimental static analysis tool developed by our team. This tool analyzes the locking APIs to extract function pairs that can be concurrently executed, and then analyzes the instructions in the paired functions to identify possible concurrency bugs including data races and atomicity violations. Fixes: b71e571adaa5 ("staging: greybus: uart: fix TIOCSSERIAL jiffies conversions") Cc: stable(a)vger.kernel.org Signed-off-by: Qiu-ji Chen <chenqiuji666(a)gmail.com> --- drivers/staging/greybus/uart.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c index cdf4ebb93b10..8cc18590d97b 100644 --- a/drivers/staging/greybus/uart.c +++ b/drivers/staging/greybus/uart.c @@ -595,12 +595,14 @@ static int get_serial_info(struct tty_struct *tty, { struct gb_tty *gb_tty = tty->driver_data; + mutex_lock(&gb_tty->port.mutex); ss->line = gb_tty->minor; ss->close_delay = jiffies_to_msecs(gb_tty->port.close_delay) / 10; ss->closing_wait = gb_tty->port.closing_wait == ASYNC_CLOSING_WAIT_NONE ? ASYNC_CLOSING_WAIT_NONE : jiffies_to_msecs(gb_tty->port.closing_wait) / 10; + mutex_unlock(&gb_tty->port.mutex); return 0; } -- 2.34.1

2 weeks, 4 days

3
2
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror September 2024