December 2021 - Linux-stable-mirror

Re: [PATCH 2/2] arm64: dts: juno: Enable more SMMUs

by Robin Murphy

On 2021-07-30 12:35, Anders Roxell wrote: > From: Robin Murphy <robin.murphy(a)arm.com> > >> Now that PCI inbound window restrictions are handled generically between >> the of_pci resource parsing and the IOMMU layer, and described in the >> Juno DT, we can finally enable the PCIe SMMU without the risk of DMA >> mappings inadvertently allocating unusable addresses. >> >> Similarly, the relevant support for IOMMU mappings for peripheral >> transfers has been hooked up in the pl330 driver for ages, so we can >> happily enable the DMA SMMU without that breaking anything either. >> >> Signed-off-by: Robin Murphy <robin.murphy(a)arm.com> > > When we build a kernel with 64k page size and run the ltp syscalls we > sporadically see a kernel crash while doing a mkfs on a connected SATA > drive. This is happening every third test run on any juno-r2 device in > the lab with the same kernel image (stable-rc 5.13.y, mainline and next) > with gcc-11. Hmm, I guess 64K pages might make a difference in that we'll chew through IOVA space a lot faster with small mappings... I'll have to try to reproduce this locally, since the interesting thing would be knowing what DMA address it was trying to use that went wrong, but IOMMU tracepoints and/or dma-debug are going to generate an crazy amount of data to sift through and try to correlate - having done it before it's not something I'd readily ask someone else to do for me :) On a hunch, though, does it make any difference if you remove the first entry from the PCIe "dma-ranges" (the 0x2c1c0000 one)? Robin. > Here is a snippet of the boot log [1]: > > + mkfs -t ext4 /dev/disk/by-id/ata-SanDisk_SDSSDA120G_165192443611 > mke2fs 1.43.8 (1-Jan-2018) > Discarding device blocks: 4096/29305200 > [ 55.344291] ata1.00: exception Emask 0x0 SAct 0x0 SErr 0x0 action 0x6 > frozen > [ 55.351423] ata1.00: irq_stat 0x00020002, failed to transmit command > FIS > [ 55.358205] ata1.00: failed command: DATA SET MANAGEMENT > [ 55.363561] ata1.00: cmd 06/01:01:00:00:00/00:00:00:00:00/a0 tag 12 > dma 512 out > [ 55.363561] res ec/ff:00:00:00:00/00:00:00:00:ec/00 Emask > 0x12 (ATA bus error) > [ 55.378955] ata1.00: status: { Busy } > [ 55.382658] ata1.00: error: { ICRC UNC AMNF IDNF ABRT } > [ 55.387947] ata1: hard resetting link > [ 55.391653] ata1: controller in dubious state, performing PORT_RST > [ 57.588447] ata1: SATA link up 3.0 Gbps (SStatus 123 SControl 0) > [ 57.613471] ata1.00: configured for UDMA/100 > [ 57.617866] ata1.00: device reported invalid CHS sector 0 > [ 57.623397] ata1: EH complete > > > When we revert this patch we don't see any issue. > > Reported-by: Linux Kernel Functional Testing <lkft(a)linaro.org> > > Cheers, > Anders > [1] > https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.13.y/build/v5.13… >

2 years, 6 months

4
9
0 0

[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, 6 months

3
5
0 0

Re: uring regression - lost write request

by Jens Axboe

On 11/24/21 8:28 AM, Jens Axboe wrote: > On 11/23/21 8:27 PM, Daniel Black wrote: >> On Mon, Nov 15, 2021 at 7:55 AM Jens Axboe <axboe(a)kernel.dk> wrote: >>> >>> On 11/14/21 1:33 PM, Daniel Black wrote: >>>> On Fri, Nov 12, 2021 at 10:44 AM Jens Axboe <axboe(a)kernel.dk> wrote: >>>>> >>>>> Alright, give this one a go if you can. Against -git, but will apply to >>>>> 5.15 as well. >>>> >>>> >>>> Works. Thank you very much. >>>> >>>> https://jira.mariadb.org/browse/MDEV-26674?page=com.atlassian.jira.plugin.s… >>>> >>>> Tested-by: Marko Mäkelä <marko.makela(a)mariadb.com> >>> >>> The patch is already upstream (and in the 5.15 stable queue), and I >>> provided 5.14 patches too. >> >> Jens, >> >> I'm getting the same reproducer on 5.14.20 >> (https://bugzilla.redhat.com/show_bug.cgi?id=2018882#c3) though the >> backport change logs indicate 5.14.19 has the patch. >> >> Anything missing? > > We might also need another patch that isn't in stable, I'm attaching > it here. Any chance you can run 5.14.20/21 with this applied? If not, > I'll do some sanity checking here and push it to -stable. Looks good to me - Greg, would you mind queueing this up for 5.14-stable? -- Jens Axboe

2 years, 7 months

4
9
0 0

[PATCH] io_uring: prevent io_put_identity() from freeing a static identity

by Tadeusz Struk

Note: this applies to 5.10 stable only. It doesn't trigger on anything above 5.10 as the code there has been substantially reworked. This also doesn't apply to any stable kernel below 5.10 afaict. Syzbot found a bug: KASAN: invalid-free in io_dismantle_req https://syzkaller.appspot.com/bug?id=123d9a852fc88ba573ffcb2dbcf4f9576c3b05… The test submits bunch of io_uring writes and exits, which then triggers uring_task_cancel() and io_put_identity(), which in some corner cases, tries to free a static identity. This causes a panic as shown in the trace below: BUG: KASAN: double-free or invalid-free in kfree+0xd5/0x310 CPU: 0 PID: 4618 Comm: repro Not tainted 5.10.76-05281-g4944ec82ebb9-dirty #17 Call Trace: dump_stack_lvl+0x1b2/0x21b print_address_description+0x8d/0x3b0 kasan_report_invalid_free+0x58/0x130 ____kasan_slab_free+0x14b/0x170 __kasan_slab_free+0x11/0x20 slab_free_freelist_hook+0xcc/0x1a0 kfree+0xd5/0x310 io_dismantle_req+0x9b0/0xd90 io_do_iopoll+0x13a4/0x23e0 io_iopoll_try_reap_events+0x116/0x290 io_uring_cancel_task_requests+0x197d/0x1ee0 io_uring_flush+0x170/0x6d0 filp_close+0xb0/0x150 put_files_struct+0x1d4/0x350 exit_files+0x80/0xa0 do_exit+0x6d9/0x2390 do_group_exit+0x16a/0x2d0 get_signal+0x133e/0x1f80 arch_do_signal+0x7b/0x610 exit_to_user_mode_prepare+0xaa/0xe0 syscall_exit_to_user_mode+0x24/0x40 do_syscall_64+0x3d/0x70 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Allocated by task 4611: ____kasan_kmalloc+0xcd/0x100 __kasan_kmalloc+0x9/0x10 kmem_cache_alloc_trace+0x208/0x390 io_uring_alloc_task_context+0x57/0x550 io_uring_add_task_file+0x1f7/0x290 io_uring_create+0x2195/0x3490 __x64_sys_io_uring_setup+0x1bf/0x280 do_syscall_64+0x31/0x70 entry_SYSCALL_64_after_hwframe+0x44/0xa9 The buggy address belongs to the object at ffff88810732b500 which belongs to the cache kmalloc-192 of size 192 The buggy address is located 88 bytes inside of 192-byte region [ffff88810732b500, ffff88810732b5c0) Kernel panic - not syncing: panic_on_warn set ... This issue bisected to this commit: commit 186725a80c4e ("io_uring: fix skipping disabling sqo on exec") Simple reverting the offending commit doesn't work as it hits some other, related issues like: /* sqo_dead check is for when this happens after cancellation */ WARN_ON_ONCE(ctx->sqo_task == current && !ctx->sqo_dead && !xa_load(&tctx->xa, (unsigned long)file)); ------------[ cut here ]------------ WARNING: CPU: 1 PID: 5622 at fs/io_uring.c:8960 io_uring_flush+0x5bc/0x6d0 Modules linked in: CPU: 1 PID: 5622 Comm: repro Not tainted 5.10.76-05281-g4944ec82ebb9-dirty #16 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.14.0-6.fc35 04/01/2014 RIP: 0010:io_uring_flush+0x5bc/0x6d0 Call Trace: filp_close+0xb0/0x150 put_files_struct+0x1d4/0x350 reset_files_struct+0x88/0xa0 bprm_execve+0x7f2/0x9f0 do_execveat_common+0x46f/0x5d0 __x64_sys_execve+0x92/0xb0 do_syscall_64+0x31/0x70 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Changing __io_uring_task_cancel() to call io_disable_sqo_submit() directly, as the comment suggests, only if __io_uring_files_cancel() is not executed seems to fix the issue. Cc: Jens Axboe <axboe(a)kernel.dk> Cc: Alexander Viro <viro(a)zeniv.linux.org.uk> Cc: <io-uring(a)vger.kernel.org> Cc: <linux-fsdevel(a)vger.kernel.org> Cc: <linux-kernel(a)vger.kernel.org> Cc: <stable(a)vger.kernel.org> Reported-by: syzbot+6055980d041c8ac23307(a)syzkaller.appspotmail.com Signed-off-by: Tadeusz Struk <tadeusz.struk(a)linaro.org> --- fs/io_uring.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 0736487165da..fcf9ffe9b209 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -8882,20 +8882,18 @@ void __io_uring_task_cancel(void) struct io_uring_task *tctx = current->io_uring; DEFINE_WAIT(wait); s64 inflight; + int canceled = 0; /* make sure overflow events are dropped */ atomic_inc(&tctx->in_idle); - /* trigger io_disable_sqo_submit() */ - if (tctx->sqpoll) - __io_uring_files_cancel(NULL); - do { /* read completions before cancelations */ inflight = tctx_inflight(tctx); if (!inflight) break; __io_uring_files_cancel(NULL); + canceled = 1; prepare_to_wait(&tctx->wait, &wait, TASK_UNINTERRUPTIBLE); @@ -8909,6 +8907,21 @@ void __io_uring_task_cancel(void) finish_wait(&tctx->wait, &wait); } while (1); + /* + * trigger io_disable_sqo_submit() + * if not already done by __io_uring_files_cancel() + */ + if (tctx->sqpoll && !canceled) { + struct file *file; + unsigned long index; + + xa_for_each(&tctx->xa, index, file) { + struct io_ring_ctx *ctx = file->private_data; + + io_disable_sqo_submit(ctx); + } + } + atomic_dec(&tctx->in_idle); io_uring_remove_task_files(tctx); -- 2.33.1

2 years, 7 months

1
3
0 0

[PATCH] ARM: davinci: da850-evm: Avoid NULL pointer dereference

by Nathan Chancellor

With newer versions of GCC, there is a panic in da850_evm_config_emac() when booting multi_v5_defconfig in QEMU under the palmetto-bmc machine: Unable to handle kernel NULL pointer dereference at virtual address 00000020 pgd = (ptrval) [00000020] *pgd=00000000 Internal error: Oops: 5 [#1] PREEMPT ARM Modules linked in: CPU: 0 PID: 1 Comm: swapper Not tainted 5.15.0 #1 Hardware name: Generic DT based system PC is at da850_evm_config_emac+0x1c/0x120 LR is at do_one_initcall+0x50/0x1e0 The emac_pdata pointer in soc_info is NULL because davinci_soc_info only gets populated on davinci machines but da850_evm_config_emac() is called on all machines via device_initcall(). Move the rmii_en assignment below the machine check so that it is only dereferenced when running on a supported SoC. Cc: stable(a)vger.kernel.org Fixes: bae105879f2f ("davinci: DA850/OMAP-L138 EVM: implement autodetect of RMII PHY") Link: https://lore.kernel.org/r/YcS4xVWs6bQlQSPC@archlinux-ax161/ Reviewed-by: Arnd Bergmann <arnd(a)arndb.de> Signed-off-by: Nathan Chancellor <nathan(a)kernel.org> --- arch/arm/mach-davinci/board-da850-evm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index 428012687a80..7f7f6bae21c2 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -1101,11 +1101,13 @@ static int __init da850_evm_config_emac(void) int ret; u32 val; struct davinci_soc_info *soc_info = &davinci_soc_info; - u8 rmii_en = soc_info->emac_pdata->rmii_en; + u8 rmii_en; if (!machine_is_davinci_da850_evm()) return 0; + rmii_en = soc_info->emac_pdata->rmii_en; + cfg_chip3_base = DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP3_REG); val = __raw_readl(cfg_chip3_base); base-commit: a7904a538933c525096ca2ccde1e60d0ee62c08e -- 2.34.1

2 years, 7 months

2
2
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, 7 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, 7 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, 7 months

5
10
0 0

[PATCH 2/4] media: davinci: vpif: fix unbalanced runtime PM enable

by Johan Hovold

Make sure to disable runtime PM before returning on probe errors. Fixes: 479f7a118105 ("[media] davinci: vpif: adaptions for DT support") Cc: stable(a)vger.kernel.org # 4.12: 4024d6f601e3c Cc: Kevin Hilman <khilman(a)baylibre.com> Signed-off-by: Johan Hovold <johan(a)kernel.org> --- drivers/media/platform/davinci/vpif.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c index 9752a5ec36f7..1f5eacf48580 100644 --- a/drivers/media/platform/davinci/vpif.c +++ b/drivers/media/platform/davinci/vpif.c @@ -428,6 +428,7 @@ static int vpif_probe(struct platform_device *pdev) static struct resource *res_irq; struct platform_device *pdev_capture, *pdev_display; struct device_node *endpoint = NULL; + int ret; vpif_base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(vpif_base)) @@ -456,8 +457,8 @@ static int vpif_probe(struct platform_device *pdev) res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); if (!res_irq) { dev_warn(&pdev->dev, "Missing IRQ resource.\n"); - pm_runtime_put(&pdev->dev); - return -EINVAL; + ret = -EINVAL; + goto err_put_rpm; } pdev_capture = devm_kzalloc(&pdev->dev, sizeof(*pdev_capture), @@ -491,6 +492,12 @@ static int vpif_probe(struct platform_device *pdev) } return 0; + +err_put_rpm: + pm_runtime_put(&pdev->dev); + pm_runtime_disable(&pdev->dev); + + return ret; } static int vpif_remove(struct platform_device *pdev) -- 2.32.0

2 years, 7 months

2
2
0 0

[PATCH] ARM: dts: imx23-evk: Remove MX23_PAD_SSP1_DETECT from hog group

by Fabio Estevam

Currently, SD card fails to mount due to the following pinctrl error: [ 11.170000] imx23-pinctrl 80018000.pinctrl: pin SSP1_DETECT already requested by 80018000.pinctrl; cannot claim for 80010000.spi [ 11.180000] imx23-pinctrl 80018000.pinctrl: pin-65 (80010000.spi) status -22 [ 11.190000] imx23-pinctrl 80018000.pinctrl: could not request pin 65 (SSP1_DETECT) from group mmc0-pins-fixup.0 on device 80018000.pinctrl [ 11.200000] mxs-mmc 80010000.spi: Error applying setting, reverse things back Fix it by removing the MX23_PAD_SSP1_DETECT pin from the hog group as it is already been used by the mmc0-pins-fixup pinctrl group. With this change the rootfs can be mounted and the imx23-evk board can boot successfully. Cc: <stable(a)vger.kernel.org> Fixes: bc3875f1a61e ("ARM: dts: mxs: modify mx23/mx28 dts files to use pinctrl headers") Signed-off-by: Fabio Estevam <festevam(a)gmail.com> --- arch/arm/boot/dts/imx23-evk.dts | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/boot/dts/imx23-evk.dts b/arch/arm/boot/dts/imx23-evk.dts index 8cbaf1c81174..3b609d987d88 100644 --- a/arch/arm/boot/dts/imx23-evk.dts +++ b/arch/arm/boot/dts/imx23-evk.dts @@ -79,7 +79,6 @@ hog_pins_a: hog@0 { MX23_PAD_LCD_RESET__GPIO_1_18 MX23_PAD_PWM3__GPIO_1_29 MX23_PAD_PWM4__GPIO_1_30 - MX23_PAD_SSP1_DETECT__SSP1_DETECT >; fsl,drive-strength = <MXS_DRIVE_4mA>; fsl,voltage = <MXS_VOLTAGE_HIGH>; -- 2.25.1

2 years, 7 months

2
1
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror December 2021