October 2021 - Linux-stable-mirror

[PATCH v3] mmc: core: Add a card quirk for non-hw busy detection

by Linus Walleij

Some boot partitions on the Samsung 4GB KLM4G1YE4C "4YMD1R" and "M4G1YC" cards appear broken when accessed randomly. CMD6 to switch back to the main partition randomly stalls after CMD18 access to the boot partition 1, and the card never comes back online. The accesses to the boot partitions work several times before this happens, but eventually the card access hangs while initializing the card. Some problematic eMMC cards are found in the Samsung GT-S7710 (Skomer) and SGH-I407 (Kyle) mobile phones. I tried using only single blocks with CMD17 on the boot partitions with the result that it crashed even faster. After a bit of root cause analysis it turns out that these old eMMC cards probably cannot do hardware busy detection (monitoring DAT0) properly. The card survives on older kernels, but this is because recent kernels have added busy detection handling for the SoC used in these phones, exposing the issue. Construct a quirk that makes the MMC cord avoid using the ->card_busy() callback if the card is listed with MMC_QUIRK_BROKEN_HW_BUSY_DETECT and register the known problematic cards. The core changes are pretty straight-forward with a helper inline to check of we can use hardware busy detection. On the MMCI host we have to counter the fact that if the host was able to use busy detect, it would be used unsolicited in the command IRQ callback. Rewrite this so that MMCI will not attempt to use hardware busy detection in the command IRQ until: - A card is attached to the host and - We know that the card can handle this busy detection I have glanced over the ->card_busy() callbacks on some other hosts and they seem to mostly read a register reflecting the value of DAT0 for this which works fine with the quirk in this patch. However if the error appear on other hosts they might need additional fixes. After applying this patch, the main partition can be accessed and mounted without problems on Samsung GT-S7710 and SGH-I407. Fixes: cb0335b778c7 ("mmc: mmci: add busy_complete callback") Cc: stable(a)vger.kernel.org Cc: phone-devel(a)vger.kernel.org Cc: Ludovic Barre <ludovic.barre(a)st.com> Cc: Stephan Gerhold <stephan(a)gerhold.net> Reported-by: newbyte(a)disroot.org Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- ChangeLog v2->v3: - Rebase on v5.14-rc1 - Reword the commit message slightly. ChangeLog v1->v2: - Rewrite to reflect the actual problem of broken busy detection. --- drivers/mmc/core/core.c | 8 ++++---- drivers/mmc/core/core.h | 17 +++++++++++++++++ drivers/mmc/core/mmc_ops.c | 4 ++-- drivers/mmc/core/quirks.h | 21 +++++++++++++++++++++ drivers/mmc/host/mmci.c | 22 ++++++++++++++++++++-- include/linux/mmc/card.h | 1 + 6 files changed, 65 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 95fedcf56e4a..e08dd9ea3d46 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -232,7 +232,7 @@ static void __mmc_start_request(struct mmc_host *host, struct mmc_request *mrq) * And bypass I/O abort, reset and bus suspend operations. */ if (sdio_is_io_busy(mrq->cmd->opcode, mrq->cmd->arg) && - host->ops->card_busy) { + mmc_hw_busy_detect(host)) { int tries = 500; /* Wait aprox 500ms at maximum */ while (host->ops->card_busy(host) && --tries) @@ -1200,7 +1200,7 @@ int mmc_set_uhs_voltage(struct mmc_host *host, u32 ocr) */ if (!host->ops->start_signal_voltage_switch) return -EPERM; - if (!host->ops->card_busy) + if (!mmc_hw_busy_detect(host)) pr_warn("%s: cannot verify signal voltage switch\n", mmc_hostname(host)); @@ -1220,7 +1220,7 @@ int mmc_set_uhs_voltage(struct mmc_host *host, u32 ocr) * after the response of cmd11, but wait 1 ms to be sure */ mmc_delay(1); - if (host->ops->card_busy && !host->ops->card_busy(host)) { + if (mmc_hw_busy_detect(host) && !host->ops->card_busy(host)) { err = -EAGAIN; goto power_cycle; } @@ -1241,7 +1241,7 @@ int mmc_set_uhs_voltage(struct mmc_host *host, u32 ocr) * Failure to switch is indicated by the card holding * dat[0:3] low */ - if (host->ops->card_busy && host->ops->card_busy(host)) + if (mmc_hw_busy_detect(host) && host->ops->card_busy(host)) err = -EAGAIN; power_cycle: diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h index 0c4de2030b3f..6a5619eed4a6 100644 --- a/drivers/mmc/core/core.h +++ b/drivers/mmc/core/core.h @@ -181,4 +181,21 @@ static inline int mmc_flush_cache(struct mmc_host *host) return 0; } +/** + * mmc_hw_busy_detect() - Can we use hw busy detection? + * @host: the host in question + */ +static inline bool mmc_hw_busy_detect(struct mmc_host *host) +{ + struct mmc_card *card = host->card; + bool has_ops; + bool able = true; + + has_ops = (host->ops->card_busy != NULL); + if (card) + able = !(card->quirks & MMC_QUIRK_BROKEN_HW_BUSY_DETECT); + + return (has_ops && able); +} + #endif diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index 973756ed4016..546fc799a8e5 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -435,7 +435,7 @@ static int mmc_busy_cb(void *cb_data, bool *busy) u32 status = 0; int err; - if (host->ops->card_busy) { + if (mmc_hw_busy_detect(host)) { *busy = host->ops->card_busy(host); return 0; } @@ -597,7 +597,7 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, * when it's not allowed to poll by using CMD13, then we need to rely on * waiting the stated timeout to be sufficient. */ - if (!send_status && !host->ops->card_busy) { + if (!send_status && !mmc_hw_busy_detect(host)) { mmc_delay(timeout_ms); goto out_tim; } diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h index d68e6e513a4f..8da6526f0eb0 100644 --- a/drivers/mmc/core/quirks.h +++ b/drivers/mmc/core/quirks.h @@ -99,6 +99,27 @@ static const struct mmc_fixup __maybe_unused mmc_blk_fixups[] = { MMC_FIXUP("V10016", CID_MANFID_KINGSTON, CID_OEMID_ANY, add_quirk_mmc, MMC_QUIRK_TRIM_BROKEN), + /* + * Some older Samsung eMMCs have broken hardware busy detection. + * Enabling this feature in the host controller can make the card + * accesses lock up completely. + */ + MMC_FIXUP("4YMD1R", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc, + MMC_QUIRK_BROKEN_HW_BUSY_DETECT), + /* Samsung KLMxGxxE4x eMMCs from 2012: 4, 8, 16, 32 and 64 GB */ + MMC_FIXUP("M4G1YC", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc, + MMC_QUIRK_BROKEN_HW_BUSY_DETECT), + MMC_FIXUP("M8G1WA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc, + MMC_QUIRK_BROKEN_HW_BUSY_DETECT), + MMC_FIXUP("MAG2WA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc, + MMC_QUIRK_BROKEN_HW_BUSY_DETECT), + MMC_FIXUP("MBG4WA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc, + MMC_QUIRK_BROKEN_HW_BUSY_DETECT), + MMC_FIXUP("MAG2WA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc, + MMC_QUIRK_BROKEN_HW_BUSY_DETECT), + MMC_FIXUP("MCG8WA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc, + MMC_QUIRK_BROKEN_HW_BUSY_DETECT), + END_FIXUP }; diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 984d35055156..3046917b2b67 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -347,6 +347,24 @@ static int mmci_card_busy(struct mmc_host *mmc) return busy; } +/* Use this if the MMCI variant AND the card supports it */ +static bool mmci_use_busy_detect(struct mmci_host *host) +{ + struct mmc_card *card = host->mmc->card; + + if (!host->variant->busy_detect) + return false; + + /* We don't allow this until we know that the card can handle it */ + if (!card) + return false; + + if (card->quirks & MMC_QUIRK_BROKEN_HW_BUSY_DETECT) + return false; + + return true; +} + static void mmci_reg_delay(struct mmci_host *host) { /* @@ -1381,7 +1399,7 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd, return; /* Handle busy detection on DAT0 if the variant supports it. */ - if (busy_resp && host->variant->busy_detect) + if (busy_resp && mmci_use_busy_detect(host)) if (!host->ops->busy_complete(host, status, err_msk)) return; @@ -1725,7 +1743,7 @@ static void mmci_set_max_busy_timeout(struct mmc_host *mmc) struct mmci_host *host = mmc_priv(mmc); u32 max_busy_timeout = 0; - if (!host->variant->busy_detect) + if (!mmci_use_busy_detect(host)) return; if (host->variant->busy_timeout && mmc->actual_clock) diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index 74e6c0624d27..525a39951c6d 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -280,6 +280,7 @@ struct mmc_card { /* for byte mode */ #define MMC_QUIRK_NONSTD_SDIO (1<<2) /* non-standard SDIO card attached */ /* (missing CIA registers) */ +#define MMC_QUIRK_BROKEN_HW_BUSY_DETECT (1<<3) /* Disable hardware busy detection on DAT0 */ #define MMC_QUIRK_NONSTD_FUNC_IF (1<<4) /* SDIO card has nonstd function interfaces */ #define MMC_QUIRK_DISABLE_CD (1<<5) /* disconnect CD/DAT[3] resistor */ #define MMC_QUIRK_INAND_CMD38 (1<<6) /* iNAND devices have broken CMD38 */ -- 2.31.1

2 years, 2 months

3
5
0 0

ipheth: fix EOVERFLOW in ipheth_rcvbulk_callback

by Georgi Valkov

ipheth: fix EOVERFLOW in ipheth_rcvbulk_callback https://github.com/openwrt/openwrt/pull/4084 From dd109ded2b526636fff438d33433ab64ffd21583 Mon Sep 17 00:00:00 2001 From: Georgi Valkov <gvalkov(a)abv.bg> Date: Fri, 16 Apr 2021 20:44:36 +0300 Subject: [PATCH] ipheth: fix EOVERFLOW in ipheth_rcvbulk_callback When rx_buf is allocated we need to account for IPHETH_IP_ALIGN, which reduces the usable size by 2 bytes. Otherwise we have 1512 bytes usable instead of 1514, and if we receive more than 1512 bytes, ipheth_rcvbulk_callback is called with status -EOVERFLOW, after which the driver malfunctiones and all communication stops. Fixes: ipheth 2-1:4.2: ipheth_rcvbulk_callback: urb status: -75 Signed-off-by: Georgi Valkov <gvalkov(a)abv.bg> --- drivers/net/usb/ipheth.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c index 207e59e74935..06d9f19ca142 100644 --- a/drivers/net/usb/ipheth.c +++ b/drivers/net/usb/ipheth.c @@ -121,7 +121,7 @@ static int ipheth_alloc_urbs(struct ipheth_device *iphone) if (tx_buf == NULL) goto free_rx_urb; - rx_buf = usb_alloc_coherent(iphone->udev, IPHETH_BUF_SIZE, + rx_buf = usb_alloc_coherent(iphone->udev, IPHETH_BUF_SIZE + IPHETH_IP_ALIGN, GFP_KERNEL, &rx_urb->transfer_dma); if (rx_buf == NULL) goto free_tx_buf; @@ -146,7 +146,7 @@ static int ipheth_alloc_urbs(struct ipheth_device *iphone) static void ipheth_free_urbs(struct ipheth_device *iphone) { - usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->rx_buf, + usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE + IPHETH_IP_ALIGN, iphone->rx_buf, iphone->rx_urb->transfer_dma); usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->tx_buf, iphone->tx_urb->transfer_dma); @@ -317,7 +317,7 @@ static int ipheth_rx_submit(struct ipheth_device *dev, gfp_t mem_flags) usb_fill_bulk_urb(dev->rx_urb, udev, usb_rcvbulkpipe(udev, dev->bulk_in), - dev->rx_buf, IPHETH_BUF_SIZE, + dev->rx_buf, IPHETH_BUF_SIZE + IPHETH_IP_ALIGN, ipheth_rcvbulk_callback, dev); dev->rx_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; -- 2.31.1

2 years, 2 months

4
13
0 0

[PATCH 5.10 000/167] 5.10.54-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.10.54 release. There are 167 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 28 Jul 2021 15:38:12 +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.54-rc… 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.54-rc1 Mathias Nyman <mathias.nyman(a)linux.intel.com> xhci: add xhci_get_virt_ep() helper Íñigo Huguet <ihuguet(a)redhat.com> sfc: ensure correct number of XDP queues Colin Xu <colin.xu(a)intel.com> drm/i915/gvt: Clear d3_entered on elsp cmd submission. David Jeffery <djeffery(a)redhat.com> usb: ehci: Prevent missed ehci interrupts with edge-triggered MSI Riccardo Mancini <rickyman7(a)gmail.com> perf inject: Close inject.output on exit Robert Richter <rrichter(a)amd.com> Documentation: Fix intiramfs script name Paul Blakey <paulb(a)nvidia.com> skbuff: Release nfct refcount on napi stolen or re-used skbs Mahesh Bandewar <maheshb(a)google.com> bonding: fix build issue Evan Quan <evan.quan(a)amd.com> PCI: Mark AMD Navi14 GPU ATS as broken Marek Behún <kabel(a)kernel.org> net: dsa: mv88e6xxx: enable SerDes PCS register dump via ethtool -d on Topaz Marek Behún <kabel(a)kernel.org> net: dsa: mv88e6xxx: enable SerDes RX stats for Topaz Likun Gao <Likun.Gao(a)amd.com> drm/amdgpu: update golden setting for sienna_cichlid Charles Baylis <cb-kernel(a)fishzet.co.uk> drm: Return -ENOTTY for non-drm ioctls Jason Ekstrand <jason(a)jlekstrand.net> Revert "drm/i915: Propagate errors on awaiting already signaled fences" Adrian Hunter <adrian.hunter(a)intel.com> driver core: Prevent warning when removing a device link from unregistered consumer Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> nds32: fix up stack guard gap Jérôme Glisse <jglisse(a)redhat.com> misc: eeprom: at24: Always append device id even if label property is set. Ilya Dryomov <idryomov(a)gmail.com> rbd: always kick acquire on "acquired" and "released" notifications Ilya Dryomov <idryomov(a)gmail.com> rbd: don't hold lock_rwsem while running_list is being drained Mike Kravetz <mike.kravetz(a)oracle.com> hugetlbfs: fix mount mode command line processing Mike Rapoport <rppt(a)kernel.org> memblock: make for_each_mem_range() traverse MEMBLOCK_HOTPLUG regions Peter Collingbourne <pcc(a)google.com> userfaultfd: do not untag user pointers Pavel Begunkov <asml.silence(a)gmail.com> io_uring: remove double poll entry on arm failure Pavel Begunkov <asml.silence(a)gmail.com> io_uring: explicitly count entries for poll reqs Peter Collingbourne <pcc(a)google.com> selftest: use mmap instead of posix_memalign to allocate memory Frederic Weisbecker <frederic(a)kernel.org> posix-cpu-timers: Fix rearm racing against process tick Bhaumik Bhatt <bbhatt(a)codeaurora.org> bus: mhi: core: Validate channel ID when processing command completions Markus Boehme <markubo(a)amazon.com> ixgbe: Fix packet corruption due to missing DMA sync Gustavo A. R. Silva <gustavoars(a)kernel.org> media: ngene: Fix out-of-bounds bug in ngene_command_config_free_buf() Anand Jain <anand.jain(a)oracle.com> btrfs: check for missing device in btrfs_trim_fs Steven Rostedt (VMware) <rostedt(a)goodmis.org> tracing: Synthetic event field_pos is an index not a boolean Haoran Luo <www(a)aegistudio.net> tracing: Fix bug in rb_per_cpu_empty() that might cause deadloop. Steven Rostedt (VMware) <rostedt(a)goodmis.org> tracing/histogram: Rename "cpu" to "common_cpu" Steven Rostedt (VMware) <rostedt(a)goodmis.org> tracepoints: Update static_call before tp_funcs when adding a tracepoint Marc Zyngier <maz(a)kernel.org> firmware/efi: Tell memblock about EFI iomem reservations Amelie Delaunay <amelie.delaunay(a)foss.st.com> usb: typec: stusb160x: register role switch before interrupt registration Minas Harutyunyan <Minas.Harutyunyan(a)synopsys.com> usb: dwc2: gadget: Fix sending zero length packet in DDMA mode. Minas Harutyunyan <Minas.Harutyunyan(a)synopsys.com> usb: dwc2: gadget: Fix GOUTNAK flow for Slave mode. Zhang Qilong <zhangqilong3(a)huawei.com> usb: gadget: Fix Unbalanced pm_runtime_enable in tegra_xudc_probe John Keeping <john(a)metanate.com> USB: serial: cp210x: add ID for CEL EM3588 USB ZigBee stick Ian Ray <ian.ray(a)ge.com> USB: serial: cp210x: fix comments for GE CS1000 Marco De Marco <marco.demarco(a)posteo.net> USB: serial: option: add support for u-blox LARA-R6 family Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> usb: renesas_usbhs: Fix superfluous irqs happen after usb_pkt_pop() Mark Tomlinson <mark.tomlinson(a)alliedtelesis.co.nz> usb: max-3421: Prevent corruption of freed memory Julian Sikorski <belegdol(a)gmail.com> USB: usb-storage: Add LaCie Rugged USB3-FW to IGNORE_UAS Mathias Nyman <mathias.nyman(a)linux.intel.com> usb: hub: Fix link power management max exit latency (MEL) calculations Mathias Nyman <mathias.nyman(a)linux.intel.com> usb: hub: Disable USB 3 device initiated lpm if exit latency is too high Nicholas Piggin <npiggin(a)gmail.com> KVM: PPC: Book3S HV Nested: Sanitise H_ENTER_NESTED TM state Nicholas Piggin <npiggin(a)gmail.com> KVM: PPC: Book3S: Fix H_RTAS rets buffer overflow Mathias Nyman <mathias.nyman(a)linux.intel.com> xhci: Fix lost USB 2 remote wake Greg Thelen <gthelen(a)google.com> usb: xhci: avoid renesas_usb_fw.mem when it's unusable Moritz Fischer <mdf(a)kernel.org> Revert "usb: renesas-xhci: Fix handling of unknown ROM state" Takashi Iwai <tiwai(a)suse.de> ALSA: pcm: Fix mmap capability check Alan Young <consult.awy(a)gmail.com> ALSA: pcm: Call substream ack() method upon compat mmap commit Takashi Iwai <tiwai(a)suse.de> ALSA: hdmi: Expose all pins on MSI MS-7C94 board Hui Wang <hui.wang(a)canonical.com> ALSA: hda/realtek: Fix pop noise and 2 Front Mic issues on a machine Takashi Iwai <tiwai(a)suse.de> ALSA: sb: Fix potential ABBA deadlock in CSP driver Alexander Tsoy <alexander(a)tsoy.me> ALSA: usb-audio: Add registration quirk for JBL Quantum headsets Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Add missing proc text entry for BESPOKEN type Alexander Egorenkov <egorenar(a)linux.ibm.com> s390/boot: fix use of expolines in the DMA code Vasily Gorbik <gor(a)linux.ibm.com> s390/ftrace: fix ftrace_update_ftrace_func implementation Stephen Boyd <swboyd(a)chromium.org> mmc: core: Don't allocate IDA for OF aliases Marcelo Henrique Cerri <marcelo.cerri(a)canonical.com> proc: Avoid mixing integer types in mem_rw() Ronnie Sahlberg <lsahlber(a)redhat.com> cifs: fix fallocate when trying to allocate a hole. Ronnie Sahlberg <lsahlber(a)redhat.com> cifs: only write 64kb at a time when fallocating a small region of a file Maxime Ripard <maxime(a)cerno.tech> drm/panel: raspberrypi-touchscreen: Prevent double-free Yajun Deng <yajun.deng(a)linux.dev> net: sched: cls_api: Fix the the wrong parameter Vladimir Oltean <vladimir.oltean(a)nxp.com> net: dsa: sja1105: make VID 4095 a bridge VLAN too Wei Wang <weiwan(a)google.com> tcp: disable TFO blackhole logic by default Xin Long <lucien.xin(a)gmail.com> sctp: update active_key for asoc when old key is being replaced Christoph Hellwig <hch(a)lst.de> nvme: set the PRACT bit when using Write Zeroes with T10 PI Sayanta Pattanayak <sayanta.pattanayak(a)arm.com> r8169: Avoid duplicate sysfs entry creation error David Howells <dhowells(a)redhat.com> afs: Fix tracepoint string placement with built-in AFS Vincent Palatin <vpalatin(a)chromium.org> Revert "USB: quirks: ignore remote wake-up on Fibocom L850-GL LTE modem" Zhihao Cheng <chengzhihao1(a)huawei.com> nvme-pci: don't WARN_ON in nvme_reset_work if ctrl.state is not RESETTING Luis Henriques <lhenriques(a)suse.de> ceph: don't WARN if we're still opening a session to an MDS Paolo Abeni <pabeni(a)redhat.com> ipv6: fix another slab-out-of-bounds in fib6_nh_flush_exceptions Peilin Ye <peilin.ye(a)bytedance.com> net/sched: act_skbmod: Skip non-Ethernet packets Alexandru Tachici <alexandru.tachici(a)analog.com> spi: spi-bcm2835: Fix deadlock Jian Shen <shenjian15(a)huawei.com> net: hns3: fix rx VLAN offload state inconsistent issue Chengwen Feng <fengchengwen(a)huawei.com> net: hns3: fix possible mismatches resp of mailbox Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> ALSA: hda: intel-dsp-cfg: add missing ElkhartLake PCI ID Eric Dumazet <edumazet(a)google.com> net/tcp_fastopen: fix data races around tfo_active_disable_stamp Randy Dunlap <rdunlap(a)infradead.org> net: hisilicon: rename CACHE_LINE_MASK to avoid redefinition Somnath Kotur <somnath.kotur(a)broadcom.com> bnxt_en: Check abort error state in bnxt_half_open_nic() Michael Chan <michael.chan(a)broadcom.com> bnxt_en: Validate vlan protocol ID on RX packets Michael Chan <michael.chan(a)broadcom.com> bnxt_en: Add missing check for BNXT_STATE_ABORT_ERR in bnxt_fw_rset_task() Michael Chan <michael.chan(a)broadcom.com> bnxt_en: Refresh RoCE capabilities in bnxt_ulp_probe() Kalesh AP <kalesh-anakkur.purayil(a)broadcom.com> bnxt_en: don't disable an already disabled PCI device Robert Richter <rrichter(a)amd.com> ACPI: Kconfig: Fix table override from built-in initrd Marek Vasut <marex(a)denx.de> spi: cadence: Correct initialisation of runtime PM again Dmitry Bogdanov <d.bogdanov(a)yadro.com> scsi: target: Fix protect handling in WRITE SAME(32) Mike Christie <michael.christie(a)oracle.com> scsi: iscsi: Fix iface sysfs attr detection Nguyen Dinh Phi <phind.uet(a)gmail.com> netrom: Decrease sock refcount when sock timers expire Xin Long <lucien.xin(a)gmail.com> sctp: trim optlen when it's a huge value in sctp_setsockopt Pavel Skripkin <paskripkin(a)gmail.com> net: sched: fix memory leak in tcindex_partial_destroy_work Nicholas Piggin <npiggin(a)gmail.com> KVM: PPC: Fix kvm_arch_vcpu_ioctl vcpu_load leak Nicholas Piggin <npiggin(a)gmail.com> KVM: PPC: Book3S: Fix CONFIG_TRANSACTIONAL_MEM=n crash Yajun Deng <yajun.deng(a)linux.dev> net: decnet: Fix sleeping inside in af_decnet Michal Suchanek <msuchanek(a)suse.de> efi/tpm: Differentiate missing and invalid final event log table. Roman Skakun <Roman_Skakun(a)epam.com> dma-mapping: handle vmalloc addresses in dma_common_{mmap,get_sgtable} Dongliang Mu <mudongliangabcd(a)gmail.com> usb: hso: fix error handling code of hso_create_net_device Ziyang Xuan <william.xuanziyang(a)huawei.com> net: fix uninit-value in caif_seqpkt_sendmsg Tobias Klauser <tklauser(a)distanz.ch> bpftool: Check malloc return value in mount_bpffs_for_pin Jakub Sitnicki <jakub(a)cloudflare.com> bpf, sockmap, udp: sk_prot needs inuse_idx set for proc stats John Fastabend <john.fastabend(a)gmail.com> bpf, sockmap, tcp: sk_prot needs inuse_idx set for proc stats John Fastabend <john.fastabend(a)gmail.com> bpf, sockmap: Fix potential memory leak on unlikely error case Colin Ian King <colin.king(a)canonical.com> s390/bpf: Perform r1 range checking before accessing jit->seen_reg[r1] Colin Ian King <colin.king(a)canonical.com> liquidio: Fix unintentional sign extension issue on left shift of u16 Nicolas Saenz Julienne <nsaenzju(a)redhat.com> timers: Fix get_next_timer_interrupt() with no timers pending Xuan Zhuo <xuanzhuo(a)linux.alibaba.com> xdp, net: Fix use-after-free in bpf_xdp_link_release Daniel Borkmann <daniel(a)iogearbox.net> bpf: Fix tail_call_reachable rejection for interpreter when jit failed Xuan Zhuo <xuanzhuo(a)linux.alibaba.com> bpf, test: fix NULL pointer dereference on invalid expected_attach_type Maxim Schwalm <maxim.schwalm(a)gmail.com> ASoC: rt5631: Fix regcache sync errors on resume Peter Hess <peter.hess(a)ph-home.de> spi: mediatek: fix fifo rx mode Axel Lin <axel.lin(a)ingics.com> regulator: hi6421: Fix getting wrong drvdata Axel Lin <axel.lin(a)ingics.com> regulator: hi6421: Use correct variable type for regmap api val argument Alain Volmat <alain.volmat(a)foss.st.com> spi: stm32: fixes pm_runtime calls in probe/remove Clark Wang <xiaoning.wang(a)nxp.com> spi: imx: add a check for speed_hz before calculating the clock Charles Keepax <ckeepax(a)opensource.cirrus.com> ASoC: wm_adsp: Correct wm_coeff_tlv_get handling Yang Jihong <yangjihong1(a)huawei.com> perf sched: Fix record failure when CONFIG_SCHEDSTATS is not set Riccardo Mancini <rickyman7(a)gmail.com> perf data: Close all files in close_dir() Riccardo Mancini <rickyman7(a)gmail.com> perf probe-file: Delete namelist in del_events() on the error path Riccardo Mancini <rickyman7(a)gmail.com> perf lzma: Close lzma stream on exit Riccardo Mancini <rickyman7(a)gmail.com> perf script: Fix memory 'threads' and 'cpus' leaks on exit Riccardo Mancini <rickyman7(a)gmail.com> perf report: Free generated help strings for sort option Riccardo Mancini <rickyman7(a)gmail.com> perf env: Fix memory leak of cpu_pmu_caps Riccardo Mancini <rickyman7(a)gmail.com> perf test maps__merge_in: Fix memory leak of maps Riccardo Mancini <rickyman7(a)gmail.com> perf dso: Fix memory leak in dso__new_map() Riccardo Mancini <rickyman7(a)gmail.com> perf test event_update: Fix memory leak of evlist Riccardo Mancini <rickyman7(a)gmail.com> perf test session_topology: Delete session->evlist Riccardo Mancini <rickyman7(a)gmail.com> perf env: Fix sibling_dies memory leak Riccardo Mancini <rickyman7(a)gmail.com> perf probe: Fix dso->nsinfo refcounting Riccardo Mancini <rickyman7(a)gmail.com> perf map: Fix dso->nsinfo refcounting Riccardo Mancini <rickyman7(a)gmail.com> perf inject: Fix dso->nsinfo refcounting Like Xu <like.xu.linux(a)gmail.com> KVM: x86/pmu: Clear anythread deprecated bit when 0xa leaf is unsupported on the SVM Casey Chen <cachen(a)purestorage.com> nvme-pci: do not call nvme_dev_remove_admin from nvme_remove Jianguo Wu <wujianguo(a)chinatelecom.cn> mptcp: fix warning in __skb_flow_dissect() when do syn cookie for subflow join Antoine Tenart <atenart(a)kernel.org> net: do not reuse skbuff allocated from skbuff_fclone_cache in the skb cache Shahjada Abul Husain <shahjada(a)chelsio.com> cxgb4: fix IRQ free race during driver unload Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> pwm: sprd: Ensure configuring period and duty_cycle isn't wrongly skipped Hangbin Liu <liuhangbin(a)gmail.com> selftests: icmp_redirect: IPv6 PMTU info should be cleared after redirect Hangbin Liu <liuhangbin(a)gmail.com> selftests: icmp_redirect: remove from checking for IPv6 route get YueHaibing <yuehaibing(a)huawei.com> stmmac: platform: Fix signedness bug in stmmac_probe_config_dt() Nicolas Dichtel <nicolas.dichtel(a)6wind.com> ipv6: fix 'disable_policy' for fwd packets Taehee Yoo <ap420073(a)gmail.com> bonding: fix incorrect return value of bond_ipsec_offload_ok() Taehee Yoo <ap420073(a)gmail.com> bonding: fix suspicious RCU usage in bond_ipsec_offload_ok() Taehee Yoo <ap420073(a)gmail.com> bonding: Add struct bond_ipesc to manage SA Taehee Yoo <ap420073(a)gmail.com> bonding: disallow setting nested bonding + ipsec offload Taehee Yoo <ap420073(a)gmail.com> bonding: fix suspicious RCU usage in bond_ipsec_del_sa() Taehee Yoo <ap420073(a)gmail.com> ixgbevf: use xso.real_dev instead of xso.dev in callback functions of struct xfrmdev_ops Taehee Yoo <ap420073(a)gmail.com> bonding: fix null dereference in bond_ipsec_add_sa() Taehee Yoo <ap420073(a)gmail.com> bonding: fix suspicious RCU usage in bond_ipsec_add_sa() Björn Töpel <bjorn.topel(a)intel.com> net: Introduce preferred busy-polling Aleksandr Nogikh <nogikh(a)google.com> net: add kcov handle to skb extensions Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> gve: Fix an error handling path in 'gve_probe()' Jedrzej Jagielski <jedrzej.jagielski(a)intel.com> igb: Fix position of assignment to *ring Aleksandr Loktionov <aleksandr.loktionov(a)intel.com> igb: Check if num of q_vectors is smaller than max before array access Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> iavf: Fix an error handling path in 'iavf_probe()' Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> e1000e: Fix an error handling path in 'e1000_probe()' Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> fm10k: Fix an error handling path in 'fm10k_probe()' Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> igb: Fix an error handling path in 'igb_probe()' Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> igc: Fix an error handling path in 'igc_probe()' Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> ixgbe: Fix an error handling path in 'ixgbe_probe()' Tom Rix <trix(a)redhat.com> igc: change default return of igc_read_phy_reg() Vinicius Costa Gomes <vinicius.gomes(a)intel.com> igb: Fix use-after-free error during reset Vinicius Costa Gomes <vinicius.gomes(a)intel.com> igc: Fix use-after-free error during reset ------------- Diffstat: Documentation/arm64/tagged-address-abi.rst | 26 ++- .../early-userspace/early_userspace_support.rst | 8 +- .../filesystems/ramfs-rootfs-initramfs.rst | 2 +- Documentation/networking/ip-sysctl.rst | 2 +- Documentation/trace/histogram.rst | 2 +- Makefile | 4 +- arch/alpha/include/uapi/asm/socket.h | 2 + arch/mips/include/uapi/asm/socket.h | 2 + arch/nds32/mm/mmap.c | 2 +- arch/parisc/include/uapi/asm/socket.h | 2 + arch/powerpc/kvm/book3s_hv.c | 2 + arch/powerpc/kvm/book3s_hv_nested.c | 20 +++ arch/powerpc/kvm/book3s_rtas.c | 25 ++- arch/powerpc/kvm/powerpc.c | 4 +- arch/s390/boot/text_dma.S | 19 +-- arch/s390/include/asm/ftrace.h | 1 + arch/s390/kernel/ftrace.c | 2 + arch/s390/kernel/mcount.S | 4 +- arch/s390/net/bpf_jit_comp.c | 2 +- arch/sparc/include/uapi/asm/socket.h | 2 + arch/x86/kvm/cpuid.c | 3 +- drivers/acpi/Kconfig | 2 +- drivers/base/core.c | 6 +- drivers/block/rbd.c | 32 ++-- drivers/bus/mhi/core/main.c | 17 +- drivers/firmware/efi/efi.c | 13 +- drivers/firmware/efi/tpm.c | 8 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 1 + drivers/gpu/drm/drm_ioctl.c | 3 + drivers/gpu/drm/i915/gvt/handlers.c | 15 ++ drivers/gpu/drm/i915/i915_request.c | 8 +- .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 1 - drivers/media/pci/ngene/ngene-core.c | 2 +- drivers/media/pci/ngene/ngene.h | 14 +- drivers/misc/eeprom/at24.c | 17 +- drivers/mmc/core/host.c | 20 +-- drivers/net/bonding/bond_main.c | 183 +++++++++++++++++---- drivers/net/dsa/mv88e6xxx/chip.c | 10 ++ drivers/net/dsa/mv88e6xxx/serdes.c | 6 +- drivers/net/dsa/sja1105/sja1105_main.c | 6 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 34 +++- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 9 +- .../ethernet/cavium/liquidio/cn23xx_pf_device.c | 2 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 18 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 3 + drivers/net/ethernet/google/gve/gve_main.c | 5 +- drivers/net/ethernet/hisilicon/hip04_eth.c | 6 +- drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 6 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 1 + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 10 ++ drivers/net/ethernet/intel/e1000e/netdev.c | 1 + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 1 + drivers/net/ethernet/intel/iavf/iavf_main.c | 1 + drivers/net/ethernet/intel/igb/igb_main.c | 15 +- drivers/net/ethernet/intel/igc/igc.h | 2 +- drivers/net/ethernet/intel/igc/igc_main.c | 3 + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +- drivers/net/ethernet/intel/ixgbevf/ipsec.c | 20 ++- drivers/net/ethernet/realtek/r8169_main.c | 3 +- drivers/net/ethernet/sfc/efx_channels.c | 13 +- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 +- drivers/net/usb/hso.c | 33 ++-- drivers/nvme/host/core.c | 5 +- drivers/nvme/host/pci.c | 5 +- drivers/pci/quirks.c | 4 +- drivers/pwm/pwm-sprd.c | 11 +- drivers/regulator/hi6421-regulator.c | 30 ++-- drivers/scsi/scsi_transport_iscsi.c | 90 ++++------ drivers/spi/spi-bcm2835.c | 12 +- drivers/spi/spi-cadence.c | 14 +- drivers/spi/spi-imx.c | 37 +++-- drivers/spi/spi-mt65xx.c | 16 +- drivers/spi/spi-stm32.c | 9 +- drivers/target/target_core_sbc.c | 35 ++-- drivers/usb/core/hub.c | 120 ++++++++++---- drivers/usb/core/quirks.c | 4 - drivers/usb/dwc2/gadget.c | 31 +++- drivers/usb/gadget/udc/tegra-xudc.c | 1 + drivers/usb/host/ehci-hcd.c | 18 +- drivers/usb/host/max3421-hcd.c | 44 ++--- drivers/usb/host/xhci-hub.c | 3 +- drivers/usb/host/xhci-pci-renesas.c | 16 +- drivers/usb/host/xhci-pci.c | 7 + drivers/usb/host/xhci-ring.c | 58 +++++-- drivers/usb/host/xhci.h | 3 +- drivers/usb/renesas_usbhs/fifo.c | 7 + drivers/usb/serial/cp210x.c | 5 +- drivers/usb/serial/option.c | 3 + drivers/usb/storage/unusual_uas.h | 7 + drivers/usb/typec/stusb160x.c | 11 +- fs/afs/cmservice.c | 25 +-- fs/btrfs/extent-tree.c | 3 + fs/ceph/mds_client.c | 2 +- fs/cifs/smb2ops.c | 49 ++++-- fs/eventpoll.c | 2 +- fs/hugetlbfs/inode.c | 2 +- fs/io_uring.c | 18 +- fs/proc/base.c | 2 +- fs/userfaultfd.c | 24 ++- include/drm/drm_ioctl.h | 1 + include/linux/memblock.h | 4 +- include/linux/netdevice.h | 35 ++-- include/linux/skbuff.h | 33 ++++ include/net/bonding.h | 9 +- include/net/busy_poll.h | 5 +- include/net/sock.h | 4 + include/trace/events/afs.h | 67 +++++++- include/uapi/asm-generic/socket.h | 2 + kernel/bpf/verifier.c | 2 + kernel/dma/ops_helpers.c | 12 +- kernel/time/posix-cpu-timers.c | 10 +- kernel/time/timer.c | 8 +- kernel/trace/ring_buffer.c | 28 +++- kernel/trace/trace.c | 4 + kernel/trace/trace_events_hist.c | 22 ++- kernel/trace/trace_synth.h | 2 +- kernel/tracepoint.c | 2 +- lib/Kconfig.debug | 1 + mm/memblock.c | 3 +- net/bpf/test_run.c | 3 + net/caif/caif_socket.c | 3 +- net/core/dev.c | 107 +++++++++--- net/core/skbuff.c | 12 ++ net/core/skmsg.c | 16 +- net/core/sock.c | 9 + net/decnet/af_decnet.c | 27 ++- net/ipv4/tcp_bpf.c | 2 +- net/ipv4/tcp_fastopen.c | 28 +++- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/udp_bpf.c | 2 +- net/ipv6/ip6_output.c | 4 +- net/ipv6/route.c | 2 +- net/mptcp/syncookies.c | 16 +- net/netrom/nr_timer.c | 20 ++- net/sched/act_skbmod.c | 12 +- net/sched/cls_api.c | 2 +- net/sched/cls_tcindex.c | 5 +- net/sctp/auth.c | 2 + net/sctp/socket.c | 4 + sound/core/pcm_native.c | 25 ++- sound/hda/intel-dsp-config.c | 4 + sound/isa/sb/sb16_csp.c | 4 + sound/pci/hda/patch_hdmi.c | 1 + sound/pci/hda/patch_realtek.c | 1 + sound/soc/codecs/rt5631.c | 2 + sound/soc/codecs/wm_adsp.c | 2 +- sound/usb/mixer.c | 10 +- sound/usb/quirks.c | 3 + tools/bpf/bpftool/common.c | 5 + tools/perf/builtin-inject.c | 13 +- tools/perf/builtin-report.c | 33 ++-- tools/perf/builtin-sched.c | 33 +++- tools/perf/builtin-script.c | 7 + tools/perf/tests/event_update.c | 2 +- tools/perf/tests/maps.c | 2 + tools/perf/tests/topology.c | 1 + tools/perf/util/data.c | 2 +- tools/perf/util/dso.c | 4 +- tools/perf/util/env.c | 2 + tools/perf/util/lzma.c | 8 +- tools/perf/util/map.c | 2 + tools/perf/util/probe-event.c | 4 +- tools/perf/util/probe-file.c | 4 +- tools/perf/util/sort.c | 2 +- tools/perf/util/sort.h | 2 +- tools/testing/selftests/net/icmp_redirect.sh | 5 +- tools/testing/selftests/vm/userfaultfd.c | 6 +- 167 files changed, 1515 insertions(+), 637 deletions(-)

2 years, 2 months

7
182
0 0

[PATCH 1/1] KVM: s390: index kvm->arch.idle_mask by vcpu_idx

by Halil Pasic

While in practice vcpu->vcpu_idx == vcpu->vcp_id is often true, it may not always be, and we must not rely on this. Currently kvm->arch.idle_mask is indexed by vcpu_id, which implies that code like for_each_set_bit(vcpu_id, kvm->arch.idle_mask, online_vcpus) { vcpu = kvm_get_vcpu(kvm, vcpu_id); do_stuff(vcpu); } is not legit. The trouble is, we do actually use kvm->arch.idle_mask like this. To fix this problem we have two options. Either use kvm_get_vcpu_by_id(vcpu_id), which would loop to find the right vcpu_id, or switch to indexing via vcpu_idx. The latter is preferable for obvious reasons. Let us make switch from indexing kvm->arch.idle_mask by vcpu_id to indexing it by vcpu_idx. To keep gisa_int.kicked_mask indexed by the same index as idle_mask lets make the same change for it as well. Signed-off-by: Halil Pasic <pasic(a)linux.ibm.com> Fixes: 1ee0bc559dc3 ("KVM: s390: get rid of local_int array") Cc: <stable(a)vger.kernel.org> # 3.15+ --- arch/s390/include/asm/kvm_host.h | 1 + arch/s390/kvm/interrupt.c | 12 ++++++------ arch/s390/kvm/kvm-s390.c | 2 +- arch/s390/kvm/kvm-s390.h | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h index 161a9e12bfb8..630eab0fa176 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host.h @@ -957,6 +957,7 @@ struct kvm_arch{ atomic64_t cmma_dirty_pages; /* subset of available cpu features enabled by user space */ DECLARE_BITMAP(cpu_feat, KVM_S390_VM_CPU_FEAT_NR_BITS); + /* indexed by vcpu_idx */ DECLARE_BITMAP(idle_mask, KVM_MAX_VCPUS); struct kvm_s390_gisa_interrupt gisa_int; struct kvm_s390_pv pv; diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index d548d60caed2..16256e17a544 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -419,13 +419,13 @@ static unsigned long deliverable_irqs(struct kvm_vcpu *vcpu) static void __set_cpu_idle(struct kvm_vcpu *vcpu) { kvm_s390_set_cpuflags(vcpu, CPUSTAT_WAIT); - set_bit(vcpu->vcpu_id, vcpu->kvm->arch.idle_mask); + set_bit(kvm_vcpu_get_idx(vcpu), vcpu->kvm->arch.idle_mask); } static void __unset_cpu_idle(struct kvm_vcpu *vcpu) { kvm_s390_clear_cpuflags(vcpu, CPUSTAT_WAIT); - clear_bit(vcpu->vcpu_id, vcpu->kvm->arch.idle_mask); + clear_bit(kvm_vcpu_get_idx(vcpu), vcpu->kvm->arch.idle_mask); } static void __reset_intercept_indicators(struct kvm_vcpu *vcpu) @@ -3050,18 +3050,18 @@ int kvm_s390_get_irq_state(struct kvm_vcpu *vcpu, __u8 __user *buf, int len) static void __airqs_kick_single_vcpu(struct kvm *kvm, u8 deliverable_mask) { - int vcpu_id, online_vcpus = atomic_read(&kvm->online_vcpus); + int vcpu_idx, online_vcpus = atomic_read(&kvm->online_vcpus); struct kvm_s390_gisa_interrupt *gi = &kvm->arch.gisa_int; struct kvm_vcpu *vcpu; - for_each_set_bit(vcpu_id, kvm->arch.idle_mask, online_vcpus) { - vcpu = kvm_get_vcpu(kvm, vcpu_id); + for_each_set_bit(vcpu_idx, kvm->arch.idle_mask, online_vcpus) { + vcpu = kvm_get_vcpu(kvm, vcpu_idx); if (psw_ioint_disabled(vcpu)) continue; deliverable_mask &= (u8)(vcpu->arch.sie_block->gcr[6] >> 24); if (deliverable_mask) { /* lately kicked but not yet running */ - if (test_and_set_bit(vcpu_id, gi->kicked_mask)) + if (test_and_set_bit(vcpu_idx, gi->kicked_mask)) return; kvm_s390_vcpu_wakeup(vcpu); return; diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 4527ac7b5961..8580543c5bc3 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -4044,7 +4044,7 @@ static int vcpu_pre_run(struct kvm_vcpu *vcpu) kvm_s390_patch_guest_per_regs(vcpu); } - clear_bit(vcpu->vcpu_id, vcpu->kvm->arch.gisa_int.kicked_mask); + clear_bit(kvm_vcpu_get_idx(vcpu), vcpu->kvm->arch.gisa_int.kicked_mask); vcpu->arch.sie_block->icptcode = 0; cpuflags = atomic_read(&vcpu->arch.sie_block->cpuflags); diff --git a/arch/s390/kvm/kvm-s390.h b/arch/s390/kvm/kvm-s390.h index 9fad25109b0d..ecd741ee3276 100644 --- a/arch/s390/kvm/kvm-s390.h +++ b/arch/s390/kvm/kvm-s390.h @@ -79,7 +79,7 @@ static inline int is_vcpu_stopped(struct kvm_vcpu *vcpu) static inline int is_vcpu_idle(struct kvm_vcpu *vcpu) { - return test_bit(vcpu->vcpu_id, vcpu->kvm->arch.idle_mask); + return test_bit(kvm_vcpu_get_idx(vcpu), vcpu->kvm->arch.idle_mask); } static inline int kvm_is_ucontrol(struct kvm *kvm) base-commit: 77dd11439b86e3f7990e4c0c9e0b67dca82750ba -- 2.25.1

2 years, 2 months

5
10
0 0

[PATCH v3] drm/ast: Don't check new mode if CRTC is being disabled

by Thomas Zimmermann

Suspending failed because there's no mode if the CRTC is being disabled. Early-out in this case. This fixes runtime PM for ast. v3: * fixed commit message v2: * added Tested-by/Reported-by tags * added Fixes tags and CC (Sam) * improved comment Signed-off-by: Thomas Zimmermann <tzimmermann(a)suse.de> Reported-by: Cary Garrett <cogarre(a)gmail.com> Tested-by: Cary Garrett <cogarre(a)gmail.com> Fixes: b48e1b6ffd28 ("drm/ast: Add CRTC helpers for atomic modesetting") Cc: Thomas Zimmermann <tzimmermann(a)suse.de> Cc: Gerd Hoffmann <kraxel(a)redhat.com> Cc: Dave Airlie <airlied(a)redhat.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Sam Ravnborg <sam(a)ravnborg.org> Cc: <stable(a)vger.kernel.org> # v5.6+ --- drivers/gpu/drm/ast/ast_mode.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index 7a9f20a2fd303..0cbbb21edb4e1 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -801,6 +801,9 @@ static int ast_crtc_helper_atomic_check(struct drm_crtc *crtc, return -EINVAL; } + if (!state->enable) + return 0; /* no mode checks if CRTC is being disabled */ + ast_state = to_ast_crtc_state(state); format = ast_state->format; -- 2.26.0

2 years, 2 months

3
3
0 0

[PATCH 5.14 000/169] 5.14.15-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.14.15 release. There are 169 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 27 Oct 2021 19:08:09 +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.14.15-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.14.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.14.15-rc1 Fabien Dessenne <fabien.dessenne(a)foss.st.com> pinctrl: stm32: use valid pin identifier in stm32_pinctrl_resume() Nick Desaulniers <ndesaulniers(a)google.com> ARM: 9122/1: select HAVE_FUTEX_CMPXCHG Sasha Neftin <sasha.neftin(a)intel.com> e1000e: Separate TGP board type from SPT Yanfei Xu <yanfei.xu(a)windriver.com> net: mdiobus: Fix memory leak in __mdiobus_register Oliver Neukum <oneukum(a)suse.com> usbnet: sanity check for maxpacket Daniel Borkmann <daniel(a)iogearbox.net> bpf, test, cgroup: Use sk_{alloc,free} for test cases Niklas Schnelle <schnelle(a)linux.ibm.com> s390/pci: fix zpci_zdev_put() on reserve Niklas Schnelle <schnelle(a)linux.ibm.com> s390/pci: cleanup resources only if necessary Dexuan Cui <decui(a)microsoft.com> scsi: core: Fix shost->cmd_per_lun calculation in scsi_add_host_with_dma() Ian Kent <raven(a)themaw.net> autofs: fix wait name hash calculation in autofs_wait() Anitha Chrisanthus <anitha.chrisanthus(a)intel.com> drm/kmb: Limit supported mode to 1080p Edmund Dea <edmund.j.dea(a)intel.com> drm/kmb: Enable alpha blended second plane Maor Dickman <maord(a)nvidia.com> net/mlx5: Lag, change multipath and bonding to be mutually exclusive Mark Bloch <mbloch(a)nvidia.com> net/mlx5: Lag, move lag destruction to a workqueue Yunsheng Lin <linyunsheng(a)huawei.com> net: hns3: fix for miscalculation of rx unused desc Woody Lin <woodylin(a)google.com> sched/scs: Reset the shadow stack when idle_task_exit Marek Szyprowski <m.szyprowski(a)samsung.com> mm/thp: decrease nr_thps in file's mapping on THP split Joy Gu <jgu(a)purestorage.com> scsi: qla2xxx: Fix a memory leak in an error path of qla2x00_process_els() Sreekanth Reddy <sreekanth.reddy(a)broadcom.com> scsi: mpi3mr: Fix duplicate device entries when scanning through sysfs Andrea Parri (Microsoft) <parri.andrea(a)gmail.com> scsi: storvsc: Fix validation for unsolicited incoming packets Mike Christie <michael.christie(a)oracle.com> scsi: iscsi: Fix set_param() handling Srinivasa Rao Mandadapu <srivasam(a)codeaurora.org> ASoC: codec: wcd938x: Add irq config support Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> Input: snvs_pwrkey - add clk handling Kan Liang <kan.liang(a)linux.intel.com> perf/x86/msr: Add Sapphire Rapids CPU support Shunsuke Nakamura <nakamura.shun(a)fujitsu.com> libperf tests: Fix test_stat_cpu Shunsuke Nakamura <nakamura.shun(a)fujitsu.com> libperf test evsel: Fix build error on !x86 architectures Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> spi-mux: Fix false-positive lockdep splats Mark Brown <broonie(a)kernel.org> spi: Fix deadlock when adding SPI controllers on SPI buses Kai Vehmanen <kai.vehmanen(a)linux.intel.com> ALSA: hda: avoid write to STATESTS if controller is in reset Prashant Malani <pmalani(a)chromium.org> platform/x86: intel_scu_ipc: Update timeout value in comment Prashant Malani <pmalani(a)chromium.org> platform/x86: intel_scu_ipc: Increase virtual timeout to 10s Zheyu Ma <zheyuma97(a)gmail.com> isdn: mISDN: Fix sleeping function called from invalid context Herve Codina <herve.codina(a)bootlin.com> ARM: dts: spear3xx: Fix gmac node Herve Codina <herve.codina(a)bootlin.com> net: stmmac: add support for dwmac 3.40a Filipe Manana <fdmanana(a)suse.com> btrfs: deal with errors when checking if a dir entry exists during log replay Takashi Iwai <tiwai(a)suse.de> ALSA: hda: intel: Allow repeatedly probing on codec configuration errors Michael Forney <mforney(a)mforney.org> objtool: Update section header before relocations Michael Forney <mforney(a)mforney.org> objtool: Check for gelf_update_rel[a] failures Arnd Bergmann <arnd(a)arndb.de> bitfield: build kunit tests without structleak plugin Brendan Higgins <brendanhiggins(a)google.com> thunderbolt: build kunit tests without structleak plugin Brendan Higgins <brendanhiggins(a)google.com> device property: build kunit tests without structleak plugin Brendan Higgins <brendanhiggins(a)google.com> iio/test-format: build kunit tests without structleak plugin Brendan Higgins <brendanhiggins(a)google.com> gcc-plugins/structleak: add makefile var for disabling structleak Rob Clark <robdclark(a)chromium.org> drm/msm/a6xx: Serialize GMU communication Xiyu Yang <xiyuyang19(a)fudan.edu.cn> kunit: fix reference count leak in kfree_at_end Chenyi Qiang <chenyi.qiang(a)intel.com> KVM: MMU: Reset mmu->pkru_mask to avoid stale data Yunsheng Lin <linyunsheng(a)huawei.com> net: hns3: fix the max tx size according to user manual Marek Vasut <marex(a)denx.de> drm: mxsfb: Fix NULL pointer dereference crash on unload Peter Gonda <pgonda(a)google.com> KVM: SEV-ES: Set guest_state_protected after VMSA update Nikolay Aleksandrov <nikolay(a)nvidia.com> net: bridge: mcast: use multicast_membership_interval for IGMPv3 Florian Westphal <fw(a)strlen.de> selftests: netfilter: remove stray bash debug line Vegard Nossum <vegard.nossum(a)gmail.com> netfilter: Kconfig: use 'default y' instead of 'm' for bool config option Xiaolong Huang <butterflyhuangxx(a)gmail.com> isdn: cpai: check ctr->cnr to avoid array index out of bound Lin Ma <linma(a)zju.edu.cn> nfc: nci: fix the UAF of rf_conn_info object Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86: remove unnecessary arguments from complete_emulator_pio_in Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86: split the two parts of emulator_pio_in Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86: check for interrupts before deciding whether to exit the fast path Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86: leave vcpu->arch.pio.count alone in emulator_pio_in_out Paolo Bonzini <pbonzini(a)redhat.com> KVM: SEV-ES: reduce ghcb_sa_len to 32 bits Paolo Bonzini <pbonzini(a)redhat.com> KVM: SEV-ES: go over the sev_pio_data buffer in multiple passes if needed Paolo Bonzini <pbonzini(a)redhat.com> KVM: SEV-ES: fix length of string I/O Paolo Bonzini <pbonzini(a)redhat.com> KVM: SEV-ES: keep INS functions together Paolo Bonzini <pbonzini(a)redhat.com> KVM: SEV-ES: clean up kvm_sev_es_ins/outs Paolo Bonzini <pbonzini(a)redhat.com> KVM: SEV-ES: rename guest_ins_data to sev_pio_data Masahiro Kozuka <masa.koz(a)kozuka.jp> KVM: SEV: Flush cache on non-coherent systems before RECEIVE_UPDATE_DATA Paolo Bonzini <pbonzini(a)redhat.com> KVM: nVMX: promptly process interrupts delivered while in guest mode Miaohe Lin <linmiaohe(a)huawei.com> mm, slub: fix incorrect memcg slab count for bulk free Miaohe Lin <linmiaohe(a)huawei.com> mm, slub: fix potential use-after-free in slab_debugfs_fops Miaohe Lin <linmiaohe(a)huawei.com> mm, slub: fix potential memoryleak in kmem_cache_open() Miaohe Lin <linmiaohe(a)huawei.com> mm, slub: fix mismatch between reconstructed freelist depth and cnt Michael Ellerman <mpe(a)ellerman.id.au> powerpc/idle: Don't corrupt back chain when going idle Michael Ellerman <mpe(a)ellerman.id.au> KVM: PPC: Book3S HV: Make idle_kvm_start_guest() return 0 if it went to guest Michael Ellerman <mpe(a)ellerman.id.au> KVM: PPC: Book3S HV: Fix stack handling in idle_kvm_start_guest() Eric W. Biederman <ebiederm(a)xmission.com> ucounts: Fix signal ucount refcounting Eric W. Biederman <ebiederm(a)xmission.com> ucounts: Proper error handling in set_cred_ucounts Eric W. Biederman <ebiederm(a)xmission.com> ucounts: Pair inc_rlimit_ucounts with dec_rlimit_ucoutns in commit_creds Eric W. Biederman <ebiederm(a)xmission.com> ucounts: Move get_ucounts from cred_alloc_blank to key_change_session_keyring DENG Qingfang <dqfext(a)gmail.com> net: dsa: mt7530: correct ds->num_ports Gaosheng Cui <cuigaosheng1(a)huawei.com> audit: fix possible null-pointer dereference in audit_filter_rules Tejun Heo <tj(a)kernel.org> blk-cgroup: blk_cgroup_bio_start() should use irq-safe operations on blkg->iostat_cpu Hans de Goede <hdegoede(a)redhat.com> ASoC: nau8824: Fix headphone vs headset, button-press detection no longer working Takashi Iwai <tiwai(a)suse.de> ASoC: DAPM: Fix missing kctl change notifications Steven Clarkson <sc(a)lambdal.com> ALSA: hda/realtek: Add quirk for Clevo PC50HS Brendan Grieve <brendan(a)grieve.com.au> ALSA: usb-audio: Provide quirk for Sennheiser GSP670 Headset Sean Christopherson <seanjc(a)google.com> mm/secretmem: fix NULL page->mapping dereference in page_is_secretmem() Matthew Wilcox (Oracle) <willy(a)infradead.org> vfs: check fd has read access in kernel_read_file_from_fd() Lukas Bulwahn <lukas.bulwahn(a)gmail.com> elfcore: correct reference to CONFIG_UML Eric Dumazet <edumazet(a)google.com> mm/mempolicy: do not allow illegal MPOL_F_NUMA_BALANCING | MPOL_LOCAL in mbind() Nadav Amit <namit(a)vmware.com> userfaultfd: fix a race between writeprotect and exit_mmap() Peter Xu <peterx(a)redhat.com> mm/userfaultfd: selftests: fix memory corruption with thp enabled Valentin Vidic <vvidic(a)valentin-vidic.from.hr> ocfs2: mount fails with buffer overflow in strlen Jan Kara <jack(a)suse.cz> ocfs2: fix data corruption after conversion from inline format Steven Rostedt (VMware) <rostedt(a)goodmis.org> tracing: Have all levels of checks prevent recursion Jeff Layton <jlayton(a)kernel.org> ceph: fix handling of "meta" errors Jeff Layton <jlayton(a)kernel.org> ceph: skip existing superblocks that are blocklisted or shut down when mounting Zhang Changzhong <zhangchangzhong(a)huawei.com> can: j1939: j1939_xtp_rx_rts_session_new(): abort TP less than 9 bytes Zhang Changzhong <zhangchangzhong(a)huawei.com> can: j1939: j1939_xtp_rx_dat_one(): cancel session if receive TP.DT with error length Ziyang Xuan <william.xuanziyang(a)huawei.com> can: j1939: j1939_netdev_start(): fix UAF for rx_kref of j1939_priv Ziyang Xuan <william.xuanziyang(a)huawei.com> can: j1939: j1939_tp_rxtimer(): fix errant alert in j1939_tp_rxtimer Ziyang Xuan <william.xuanziyang(a)huawei.com> can: isotp: isotp_sendmsg(): fix TX buffer concurrent access in isotp_sendmsg() Ziyang Xuan <william.xuanziyang(a)huawei.com> can: isotp: isotp_sendmsg(): add result check for wait_event_interruptible() Marc Kleine-Budde <mkl(a)pengutronix.de> can: isotp: isotp_sendmsg(): fix return error on FC timeout on TX path Zheyu Ma <zheyuma97(a)gmail.com> can: peak_pci: peak_pci_remove(): fix UAF Stephane Grosjean <s.grosjean(a)peak-system.com> can: peak_usb: pcan_usb_fd_decode_status(): fix back to ERROR_ACTIVE state notification Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> can: rcar_can: fix suspend/resume Vladimir Oltean <vladimir.oltean(a)nxp.com> net: enetc: make sure all traffic classes can send large frames Vladimir Oltean <vladimir.oltean(a)nxp.com> net: enetc: fix ethtool counter name for PM0_TERR Anitha Chrisanthus <anitha.chrisanthus(a)intel.com> drm/kmb: Enable ADV bridge after modeset Anitha Chrisanthus <anitha.chrisanthus(a)intel.com> drm/kmb: Corrected typo in handle_lcd_irq Edmund Dea <edmund.j.dea(a)intel.com> drm/kmb: Disable change of plane parameters Edmund Dea <edmund.j.dea(a)intel.com> drm/kmb: Remove clearing DPHY regs Anitha Chrisanthus <anitha.chrisanthus(a)intel.com> drm/kmb: Work around for higher system clock Dan Johansen <strit(a)manjaro.org> drm/panel: ilitek-ili9881c: Fix sync for Feixin K101-IM2BYL02 panel Emeel Hakim <ehakim(a)nvidia.com> net/mlx5e: IPsec: Fix work queue entry ethernet segment checksum flags Emeel Hakim <ehakim(a)nvidia.com> net/mlx5e: IPsec: Fix a misuse of the software parser's fields Tony Nguyen <anthony.l.nguyen(a)intel.com> ice: Add missing E810 device ids Sasha Neftin <sasha.neftin(a)intel.com> igc: Update I226_K device ID Sasha Neftin <sasha.neftin(a)intel.com> e1000e: Fix packet loss on Tiger Lake and later Yang Yingliang <yangyingliang(a)huawei.com> ptp: Fix possible memory leak in ptp_clock_register() Kurt Kanzenbach <kurt(a)linutronix.de> net: stmmac: Fix E2E delay mechanism Peng Li <lipeng321(a)huawei.com> net: hns3: disable sriov before unload hclge layer Yufeng Mo <moyufeng(a)huawei.com> net: hns3: fix vf reset workqueue cannot exit Yunsheng Lin <linyunsheng(a)huawei.com> net: hns3: schedule the polling again when allocation fails Guangbin Huang <huangguangbin2(a)huawei.com> net: hns3: add limit ets dwrr bandwidth cannot be 0 Guangbin Huang <huangguangbin2(a)huawei.com> net: hns3: reset DWRR of unused tc to zero Jiaran Zhang <zhangjiaran(a)huawei.com> net: hns3: Add configuration of TM QCN error event Nathan Lynch <nathanl(a)linux.ibm.com> powerpc/smp: do not decrement idle task preempt count in CPU offline Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> net: dsa: Fix an error handling path in 'dsa_switch_parse_ports_of()' Randy Dunlap <rdunlap(a)infradead.org> NIOS2: irqflags: rename a redefined register name Paul Blakey <paulb(a)nvidia.com> net/sched: act_ct: Fix byte count on fragmented packets Aleksander Jan Bajkowski <olek2(a)wp.pl> net: dsa: lantiq_gswip: fix register definition Randy Dunlap <rdunlap(a)infradead.org> hamradio: baycom_epp: fix build for UML Stephen Suryaputra <ssuryaextr(a)gmail.com> ipv6: When forwarding count rx stats on the orig netdev Leonard Crestez <cdleonard(a)gmail.com> tcp: md5: Fix overlap between vrf and non-vrf keys Vegard Nossum <vegard.nossum(a)oracle.com> lan78xx: select CRC32 Xin Long <lucien.xin(a)gmail.com> sctp: fix transport encap_port update in sctp_vtag_verify Antoine Tenart <atenart(a)kernel.org> netfilter: ipvs: make global sysctl readonly in non-init netns Xin Long <lucien.xin(a)gmail.com> netfilter: ip6t_rt: fix rt0_hdr parsing in rt_mt6 Brett Creeley <brett.creeley(a)intel.com> ice: Print the api_patch as part of the fw.mgmt.api Michal Swiatkowski <michal.swiatkowski(a)linux.intel.com> ice: fix getting UDP tunnel entry Dave Ertman <david.m.ertman(a)intel.com> ice: Avoid crash from unnecessary IDA free Brett Creeley <brett.creeley(a)intel.com> ice: Fix failure to re-add LAN/RDMA Tx queues Shengjiu Wang <shengjiu.wang(a)nxp.com> ASoC: wm8960: Fix clock configuration on slave mode Gerald Schaefer <gerald.schaefer(a)linux.ibm.com> dma-debug: fix sg checks in debug_dma_map_sg() Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: skip netdev events generated on netns removal Juhee Kang <claudiajkang(a)gmail.com> netfilter: xt_IDLETIMER: fix panic that occurs when timer_type has garbage value Quentin Perret <qperret(a)google.com> KVM: arm64: Release mmap_lock when using VM_SHARED with MTE Quentin Perret <qperret(a)google.com> KVM: arm64: Fix host stage-2 PGD refcount Mark Brown <broonie(a)kernel.org> ASoC: cs4341: Add SPI device ID table Mark Brown <broonie(a)kernel.org> ASoC: pcm179x: Add missing entries SPI to device ID table Shengjiu Wang <shengjiu.wang(a)nxp.com> ASoC: fsl_xcvr: Fix channel swap issue with ARC Peter Rosin <peda(a)axentia.se> ASoC: pcm512x: Mend accesses to the I2S_1 and I2S_2 registers Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/bpf: Emit stf barrier instruction sequences for BPF_NOSPEC Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/security: Add a helper to query stf_barrier type Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/bpf: Validate branch ranges Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/lib: Add helper to check if offset is within conditional branch range Benjamin Coddington <bcodding(a)redhat.com> NFSD: Keep existing listeners on portlist error Guenter Roeck <linux(a)roeck-us.net> xtensa: xtfpga: Try software restart before simulating CPU reset Max Filippov <jcmvbkbc(a)gmail.com> xtensa: xtfpga: use CONFIG_USE_OF instead of CONFIG_OF Yifan Zhang <yifan1.zhang(a)amd.com> drm/amdgpu: init iommu after amdkfd device init Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu/display: fix dependencies for DRM_AMD_DC_SI Hayes Wang <hayeswang(a)realtek.com> r8152: avoid to resubmit rx immediately Jan Beulich <jbeulich(a)suse.com> xen/x86: prevent PVH type from getting clobbered Johannes Thumshirn <johannes.thumshirn(a)wdc.com> block: decode QUEUE_FLAG_HCTX_ACTIVE in debugfs output Eugen Hristev <eugen.hristev(a)microchip.com> ARM: dts: at91: sama5d2_som1_ek: disable ISC node by default Rob Herring <robh(a)kernel.org> arm: dts: vexpress-v2p-ca9: Fix the SMB unit-address Geert Uytterhoeven <geert+renesas(a)glider.be> sh: pgtable-3level: fix cast to pointer from integer of different size Helge Deller <deller(a)gmx.de> parisc: math-emu: Fix fall-through warnings Geert Uytterhoeven <geert(a)linux-m68k.org> block/mq-deadline: Move dd_queued() to fix defined but not used warning ------------- Diffstat: Documentation/networking/devlink/ice.rst | 9 +- Makefile | 4 +- arch/arm/Kconfig | 1 + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 1 - arch/arm/boot/dts/spear3xx.dtsi | 2 +- arch/arm/boot/dts/vexpress-v2m.dtsi | 2 +- arch/arm/boot/dts/vexpress-v2p-ca9.dts | 2 +- arch/arm64/kvm/hyp/include/nvhe/gfp.h | 1 + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 13 +- arch/arm64/kvm/hyp/nvhe/page_alloc.c | 14 ++ arch/arm64/kvm/mmu.c | 6 +- arch/nios2/include/asm/irqflags.h | 4 +- arch/nios2/include/asm/registers.h | 2 +- arch/parisc/math-emu/fpudispatch.c | 56 ++++++- arch/powerpc/include/asm/code-patching.h | 1 + arch/powerpc/include/asm/security_features.h | 5 + arch/powerpc/kernel/idle_book3s.S | 10 +- arch/powerpc/kernel/security.c | 5 + arch/powerpc/kernel/smp.c | 2 - arch/powerpc/kvm/book3s_hv_rmhandlers.S | 28 ++-- arch/powerpc/lib/code-patching.c | 7 +- arch/powerpc/net/bpf_jit.h | 33 ++-- arch/powerpc/net/bpf_jit64.h | 8 +- arch/powerpc/net/bpf_jit_comp.c | 6 +- arch/powerpc/net/bpf_jit_comp32.c | 8 +- arch/powerpc/net/bpf_jit_comp64.c | 63 +++++++- arch/s390/include/asm/pci.h | 2 + arch/s390/pci/pci.c | 48 +++++- arch/s390/pci/pci_event.c | 4 +- arch/sh/include/asm/pgtable-3level.h | 2 +- arch/x86/events/msr.c | 1 + arch/x86/include/asm/kvm_host.h | 3 +- arch/x86/kvm/mmu/mmu.c | 6 +- arch/x86/kvm/svm/sev.c | 16 +- arch/x86/kvm/svm/svm.h | 2 +- arch/x86/kvm/vmx/vmx.c | 17 +- arch/x86/kvm/x86.c | 150 ++++++++++++------ arch/x86/xen/enlighten.c | 9 +- arch/xtensa/platforms/xtfpga/setup.c | 12 +- block/blk-cgroup.c | 5 +- block/blk-mq-debugfs.c | 1 + block/mq-deadline.c | 12 +- drivers/base/test/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 +- drivers/gpu/drm/amd/display/Kconfig | 2 + drivers/gpu/drm/kmb/kmb_crtc.c | 41 ++++- drivers/gpu/drm/kmb/kmb_drv.c | 10 +- drivers/gpu/drm/kmb/kmb_drv.h | 13 ++ drivers/gpu/drm/kmb/kmb_dsi.c | 25 +-- drivers/gpu/drm/kmb/kmb_dsi.h | 2 +- drivers/gpu/drm/kmb/kmb_plane.c | 122 +++++++++++++-- drivers/gpu/drm/kmb/kmb_plane.h | 11 +- drivers/gpu/drm/kmb/kmb_regs.h | 3 + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 3 + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 40 ++++- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 6 +- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 12 +- drivers/iio/test/Makefile | 1 + drivers/input/keyboard/snvs_pwrkey.c | 29 ++++ drivers/isdn/capi/kcapi.c | 5 + drivers/isdn/hardware/mISDN/netjet.c | 2 +- drivers/net/can/rcar/rcar_can.c | 20 ++- drivers/net/can/sja1000/peak_pci.c | 9 +- drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 5 +- drivers/net/dsa/lantiq_gswip.c | 2 +- drivers/net/dsa/mt7530.c | 8 +- .../net/ethernet/freescale/enetc/enetc_ethtool.c | 2 +- drivers/net/ethernet/freescale/enetc/enetc_pf.c | 5 +- drivers/net/ethernet/hisilicon/hns3/hnae3.c | 21 +++ drivers/net/ethernet/hisilicon/hns3/hnae3.h | 1 + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 37 +++-- drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 7 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 9 ++ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 5 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h | 2 + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 1 + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 6 +- drivers/net/ethernet/intel/e1000e/e1000.h | 4 +- drivers/net/ethernet/intel/e1000e/ich8lan.c | 31 +++- drivers/net/ethernet/intel/e1000e/ich8lan.h | 3 + drivers/net/ethernet/intel/e1000e/netdev.c | 29 ++-- drivers/net/ethernet/intel/ice/ice_common.c | 2 + drivers/net/ethernet/intel/ice/ice_devids.h | 4 + drivers/net/ethernet/intel/ice/ice_devlink.c | 3 +- drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 4 +- drivers/net/ethernet/intel/ice/ice_lib.c | 9 ++ drivers/net/ethernet/intel/ice/ice_main.c | 8 +- drivers/net/ethernet/intel/ice/ice_sched.c | 13 ++ drivers/net/ethernet/intel/ice/ice_sched.h | 1 + drivers/net/ethernet/intel/igc/igc_hw.h | 2 +- .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 2 + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 51 +++--- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 20 +-- drivers/net/ethernet/mellanox/mlx5/core/lag.c | 19 ++- drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 13 +- drivers/net/ethernet/mellanox/mlx5/core/lag_mp.h | 2 + .../net/ethernet/stmicro/stmmac/dwmac-generic.c | 1 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 + drivers/net/hamradio/baycom_epp.c | 6 +- drivers/net/phy/mdio_bus.c | 1 + drivers/net/usb/Kconfig | 1 + drivers/net/usb/r8152.c | 16 +- drivers/net/usb/usbnet.c | 4 + drivers/pci/hotplug/s390_pci_hpc.c | 9 +- drivers/pinctrl/stm32/pinctrl-stm32.c | 4 +- drivers/platform/x86/intel_scu_ipc.c | 4 +- drivers/ptp/ptp_clock.c | 15 +- drivers/scsi/hosts.c | 3 +- drivers/scsi/mpi3mr/mpi3mr_os.c | 2 +- drivers/scsi/qla2xxx/qla_bsg.c | 2 +- drivers/scsi/scsi_transport_iscsi.c | 2 - drivers/scsi/storvsc_drv.c | 32 ++-- drivers/spi/spi-mux.c | 7 + drivers/spi/spi.c | 27 ++-- drivers/thunderbolt/Makefile | 1 + fs/autofs/waitq.c | 2 +- fs/btrfs/tree-log.c | 47 +++--- fs/ceph/caps.c | 12 +- fs/ceph/file.c | 1 - fs/ceph/inode.c | 2 - fs/ceph/mds_client.c | 17 +- fs/ceph/super.c | 17 +- fs/ceph/super.h | 3 - fs/kernel_read_file.c | 2 +- fs/nfsd/nfsctl.c | 5 +- fs/ocfs2/alloc.c | 46 ++---- fs/ocfs2/super.c | 14 +- fs/userfaultfd.c | 12 +- include/linux/elfcore.h | 2 +- include/linux/mlx5/driver.h | 1 - include/linux/secretmem.h | 2 +- include/linux/spi/spi.h | 3 + include/linux/trace_recursion.h | 49 ++---- include/linux/user_namespace.h | 2 + include/net/sctp/sm.h | 6 +- include/sound/hda_codec.h | 1 + kernel/auditsc.c | 2 +- kernel/cred.c | 9 +- kernel/dma/debug.c | 12 +- kernel/sched/core.c | 1 + kernel/signal.c | 25 +-- kernel/trace/ftrace.c | 4 +- kernel/ucount.c | 49 ++++++ lib/Makefile | 2 +- lib/kunit/executor_test.c | 4 +- mm/huge_memory.c | 6 +- mm/mempolicy.c | 16 +- mm/slub.c | 23 ++- net/bpf/test_run.c | 14 +- net/bridge/br_private.h | 4 +- net/can/isotp.c | 51 ++++-- net/can/j1939/j1939-priv.h | 1 + net/can/j1939/main.c | 7 +- net/can/j1939/transport.c | 14 +- net/dsa/dsa2.c | 9 +- net/ipv4/tcp_ipv4.c | 19 ++- net/ipv6/ip6_output.c | 3 +- net/ipv6/netfilter/ip6t_rt.c | 48 +----- net/netfilter/Kconfig | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 5 + net/netfilter/nft_chain_filter.c | 9 +- net/netfilter/xt_IDLETIMER.c | 2 +- net/nfc/nci/rsp.c | 2 + net/sched/act_ct.c | 2 +- scripts/Makefile.gcc-plugins | 4 + security/keys/process_keys.c | 8 + sound/hda/hdac_controller.c | 5 +- sound/pci/hda/hda_bind.c | 20 +-- sound/pci/hda/hda_codec.c | 1 + sound/pci/hda/hda_controller.c | 24 ++- sound/pci/hda/hda_controller.h | 2 +- sound/pci/hda/hda_intel.c | 29 +++- sound/pci/hda/hda_intel.h | 4 +- sound/pci/hda/patch_realtek.c | 1 + sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/cs4341.c | 7 + sound/soc/codecs/nau8824.c | 4 +- sound/soc/codecs/pcm179x-spi.c | 1 + sound/soc/codecs/pcm512x.c | 2 + sound/soc/codecs/wm8960.c | 13 +- sound/soc/fsl/fsl_xcvr.c | 17 +- sound/soc/soc-dapm.c | 13 +- sound/usb/quirks-table.h | 32 ++++ tools/lib/perf/tests/test-evlist.c | 6 +- tools/lib/perf/tests/test-evsel.c | 7 +- tools/objtool/elf.c | 56 +++---- tools/testing/selftests/net/forwarding/Makefile | 1 + .../net/forwarding/forwarding.config.sample | 2 + .../net/forwarding/ip6_forward_instats_vrf.sh | 172 +++++++++++++++++++++ tools/testing/selftests/net/forwarding/lib.sh | 8 + tools/testing/selftests/netfilter/nft_flowtable.sh | 1 - tools/testing/selftests/vm/userfaultfd.c | 23 ++- 196 files changed, 1761 insertions(+), 731 deletions(-)

2 years, 3 months

9
180
0 0

[PATCH] gpio: dln2: Fix interrupts when replugging the device

by Noralf Trønnes

When replugging the device the following message shows up: gpio gpiochip2: (dln2): detected irqchip that is shared with multiple gpiochips: please fix the driver. This also has the effect that interrupts won't work. The same problem would also show up if multiple devices where plugged in. Fix this by allocating the irq_chip data structure per instance like other drivers do. I don't know when this problem appeared, but it is present in 5.10. Cc: <stable(a)vger.kernel.org> # 5.10+ Cc: Daniel Baluta <daniel.baluta(a)gmail.com> Signed-off-by: Noralf Trønnes <noralf(a)tronnes.org> --- drivers/gpio/gpio-dln2.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/gpio/gpio-dln2.c b/drivers/gpio/gpio-dln2.c index 4c5f6d0c8d74..22f11dd5210d 100644 --- a/drivers/gpio/gpio-dln2.c +++ b/drivers/gpio/gpio-dln2.c @@ -46,6 +46,7 @@ struct dln2_gpio { struct platform_device *pdev; struct gpio_chip gpio; + struct irq_chip irqchip; /* * Cache pin direction to save us one transfer, since the hardware has @@ -383,15 +384,6 @@ static void dln2_irq_bus_unlock(struct irq_data *irqd) mutex_unlock(&dln2->irq_lock); } -static struct irq_chip dln2_gpio_irqchip = { - .name = "dln2-irq", - .irq_mask = dln2_irq_mask, - .irq_unmask = dln2_irq_unmask, - .irq_set_type = dln2_irq_set_type, - .irq_bus_lock = dln2_irq_bus_lock, - .irq_bus_sync_unlock = dln2_irq_bus_unlock, -}; - static void dln2_gpio_event(struct platform_device *pdev, u16 echo, const void *data, int len) { @@ -477,8 +469,15 @@ static int dln2_gpio_probe(struct platform_device *pdev) dln2->gpio.direction_output = dln2_gpio_direction_output; dln2->gpio.set_config = dln2_gpio_set_config; + dln2->irqchip.name = "dln2-irq", + dln2->irqchip.irq_mask = dln2_irq_mask, + dln2->irqchip.irq_unmask = dln2_irq_unmask, + dln2->irqchip.irq_set_type = dln2_irq_set_type, + dln2->irqchip.irq_bus_lock = dln2_irq_bus_lock, + dln2->irqchip.irq_bus_sync_unlock = dln2_irq_bus_unlock, + girq = &dln2->gpio.irq; - girq->chip = &dln2_gpio_irqchip; + girq->chip = &dln2->irqchip; /* The event comes from the outside so no parent handler */ girq->parent_handler = NULL; girq->num_parents = 0; -- 2.33.0

2 years, 4 months

3
5
0 0

[PATCH] remoteproc: qcom: pas: Add missing power-domain "mxc" for CDSP

by Sibi Sankar

Add missing power-domain "mxc" required by CDSP PAS remoteproc on SM8350 SoC. Fixes: e8b4e9a21af7 ("remoteproc: qcom: pas: Add SM8350 PAS remoteprocs") Signed-off-by: Sibi Sankar <sibis(a)codeaurora.org> Cc: stable(a)vger.kernel.org --- The device tree and pas documentation lists mcx as a required pd for cdsp. Looks like it was missed while adding the proxy pds in the pas driver. Bjorn/Vinod you'll need to test this patch before picking it up. drivers/remoteproc/qcom_q6v5_pas.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index b921fc26cd04..ad20065dbdea 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -661,6 +661,7 @@ static const struct adsp_data sm8350_cdsp_resource = { }, .proxy_pd_names = (char*[]){ "cx", + "mxc", NULL }, .ssr_name = "cdsp", -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

2 years, 4 months

2
2
0 0

Re: [PATCH v5 1/2] x86/PCI: Ignore E820 reservations for bridge windows on newer systems

by Bjorn Helgaas

On Wed, Oct 20, 2021 at 12:23:26PM +0200, Hans de Goede wrote: > On 10/19/21 23:52, Bjorn Helgaas wrote: > > On Thu, Oct 14, 2021 at 08:39:42PM +0200, Hans de Goede wrote: > >> Some BIOS-es contain a bug where they add addresses which map to system > >> RAM in the PCI host bridge window returned by the ACPI _CRS method, see > >> commit 4dc2287c1805 ("x86: avoid E820 regions when allocating address > >> space"). > >> > >> To work around this bug Linux excludes E820 reserved addresses when > >> allocating addresses from the PCI host bridge window since 2010. > >> ... > > I haven't seen anybody else eager to merge this, so I guess I'll stick > > my neck out here. > > > > I applied this to my for-linus branch for v5.15. > > Thank you, and sorry about the build-errors which the lkp > kernel-test-robot found. > > I've just send out a patch which fixes these build-errors > (verified with both .config-s from the lkp reports). > Feel free to squash this into the original patch (or keep > them separate, whatever works for you). Thanks, I squashed the fix in. HOWEVER, I think it would be fairly risky to push this into v5.15. We would be relying on the assumption that current machines have all fixed the BIOS defect that 4dc2287c1805 addressed, and we have little evidence for that. I'm not sure there's significant benefit to having this in v5.15. Yes, the mainline v5.15 kernel would work on the affected machines, but I suspect most people with those machines are running distro kernels, not mainline kernels. This issue has been around a long time, so it's not like a regression that we just introduced. If we fixed these machines and regressed *other* machines, we'd be worse off than we are now. Convince me otherwise if you see this differently :) In the meantime, here's another possibility for working around this. What if we discarded remove_e820_regions() completely, but aligned the problem _CRS windows a little more? The 4dc2287c1805 case was this: BIOS-e820: 00000000bfe4dc00 - 00000000c0000000 (reserved) pci_root PNP0A03:00: host bridge window [mem 0xbff00000-0xdfffffff] where the _CRS window was of size 0x20100000, i.e., 512M + 1M. At least in this particular case, we could avoid the problem by throwing away that first 1M and aligning the window to a nice 3G boundary. Maybe it would be worth giving up a small fraction (less than 0.2% in this case) of questionable windows like this? Bjorn

2 years, 4 months

3
12
0 0

[PATCH v2] x86/setup: call early_reserve_memory() earlier

by Juergen Gross

Commit a799c2bd29d19c565 ("x86/setup: Consolidate early memory reservations") introduced early_reserve_memory() to do all needed initial memblock_reserve() calls in one function. Unfortunately the call of early_reserve_memory() is done too late for Xen dom0, as in some cases a Xen hook called by e820__memory_setup() will need those memory reservations to have happened already. Move the call of early_reserve_memory() before the call of e820__memory_setup() in order to avoid such problems. Cc: stable(a)vger.kernel.org Fixes: a799c2bd29d19c565 ("x86/setup: Consolidate early memory reservations") Reported-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> Signed-off-by: Juergen Gross <jgross(a)suse.com> --- V2: - update comment (Jan Beulich, Boris Petkov) - move call down in setup_arch() (Mike Galbraith) --- arch/x86/kernel/setup.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 79f164141116..40ed44ead063 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -830,6 +830,20 @@ void __init setup_arch(char **cmdline_p) x86_init.oem.arch_setup(); + /* + * Do some memory reservations *before* memory is added to memblock, so + * memblock allocations won't overwrite it. + * + * After this point, everything still needed from the boot loader or + * firmware or kernel text should be early reserved or marked not RAM in + * e820. All other memory is free game. + * + * This call needs to happen before e820__memory_setup() which calls the + * xen_memory_setup() on Xen dom0 which relies on the fact that those + * early reservations have happened already. + */ + early_reserve_memory(); + iomem_resource.end = (1ULL << boot_cpu_data.x86_phys_bits) - 1; e820__memory_setup(); parse_setup_data(); @@ -876,18 +890,6 @@ void __init setup_arch(char **cmdline_p) parse_early_param(); - /* - * Do some memory reservations *before* memory is added to - * memblock, so memblock allocations won't overwrite it. - * Do it after early param, so we could get (unlikely) panic from - * serial. - * - * After this point everything still needed from the boot loader or - * firmware or kernel text should be early reserved or marked not - * RAM in e820. All other memory is free game. - */ - early_reserve_memory(); - #ifdef CONFIG_MEMORY_HOTPLUG /* * Memory used by the kernel cannot be hot-removed because Linux -- 2.26.2

2 years, 4 months

12
24
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror October 2021