October 2023 - Linux-stable-mirror

FAILED: patch "[PATCH] drm/amd: Disable ASPM for VI w/ all Intel systems" 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 64ffd2f1d00c6235dabe9704bbb0d9ce3e28147f # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023102753-hatless-serpent-a3a8@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 64ffd2f1d00c6235dabe9704bbb0d9ce3e28147f Mon Sep 17 00:00:00 2001 From: Mario Limonciello <mario.limonciello(a)amd.com> Date: Fri, 20 Oct 2023 10:26:29 -0500 Subject: [PATCH] drm/amd: Disable ASPM for VI w/ all Intel systems Originally we were quirking ASPM disabled specifically for VI when used with Alder Lake, but it appears to have problems with Rocket Lake as well. Like we've done in the case of dpm for newer platforms, disable ASPM for all Intel systems. Cc: stable(a)vger.kernel.org # 5.15+ Fixes: 0064b0ce85bb ("drm/amd/pm: enable ASPM by default") Reported-and-tested-by: Paolo Gentili <paolo.gentili(a)canonical.com> Closes: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2036742 Signed-off-by: Mario Limonciello <mario.limonciello(a)amd.com> Reviewed-by: Alex Deucher <alexander.deucher(a)amd.com> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c index 6a8494f98d3e..fe8ba9e9837b 100644 --- a/drivers/gpu/drm/amd/amdgpu/vi.c +++ b/drivers/gpu/drm/amd/amdgpu/vi.c @@ -1124,7 +1124,7 @@ static void vi_program_aspm(struct amdgpu_device *adev) bool bL1SS = false; bool bClkReqSupport = true; - if (!amdgpu_device_should_use_aspm(adev) || !amdgpu_device_aspm_support_quirk()) + if (!amdgpu_device_should_use_aspm(adev) || !amdgpu_device_pcie_dynamic_switching_supported()) return; if (adev->flags & AMD_IS_APU ||

1 year, 5 months

1
0
0 0

[PATCH 5.10 000/199] 5.10.199-rc2 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.10.199 release. There are 199 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Thu, 26 Oct 2023 08:32:45 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.199-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.10.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.10.199-rc2 Zhang Changzhong <zhangchangzhong(a)huawei.com> xfrm6: fix inet6_dev refcount underflow problem Kees Cook <keescook(a)chromium.org> Bluetooth: hci_sock: Correctly bounds check and pad HCI_MON_NEW_INDEX name Edward AD <twuufnxlz(a)gmail.com> Bluetooth: hci_sock: fix slab oob read in create_monitor_event Tony Lindgren <tony(a)atomide.com> phy: mapphone-mdm6600: Fix pinctrl_pm handling for sleep pins Tony Lindgren <tony(a)atomide.com> phy: mapphone-mdm6600: Fix runtime PM for remove Tony Lindgren <tony(a)atomide.com> phy: mapphone-mdm6600: Fix runtime disable on probe Dan Carpenter <dan.carpenter(a)linaro.org> ASoC: pxa: fix a memory leak in probe() Haibo Chen <haibo.chen(a)nxp.com> gpio: vf610: set value before the direction to avoid a glitch Hans de Goede <hdegoede(a)redhat.com> platform/x86: asus-wmi: Map 0x2a code, Ignore 0x2b and 0x2c events Hans de Goede <hdegoede(a)redhat.com> platform/x86: asus-wmi: Change ASUS_WMI_BRN_DOWN code from 0x20 to 0x2e Niklas Schnelle <schnelle(a)linux.ibm.com> s390/pci: fix iommu bitmap allocation Peter Zijlstra <peterz(a)infradead.org> perf: Disallow mis-matched inherited group reads Puliang Lu <puliang.lu(a)fibocom.com> USB: serial: option: add Fibocom to DELL custom modem FM101R-GL Benoît Monin <benoit.monin(a)gmx.fr> USB: serial: option: add entry for Sierra EM9191 with new firmware Fabio Porcedda <fabio.porcedda(a)gmail.com> USB: serial: option: add Telit LE910C4-WWX 0x1035 composition Maurizio Lombardi <mlombard(a)redhat.com> nvme-rdma: do not try to stop unallocated queues Keith Busch <kbusch(a)kernel.org> nvme-pci: add BOGUS_NID for Intel 0a54 device Sunil V L <sunilvl(a)ventanamicro.com> ACPI: irq: Fix incorrect return value in acpi_register_gsi() Trond Myklebust <trond.myklebust(a)hammerspace.com> pNFS: Fix a hang in nfs4_evict_inode() Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> Revert "pinctrl: avoid unsafe code pattern in find_pinctrl()" Avri Altman <avri.altman(a)wdc.com> mmc: core: Capture correct oemid-bits for eMMC cards Haibo Chen <haibo.chen(a)nxp.com> mmc: core: sdio: hold retuning if sdio in 1-bit mode Geert Uytterhoeven <geert+renesas(a)glider.be> mtd: physmap-core: Restore map_rom fallback Martin Kurbanov <mmkurbanov(a)sberdevices.ru> mtd: spinand: micron: correct bitmask for ecc status Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: rawnand: arasan: Ensure program page operations are successful Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: rawnand: marvell: Ensure program page operations are successful Bibek Kumar Patro <quic_bibekkum(a)quicinc.com> mtd: rawnand: qcom: Unmap the right resource upon probe failure Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: hci_event: Fix using memcmp when comparing keys Maher Sanalla <msanalla(a)nvidia.com> net/mlx5: Handle fw tracer change ownership event based on MTRC Renan Guilherme Lebre Ramos <japareaggae(a)gmail.com> platform/x86: touchscreen_dmi: Add info for the Positivo C4128B Rahul Rameshbabu <sergeantsagara(a)protonmail.com> HID: multitouch: Add required quirk for Synaptics 0xcd7e device Josef Bacik <josef(a)toxicpanda.com> btrfs: fix some -Wmaybe-uninitialized warnings in ioctl.c Kai Uwe Broulik <foss-linux(a)broulik.de> drm: panel-orientation-quirks: Add quirk for One Mix 2S Hangbin Liu <liuhangbin(a)gmail.com> ipv4/fib: send notify when delete source address routes Kees Cook <keescook(a)chromium.org> sky2: Make sure there is at least one frag_addr available Michał Mirosław <mirq-linux(a)rere.qmqm.pl> regulator/core: Revert "fix kobject release warning and memory leak in regulator_register()" Benjamin Berg <benjamin.berg(a)intel.com> wifi: cfg80211: avoid leaking stack data into trace Wen Gong <quic_wgong(a)quicinc.com> wifi: mac80211: allow transmitting EAPOL frames with tainted key Ilan Peer <ilan.peer(a)intel.com> wifi: cfg80211: Fix 6GHz scan configuration Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: hci_core: Fix build warnings Ying Hsu <yinghsu(a)chromium.org> Bluetooth: Avoid redundant authentication Ma Ke <make_ruc2021(a)163.com> HID: holtek: fix slab-out-of-bounds Write in holtek_kbd_input_event Clément Léger <cleger(a)rivosinc.com> tracing: relax trace_event_eval_update() execution with cond_resched() Damien Le Moal <dlemoal(a)kernel.org> ata: libata-eh: Fix compilation warning in ata_eh_link_report() Chengfeng Ye <dg573847474(a)gmail.com> gpio: timberdale: Fix potential deadlock on &tgpio->lock Jeff Layton <jlayton(a)kernel.org> overlayfs: set ctime when setting mtime and atime Heiner Kallweit <hkallweit1(a)gmail.com> i2c: mux: Avoid potential false error message in i2c_mux_add_adapter Josef Bacik <josef(a)toxicpanda.com> btrfs: initialize start_slot in btrfs_log_prealloc_extents Filipe Manana <fdmanana(a)suse.com> btrfs: return -EUCLEAN for delayed tree ref with a ref count not equals to 1 Tony Lindgren <tony(a)atomide.com> ARM: dts: ti: omap: Fix noisy serial with overrun-throttle-ms for mapphone RD Babiera <rdbabiera(a)google.com> usb: typec: altmodes/displayport: Signal hpd low when exiting mode Hans de Goede <hdegoede(a)redhat.com> usb: typec: altmodes/displayport: Notify drm subsys of hotplug events Hans de Goede <hdegoede(a)redhat.com> drm/connector: Add support for out-of-band hotplug notification (v3) Hans de Goede <hdegoede(a)redhat.com> drm/connector: Add drm_connector_find_by_fwnode() function (v3) Hans de Goede <hdegoede(a)redhat.com> drm/connector: Add a fwnode pointer to drm_connector and register with ACPI (v2) Hans de Goede <hdegoede(a)redhat.com> drm/connector: Give connector sysfs devices there own device_type Daniel Miess <daniel.miess(a)amd.com> drm/amd/display: Don't set dpms_off for seamless boot Yongqiang Sun <yongqiang.sun(a)amd.com> drm/amd/display: only check available pipe to disable vbios mode. Tony Lindgren <tony(a)atomide.com> serial: 8250_omap: Fix errors with no_console_suspend Tony Lindgren <tony(a)atomide.com> serial: 8250: omap: Fix imprecise external abort for omap_8250_pm() Mathias Nyman <mathias.nyman(a)linux.intel.com> xhci: track port suspend state correctly in unsuccessful resume cases Mathias Nyman <mathias.nyman(a)linux.intel.com> xhci: decouple usb2 port resume and get_port_status request handling Mathias Nyman <mathias.nyman(a)linux.intel.com> xhci: clear usb2 resume related variables in one place. Mathias Nyman <mathias.nyman(a)linux.intel.com> xhci: rename resume_done to resume_timestamp Mathias Nyman <mathias.nyman(a)linux.intel.com> xhci: move port specific items such as state completions to port structure Mathias Nyman <mathias.nyman(a)linux.intel.com> xhci: cleanup xhci_hub_control port references Thinh Nguyen <Thinh.Nguyen(a)synopsys.com> usb: core: Track SuperSpeed Plus GenXxY Juntong Deng <juntong.deng(a)outlook.com> selftests/mm: fix awk usage in charge_reserved_hugetlb.sh and hugetlb_reparenting_test.sh that may cause error Waiman Long <longman(a)redhat.com> selftests/vm: make charge_reserved_hugetlb.sh work with existing cgroup setting Hans de Goede <hdegoede(a)redhat.com> ACPI: resource: Skip IRQ override on ASUS ExpertBook B1402CBA Paul Menzel <pmenzel(a)molgen.mpg.de> ACPI: resource: Skip IRQ override on ASUS ExpertBook B1502CBA Tamim Khan <tamim(a)fusetak.com> ACPI: resource: Skip IRQ override on Asus Expertbook B2402CBA Hans de Goede <hdegoede(a)redhat.com> ACPI: resource: Add Asus ExpertBook B2502 to Asus quirks Tamim Khan <tamim(a)fusetak.com> ACPI: resource: Skip IRQ override on Asus Vivobook S5602ZA Kellen Renshaw <kellen.renshaw(a)canonical.com> ACPI: resource: Add ASUS model S5402ZA to quirks Tamim Khan <tamim(a)fusetak.com> ACPI: resource: Skip IRQ override on Asus Vivobook K3402ZA/K3502ZA Hui Wang <hui.wang(a)canonical.com> ACPI: resources: Add DMI-based legacy IRQ override quirk John Garry <john.garry(a)huawei.com> ACPI: Drop acpi_dev_irqresource_disabled() John Garry <john.garry(a)huawei.com> resource: Add irqresource_disabled() Mika Westerberg <mika.westerberg(a)linux.intel.com> thunderbolt: Workaround an IOMMU fault on certain systems with Intel Maple Ridge Gavrilov Ilia <Ilia.Gavrilov(a)infotecs.ru> net: pktgen: Fix interface flags printing Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_rbtree: .deactivate fails if element has expired Geert Uytterhoeven <geert+renesas(a)glider.be> neighbor: tracing: Move pin6 inside CONFIG_IPV6=y section Pedro Tammela <pctammela(a)mojatatu.com> net/sched: sch_hfsc: upgrade 'rt' to 'sc' when it becomes a inner curve Jinjie Ruan <ruanjinjie(a)huawei.com> net: dsa: bcm_sf2: Fix possible memory leak in bcm_sf2_mdio_register() Michal Schmidt <mschmidt(a)redhat.com> i40e: prevent crash on probe if hw registers have invalid values Dan Carpenter <dan.carpenter(a)linaro.org> net: usb: smsc95xx: Fix an error code in smsc95xx_reset() Eric Dumazet <edumazet(a)google.com> ipv4: fib: annotate races around nh->nh_saddr_genid and nh->nh_saddr Eric Dumazet <edumazet(a)google.com> tun: prevent negative ifindex Eric Dumazet <edumazet(a)google.com> tcp: tsq: relax tcp_small_queue_check() when rtx queue contains a single skb Neal Cardwell <ncardwell(a)google.com> tcp: fix excessive TLP and RACK timeouts from HZ rounding Josua Mayer <josua(a)solid-run.com> net: rfkill: gpio: prevent value glitch during probe Ma Ke <make_ruc2021(a)163.com> net: ipv6: fix return value check in esp_remove_trailer Ma Ke <make_ruc2021(a)163.com> net: ipv4: fix return value check in esp_remove_trailer Eric Dumazet <edumazet(a)google.com> xfrm: interface: use DEV_STATS_INC() Eric Dumazet <edumazet(a)google.com> xfrm: fix a data-race in xfrm_gen_index() Manish Chopra <manishc(a)marvell.com> qed: fix LL2 RX buffer allocation Ville Syrjälä <ville.syrjala(a)linux.intel.com> drm/i915: Retry gtt fault when out of fence registers Sagi Grimberg <sagi(a)grimberg.me> nvmet-tcp: Fix a possible UAF in queue intialization setup Florian Westphal <fw(a)strlen.de> netfilter: nft_payload: fix wrong mac header matching Paolo Abeni <pabeni(a)redhat.com> tcp: check mptcp-level constraints for backlog coalescing Joerg Roedel <jroedel(a)suse.de> x86/sev: Check for user-space IOIO pointing to kernel space Joerg Roedel <jroedel(a)suse.de> x86/sev: Check IOBM for IOIO exceptions from user-space Borislav Petkov (AMD) <bp(a)alien8.de> x86/sev: Disable MMIO emulation from user mode Jim Mattson <jmattson(a)google.com> KVM: x86: Mask LVTPC when handling a PMI Johan Hovold <johan+linaro(a)kernel.org> regmap: fix NULL deref on lookup Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> nfc: nci: fix possible NULL pointer dereference in send_acknowledge() Jesse Brandeburg <jesse.brandeburg(a)intel.com> ice: reset first in crash dump kernels Jesse Brandeburg <jesse.brandeburg(a)intel.com> ice: fix over-shifted variable Arnd Bergmann <arnd(a)arndb.de> Bluetooth: avoid memcmp() out of bounds warning Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: hci_event: Fix coding style Arkadiusz Bokowy <arkadiusz.bokowy(a)gmail.com> Bluetooth: vhci: Fix race when opening vhci device Ziyang Xuan <william.xuanziyang(a)huawei.com> Bluetooth: Fix a refcnt underflow problem for hci_conn Lee, Chun-Yi <jlee(a)suse.com> Bluetooth: Reject connection with the device which has same BD_ADDR Lee, Chun-Yi <jlee(a)suse.com> Bluetooth: hci_event: Ignore NULL link key Ricardo Cañuelo <ricardo.canuelo(a)collabora.com> usb: hub: Guard against accesses to uninitialized BOS descriptors Bagas Sanjaya <bagasdotme(a)gmail.com> Documentation: sysctl: align cells in second content column Liam Mark <lmark(a)codeaurora.org> mm/memory_hotplug: rate limit page migration warnings Hyeonggon Yoo <42.hyeyoo(a)gmail.com> lib/Kconfig.debug: do not enable DEBUG_PREEMPT by default Nicolas Dichtel <nicolas.dichtel(a)6wind.com> dev_forward_skb: do not scrub skb mark within the same name space Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> ravb: Fix use-after-free issue in ravb_tx_timeout_work() Bart Van Assche <bvanassche(a)acm.org> RDMA/srp: Fix srp_abort() yangx.jy(a)fujitsu.com <yangx.jy(a)fujitsu.com> RDMA/srp: Set scmnd->result only when scmnd is not NULL Ren Zhijie <renzhijie2(a)huawei.com> arm64: armv8_deprecated: fix unused-function error Mark Rutland <mark.rutland(a)arm.com> arm64: armv8_deprecated: rework deprected instruction handling Mark Rutland <mark.rutland(a)arm.com> arm64: armv8_deprecated: move aarch32 helper earlier Mark Rutland <mark.rutland(a)arm.com> arm64: armv8_deprecated move emulation functions Mark Rutland <mark.rutland(a)arm.com> arm64: armv8_deprecated: fold ops into insn_emulation Mark Rutland <mark.rutland(a)arm.com> arm64: rework EL0 MRS emulation Mark Rutland <mark.rutland(a)arm.com> arm64: factor insn read out of call_undef_hook() Mark Rutland <mark.rutland(a)arm.com> arm64: factor out EL1 SSBS emulation hook Mark Rutland <mark.rutland(a)arm.com> arm64: split EL0/EL1 UNDEF handlers Mark Rutland <mark.rutland(a)arm.com> arm64: allow kprobes on EL0 handlers Mark Rutland <mark.rutland(a)arm.com> arm64: rework BTI exception handling Mark Rutland <mark.rutland(a)arm.com> arm64: rework FPAC exception handling Mark Rutland <mark.rutland(a)arm.com> arm64: consistently pass ESR_ELx to die() Mark Rutland <mark.rutland(a)arm.com> arm64: die(): pass 'err' as long Mark Rutland <mark.rutland(a)arm.com> arm64: report EL1 UNDEFs better Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> x86/alternatives: Disable KASAN in apply_alternatives() Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/64e: Fix wrong test in __ptep_test_and_clear_young() Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/8xx: Fix pte_access_permitted() for PAGE_NONE Duoming Zhou <duoming(a)zju.edu.cn> dmaengine: mediatek: Fix deadlock caused by synchronize_irq() Krishna Kurapati <quic_kriskura(a)quicinc.com> usb: gadget: ncm: Handle decoding of multiple NTB's in unwrap call Piyush Mehta <piyush.mehta(a)amd.com> usb: gadget: udc-xilinx: replace memcpy with memcpy_toio Dharma Balasubiramani <dharma.b(a)microchip.com> counter: microchip-tcb-capture: Fix the use of internal GCLK logic Dmitry Torokhov <dmitry.torokhov(a)gmail.com> pinctrl: avoid unsafe code pattern in find_pinctrl() Michal Koutný <mkoutny(a)suse.com> cgroup: Remove duplicates in cgroup v1 tasks file Rijo Thomas <Rijo-john.Thomas(a)amd.com> tee: amdtee: fix use-after-free vulnerability in amdtee_close_session Hans de Goede <hdegoede(a)redhat.com> Input: goodix - ensure int GPIO is in input for gpio_count == 1 && gpio_int_idx == 0 case Szilard Fabian <szfabian(a)bluemarch.art> Input: i8042 - add Fujitsu Lifebook E5411 to i8042 quirk table Matthias Berndt <matthias_berndt(a)gmx.de> Input: xpad - add PXN V900 support Jeffery Miller <jefferymiller(a)google.com> Input: psmouse - fix fast_reconnect function for PS/2 mode Javier Carrasco <javier.carrasco.cruz(a)gmail.com> Input: powermate - fix use-after-free in powermate_config_complete Dan Carpenter <dan.carpenter(a)linaro.org> ceph: fix type promotion bug on 32bit systems Xiubo Li <xiubli(a)redhat.com> ceph: fix incorrect revoked caps assert in ceph_fill_file_size() Jordan Rife <jrife(a)google.com> libceph: use kernel_connect() Mika Westerberg <mika.westerberg(a)linux.intel.com> thunderbolt: Check that lane 1 is in CL0 before enabling lane bonding Jorge Sanjuan Garcia <jorge.sanjuangarcia(a)duagon.com> mcb: remove is_added flag from mcb_device struct Borislav Petkov (AMD) <bp(a)alien8.de> x86/cpu: Fix AMD erratum #1485 on Zen4-based CPUs Alexander Zangerl <az(a)breathe-safe.com> iio: pressure: ms5611: ms5611_prom_is_valid false negative bug Lakshmi Yadlapati <lakshmiy(a)us.ibm.com> iio: pressure: dps310: Adjust Timeout Settings Phil Elwell <phil(a)raspberrypi.com> iio: pressure: bmp280: Fix NULL pointer exception Xingxing Luo <xingxing.luo(a)unisoc.com> usb: musb: Modify the "HWVers" register address Xingxing Luo <xingxing.luo(a)unisoc.com> usb: musb: Get the musb_qh poniter after musb_giveback Thinh Nguyen <Thinh.Nguyen(a)synopsys.com> usb: dwc3: Soft reset phy on probe for host Javier Carrasco <javier.carrasco.cruz(a)gmail.com> net: usb: dm9601: fix uninitialized variable use in dm9601_mdio_read Wesley Cheng <quic_wcheng(a)quicinc.com> usb: xhci: xhci-ring: Use sysdev for mapping bounce buffer Amelie Delaunay <amelie.delaunay(a)foss.st.com> dmaengine: stm32-mdma: abort resume if no ongoing transfer Zheng Wang <zyytlz.wz(a)163.com> media: mtk-jpeg: Fix use after free bug due to uncanceled work Patrick Rohr <prohr(a)google.com> net: release reference to inet6_dev pointer Patrick Rohr <prohr(a)google.com> net: change accept_ra_min_rtr_lft to affect all RA lifetimes Patrick Rohr <prohr(a)google.com> net: add sysctl accept_ra_min_rtr_lft Sasha Levin <sashal(a)kernel.org> Revert "spi: spi-zynqmp-gqspi: Fix runtime PM imbalance in zynqmp_qspi_probe" Sasha Levin <sashal(a)kernel.org> Revert "spi: zynqmp-gqspi: fix clock imbalance on probe failure" Waiman Long <longman(a)redhat.com> workqueue: Override implicit ordered attribute in workqueue_apply_unbound_cpumask() Jeremy Cline <jeremy(a)jcline.org> nfc: nci: assert requested protocol is valid Ralph Siemsen <ralph.siemsen(a)linaro.org> pinctrl: renesas: rzn1: Enable missing PINMUX Eric Dumazet <edumazet(a)google.com> net: nfc: fix races in nfc_llcp_sock_get() and nfc_llcp_sock_get_sn() Dan Carpenter <dan.carpenter(a)linaro.org> ixgbe: fix crash with empty VF macvlan list Radu Pirea (NXP OSS) <radu-nicolae.pirea(a)oss.nxp.com> net: phy: mscc: macsec: reject PN update requests Radu Pirea (NXP OSS) <radu-nicolae.pirea(a)oss.nxp.com> net: macsec: indicate next pn update when offloading Konstantin Meskhidze <konstantin.meskhidze(a)huawei.com> drm/vmwgfx: fix typo of sizeof argument Björn Töpel <bjorn(a)rivosinc.com> riscv, bpf: Sign-extend return values Pu Lehui <pulehui(a)huawei.com> riscv, bpf: Factor out emit_call for kernel and bpf context Roger Pau Monne <roger.pau(a)citrix.com> xen-netback: use default TX queue size for vifs Dan Carpenter <dan.carpenter(a)linaro.org> mlxsw: fix mlxsw_sp2_nve_vxlan_learning_set() return type Dinghao Liu <dinghao.liu(a)zju.edu.cn> ieee802154: ca8210: Fix a potential UAF in ca8210_probe Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> ravb: Fix up dma_free_coherent() call in ravb_remove() Abhinav Kumar <quic_abhinavk(a)quicinc.com> drm/msm/dpu: change _dpu_plane_calc_bw() to use u64 to avoid overflow Abhinav Kumar <quic_abhinavk(a)quicinc.com> drm/msm/dsi: skip the wait for video mode done if not applicable Kuogee Hsieh <quic_khsieh(a)quicinc.com> drm/msm/dp: do not reinitialize phy unless retry during link training Jordan Rife <jrife(a)google.com> net: prevent address rewrite in kernel_bind() Jan Kara <jack(a)suse.cz> quota: Fix slow quotaoff Hans de Goede <hdegoede(a)redhat.com> HID: logitech-hidpp: Fix kernel crash on receiver USB disconnect Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> lib/test_meminit: fix off-by-one error in test_pages() Jing Zhang <renyu.zj(a)linux.alibaba.com> perf/arm-cmn: Fix the unhandled overflow status of counter 4 to 7 Artem Chernyshev <artem.chernyshev(a)red-soft.ru> RDMA/cxgb4: Check skb value for failure to allocate Bart Van Assche <bvanassche(a)acm.org> RDMA/srp: Do not call scsi_done() from srp_abort() Bart Van Assche <bvanassche(a)acm.org> RDMA/srp: Make struct scsi_cmnd and struct srp_request adjacent ------------- Diffstat: Documentation/admin-guide/sysctl/net.rst | 18 +- Documentation/networking/ip-sysctl.rst | 8 + Makefile | 4 +- arch/arm/boot/dts/motorola-mapphone-common.dtsi | 1 + arch/arm64/include/asm/cpufeature.h | 3 +- arch/arm64/include/asm/exception.h | 13 +- arch/arm64/include/asm/spectre.h | 2 + arch/arm64/include/asm/system_misc.h | 2 +- arch/arm64/include/asm/traps.h | 19 +- arch/arm64/kernel/armv8_deprecated.c | 572 ++++++++++----------- arch/arm64/kernel/cpufeature.c | 23 +- arch/arm64/kernel/entry-common.c | 36 +- arch/arm64/kernel/proton-pack.c | 26 +- arch/arm64/kernel/traps.c | 125 ++--- arch/powerpc/include/asm/nohash/32/pte-8xx.h | 7 + arch/powerpc/include/asm/nohash/64/pgtable.h | 2 +- arch/powerpc/include/asm/nohash/pgtable.h | 2 + arch/riscv/net/bpf_jit_comp64.c | 33 +- arch/s390/pci/pci_dma.c | 15 +- arch/x86/boot/compressed/sev-es.c | 10 + arch/x86/include/asm/msr-index.h | 9 +- arch/x86/kernel/alternative.c | 13 + arch/x86/kernel/cpu/amd.c | 8 + arch/x86/kernel/sev-es-shared.c | 53 +- arch/x86/kernel/sev-es.c | 30 ++ arch/x86/kvm/lapic.c | 8 +- drivers/acpi/irq.c | 7 +- drivers/acpi/resource.c | 121 ++++- drivers/ata/libata-eh.c | 2 +- drivers/base/regmap/regmap.c | 2 +- drivers/bluetooth/hci_vhci.c | 3 + drivers/counter/microchip-tcb-capture.c | 2 +- drivers/dma/mediatek/mtk-uart-apdma.c | 3 +- drivers/dma/stm32-mdma.c | 4 + drivers/gpio/gpio-timberdale.c | 5 +- drivers/gpio/gpio-vf610.c | 4 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 9 +- drivers/gpu/drm/drm_connector.c | 79 +++ drivers/gpu/drm/drm_crtc_internal.h | 2 + drivers/gpu/drm/drm_panel_orientation_quirks.c | 16 + drivers/gpu/drm/drm_sysfs.c | 87 +++- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 12 +- drivers/gpu/drm/msm/dp/dp_ctrl.c | 13 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 12 + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- drivers/hid/hid-holtek-kbd.c | 4 + drivers/hid/hid-logitech-hidpp.c | 3 +- drivers/hid/hid-multitouch.c | 4 + drivers/i2c/i2c-mux.c | 2 +- drivers/iio/pressure/bmp280-core.c | 2 +- drivers/iio/pressure/dps310.c | 8 +- drivers/iio/pressure/ms5611_core.c | 2 +- drivers/infiniband/hw/cxgb4/cm.c | 3 + drivers/infiniband/ulp/srp/ib_srp.c | 172 +++---- drivers/infiniband/ulp/srp/ib_srp.h | 2 - drivers/input/joystick/xpad.c | 2 + drivers/input/misc/powermate.c | 1 + drivers/input/mouse/elantech.c | 1 + drivers/input/mouse/synaptics.c | 1 + drivers/input/serio/i8042-acpipnpio.h | 8 + drivers/input/touchscreen/goodix.c | 19 + drivers/mcb/mcb-core.c | 10 +- drivers/mcb/mcb-parse.c | 2 - drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 1 + drivers/mmc/core/mmc.c | 2 +- drivers/mmc/core/sdio.c | 8 +- drivers/mtd/maps/physmap-core.c | 11 + drivers/mtd/nand/raw/arasan-nand-controller.c | 16 +- drivers/mtd/nand/raw/marvell_nand.c | 23 +- drivers/mtd/nand/raw/qcom_nandc.c | 2 +- drivers/mtd/nand/spi/micron.c | 2 +- drivers/net/dsa/bcm_sf2.c | 24 +- drivers/net/ethernet/intel/i40e/i40e_common.c | 4 +- drivers/net/ethernet/intel/ice/ice_lib.c | 3 +- drivers/net/ethernet/intel/ice/ice_main.c | 15 + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 5 +- drivers/net/ethernet/marvell/sky2.h | 2 +- .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 2 +- .../ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c | 4 +- drivers/net/ethernet/qlogic/qed/qed_ll2.c | 7 +- drivers/net/ethernet/renesas/ravb_main.c | 6 +- drivers/net/ieee802154/ca8210.c | 17 +- drivers/net/macsec.c | 2 + drivers/net/phy/mscc/mscc_macsec.c | 6 + drivers/net/tun.c | 7 +- drivers/net/usb/dm9601.c | 7 +- drivers/net/usb/smsc95xx.c | 2 +- drivers/net/xen-netback/interface.c | 3 - drivers/nvme/host/pci.c | 3 +- drivers/nvme/host/rdma.c | 3 + drivers/nvme/target/tcp.c | 7 +- drivers/perf/arm-cmn.c | 2 +- drivers/phy/motorola/phy-mapphone-mdm6600.c | 38 +- drivers/pinctrl/renesas/Kconfig | 1 + drivers/platform/x86/asus-nb-wmi.c | 3 + drivers/platform/x86/asus-wmi.h | 2 +- drivers/platform/x86/touchscreen_dmi.c | 23 + drivers/regulator/core.c | 6 +- drivers/spi/spi-zynqmp-gqspi.c | 24 +- drivers/tee/amdtee/core.c | 10 +- drivers/thunderbolt/icm.c | 38 +- drivers/thunderbolt/switch.c | 7 + drivers/tty/serial/8250/8250_omap.c | 93 ++-- drivers/usb/core/hcd.c | 6 +- drivers/usb/core/hub.c | 106 +++- drivers/usb/core/hub.h | 2 +- drivers/usb/dwc3/core.c | 39 +- drivers/usb/gadget/function/f_ncm.c | 26 +- drivers/usb/gadget/udc/udc-xilinx.c | 20 +- drivers/usb/host/xhci-hub.c | 228 ++++---- drivers/usb/host/xhci-mem.c | 10 +- drivers/usb/host/xhci-ring.c | 17 +- drivers/usb/host/xhci.h | 9 +- drivers/usb/musb/musb_debugfs.c | 2 +- drivers/usb/musb/musb_host.c | 9 +- drivers/usb/serial/option.c | 7 + drivers/usb/typec/altmodes/Kconfig | 1 + drivers/usb/typec/altmodes/displayport.c | 28 + fs/btrfs/extent-tree.c | 6 +- fs/btrfs/ioctl.c | 4 +- fs/btrfs/tree-log.c | 2 +- fs/ceph/file.c | 2 +- fs/ceph/inode.c | 4 +- fs/nfs/pnfs.c | 33 +- fs/overlayfs/copy_up.c | 2 +- fs/quota/dquot.c | 66 ++- include/drm/drm_connector.h | 25 + include/linux/ioport.h | 7 + include/linux/ipv6.h | 1 + include/linux/mcb.h | 1 - include/linux/netdevice.h | 2 +- include/linux/perf_event.h | 1 + include/linux/quota.h | 4 +- include/linux/quotaops.h | 2 +- include/linux/usb.h | 2 + include/net/bluetooth/hci_core.h | 2 +- include/net/bluetooth/hci_mon.h | 2 +- include/net/ip_fib.h | 1 + include/net/macsec.h | 1 + include/net/netns/xfrm.h | 1 + include/net/tcp.h | 3 + include/trace/events/neigh.h | 4 +- include/uapi/linux/ipv6.h | 7 + kernel/cgroup/cgroup-v1.c | 5 +- kernel/events/core.c | 39 +- kernel/trace/trace_events.c | 1 + kernel/workqueue.c | 8 +- lib/Kconfig.debug | 5 +- lib/test_meminit.c | 2 +- mm/memory_hotplug.c | 16 +- net/bluetooth/hci_conn.c | 72 ++- net/bluetooth/hci_core.c | 8 +- net/bluetooth/hci_event.c | 33 +- net/bluetooth/hci_sock.c | 3 +- net/ceph/messenger.c | 4 +- net/core/pktgen.c | 14 +- net/ipv4/esp4.c | 4 +- net/ipv4/fib_semantics.c | 15 +- net/ipv4/fib_trie.c | 4 + net/ipv4/tcp_ipv4.c | 1 + net/ipv4/tcp_output.c | 25 +- net/ipv4/tcp_recovery.c | 2 +- net/ipv6/addrconf.c | 13 + net/ipv6/esp6.c | 4 +- net/ipv6/ndisc.c | 13 +- net/ipv6/xfrm6_policy.c | 4 +- net/mac80211/tx.c | 3 +- net/netfilter/ipvs/ip_vs_sync.c | 4 +- net/netfilter/nft_payload.c | 2 +- net/netfilter/nft_set_rbtree.c | 2 + net/nfc/llcp_core.c | 30 +- net/nfc/nci/core.c | 5 + net/nfc/nci/spi.c | 2 + net/rds/tcp_connect.c | 2 +- net/rds/tcp_listen.c | 2 +- net/rfkill/rfkill-gpio.c | 4 +- net/sched/sch_hfsc.c | 18 +- net/socket.c | 6 +- net/wireless/nl80211.c | 2 +- net/wireless/scan.c | 4 + net/xfrm/xfrm_interface_core.c | 22 +- net/xfrm/xfrm_policy.c | 6 +- sound/soc/pxa/pxa-ssp.c | 2 +- .../selftests/vm/charge_reserved_hugetlb.sh | 34 +- .../selftests/vm/hugetlb_reparenting_test.sh | 21 +- tools/testing/selftests/vm/write_hugetlb_memory.sh | 2 +- 187 files changed, 2095 insertions(+), 1183 deletions(-)

1 year, 5 months

8
9
0 0

Hola

by audu bello

Se le envió un correo electrónico sobre la recepción de fondos pendientes, pero estoy Me sorprende que nunca te hayas molestado en responder. Utilice URGENTEMENTE mi dirección de correo electrónico habitual: a00728298(a)yahoo.com Atentamente Gerente de Auditoría

1 year, 5 months

1
0
0 0

FAILED: patch "[PATCH] drm/dp_mst: Fix NULL deref in" 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 3d887d512494d678b17c57b835c32f4e48d34f26 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023102722-foyer-jawed-7d2f@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 3d887d512494d678b17c57b835c32f4e48d34f26 Mon Sep 17 00:00:00 2001 From: Lukasz Majczak <lma(a)semihalf.com> Date: Fri, 22 Sep 2023 08:34:10 +0200 Subject: [PATCH] drm/dp_mst: Fix NULL deref in get_mst_branch_device_by_guid_helper() As drm_dp_get_mst_branch_device_by_guid() is called from drm_dp_get_mst_branch_device_by_guid(), mstb parameter has to be checked, otherwise NULL dereference may occur in the call to the memcpy() and cause following: [12579.365869] BUG: kernel NULL pointer dereference, address: 0000000000000049 [12579.365878] #PF: supervisor read access in kernel mode [12579.365880] #PF: error_code(0x0000) - not-present page [12579.365882] PGD 0 P4D 0 [12579.365887] Oops: 0000 [#1] PREEMPT SMP NOPTI ... [12579.365895] Workqueue: events_long drm_dp_mst_up_req_work [12579.365899] RIP: 0010:memcmp+0xb/0x29 [12579.365921] Call Trace: [12579.365927] get_mst_branch_device_by_guid_helper+0x22/0x64 [12579.365930] drm_dp_mst_up_req_work+0x137/0x416 [12579.365933] process_one_work+0x1d0/0x419 [12579.365935] worker_thread+0x11a/0x289 [12579.365938] kthread+0x13e/0x14f [12579.365941] ? process_one_work+0x419/0x419 [12579.365943] ? kthread_blkcg+0x31/0x31 [12579.365946] ret_from_fork+0x1f/0x30 As get_mst_branch_device_by_guid_helper() is recursive, moving condition to the first line allow to remove a similar one for step over of NULL elements inside a loop. Fixes: 5e93b8208d3c ("drm/dp/mst: move GUID storage from mgr, port to only mst branch") Cc: <stable(a)vger.kernel.org> # 4.14+ Signed-off-by: Lukasz Majczak <lma(a)semihalf.com> Reviewed-by: Radoslaw Biernacki <rad(a)chromium.org> Signed-off-by: Manasi Navare <navaremanasi(a)chromium.org> Link: https://patchwork.freedesktop.org/patch/msgid/20230922063410.23626-1-lma@se… diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c index ed96cfcfa304..8c929ef72c72 100644 --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c @@ -2574,14 +2574,14 @@ static struct drm_dp_mst_branch *get_mst_branch_device_by_guid_helper( struct drm_dp_mst_branch *found_mstb; struct drm_dp_mst_port *port; + if (!mstb) + return NULL; + if (memcmp(mstb->guid, guid, 16) == 0) return mstb; list_for_each_entry(port, &mstb->ports, next) { - if (!port->mstb) - continue; - found_mstb = get_mst_branch_device_by_guid_helper(port->mstb, guid); if (found_mstb)

1 year, 5 months

1
0
0 0

FAILED: patch "[PATCH] drm/dp_mst: Fix NULL deref in" 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 3d887d512494d678b17c57b835c32f4e48d34f26 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023102720-gatherer-voter-6a5b@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 3d887d512494d678b17c57b835c32f4e48d34f26 Mon Sep 17 00:00:00 2001 From: Lukasz Majczak <lma(a)semihalf.com> Date: Fri, 22 Sep 2023 08:34:10 +0200 Subject: [PATCH] drm/dp_mst: Fix NULL deref in get_mst_branch_device_by_guid_helper() As drm_dp_get_mst_branch_device_by_guid() is called from drm_dp_get_mst_branch_device_by_guid(), mstb parameter has to be checked, otherwise NULL dereference may occur in the call to the memcpy() and cause following: [12579.365869] BUG: kernel NULL pointer dereference, address: 0000000000000049 [12579.365878] #PF: supervisor read access in kernel mode [12579.365880] #PF: error_code(0x0000) - not-present page [12579.365882] PGD 0 P4D 0 [12579.365887] Oops: 0000 [#1] PREEMPT SMP NOPTI ... [12579.365895] Workqueue: events_long drm_dp_mst_up_req_work [12579.365899] RIP: 0010:memcmp+0xb/0x29 [12579.365921] Call Trace: [12579.365927] get_mst_branch_device_by_guid_helper+0x22/0x64 [12579.365930] drm_dp_mst_up_req_work+0x137/0x416 [12579.365933] process_one_work+0x1d0/0x419 [12579.365935] worker_thread+0x11a/0x289 [12579.365938] kthread+0x13e/0x14f [12579.365941] ? process_one_work+0x419/0x419 [12579.365943] ? kthread_blkcg+0x31/0x31 [12579.365946] ret_from_fork+0x1f/0x30 As get_mst_branch_device_by_guid_helper() is recursive, moving condition to the first line allow to remove a similar one for step over of NULL elements inside a loop. Fixes: 5e93b8208d3c ("drm/dp/mst: move GUID storage from mgr, port to only mst branch") Cc: <stable(a)vger.kernel.org> # 4.14+ Signed-off-by: Lukasz Majczak <lma(a)semihalf.com> Reviewed-by: Radoslaw Biernacki <rad(a)chromium.org> Signed-off-by: Manasi Navare <navaremanasi(a)chromium.org> Link: https://patchwork.freedesktop.org/patch/msgid/20230922063410.23626-1-lma@se… diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c index ed96cfcfa304..8c929ef72c72 100644 --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c @@ -2574,14 +2574,14 @@ static struct drm_dp_mst_branch *get_mst_branch_device_by_guid_helper( struct drm_dp_mst_branch *found_mstb; struct drm_dp_mst_port *port; + if (!mstb) + return NULL; + if (memcmp(mstb->guid, guid, 16) == 0) return mstb; list_for_each_entry(port, &mstb->ports, next) { - if (!port->mstb) - continue; - found_mstb = get_mst_branch_device_by_guid_helper(port->mstb, guid); if (found_mstb)

1 year, 5 months

1
0
0 0

[PATCH 6.5] accel/ivpu: Don't enter d0i3 during FLR

by Stanislaw Gruszka

commit 828d63042aeca132a93938b98dc7f1a6c97bbc51 upstream. Avoid HW bug on some platforms where we enter D0i3 state and CPU is in low power states (C8 or above). Fixes: 852be13f3bd3 ("accel/ivpu: Add PM support") Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz(a)linux.intel.com> Reviewed-by: Stanislaw Gruszka <stanislaw.gruszka(a)linux.intel.com> Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka(a)linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231003064213.1527327-1-stan… - --- drivers/accel/ivpu/ivpu_drv.c | 11 ++++++++--- drivers/accel/ivpu/ivpu_drv.h | 1 + drivers/accel/ivpu/ivpu_hw.h | 8 ++++++++ drivers/accel/ivpu/ivpu_hw_mtl.c | 1 + drivers/accel/ivpu/ivpu_pm.c | 3 ++- 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/drivers/accel/ivpu/ivpu_drv.c b/drivers/accel/ivpu/ivpu_drv.c index 8396db2b5203..13e11437bee5 100644 --- a/drivers/accel/ivpu/ivpu_drv.c +++ b/drivers/accel/ivpu/ivpu_drv.c @@ -343,14 +343,19 @@ int ivpu_boot(struct ivpu_device *vdev) return 0; } -int ivpu_shutdown(struct ivpu_device *vdev) +void ivpu_prepare_for_reset(struct ivpu_device *vdev) { - int ret; - ivpu_hw_irq_disable(vdev); disable_irq(vdev->irq); ivpu_ipc_disable(vdev); ivpu_mmu_disable(vdev); +} + +int ivpu_shutdown(struct ivpu_device *vdev) +{ + int ret; + + ivpu_prepare_for_reset(vdev); ret = ivpu_hw_power_down(vdev); if (ret) diff --git a/drivers/accel/ivpu/ivpu_drv.h b/drivers/accel/ivpu/ivpu_drv.h index 399dc5dcefd7..343b15e56799 100644 --- a/drivers/accel/ivpu/ivpu_drv.h +++ b/drivers/accel/ivpu/ivpu_drv.h @@ -144,6 +144,7 @@ void ivpu_file_priv_put(struct ivpu_file_priv **link); int ivpu_boot(struct ivpu_device *vdev); int ivpu_shutdown(struct ivpu_device *vdev); +void ivpu_prepare_for_reset(struct ivpu_device *vdev); static inline bool ivpu_is_mtl(struct ivpu_device *vdev) { diff --git a/drivers/accel/ivpu/ivpu_hw.h b/drivers/accel/ivpu/ivpu_hw.h index 50a9304ab09c..dac59f1c1e05 100644 --- a/drivers/accel/ivpu/ivpu_hw.h +++ b/drivers/accel/ivpu/ivpu_hw.h @@ -13,6 +13,7 @@ struct ivpu_hw_ops { int (*power_up)(struct ivpu_device *vdev); int (*boot_fw)(struct ivpu_device *vdev); int (*power_down)(struct ivpu_device *vdev); + int (*reset)(struct ivpu_device *vdev); bool (*is_idle)(struct ivpu_device *vdev); void (*wdt_disable)(struct ivpu_device *vdev); void (*diagnose_failure)(struct ivpu_device *vdev); @@ -90,6 +91,13 @@ static inline int ivpu_hw_power_down(struct ivpu_device *vdev) return vdev->hw->ops->power_down(vdev); }; +static inline int ivpu_hw_reset(struct ivpu_device *vdev) +{ + ivpu_dbg(vdev, PM, "HW reset\n"); + + return vdev->hw->ops->reset(vdev); +}; + static inline void ivpu_hw_wdt_disable(struct ivpu_device *vdev) { vdev->hw->ops->wdt_disable(vdev); diff --git a/drivers/accel/ivpu/ivpu_hw_mtl.c b/drivers/accel/ivpu/ivpu_hw_mtl.c index 2a5dd3a5dc46..d21c16b5e6f8 100644 --- a/drivers/accel/ivpu/ivpu_hw_mtl.c +++ b/drivers/accel/ivpu/ivpu_hw_mtl.c @@ -1041,6 +1041,7 @@ const struct ivpu_hw_ops ivpu_hw_mtl_ops = { .power_up = ivpu_hw_mtl_power_up, .is_idle = ivpu_hw_mtl_is_idle, .power_down = ivpu_hw_mtl_power_down, + .reset = ivpu_hw_mtl_reset, .boot_fw = ivpu_hw_mtl_boot_fw, .wdt_disable = ivpu_hw_mtl_wdt_disable, .diagnose_failure = ivpu_hw_mtl_diagnose_failure, diff --git a/drivers/accel/ivpu/ivpu_pm.c b/drivers/accel/ivpu/ivpu_pm.c index aa4d56dc52b3..86ec828dd1df 100644 --- a/drivers/accel/ivpu/ivpu_pm.c +++ b/drivers/accel/ivpu/ivpu_pm.c @@ -260,7 +260,8 @@ void ivpu_pm_reset_prepare_cb(struct pci_dev *pdev) ivpu_dbg(vdev, PM, "Pre-reset..\n"); atomic_set(&vdev->pm->in_reset, 1); - ivpu_shutdown(vdev); + ivpu_prepare_for_reset(vdev); + ivpu_hw_reset(vdev); ivpu_pm_prepare_cold_boot(vdev); ivpu_jobs_abort_all(vdev); ivpu_dbg(vdev, PM, "Pre-reset done.\n"); -- 2.34.1

1 year, 5 months

2
1
0 0

FAILED: patch "[PATCH] accel/ivpu/37xx: Fix missing VPUIP interrupts" failed to apply to 6.5-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.5-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.5.y git checkout FETCH_HEAD git cherry-pick -x b132ac51d7a50c37683be56c96ff64f8c887930f # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023102746-unengaged-cosponsor-948a@gregkh' --subject-prefix 'PATCH 6.5.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From b132ac51d7a50c37683be56c96ff64f8c887930f Mon Sep 17 00:00:00 2001 From: Karol Wachowski <karol.wachowski(a)linux.intel.com> Date: Tue, 24 Oct 2023 18:19:52 +0200 Subject: [PATCH] accel/ivpu/37xx: Fix missing VPUIP interrupts Move sequence of masking and unmasking global interrupts from buttress interrupt handler to generic one that handles both VPUIP and BTRS interrupts. Unmasking global interrupts will re-trigger MSI for any pending interrupts. Lack of this sequence will cause the driver to miss any VPUIP interrupt that comes after reading VPU_37XX_HOST_SS_ICB_STATUS_0 and before clearing all active interrupt sources. Fixes: 35b137630f08 ("accel/ivpu: Introduce a new DRM driver for Intel VPU") Cc: stable(a)vger.kernel.org Signed-off-by: Karol Wachowski <karol.wachowski(a)linux.intel.com> Reviewed-by: Stanislaw Gruszka <stanislaw.gruszka(a)linux.intel.com> Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka(a)linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231024161952.759914-1-stani… diff --git a/drivers/accel/ivpu/ivpu_hw_37xx.c b/drivers/accel/ivpu/ivpu_hw_37xx.c index 976019429164..18be8b98e9a8 100644 --- a/drivers/accel/ivpu/ivpu_hw_37xx.c +++ b/drivers/accel/ivpu/ivpu_hw_37xx.c @@ -940,9 +940,6 @@ static u32 ivpu_hw_37xx_irqb_handler(struct ivpu_device *vdev, int irq) if (status == 0) return 0; - /* Disable global interrupt before handling local buttress interrupts */ - REGB_WR32(VPU_37XX_BUTTRESS_GLOBAL_INT_MASK, 0x1); - if (REG_TEST_FLD(VPU_37XX_BUTTRESS_INTERRUPT_STAT, FREQ_CHANGE, status)) ivpu_dbg(vdev, IRQ, "FREQ_CHANGE irq: %08x", REGB_RD32(VPU_37XX_BUTTRESS_CURRENT_PLL)); @@ -974,9 +971,6 @@ static u32 ivpu_hw_37xx_irqb_handler(struct ivpu_device *vdev, int irq) else REGB_WR32(VPU_37XX_BUTTRESS_INTERRUPT_STAT, status); - /* Re-enable global interrupt */ - REGB_WR32(VPU_37XX_BUTTRESS_GLOBAL_INT_MASK, 0x0); - if (schedule_recovery) ivpu_pm_schedule_recovery(vdev); @@ -988,9 +982,14 @@ static irqreturn_t ivpu_hw_37xx_irq_handler(int irq, void *ptr) struct ivpu_device *vdev = ptr; u32 ret_irqv, ret_irqb; + REGB_WR32(VPU_37XX_BUTTRESS_GLOBAL_INT_MASK, 0x1); + ret_irqv = ivpu_hw_37xx_irqv_handler(vdev, irq); ret_irqb = ivpu_hw_37xx_irqb_handler(vdev, irq); + /* Re-enable global interrupts to re-trigger MSI for pending interrupts */ + REGB_WR32(VPU_37XX_BUTTRESS_GLOBAL_INT_MASK, 0x0); + return IRQ_RETVAL(ret_irqb | ret_irqv); }

1 year, 5 months

1
0
0 0

FAILED: patch "[PATCH] vdpa/mlx5: Fix firmware error on creation of 1k VQs" 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 abb0dcf9938c93f765abf8cb45567cadef0af6b2 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023102751-unsealed-faction-dcd6@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From abb0dcf9938c93f765abf8cb45567cadef0af6b2 Mon Sep 17 00:00:00 2001 From: Dragos Tatulea <dtatulea(a)nvidia.com> Date: Thu, 31 Aug 2023 18:50:56 +0300 Subject: [PATCH] vdpa/mlx5: Fix firmware error on creation of 1k VQs A firmware error is triggered when configuring a 9k MTU on the PF after switching to switchdev mode and then using a vdpa device with larger (1k) rings: mlx5_cmd_out_err: CREATE_GENERAL_OBJECT(0xa00) op_mod(0xd) failed, status bad resource(0x5), syndrome (0xf6db90), err(-22) This is due to the fact that the hw VQ size parameters are computed based on the umem_1/2/3_buffer_param_a/b capabilities and all device capabilities are read only when the driver is moved to switchdev mode. The problematic configuration flow looks like this: 1) Create VF 2) Unbind VF 3) Switch PF to switchdev mode. 4) Bind VF 5) Set PF MTU to 9k 6) create vDPA device 7) Start VM with vDPA device and 1K queue size Note that setting the MTU before step 3) doesn't trigger this issue. This patch reads the forementioned umem parameters at the latest point possible before the VQs of the device are created. v2: - Allocate output with kmalloc to reduce stack frame size. - Removed stable from cc. Fixes: 1a86b377aa21 ("vdpa/mlx5: Add VDPA driver for supported mlx5 devices") Signed-off-by: Dragos Tatulea <dtatulea(a)nvidia.com> Message-Id: <20230831155702.1080754-1-dtatulea(a)nvidia.com> Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> Acked-by: Jason Wang <jasowang(a)redhat.com> diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c index 2b7b9000f2d3..946488b8989f 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -625,30 +625,70 @@ static void cq_destroy(struct mlx5_vdpa_net *ndev, u16 idx) mlx5_db_free(ndev->mvdev.mdev, &vcq->db); } +static int read_umem_params(struct mlx5_vdpa_net *ndev) +{ + u32 in[MLX5_ST_SZ_DW(query_hca_cap_in)] = {}; + u16 opmod = (MLX5_CAP_VDPA_EMULATION << 1) | (HCA_CAP_OPMOD_GET_CUR & 0x01); + struct mlx5_core_dev *mdev = ndev->mvdev.mdev; + int out_size; + void *caps; + void *out; + int err; + + out_size = MLX5_ST_SZ_BYTES(query_hca_cap_out); + out = kzalloc(out_size, GFP_KERNEL); + if (!out) + return -ENOMEM; + + MLX5_SET(query_hca_cap_in, in, opcode, MLX5_CMD_OP_QUERY_HCA_CAP); + MLX5_SET(query_hca_cap_in, in, op_mod, opmod); + err = mlx5_cmd_exec_inout(mdev, query_hca_cap, in, out); + if (err) { + mlx5_vdpa_warn(&ndev->mvdev, + "Failed reading vdpa umem capabilities with err %d\n", err); + goto out; + } + + caps = MLX5_ADDR_OF(query_hca_cap_out, out, capability); + + ndev->umem_1_buffer_param_a = MLX5_GET(virtio_emulation_cap, caps, umem_1_buffer_param_a); + ndev->umem_1_buffer_param_b = MLX5_GET(virtio_emulation_cap, caps, umem_1_buffer_param_b); + + ndev->umem_2_buffer_param_a = MLX5_GET(virtio_emulation_cap, caps, umem_2_buffer_param_a); + ndev->umem_2_buffer_param_b = MLX5_GET(virtio_emulation_cap, caps, umem_2_buffer_param_b); + + ndev->umem_3_buffer_param_a = MLX5_GET(virtio_emulation_cap, caps, umem_3_buffer_param_a); + ndev->umem_3_buffer_param_b = MLX5_GET(virtio_emulation_cap, caps, umem_3_buffer_param_b); + +out: + kfree(out); + return 0; +} + static void set_umem_size(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueue *mvq, int num, struct mlx5_vdpa_umem **umemp) { - struct mlx5_core_dev *mdev = ndev->mvdev.mdev; - int p_a; - int p_b; + u32 p_a; + u32 p_b; switch (num) { case 1: - p_a = MLX5_CAP_DEV_VDPA_EMULATION(mdev, umem_1_buffer_param_a); - p_b = MLX5_CAP_DEV_VDPA_EMULATION(mdev, umem_1_buffer_param_b); + p_a = ndev->umem_1_buffer_param_a; + p_b = ndev->umem_1_buffer_param_b; *umemp = &mvq->umem1; break; case 2: - p_a = MLX5_CAP_DEV_VDPA_EMULATION(mdev, umem_2_buffer_param_a); - p_b = MLX5_CAP_DEV_VDPA_EMULATION(mdev, umem_2_buffer_param_b); + p_a = ndev->umem_2_buffer_param_a; + p_b = ndev->umem_2_buffer_param_b; *umemp = &mvq->umem2; break; case 3: - p_a = MLX5_CAP_DEV_VDPA_EMULATION(mdev, umem_3_buffer_param_a); - p_b = MLX5_CAP_DEV_VDPA_EMULATION(mdev, umem_3_buffer_param_b); + p_a = ndev->umem_3_buffer_param_a; + p_b = ndev->umem_3_buffer_param_b; *umemp = &mvq->umem3; break; } + (*umemp)->size = p_a * mvq->num_ent + p_b; } @@ -2679,6 +2719,11 @@ static int setup_driver(struct mlx5_vdpa_dev *mvdev) goto out; } mlx5_vdpa_add_debugfs(ndev); + + err = read_umem_params(ndev); + if (err) + goto err_setup; + err = setup_virtqueues(mvdev); if (err) { mlx5_vdpa_warn(mvdev, "setup_virtqueues\n"); diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.h b/drivers/vdpa/mlx5/net/mlx5_vnet.h index 60cdbc903037..90b556a57971 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.h +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.h @@ -65,6 +65,15 @@ struct mlx5_vdpa_net { struct hlist_head macvlan_hash[MLX5V_MACVLAN_SIZE]; struct mlx5_vdpa_irq_pool irqp; struct dentry *debugfs; + + u32 umem_1_buffer_param_a; + u32 umem_1_buffer_param_b; + + u32 umem_2_buffer_param_a; + u32 umem_2_buffer_param_b; + + u32 umem_3_buffer_param_a; + u32 umem_3_buffer_param_b; }; struct mlx5_vdpa_counter {

1 year, 5 months

1
0
0 0

FAILED: patch "[PATCH] vdpa/mlx5: Fix firmware error on creation of 1k VQs" 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 abb0dcf9938c93f765abf8cb45567cadef0af6b2 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023102749-vitalize-debtless-eaf8@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From abb0dcf9938c93f765abf8cb45567cadef0af6b2 Mon Sep 17 00:00:00 2001 From: Dragos Tatulea <dtatulea(a)nvidia.com> Date: Thu, 31 Aug 2023 18:50:56 +0300 Subject: [PATCH] vdpa/mlx5: Fix firmware error on creation of 1k VQs A firmware error is triggered when configuring a 9k MTU on the PF after switching to switchdev mode and then using a vdpa device with larger (1k) rings: mlx5_cmd_out_err: CREATE_GENERAL_OBJECT(0xa00) op_mod(0xd) failed, status bad resource(0x5), syndrome (0xf6db90), err(-22) This is due to the fact that the hw VQ size parameters are computed based on the umem_1/2/3_buffer_param_a/b capabilities and all device capabilities are read only when the driver is moved to switchdev mode. The problematic configuration flow looks like this: 1) Create VF 2) Unbind VF 3) Switch PF to switchdev mode. 4) Bind VF 5) Set PF MTU to 9k 6) create vDPA device 7) Start VM with vDPA device and 1K queue size Note that setting the MTU before step 3) doesn't trigger this issue. This patch reads the forementioned umem parameters at the latest point possible before the VQs of the device are created. v2: - Allocate output with kmalloc to reduce stack frame size. - Removed stable from cc. Fixes: 1a86b377aa21 ("vdpa/mlx5: Add VDPA driver for supported mlx5 devices") Signed-off-by: Dragos Tatulea <dtatulea(a)nvidia.com> Message-Id: <20230831155702.1080754-1-dtatulea(a)nvidia.com> Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> Acked-by: Jason Wang <jasowang(a)redhat.com> diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c index 2b7b9000f2d3..946488b8989f 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -625,30 +625,70 @@ static void cq_destroy(struct mlx5_vdpa_net *ndev, u16 idx) mlx5_db_free(ndev->mvdev.mdev, &vcq->db); } +static int read_umem_params(struct mlx5_vdpa_net *ndev) +{ + u32 in[MLX5_ST_SZ_DW(query_hca_cap_in)] = {}; + u16 opmod = (MLX5_CAP_VDPA_EMULATION << 1) | (HCA_CAP_OPMOD_GET_CUR & 0x01); + struct mlx5_core_dev *mdev = ndev->mvdev.mdev; + int out_size; + void *caps; + void *out; + int err; + + out_size = MLX5_ST_SZ_BYTES(query_hca_cap_out); + out = kzalloc(out_size, GFP_KERNEL); + if (!out) + return -ENOMEM; + + MLX5_SET(query_hca_cap_in, in, opcode, MLX5_CMD_OP_QUERY_HCA_CAP); + MLX5_SET(query_hca_cap_in, in, op_mod, opmod); + err = mlx5_cmd_exec_inout(mdev, query_hca_cap, in, out); + if (err) { + mlx5_vdpa_warn(&ndev->mvdev, + "Failed reading vdpa umem capabilities with err %d\n", err); + goto out; + } + + caps = MLX5_ADDR_OF(query_hca_cap_out, out, capability); + + ndev->umem_1_buffer_param_a = MLX5_GET(virtio_emulation_cap, caps, umem_1_buffer_param_a); + ndev->umem_1_buffer_param_b = MLX5_GET(virtio_emulation_cap, caps, umem_1_buffer_param_b); + + ndev->umem_2_buffer_param_a = MLX5_GET(virtio_emulation_cap, caps, umem_2_buffer_param_a); + ndev->umem_2_buffer_param_b = MLX5_GET(virtio_emulation_cap, caps, umem_2_buffer_param_b); + + ndev->umem_3_buffer_param_a = MLX5_GET(virtio_emulation_cap, caps, umem_3_buffer_param_a); + ndev->umem_3_buffer_param_b = MLX5_GET(virtio_emulation_cap, caps, umem_3_buffer_param_b); + +out: + kfree(out); + return 0; +} + static void set_umem_size(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueue *mvq, int num, struct mlx5_vdpa_umem **umemp) { - struct mlx5_core_dev *mdev = ndev->mvdev.mdev; - int p_a; - int p_b; + u32 p_a; + u32 p_b; switch (num) { case 1: - p_a = MLX5_CAP_DEV_VDPA_EMULATION(mdev, umem_1_buffer_param_a); - p_b = MLX5_CAP_DEV_VDPA_EMULATION(mdev, umem_1_buffer_param_b); + p_a = ndev->umem_1_buffer_param_a; + p_b = ndev->umem_1_buffer_param_b; *umemp = &mvq->umem1; break; case 2: - p_a = MLX5_CAP_DEV_VDPA_EMULATION(mdev, umem_2_buffer_param_a); - p_b = MLX5_CAP_DEV_VDPA_EMULATION(mdev, umem_2_buffer_param_b); + p_a = ndev->umem_2_buffer_param_a; + p_b = ndev->umem_2_buffer_param_b; *umemp = &mvq->umem2; break; case 3: - p_a = MLX5_CAP_DEV_VDPA_EMULATION(mdev, umem_3_buffer_param_a); - p_b = MLX5_CAP_DEV_VDPA_EMULATION(mdev, umem_3_buffer_param_b); + p_a = ndev->umem_3_buffer_param_a; + p_b = ndev->umem_3_buffer_param_b; *umemp = &mvq->umem3; break; } + (*umemp)->size = p_a * mvq->num_ent + p_b; } @@ -2679,6 +2719,11 @@ static int setup_driver(struct mlx5_vdpa_dev *mvdev) goto out; } mlx5_vdpa_add_debugfs(ndev); + + err = read_umem_params(ndev); + if (err) + goto err_setup; + err = setup_virtqueues(mvdev); if (err) { mlx5_vdpa_warn(mvdev, "setup_virtqueues\n"); diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.h b/drivers/vdpa/mlx5/net/mlx5_vnet.h index 60cdbc903037..90b556a57971 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.h +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.h @@ -65,6 +65,15 @@ struct mlx5_vdpa_net { struct hlist_head macvlan_hash[MLX5V_MACVLAN_SIZE]; struct mlx5_vdpa_irq_pool irqp; struct dentry *debugfs; + + u32 umem_1_buffer_param_a; + u32 umem_1_buffer_param_b; + + u32 umem_2_buffer_param_a; + u32 umem_2_buffer_param_b; + + u32 umem_3_buffer_param_a; + u32 umem_3_buffer_param_b; }; struct mlx5_vdpa_counter {

1 year, 5 months

1
0
0 0

FAILED: patch "[PATCH] vdpa/mlx5: Fix firmware error on creation of 1k VQs" 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 abb0dcf9938c93f765abf8cb45567cadef0af6b2 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023102748-monetary-sworn-9a51@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From abb0dcf9938c93f765abf8cb45567cadef0af6b2 Mon Sep 17 00:00:00 2001 From: Dragos Tatulea <dtatulea(a)nvidia.com> Date: Thu, 31 Aug 2023 18:50:56 +0300 Subject: [PATCH] vdpa/mlx5: Fix firmware error on creation of 1k VQs A firmware error is triggered when configuring a 9k MTU on the PF after switching to switchdev mode and then using a vdpa device with larger (1k) rings: mlx5_cmd_out_err: CREATE_GENERAL_OBJECT(0xa00) op_mod(0xd) failed, status bad resource(0x5), syndrome (0xf6db90), err(-22) This is due to the fact that the hw VQ size parameters are computed based on the umem_1/2/3_buffer_param_a/b capabilities and all device capabilities are read only when the driver is moved to switchdev mode. The problematic configuration flow looks like this: 1) Create VF 2) Unbind VF 3) Switch PF to switchdev mode. 4) Bind VF 5) Set PF MTU to 9k 6) create vDPA device 7) Start VM with vDPA device and 1K queue size Note that setting the MTU before step 3) doesn't trigger this issue. This patch reads the forementioned umem parameters at the latest point possible before the VQs of the device are created. v2: - Allocate output with kmalloc to reduce stack frame size. - Removed stable from cc. Fixes: 1a86b377aa21 ("vdpa/mlx5: Add VDPA driver for supported mlx5 devices") Signed-off-by: Dragos Tatulea <dtatulea(a)nvidia.com> Message-Id: <20230831155702.1080754-1-dtatulea(a)nvidia.com> Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> Acked-by: Jason Wang <jasowang(a)redhat.com> diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c index 2b7b9000f2d3..946488b8989f 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -625,30 +625,70 @@ static void cq_destroy(struct mlx5_vdpa_net *ndev, u16 idx) mlx5_db_free(ndev->mvdev.mdev, &vcq->db); } +static int read_umem_params(struct mlx5_vdpa_net *ndev) +{ + u32 in[MLX5_ST_SZ_DW(query_hca_cap_in)] = {}; + u16 opmod = (MLX5_CAP_VDPA_EMULATION << 1) | (HCA_CAP_OPMOD_GET_CUR & 0x01); + struct mlx5_core_dev *mdev = ndev->mvdev.mdev; + int out_size; + void *caps; + void *out; + int err; + + out_size = MLX5_ST_SZ_BYTES(query_hca_cap_out); + out = kzalloc(out_size, GFP_KERNEL); + if (!out) + return -ENOMEM; + + MLX5_SET(query_hca_cap_in, in, opcode, MLX5_CMD_OP_QUERY_HCA_CAP); + MLX5_SET(query_hca_cap_in, in, op_mod, opmod); + err = mlx5_cmd_exec_inout(mdev, query_hca_cap, in, out); + if (err) { + mlx5_vdpa_warn(&ndev->mvdev, + "Failed reading vdpa umem capabilities with err %d\n", err); + goto out; + } + + caps = MLX5_ADDR_OF(query_hca_cap_out, out, capability); + + ndev->umem_1_buffer_param_a = MLX5_GET(virtio_emulation_cap, caps, umem_1_buffer_param_a); + ndev->umem_1_buffer_param_b = MLX5_GET(virtio_emulation_cap, caps, umem_1_buffer_param_b); + + ndev->umem_2_buffer_param_a = MLX5_GET(virtio_emulation_cap, caps, umem_2_buffer_param_a); + ndev->umem_2_buffer_param_b = MLX5_GET(virtio_emulation_cap, caps, umem_2_buffer_param_b); + + ndev->umem_3_buffer_param_a = MLX5_GET(virtio_emulation_cap, caps, umem_3_buffer_param_a); + ndev->umem_3_buffer_param_b = MLX5_GET(virtio_emulation_cap, caps, umem_3_buffer_param_b); + +out: + kfree(out); + return 0; +} + static void set_umem_size(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueue *mvq, int num, struct mlx5_vdpa_umem **umemp) { - struct mlx5_core_dev *mdev = ndev->mvdev.mdev; - int p_a; - int p_b; + u32 p_a; + u32 p_b; switch (num) { case 1: - p_a = MLX5_CAP_DEV_VDPA_EMULATION(mdev, umem_1_buffer_param_a); - p_b = MLX5_CAP_DEV_VDPA_EMULATION(mdev, umem_1_buffer_param_b); + p_a = ndev->umem_1_buffer_param_a; + p_b = ndev->umem_1_buffer_param_b; *umemp = &mvq->umem1; break; case 2: - p_a = MLX5_CAP_DEV_VDPA_EMULATION(mdev, umem_2_buffer_param_a); - p_b = MLX5_CAP_DEV_VDPA_EMULATION(mdev, umem_2_buffer_param_b); + p_a = ndev->umem_2_buffer_param_a; + p_b = ndev->umem_2_buffer_param_b; *umemp = &mvq->umem2; break; case 3: - p_a = MLX5_CAP_DEV_VDPA_EMULATION(mdev, umem_3_buffer_param_a); - p_b = MLX5_CAP_DEV_VDPA_EMULATION(mdev, umem_3_buffer_param_b); + p_a = ndev->umem_3_buffer_param_a; + p_b = ndev->umem_3_buffer_param_b; *umemp = &mvq->umem3; break; } + (*umemp)->size = p_a * mvq->num_ent + p_b; } @@ -2679,6 +2719,11 @@ static int setup_driver(struct mlx5_vdpa_dev *mvdev) goto out; } mlx5_vdpa_add_debugfs(ndev); + + err = read_umem_params(ndev); + if (err) + goto err_setup; + err = setup_virtqueues(mvdev); if (err) { mlx5_vdpa_warn(mvdev, "setup_virtqueues\n"); diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.h b/drivers/vdpa/mlx5/net/mlx5_vnet.h index 60cdbc903037..90b556a57971 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.h +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.h @@ -65,6 +65,15 @@ struct mlx5_vdpa_net { struct hlist_head macvlan_hash[MLX5V_MACVLAN_SIZE]; struct mlx5_vdpa_irq_pool irqp; struct dentry *debugfs; + + u32 umem_1_buffer_param_a; + u32 umem_1_buffer_param_b; + + u32 umem_2_buffer_param_a; + u32 umem_2_buffer_param_b; + + u32 umem_3_buffer_param_a; + u32 umem_3_buffer_param_b; }; struct mlx5_vdpa_counter {

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror October 2023