October 2023 - Linux-stable-mirror

stable-rc/linux-4.19.y build: 19 builds: 3 failed, 16 passed, 20 warnings (v4.19.296-42-gb3c2ae79aa73)

by kernelci.org bot

stable-rc/linux-4.19.y build: 19 builds: 3 failed, 16 passed, 20 warnings (v4.19.296-42-gb3c2ae79aa73) Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.19.y/kernel/v4.19.296-4… Tree: stable-rc Branch: linux-4.19.y Git Describe: v4.19.296-42-gb3c2ae79aa73 Git Commit: b3c2ae79aa73e61b75d4fa6f3dae226b59b7bd41 Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Built: 7 unique architectures Build Failures Detected: riscv: allnoconfig: (gcc-10) FAIL defconfig: (gcc-10) FAIL tinyconfig: (gcc-10) FAIL Warnings Detected: arc: arm64: defconfig (gcc-10): 3 warnings defconfig+arm64-chromebook (gcc-10): 3 warnings arm: i386: allnoconfig (gcc-10): 2 warnings i386_defconfig (gcc-10): 2 warnings tinyconfig (gcc-10): 2 warnings mips: riscv: x86_64: allnoconfig (gcc-10): 2 warnings tinyconfig (gcc-10): 2 warnings x86_64_defconfig (gcc-10): 2 warnings x86_64_defconfig+x86-chromebook (gcc-10): 2 warnings Warnings summary: 7 ld: warning: creating DT_TEXTREL in a PIE 6 aarch64-linux-gnu-ld: warning: -z norelro ignored 4 ld: arch/x86/boot/compressed/head_64.o: warning: relocation in read-only section `.head.text' 3 ld: arch/x86/boot/compressed/head_32.o: warning: relocation in read-only section `.head.text' Section mismatches summary: 3 WARNING: modpost: Found 1 section mismatch(es). ================================================================================ Detailed per-defconfig build reports: -------------------------------------------------------------------------------- 32r2el_defconfig (mips, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- allnoconfig (riscv, gcc-10) — FAIL, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- allnoconfig (i386, gcc-10) — PASS, 0 errors, 2 warnings, 0 section mismatches Warnings: ld: arch/x86/boot/compressed/head_32.o: warning: relocation in read-only section `.head.text' ld: warning: creating DT_TEXTREL in a PIE -------------------------------------------------------------------------------- allnoconfig (x86_64, gcc-10) — PASS, 0 errors, 2 warnings, 0 section mismatches Warnings: ld: arch/x86/boot/compressed/head_64.o: warning: relocation in read-only section `.head.text' ld: warning: creating DT_TEXTREL in a PIE -------------------------------------------------------------------------------- defconfig (riscv, gcc-10) — FAIL, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- defconfig (arm64, gcc-10) — PASS, 0 errors, 3 warnings, 0 section mismatches Warnings: aarch64-linux-gnu-ld: warning: -z norelro ignored aarch64-linux-gnu-ld: warning: -z norelro ignored aarch64-linux-gnu-ld: warning: -z norelro ignored Section mismatches: WARNING: modpost: Found 1 section mismatch(es). -------------------------------------------------------------------------------- defconfig+arm64-chromebook (arm64, gcc-10) — PASS, 0 errors, 3 warnings, 0 section mismatches Warnings: aarch64-linux-gnu-ld: warning: -z norelro ignored aarch64-linux-gnu-ld: warning: -z norelro ignored aarch64-linux-gnu-ld: warning: -z norelro ignored Section mismatches: WARNING: modpost: Found 1 section mismatch(es). -------------------------------------------------------------------------------- haps_hs_smp_defconfig (arc, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- i386_defconfig (i386, gcc-10) — PASS, 0 errors, 2 warnings, 0 section mismatches Warnings: ld: arch/x86/boot/compressed/head_32.o: warning: relocation in read-only section `.head.text' ld: warning: creating DT_TEXTREL in a PIE -------------------------------------------------------------------------------- imx_v6_v7_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- multi_v5_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches Section mismatches: WARNING: modpost: Found 1 section mismatch(es). -------------------------------------------------------------------------------- multi_v7_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- omap2plus_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tinyconfig (riscv, gcc-10) — FAIL, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tinyconfig (i386, gcc-10) — PASS, 0 errors, 2 warnings, 0 section mismatches Warnings: ld: arch/x86/boot/compressed/head_32.o: warning: relocation in read-only section `.head.text' ld: warning: creating DT_TEXTREL in a PIE -------------------------------------------------------------------------------- tinyconfig (x86_64, gcc-10) — PASS, 0 errors, 2 warnings, 0 section mismatches Warnings: ld: arch/x86/boot/compressed/head_64.o: warning: relocation in read-only section `.head.text' ld: warning: creating DT_TEXTREL in a PIE -------------------------------------------------------------------------------- vexpress_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- x86_64_defconfig (x86_64, gcc-10) — PASS, 0 errors, 2 warnings, 0 section mismatches Warnings: ld: arch/x86/boot/compressed/head_64.o: warning: relocation in read-only section `.head.text' ld: warning: creating DT_TEXTREL in a PIE -------------------------------------------------------------------------------- x86_64_defconfig+x86-chromebook (x86_64, gcc-10) — PASS, 0 errors, 2 warnings, 0 section mismatches Warnings: ld: arch/x86/boot/compressed/head_64.o: warning: relocation in read-only section `.head.text' ld: warning: creating DT_TEXTREL in a PIE --- For more info write to <info(a)kernelci.org>

1 year, 3 months

1
0
0 0

backport a patch of ravb for v5.10 and v5.4

by Yoshihiro Shimoda

Hello Sasha, Thank you for backporting the latest ravb patches for stable. I found one of patches [1] was queued into v5.10 and v5.4 [2]. However, another patch [3] was not queued into them. I guess that this is because conflict happens. The reason for the conflict is that the condition in the following line is diffetent: --- v5.10 or v5.4: if (priv->chip_id != RCAR_GEN2) { mainline: if (info->multi_irqs) { --- However, this difference can be ignored when backporting. For your reference, I wrote a sample patch at the end of this email. Would you backport such a patch to v5.10 and v5.4? I would appreciate it if you could let me know if there is an official way to request one. [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… [2] https://www.spinics.net/lists/stable-commits/msg319990.html https://www.spinics.net/lists/stable-commits/msg320008.html [3] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… --- drivers/net/ethernet/renesas/ravb_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index a59da6a11976..f218bacec001 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -1706,6 +1706,8 @@ static int ravb_close(struct net_device *ndev) of_phy_deregister_fixed_link(np); } + cancel_work_sync(&priv->work); + if (priv->chip_id != RCAR_GEN2) { free_irq(priv->tx_irqs[RAVB_NC], ndev); free_irq(priv->rx_irqs[RAVB_NC], ndev); -- 2.25.1

1 year, 3 months

2
2
0 0

[PATCH v2] mtd: rawnand: Ensure the nand chip supports cached reads

by Rouven Czerwinski

Both the JEDEC and ONFI specification say that read cache sequential support is an optional command. This means that we not only need to check whether the individual controller supports the command, we also need to check the parameter pages for both ONFI and JEDEC NAND flashes before enabling sequential cache reads. This fixes support for NAND flashes which don't support enabling cache reads, i.e. Samsung K9F4G08U0F or Toshiba TC58NVG0S3HTA00. Sequential cache reads are now only available for ONFI and JEDEC devices, if individual vendors implement this, it needs to be enabled per vendor. Tested on i.MX6Q with a Samsung NAND flash chip that doesn't support sequential reads. Fixes: 003fe4b9545b ("mtd: rawnand: Support for sequential cache reads") Cc: stable(a)vger.kernel.org Signed-off-by: Rouven Czerwinski <r.czerwinski(a)pengutronix.de> --- v2: - change title as suggested by Miquel - adjust controller sentence from implement to support - fix missing true assignement for flashes - add CC stable instead of empty line - add documentation comment for new supports_read_cache bool inside nand parameter struct drivers/mtd/nand/raw/nand_base.c | 3 +++ drivers/mtd/nand/raw/nand_jedec.c | 3 +++ drivers/mtd/nand/raw/nand_onfi.c | 3 +++ include/linux/mtd/jedec.h | 3 +++ include/linux/mtd/onfi.h | 1 + include/linux/mtd/rawnand.h | 2 ++ 6 files changed, 15 insertions(+) diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index d4b55155aeae..1fcac403cee6 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -5110,6 +5110,9 @@ static void rawnand_check_cont_read_support(struct nand_chip *chip) { struct mtd_info *mtd = nand_to_mtd(chip); + if (!chip->parameters.supports_read_cache) + return; + if (chip->read_retries) return; diff --git a/drivers/mtd/nand/raw/nand_jedec.c b/drivers/mtd/nand/raw/nand_jedec.c index 836757717660..b3cc8f360529 100644 --- a/drivers/mtd/nand/raw/nand_jedec.c +++ b/drivers/mtd/nand/raw/nand_jedec.c @@ -94,6 +94,9 @@ int nand_jedec_detect(struct nand_chip *chip) goto free_jedec_param_page; } + if (p->opt_cmd[0] & JEDEC_OPT_CMD_READ_CACHE) + chip->parameters.supports_read_cache = true; + memorg->pagesize = le32_to_cpu(p->byte_per_page); mtd->writesize = memorg->pagesize; diff --git a/drivers/mtd/nand/raw/nand_onfi.c b/drivers/mtd/nand/raw/nand_onfi.c index f15ef90aec8c..861975e44b55 100644 --- a/drivers/mtd/nand/raw/nand_onfi.c +++ b/drivers/mtd/nand/raw/nand_onfi.c @@ -303,6 +303,9 @@ int nand_onfi_detect(struct nand_chip *chip) ONFI_FEATURE_ADDR_TIMING_MODE, 1); } + if (le16_to_cpu(p->opt_cmd) & ONFI_OPT_CMD_READ_CACHE) + chip->parameters.supports_read_cache = true; + onfi = kzalloc(sizeof(*onfi), GFP_KERNEL); if (!onfi) { ret = -ENOMEM; diff --git a/include/linux/mtd/jedec.h b/include/linux/mtd/jedec.h index 0b6b59f7cfbd..56047a4e54c9 100644 --- a/include/linux/mtd/jedec.h +++ b/include/linux/mtd/jedec.h @@ -21,6 +21,9 @@ struct jedec_ecc_info { /* JEDEC features */ #define JEDEC_FEATURE_16_BIT_BUS (1 << 0) +/* JEDEC Optional Commands */ +#define JEDEC_OPT_CMD_READ_CACHE BIT(1) + struct nand_jedec_params { /* rev info and features block */ /* 'J' 'E' 'S' 'D' */ diff --git a/include/linux/mtd/onfi.h b/include/linux/mtd/onfi.h index a7376f9beddf..55ab2e4d62f9 100644 --- a/include/linux/mtd/onfi.h +++ b/include/linux/mtd/onfi.h @@ -55,6 +55,7 @@ #define ONFI_SUBFEATURE_PARAM_LEN 4 /* ONFI optional commands SET/GET FEATURES supported? */ +#define ONFI_OPT_CMD_READ_CACHE BIT(1) #define ONFI_OPT_CMD_SET_GET_FEATURES BIT(2) struct nand_onfi_params { diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 90a141ba2a5a..c29ace15a053 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -225,6 +225,7 @@ struct gpio_desc; * struct nand_parameters - NAND generic parameters from the parameter page * @model: Model name * @supports_set_get_features: The NAND chip supports setting/getting features + * @supports_read_cache: The NAND chip supports read cache operations * @set_feature_list: Bitmap of features that can be set * @get_feature_list: Bitmap of features that can be get * @onfi: ONFI specific parameters @@ -233,6 +234,7 @@ struct nand_parameters { /* Generic parameters */ const char *model; bool supports_set_get_features; + bool supports_read_cache; DECLARE_BITMAP(set_feature_list, ONFI_FEATURE_NUMBER); DECLARE_BITMAP(get_feature_list, ONFI_FEATURE_NUMBER); base-commit: 42dc814987c1feb6410904e58cfd4c36c4146150 -- 2.42.0

1 year, 3 months

4
11
0 0

FAILED: patch "[PATCH] RDMA/srp: Fix srp_abort()" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 6dbe4a8dead84de474483910b02ec9e6a10fc1a9 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023101650-makeshift-gorged-fd92@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 6dbe4a8dead8 ("RDMA/srp: Fix srp_abort()") 9c5274eec75b ("scsi: RDMA/srp: Use scsi_cmd_to_rq() instead of scsi_cmnd.request") ad215aaea4f9 ("RDMA/srp: Make struct scsi_cmnd and struct srp_request adjacent") 7ec2e27a3aff ("RDMA/srp: Fix a recently introduced memory leak") 2b5715fc1738 ("RDMA/srp: Fix support for unpopulated and unbalanced NUMA nodes") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 6dbe4a8dead84de474483910b02ec9e6a10fc1a9 Mon Sep 17 00:00:00 2001 From: Bart Van Assche <bvanassche(a)acm.org> Date: Thu, 8 Sep 2022 16:31:39 -0700 Subject: [PATCH] RDMA/srp: Fix srp_abort() Fix the code for converting a SCSI command pointer into an SRP request pointer. Cc: Xiao Yang <yangx.jy(a)fujitsu.com> Fixes: ad215aaea4f9 ("RDMA/srp: Make struct scsi_cmnd and struct srp_request adjacent") Signed-off-by: Bart Van Assche <bvanassche(a)acm.org> Link: https://lore.kernel.org/r/20220908233139.3042628-1-bvanassche@acm.org Signed-off-by: Leon Romanovsky <leon(a)kernel.org> diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index 1e777b2043d6..9d593445d436 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -2788,7 +2788,7 @@ static int srp_send_tsk_mgmt(struct srp_rdma_ch *ch, u64 req_tag, u64 lun, static int srp_abort(struct scsi_cmnd *scmnd) { struct srp_target_port *target = host_to_target(scmnd->device->host); - struct srp_request *req = (struct srp_request *) scmnd->host_scribble; + struct srp_request *req = scsi_cmd_priv(scmnd); u32 tag; u16 ch_idx; struct srp_rdma_ch *ch; @@ -2796,8 +2796,6 @@ static int srp_abort(struct scsi_cmnd *scmnd) shost_printk(KERN_ERR, target->scsi_host, "SRP abort called\n"); - if (!req) - return SUCCESS; tag = blk_mq_unique_tag(scsi_cmd_to_rq(scmnd)); ch_idx = blk_mq_unique_tag_to_hwq(tag); if (WARN_ON_ONCE(ch_idx >= target->ch_count))

1 year, 3 months

2
1
0 0

FAILED: patch "[PATCH] usb: hub: Guard against accesses to uninitialized BOS" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x f74a7afc224acd5e922c7a2e52244d891bbe44ee # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023101546-blinker-remote-0be1@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From f74a7afc224acd5e922c7a2e52244d891bbe44ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Ca=C3=B1uelo?= <ricardo.canuelo(a)collabora.com> Date: Wed, 30 Aug 2023 12:04:18 +0200 Subject: [PATCH] usb: hub: Guard against accesses to uninitialized BOS descriptors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Many functions in drivers/usb/core/hub.c and drivers/usb/core/hub.h access fields inside udev->bos without checking if it was allocated and initialized. If usb_get_bos_descriptor() fails for whatever reason, udev->bos will be NULL and those accesses will result in a crash: BUG: kernel NULL pointer dereference, address: 0000000000000018 PGD 0 P4D 0 Oops: 0000 [#1] PREEMPT SMP NOPTI CPU: 5 PID: 17818 Comm: kworker/5:1 Tainted: G W 5.15.108-18910-gab0e1cb584e1 #1 <HASH:1f9e 1> Hardware name: Google Kindred/Kindred, BIOS Google_Kindred.12672.413.0 02/03/2021 Workqueue: usb_hub_wq hub_event RIP: 0010:hub_port_reset+0x193/0x788 Code: 89 f7 e8 20 f7 15 00 48 8b 43 08 80 b8 96 03 00 00 03 75 36 0f b7 88 92 03 00 00 81 f9 10 03 00 00 72 27 48 8b 80 a8 03 00 00 <48> 83 78 18 00 74 19 48 89 df 48 8b 75 b0 ba 02 00 00 00 4c 89 e9 RSP: 0018:ffffab740c53fcf8 EFLAGS: 00010246 RAX: 0000000000000000 RBX: ffffa1bc5f678000 RCX: 0000000000000310 RDX: fffffffffffffdff RSI: 0000000000000286 RDI: ffffa1be9655b840 RBP: ffffab740c53fd70 R08: 00001b7d5edaa20c R09: ffffffffb005e060 R10: 0000000000000001 R11: 0000000000000000 R12: 0000000000000000 R13: ffffab740c53fd3e R14: 0000000000000032 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffffa1be96540000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000018 CR3: 000000022e80c005 CR4: 00000000003706e0 Call Trace: hub_event+0x73f/0x156e ? hub_activate+0x5b7/0x68f process_one_work+0x1a2/0x487 worker_thread+0x11a/0x288 kthread+0x13a/0x152 ? process_one_work+0x487/0x487 ? kthread_associate_blkcg+0x70/0x70 ret_from_fork+0x1f/0x30 Fall back to a default behavior if the BOS descriptor isn't accessible and skip all the functionalities that depend on it: LPM support checks, Super Speed capabilitiy checks, U1/U2 states setup. Signed-off-by: Ricardo Cañuelo <ricardo.canuelo(a)collabora.com> Cc: stable <stable(a)vger.kernel.org> Link: https://lore.kernel.org/r/20230830100418.1952143-1-ricardo.canuelo@collabor… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 3c54b218301c..0ff47eeffb49 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -151,6 +151,10 @@ int usb_device_supports_lpm(struct usb_device *udev) if (udev->quirks & USB_QUIRK_NO_LPM) return 0; + /* Skip if the device BOS descriptor couldn't be read */ + if (!udev->bos) + return 0; + /* USB 2.1 (and greater) devices indicate LPM support through * their USB 2.0 Extended Capabilities BOS descriptor. */ @@ -327,6 +331,10 @@ static void usb_set_lpm_parameters(struct usb_device *udev) if (!udev->lpm_capable || udev->speed < USB_SPEED_SUPER) return; + /* Skip if the device BOS descriptor couldn't be read */ + if (!udev->bos) + return; + hub = usb_hub_to_struct_hub(udev->parent); /* It doesn't take time to transition the roothub into U0, since it * doesn't have an upstream link. @@ -2704,13 +2712,17 @@ int usb_authorize_device(struct usb_device *usb_dev) static enum usb_ssp_rate get_port_ssp_rate(struct usb_device *hdev, u32 ext_portstatus) { - struct usb_ssp_cap_descriptor *ssp_cap = hdev->bos->ssp_cap; + struct usb_ssp_cap_descriptor *ssp_cap; u32 attr; u8 speed_id; u8 ssac; u8 lanes; int i; + if (!hdev->bos) + goto out; + + ssp_cap = hdev->bos->ssp_cap; if (!ssp_cap) goto out; @@ -4215,8 +4227,15 @@ static void usb_enable_link_state(struct usb_hcd *hcd, struct usb_device *udev, enum usb3_link_state state) { int timeout; - __u8 u1_mel = udev->bos->ss_cap->bU1devExitLat; - __le16 u2_mel = udev->bos->ss_cap->bU2DevExitLat; + __u8 u1_mel; + __le16 u2_mel; + + /* Skip if the device BOS descriptor couldn't be read */ + if (!udev->bos) + return; + + u1_mel = udev->bos->ss_cap->bU1devExitLat; + u2_mel = udev->bos->ss_cap->bU2DevExitLat; /* If the device says it doesn't have *any* exit latency to come out of * U1 or U2, it's probably lying. Assume it doesn't implement that link diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h index 37897afd1b64..d44dd7f6623e 100644 --- a/drivers/usb/core/hub.h +++ b/drivers/usb/core/hub.h @@ -153,7 +153,7 @@ static inline int hub_is_superspeedplus(struct usb_device *hdev) { return (hdev->descriptor.bDeviceProtocol == USB_HUB_PR_SS && le16_to_cpu(hdev->descriptor.bcdUSB) >= 0x0310 && - hdev->bos->ssp_cap); + hdev->bos && hdev->bos->ssp_cap); } static inline unsigned hub_power_on_good_delay(struct usb_hub *hub)

1 year, 3 months

3
2
0 0

FAILED: patch "[PATCH] x86/cpu: Fix AMD erratum #1485 on Zen4-based CPUs" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y git checkout FETCH_HEAD git cherry-pick -x f454b18e07f518bcd0c05af17a2239138bff52de # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023101528-jawed-shelving-071a@gregkh' --subject-prefix 'PATCH 4.14.y' HEAD^.. Possible dependencies: f454b18e07f5 ("x86/cpu: Fix AMD erratum #1485 on Zen4-based CPUs") 77245f1c3c64 ("x86/CPU/AMD: Do not leak quotient data after a division by 0") 138bcddb86d8 ("Merge tag 'x86_bugs_srso' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From f454b18e07f518bcd0c05af17a2239138bff52de Mon Sep 17 00:00:00 2001 From: "Borislav Petkov (AMD)" <bp(a)alien8.de> Date: Sat, 7 Oct 2023 12:57:02 +0200 Subject: [PATCH] x86/cpu: Fix AMD erratum #1485 on Zen4-based CPUs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix erratum #1485 on Zen4 parts where running with STIBP disabled can cause an #UD exception. The performance impact of the fix is negligible. Reported-by: René Rebe <rene(a)exactcode.de> Signed-off-by: Borislav Petkov (AMD) <bp(a)alien8.de> Tested-by: René Rebe <rene(a)exactcode.de> Cc: <stable(a)kernel.org> Link: https://lore.kernel.org/r/D99589F4-BC5D-430B-87B2-72C20370CF57@exactcode.com diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 1d111350197f..b37abb55e948 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -637,12 +637,17 @@ /* AMD Last Branch Record MSRs */ #define MSR_AMD64_LBR_SELECT 0xc000010e -/* Fam 17h MSRs */ -#define MSR_F17H_IRPERF 0xc00000e9 +/* Zen4 */ +#define MSR_ZEN4_BP_CFG 0xc001102e +#define MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT 5 +/* Zen 2 */ #define MSR_ZEN2_SPECTRAL_CHICKEN 0xc00110e3 #define MSR_ZEN2_SPECTRAL_CHICKEN_BIT BIT_ULL(1) +/* Fam 17h MSRs */ +#define MSR_F17H_IRPERF 0xc00000e9 + /* Fam 16h MSRs */ #define MSR_F16H_L2I_PERF_CTL 0xc0010230 #define MSR_F16H_L2I_PERF_CTR 0xc0010231 diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 03ef962a6992..ece2b5b7b0fe 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -80,6 +80,10 @@ static const int amd_div0[] = AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0x00, 0x0, 0x2f, 0xf), AMD_MODEL_RANGE(0x17, 0x50, 0x0, 0x5f, 0xf)); +static const int amd_erratum_1485[] = + AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x19, 0x10, 0x0, 0x1f, 0xf), + AMD_MODEL_RANGE(0x19, 0x60, 0x0, 0xaf, 0xf)); + static bool cpu_has_amd_erratum(struct cpuinfo_x86 *cpu, const int *erratum) { int osvw_id = *erratum++; @@ -1149,6 +1153,10 @@ static void init_amd(struct cpuinfo_x86 *c) pr_notice_once("AMD Zen1 DIV0 bug detected. Disable SMT for full protection.\n"); setup_force_cpu_bug(X86_BUG_DIV0); } + + if (!cpu_has(c, X86_FEATURE_HYPERVISOR) && + cpu_has_amd_erratum(c, amd_erratum_1485)) + msr_set_bit(MSR_ZEN4_BP_CFG, MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT); } #ifdef CONFIG_X86_32

1 year, 3 months

3
2
0 0

[PATCH 5.15 000/183] 5.15.134-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.15.134 release. There are 183 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 Fri, 06 Oct 2023 17:51: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.15.134-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.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.15.134-rc1 Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: fix kdoc warnings after gc rework Jani Nikula <jani.nikula(a)intel.com> drm/meson: fix memory leak on ->hpd_notify callback Greg Ungerer <gerg(a)kernel.org> fs: binfmt_elf_efpic: fix personality for ELF-FDPIC Matthias Schiffer <mschiffer(a)universe-factory.net> ata: libata-sata: increase PMP SRST timeout to 10s Damien Le Moal <dlemoal(a)kernel.org> ata: libata-core: Do not register PM operations for SAS ports Damien Le Moal <dlemoal(a)kernel.org> ata: libata-core: Fix port and device removal Damien Le Moal <dlemoal(a)kernel.org> ata: libata-core: Fix ata_port_request_pm() locking Mika Westerberg <mika.westerberg(a)linux.intel.com> net: thunderbolt: Fix TCPv6 GSO checksum calculation Nick Desaulniers <ndesaulniers(a)google.com> bpf: Fix BTF_ID symbol generation collision in tools/ Jiri Olsa <jolsa(a)kernel.org> bpf: Fix BTF_ID symbol generation collision Josef Bacik <josef(a)toxicpanda.com> btrfs: properly report 0 avail for very full file systems Steven Rostedt (Google) <rostedt(a)goodmis.org> ring-buffer: Update "shortest_full" in polling Ben Wolsieffer <Ben.Wolsieffer(a)hefring.com> proc: nommu: /proc/<pid>/maps: release mmap read lock Trond Myklebust <trond.myklebust(a)hammerspace.com> Revert "SUNRPC dont update timeout value on connection reset" Jens Axboe <axboe(a)kernel.dk> io_uring/fs: remove sqe->rw_flags checking from LINKAT Joel Fernandes (Google) <joel(a)joelfernandes.org> sched/rt: Fix live lock between select_fallback_rq() and RT push Liam R. Howlett <Liam.Howlett(a)oracle.com> kernel/sched: Modify initial boot task idle setup Heiner Kallweit <hkallweit1(a)gmail.com> i2c: i801: unregister tco_pdev in i801_probe() error path Niklas Cassel <niklas.cassel(a)wdc.com> ata: libata-scsi: ignore reserved bits for REPORT SUPPORTED OPERATION CODES Kailang Yang <kailang(a)realtek.com> ALSA: hda: Disable power save for solving pop issue on Lenovo ThinkCentre M70q Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: disallow rule removal from chain binding Pan Bian <bianpan2016(a)163.com> nilfs2: fix potential use after free in nilfs_gccache_submit_read_data() Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> serial: 8250_port: Check IRQ data before use Daniel Starke <daniel.starke(a)siemens.com> Revert "tty: n_gsm: fix UAF in gsm_cleanup_mux" Ricky WU <ricky_wu(a)realtek.com> misc: rtsx: Fix some platforms can not boot and move the l1ss judgment to probe Pu Wen <puwen(a)hygon.cn> x86/srso: Add SRSO mitigation for Hygon processors Nicolin Chen <nicolinc(a)nvidia.com> iommu/arm-smmu-v3: Fix soft lockup triggered by arm_smmu_mm_invalidate_range Vishal Goel <vishal.goel(a)samsung.com> Smack:- Use overlay inode label in smack_inode_copy_up() Roberto Sassu <roberto.sassu(a)huawei.com> smack: Retrieve transmuting information in smack_inode_getsecurity() Roberto Sassu <roberto.sassu(a)huawei.com> smack: Record transmuting in smk_transmuted Irvin Cote <irvin.cote(a)insa-lyon.fr> nvme-pci: always return an ERR_PTR from nvme_pci_alloc_dev Gleb Chesnokov <gleb.chesnokov(a)scst.dev> scsi: qla2xxx: Fix NULL pointer dereference in target mode Ian Rogers <irogers(a)google.com> perf metric: Return early if no CPU PMU table exists Andrii Staikov <andrii.staikov(a)intel.com> i40e: fix potential NULL pointer dereferencing of pf->vf i40e_sync_vsi_filters() Mika Westerberg <mika.westerberg(a)linux.intel.com> watchdog: iTCO_wdt: Set NO_REBOOT if the watchdog is not already running Mika Westerberg <mika.westerberg(a)linux.intel.com> watchdog: iTCO_wdt: No need to stop the timer in probe Pratyush Yadav <ptyadav(a)amazon.de> nvme-pci: do not set the NUMA node of device if it has none Christoph Hellwig <hch(a)lst.de> nvme-pci: factor out a nvme_pci_alloc_dev helper Christoph Hellwig <hch(a)lst.de> nvme-pci: factor the iod mempool creation into a helper Chengming Zhou <zhouchengming(a)bytedance.com> cgroup: Fix suspicious rcu_dereference_check() usage warning Chengming Zhou <zhouchengming(a)bytedance.com> sched/cpuacct: Optimize away RCU read lock Arnaldo Carvalho de Melo <acme(a)redhat.com> perf build: Define YYNOMEM as YYNOABORT for bison < 3.81 Thomas Zimmermann <tzimmermann(a)suse.de> fbdev/sh7760fb: Depend on FB=y Johnathan Mantey <johnathanx.mantey(a)intel.com> ncsi: Propagate carrier gain/loss events to the NCSI controller Benjamin Gray <bgray(a)linux.ibm.com> powerpc/watchpoints: Annotate atomic context in more places Benjamin Gray <bgray(a)linux.ibm.com> powerpc/watchpoint: Disable pagefaults when getting user instruction Benjamin Gray <bgray(a)linux.ibm.com> powerpc/watchpoints: Disable preemption in thread_change_pc() Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: vb2: frame_vector.c: replace WARN_ONCE with a comment Chancel Liu <chancel.liu(a)nxp.com> ASoC: imx-rpmsg: Set ignore_pmdown_time for dai_link Stanislav Fomichev <sdf(a)google.com> bpf: Clarify error expectations from bpf_clone_redirect Shengjiu Wang <shengjiu.wang(a)nxp.com> ASoC: fsl: imx-pcm-rpmsg: Add SNDRV_PCM_INFO_BATCH flag Valentin Caron <valentin.caron(a)foss.st.com> spi: stm32: add a delay before SPI disable Han Xu <han.xu(a)nxp.com> spi: nxp-fspi: reset the FLSHxCR1 registers Niklas Cassel <niklas.cassel(a)wdc.com> ata: libata-eh: do not clear ATA_PFLAG_EH_PENDING in ata_eh_reset() Steve French <stfrench(a)microsoft.com> smb3: correct places where ENOTSUPP is used instead of preferred EOPNOTSUPP Michal Grzedzicki <mge(a)meta.com> scsi: pm80xx: Avoid leaking tags when processing OPC_INB_SET_CONTROLLER_CONFIG command Michal Grzedzicki <mge(a)meta.com> scsi: pm80xx: Use phy-specific SAS address when sending PHY_START command David Francis <David.Francis(a)amd.com> drm/amdgpu: Handle null atom context in VBIOS info ioctl Swapnil Patel <swapnil.patel(a)amd.com> drm/amd/display: Don't check registers, if using AUX BL control David Thompson <davthompson(a)nvidia.com> platform/mellanox: mlxbf-bootctl: add NET dependency into Kconfig Steven Rostedt (Google) <rostedt(a)goodmis.org> ring-buffer: Do not attempt to read past "commit" Ricardo B. Marliere <rbmarliere(a)gmail.com> selftests: fix dependency checker script Filipe Manana <fdmanana(a)suse.com> btrfs: improve error message after failure to add delayed dir index item Zheng Yejian <zhengyejian1(a)huawei.com> ring-buffer: Avoid softlockup in ring_buffer_resize() Zheng Yejian <zhengyejian1(a)huawei.com> selftests/ftrace: Correctly enable event in instance-event.tc Kiwoong Kim <kwmad.kim(a)samsung.com> scsi: ufs: core: Move __ufshcd_send_uic_cmd() outside host_lock Javed Hasan <jhasan(a)marvell.com> scsi: qedf: Add synchronization between I/O completions and abort Helge Deller <deller(a)gmx.de> parisc: irq: Make irq_stack_union static to avoid sparse warning Helge Deller <deller(a)gmx.de> parisc: drivers: Fix sparse warning Helge Deller <deller(a)gmx.de> parisc: iosapic.c: Fix sparse warnings Helge Deller <deller(a)gmx.de> parisc: sba: Fix compile warning wrt list of SBA devices Tobias Schramm <t.schramm(a)manjaro.org> spi: sun6i: fix race between DMA RX transfer completion and RX FIFO drain Tobias Schramm <t.schramm(a)manjaro.org> spi: sun6i: reduce DMA RX transfer width to single byte Sergey Senozhatsky <senozhatsky(a)chromium.org> dma-debug: don't call __dma_entry_alloc_check_leak() under free_entries_lock William A. Kennington III <william(a)wkennington.com> i2c: npcm7xx: Fix callback completion ordering Wenhua Lin <Wenhua.Lin(a)unisoc.com> gpio: pmic-eic-sprd: Add can_sleep flag for PMIC EIC chip Nathan Rossi <nathan.rossi(a)digi.com> soc: imx8m: Enable OCOTP clock for imx8mm before reading registers Max Filippov <jcmvbkbc(a)gmail.com> xtensa: boot/lib: fix function prototypes Randy Dunlap <rdunlap(a)infradead.org> xtensa: boot: don't add include-dirs Randy Dunlap <rdunlap(a)infradead.org> xtensa: iss/network: make functions static Max Filippov <jcmvbkbc(a)gmail.com> xtensa: add default definition for XCHAL_HAVE_DIV32 Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> firmware: imx-dsp: Fix an error handling path in imx_dsp_setup_channels() Dan Carpenter <dan.carpenter(a)linaro.org> power: supply: ucs1002: fix error code in ucs1002_get_property() Tony Lindgren <tony(a)atomide.com> bus: ti-sysc: Fix SYSC_QUIRK_SWSUP_SIDLE_ACT handling for uart wake-up Tony Lindgren <tony(a)atomide.com> ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot Tony Lindgren <tony(a)atomide.com> ARM: dts: ti: omap: Fix bandgap thermal cells addressing for omap3/4 Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> ARM: dts: omap: correct indentation Thomas Gleixner <tglx(a)linutronix.de> treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_56.RULE (part 1) Timo Alho <talho(a)nvidia.com> clk: tegra: fix error return case for recalc_rate Adam Ford <aford173(a)gmail.com> bus: ti-sysc: Fix missing AM35xx SoC matching Julien Panis <jpanis(a)baylibre.com> bus: ti-sysc: Use fsleep() instead of usleep_range() in sysc_reset() Marek Vasut <marex(a)denx.de> drm/bridge: ti-sn65dsi83: Do not generate HFP/HBP/HSA and EOT packet Christoph Hellwig <hch(a)lst.de> MIPS: Alchemy: only build mmc support helpers if au1xmmc is enabled Qu Wenruo <wqu(a)suse.com> btrfs: reset destination buffer when read_extent_buffer() gets invalid range Nilesh Javali <njavali(a)marvell.com> scsi: qla2xxx: Use raw_smp_processor_id() instead of smp_processor_id() Shreyas Deodhar <sdeodhar(a)marvell.com> scsi: qla2xxx: Select qpair depending on which CPU post_cmd() gets called Werner Fischer <devlists(a)wefi.net> ata: ahci: Add Elkhart Lake AHCI controller Mario Limonciello <mario.limonciello(a)amd.com> ata: ahci: Rename board_ahci_mobile Paul Menzel <pmenzel(a)molgen.mpg.de> ata: ahci: Add support for AMD A85 FCH (Hudson D4) Paul Menzel <pmenzel(a)molgen.mpg.de> ata: libata: Rename link flag ATA_LFLAG_NO_DB_DELAY Xiao Liang <shaw.leon(a)gmail.com> netfilter: nft_exthdr: Fix non-linear header modification Florian Westphal <fw(a)strlen.de> netfilter: exthdr: add support for tcp option removal Namhyung Kim <namhyung(a)kernel.org> perf build: Update build rule for generated files Ian Rogers <rogers.email(a)gmail.com> perf jevents: Switch build to use jevents.py Werner Sembach <wse(a)tuxedocomputers.com> Input: i8042 - add quirk for TUXEDO Gemini 17 Gen1/Clevo PD70PN Huacai Chen <chenhuacai(a)kernel.org> Input: i8042 - rename i8042-x86ia64io.h to i8042-acpipnpio.h Darrick J. Wong <djwong(a)kernel.org> xfs: fix xfs_inodegc_stop racing with mod_delayed_work Darrick J. Wong <djwong(a)kernel.org> xfs: disable reaping in fscounters scrub Darrick J. Wong <djwong(a)kernel.org> xfs: check that per-cpu inodegc workers actually run on that cpu Darrick J. Wong <djwong(a)kernel.org> xfs: explicitly specify cpu when forcing inodegc delayed work to run immediately Dave Chinner <dchinner(a)redhat.com> xfs: introduce xfs_inodegc_push() Dave Chinner <dchinner(a)redhat.com> xfs: bound maximum wait time for inodegc work Liang He <windhl(a)126.com> i2c: mux: gpio: Add missing fwnode_handle_put() Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> i2c: mux: gpio: Replace custom acpi_get_local_address() Xiaoke Wang <xkernel.wang(a)foxmail.com> i2c: mux: demux-pinctrl: check the return value of devm_kstrdup() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> gpio: tb10x: Fix an error handling path in tb10x_gpio_probe() Sasha Levin <sashal(a)kernel.org> Fix up backport of 136191703038 ("interconnect: Teach lockdep about icc_bw_lock order") Muhammad Husaini Zulkifli <muhammad.husaini.zulkifli(a)intel.com> igc: Expose tx-usecs coalesce setting to user Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> bnxt_en: Flush XDP for bnxt_poll_nitroa0()'s NAPI Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> net: ena: Flush XDP packets on error. Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> locking/seqlock: Do the lockdep annotation before locking in do_write_seqcount_begin_nested() Jozsef Kadlecsik <kadlec(a)netfilter.org> netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: disable toggling dormant table state more than once Artem Chernyshev <artem.chernyshev(a)red-soft.ru> net: rds: Fix possible NULL-pointer dereference Ziyang Xuan <william.xuanziyang(a)huawei.com> team: fix null-ptr-deref when team device type is changed Eric Dumazet <edumazet(a)google.com> net: bridge: use DEV_STATS_INC() Jie Wang <wangjie125(a)huawei.com> net: hns3: add 5ms delay before clear firmware reset irq source Jijie Shao <shaojijie(a)huawei.com> net: hns3: fix fail to delete tc flower rules during reset issue Jian Shen <shenjian15(a)huawei.com> net: hns3: only enable unicast promisc when mac table full Jie Wang <wangjie125(a)huawei.com> net: hns3: fix GRE checksum offload issue Josh Poimboeuf <jpoimboe(a)kernel.org> x86/srso: Fix SBPB enablement for spec_rstack_overflow=off Josh Poimboeuf <jpoimboe(a)kernel.org> x86/srso: Fix srso_show_state() side effect Stephen Boyd <swboyd(a)chromium.org> platform/x86: intel_scu_ipc: Fail IPC send if still busy Stephen Boyd <swboyd(a)chromium.org> platform/x86: intel_scu_ipc: Don't override scu in intel_scu_ipc_dev_simple_command() Stephen Boyd <swboyd(a)chromium.org> platform/x86: intel_scu_ipc: Check status upon timeout in ipc_wait_for_interrupt() Stephen Boyd <swboyd(a)chromium.org> platform/x86: intel_scu_ipc: Check status after timeout in busy_loop() Eric Dumazet <edumazet(a)google.com> dccp: fix dccp_v4_err()/dccp_v6_err() again Kajol Jain <kjain(a)linux.ibm.com> powerpc/perf/hv-24x7: Update domain value check Kyle Zeng <zengyhkyle(a)gmail.com> ipv4: fix null-deref in ipv4_link_failure Vinicius Costa Gomes <vinicius.gomes(a)intel.com> igc: Fix infinite initialization loop with early XDP redirect David Christensen <drc(a)linux.vnet.ibm.com> ionic: fix 16bit math issue when PAGE_SIZE >= 64KB Ivan Vecera <ivecera(a)redhat.com> i40e: Fix VF VLAN offloading when port VLAN is configured Mateusz Palczewski <mateusz.palczewski(a)intel.com> i40e: Add VF VLAN pruning Radoslaw Tyl <radoslawx.tyl(a)intel.com> iavf: do not process adminq tasks when __IAVF_IN_REMOVE_TASK is set Shengjiu Wang <shengjiu.wang(a)nxp.com> ASoC: imx-audmix: Fix return error with devm_clk_get() Sasha Neftin <sasha.neftin(a)intel.com> net/core: Fix ETH_P_1588 flow dissector Sabrina Dubroca <sd(a)queasysnail.net> selftests: tls: swap the TX and RX sockets in some tests Toke Høiland-Jørgensen <toke(a)redhat.com> bpf: Avoid deadlock when using queue and stack maps from NMI Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: disallow element removal on anonymous sets Jerome Brunet <jbrunet(a)baylibre.com> ASoC: meson: spdifin: start hw on dai probe Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: fix memleak when more than 255 elements expired Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_hash: try later when GC hits EAGAIN on iteration Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_pipapo: stop GC iteration if GC transaction allocation fails Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_pipapo: call nft_trans_gc_queue_sync() in catchall GC Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_rbtree: use read spinlock to avoid datapath contention Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_rbtree: skip sync GC for new elements in this transaction Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: defer gc run if previous batch is still pending Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: use correct lock to protect gc_list Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: GC transaction race with abort path Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: GC transaction race with netns dismantle Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: fix GC transaction races with netns and netlink event exit path Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: don't fail inserts if duplicate has expired Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: remove busy mark and gc batch API Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_hash: mark set element as dead when deleting from packet path Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: adapt set backend to use GC transaction API Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: GC transaction API to avoid race with control plane Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: don't skip expired elements during walk Steven Rostedt (Google) <rostedt(a)goodmis.org> tracing: Have event inject files inc the trace array ref count Jan Kara <jack(a)suse.cz> ext4: do not let fstrim block system suspend Jan Kara <jack(a)suse.cz> ext4: move setting of trimmed bit into ext4_try_to_trim_range() Kemeng Shi <shikemeng(a)huaweicloud.com> ext4: replace the traditional ternary conditional operator with with max()/min() Lukas Czerner <lczerner(a)redhat.com> ext4: change s_last_trim_minblks type to unsigned long Lukas Bulwahn <lukas.bulwahn(a)gmail.com> ext4: scope ret locally in ext4_try_to_trim_range() Szuying Chen <chensiying21(a)gmail.com> ata: libahci: clear pending interrupt status Hannes Reinecke <hare(a)suse.de> ata: ahci: Drop pointless VPRINTK() calls and convert the remaining ones Steven Rostedt (Google) <rostedt(a)goodmis.org> tracing: Increase trace array ref count on enable and filter files John Keeping <john(a)metanate.com> tracing: Make trace_marker{,_raw} stream-like Olga Kornievskaia <kolga(a)netapp.com> NFSv4.1: fix pnfs MDS=DS session trunking Olga Kornievskaia <kolga(a)netapp.com> NFSv4.1: use EXCHGID4_FLAG_USE_PNFS_DS for DS server Trond Myklebust <trond.myklebust(a)hammerspace.com> SUNRPC: Mark the cred for revalidation if the server rejects it Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS/pNFS: Report EINVAL errors from connect() to the server Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS: More fixes for nfs_direct_write_reschedule_io() Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS: Use the correct commit info in nfs_join_page_group() ------------- Diffstat: Makefile | 4 +- arch/arm/boot/dts/am33xx.dtsi | 5 +- arch/arm/boot/dts/am3517.dtsi | 5 +- arch/arm/boot/dts/am4372.dtsi | 5 +- arch/arm/boot/dts/artpec6-devboard.dts | 9 +- arch/arm/boot/dts/dm814x.dtsi | 6 +- arch/arm/boot/dts/dm816x.dtsi | 6 +- arch/arm/boot/dts/dra62x.dtsi | 6 +- arch/arm/boot/dts/dra7-dspeve-thermal.dtsi | 5 +- arch/arm/boot/dts/dra7-iva-thermal.dtsi | 5 +- arch/arm/boot/dts/imx6q-gk802.dts | 9 +- arch/arm/boot/dts/motorola-mapphone-common.dtsi | 4 +- arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi | 6 +- arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi | 6 +- arch/arm/boot/dts/omap2.dtsi | 5 +- arch/arm/boot/dts/omap2420.dtsi | 5 +- arch/arm/boot/dts/omap2430.dtsi | 5 +- arch/arm/boot/dts/omap3-cm-t3517.dts | 12 +- arch/arm/boot/dts/omap3-cpu-thermal.dtsi | 8 +- arch/arm/boot/dts/omap3-gta04.dtsi | 6 +- arch/arm/boot/dts/omap3-ldp.dts | 2 +- arch/arm/boot/dts/omap3-n900.dts | 38 +- arch/arm/boot/dts/omap3-zoom3.dts | 44 +-- arch/arm/boot/dts/omap3.dtsi | 5 +- arch/arm/boot/dts/omap34xx.dtsi | 5 +- arch/arm/boot/dts/omap36xx.dtsi | 5 +- arch/arm/boot/dts/omap4-cpu-thermal.dtsi | 34 +- arch/arm/boot/dts/omap443x.dtsi | 6 +- arch/arm/boot/dts/omap4460.dtsi | 6 +- arch/arm/boot/dts/omap5-cm-t54.dts | 56 +-- arch/arm/boot/dts/omap5-core-thermal.dtsi | 5 +- arch/arm/boot/dts/omap5-gpu-thermal.dtsi | 5 +- arch/arm/boot/dts/orion5x-lacie-d2-network.dts | 5 +- .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 9 +- .../boot/dts/orion5x-maxtor-shared-storage-2.dts | 5 +- arch/arm/boot/dts/orion5x-mv88f5181.dtsi | 9 +- arch/arm/boot/dts/orion5x-mv88f5182.dtsi | 9 +- arch/arm/boot/dts/orion5x-netgear-wnr854t.dts | 9 +- arch/arm/boot/dts/orion5x-rd88f5182-nas.dts | 9 +- arch/arm/boot/dts/orion5x.dtsi | 9 +- arch/arm/include/asm/hardware/cache-aurora-l2.h | 5 +- arch/arm/include/asm/hardware/cache-feroceon-l2.h | 6 +- arch/arm/include/asm/hardware/cache-tauros2.h | 5 +- arch/arm/mach-davinci/board-da830-evm.c | 6 +- arch/arm/mach-davinci/board-da850-evm.c | 6 +- arch/arm/mach-davinci/board-dm355-evm.c | 6 +- arch/arm/mach-davinci/board-dm355-leopard.c | 5 +- arch/arm/mach-davinci/board-dm644x-evm.c | 6 +- arch/arm/mach-davinci/board-dm646x-evm.c | 7 +- arch/arm/mach-davinci/board-mityomapl138.c | 5 +- arch/arm/mach-davinci/board-neuros-osd2.c | 5 +- arch/arm/mach-davinci/board-omapl138-hawk.c | 5 +- arch/arm/mach-davinci/common.c | 6 +- arch/arm/mach-davinci/cpuidle.h | 5 +- arch/arm/mach-davinci/da830.c | 6 +- arch/arm/mach-davinci/da850.c | 6 +- arch/arm/mach-davinci/dm355.c | 6 +- arch/arm/mach-davinci/dm644x.c | 6 +- arch/arm/mach-davinci/dm646x.c | 6 +- arch/arm/mach-davinci/include/mach/common.h | 6 +- arch/arm/mach-davinci/include/mach/cputype.h | 6 +- arch/arm/mach-davinci/include/mach/da8xx.h | 6 +- arch/arm/mach-davinci/include/mach/hardware.h | 6 +- arch/arm/mach-davinci/include/mach/serial.h | 6 +- arch/arm/mach-davinci/mux.c | 6 +- arch/arm/mach-davinci/mux.h | 6 +- arch/arm/mach-davinci/pm_domain.c | 5 +- arch/arm/mach-dove/bridge-regs.h | 9 +- arch/arm/mach-dove/cm-a510.c | 5 +- arch/arm/mach-dove/common.c | 5 +- arch/arm/mach-dove/common.h | 5 +- arch/arm/mach-dove/dove-db-setup.c | 5 +- arch/arm/mach-dove/dove.h | 9 +- arch/arm/mach-dove/irq.c | 5 +- arch/arm/mach-dove/irqs.h | 9 +- arch/arm/mach-dove/mpp.c | 5 +- arch/arm/mach-dove/pcie.c | 5 +- arch/arm/mach-dove/pm.h | 6 +- arch/arm/mach-lpc18xx/board-dt.c | 5 +- arch/arm/mach-lpc32xx/pm.c | 6 +- arch/arm/mach-lpc32xx/suspend.S | 6 +- arch/arm/mach-mv78xx0/bridge-regs.h | 6 +- arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 5 +- arch/arm/mach-mv78xx0/common.c | 5 +- arch/arm/mach-mv78xx0/common.h | 5 +- arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 5 +- arch/arm/mach-mv78xx0/irq.c | 5 +- arch/arm/mach-mv78xx0/irqs.h | 9 +- arch/arm/mach-mv78xx0/mpp.c | 5 +- arch/arm/mach-mv78xx0/mpp.h | 6 +- arch/arm/mach-mv78xx0/mv78xx0.h | 5 +- arch/arm/mach-mv78xx0/pcie.c | 5 +- arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 5 +- arch/arm/mach-mvebu/armada-370-xp.h | 5 +- arch/arm/mach-mvebu/board-v7.c | 5 +- arch/arm/mach-mvebu/coherency.c | 5 +- arch/arm/mach-mvebu/coherency.h | 6 +- arch/arm/mach-mvebu/coherency_ll.S | 5 +- arch/arm/mach-mvebu/common.h | 5 +- arch/arm/mach-mvebu/cpu-reset.c | 5 +- arch/arm/mach-mvebu/dove.c | 5 +- arch/arm/mach-mvebu/headsmp-a9.S | 5 +- arch/arm/mach-mvebu/headsmp.S | 5 +- arch/arm/mach-mvebu/kirkwood.c | 5 +- arch/arm/mach-mvebu/kirkwood.h | 5 +- arch/arm/mach-mvebu/mvebu-soc-id.c | 5 +- arch/arm/mach-mvebu/mvebu-soc-id.h | 5 +- arch/arm/mach-mvebu/platsmp-a9.c | 5 +- arch/arm/mach-mvebu/platsmp.c | 5 +- arch/arm/mach-mvebu/pm-board.c | 5 +- arch/arm/mach-mvebu/pm.c | 5 +- arch/arm/mach-mvebu/pmsu.c | 5 +- arch/arm/mach-mvebu/pmsu.h | 5 +- arch/arm/mach-mvebu/pmsu_ll.S | 5 +- arch/arm/mach-mvebu/system-controller.c | 5 +- arch/arm/mach-omap1/include/mach/mtd-xip.h | 6 +- arch/arm/mach-omap1/pm_bus.c | 6 +- arch/arm/mach-omap2/prcm43xx.h | 5 +- arch/arm/mach-omap2/vc.c | 6 +- arch/arm/mach-orion5x/board-d2net.c | 5 +- arch/arm/mach-orion5x/board-dt.c | 5 +- arch/arm/mach-orion5x/board-rd88f5182.c | 5 +- arch/arm/mach-orion5x/bridge-regs.h | 9 +- arch/arm/mach-orion5x/common.c | 5 +- arch/arm/mach-orion5x/db88f5281-setup.c | 5 +- arch/arm/mach-orion5x/irq.c | 5 +- arch/arm/mach-orion5x/irqs.h | 5 +- arch/arm/mach-orion5x/kurobox_pro-setup.c | 5 +- arch/arm/mach-orion5x/ls_hgl-setup.c | 5 +- arch/arm/mach-orion5x/mpp.c | 5 +- arch/arm/mach-orion5x/net2big-setup.c | 6 +- arch/arm/mach-orion5x/orion5x.h | 5 +- arch/arm/mach-orion5x/pci.c | 5 +- arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 5 +- arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 5 +- arch/arm/mach-orion5x/rd88f5182-setup.c | 5 +- arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 5 +- arch/arm/mach-orion5x/ts78xx-setup.c | 5 +- arch/arm/mach-orion5x/wnr854t-setup.c | 9 +- arch/arm/mach-orion5x/wrt350n-v2-setup.c | 9 +- arch/arm/mach-pxa/eseries.c | 7 +- arch/arm/mach-pxa/standby.S | 6 +- arch/arm/mach-spear/generic.h | 5 +- arch/arm/mach-spear/include/mach/misc_regs.h | 5 +- arch/arm/mach-spear/include/mach/spear.h | 5 +- arch/arm/mach-spear/pl080.c | 5 +- arch/arm/mach-spear/pl080.h | 5 +- arch/arm/mach-spear/restart.c | 5 +- arch/arm/mach-spear/spear1310.c | 5 +- arch/arm/mach-spear/spear1340.c | 5 +- arch/arm/mach-spear/spear13xx.c | 5 +- arch/arm/mach-spear/spear300.c | 5 +- arch/arm/mach-spear/spear310.c | 5 +- arch/arm/mach-spear/spear320.c | 5 +- arch/arm/mach-spear/spear3xx.c | 5 +- arch/arm/mach-spear/spear6xx.c | 5 +- arch/arm/mach-spear/time.c | 5 +- arch/arm/mm/cache-feroceon-l2.c | 5 +- arch/arm/mm/cache-tauros2.c | 5 +- arch/mips/alchemy/devboards/db1000.c | 4 + arch/mips/alchemy/devboards/db1200.c | 6 + arch/mips/alchemy/devboards/db1300.c | 4 + arch/parisc/include/asm/ropes.h | 3 + arch/parisc/kernel/drivers.c | 2 +- arch/parisc/kernel/irq.c | 2 +- arch/powerpc/kernel/hw_breakpoint.c | 16 +- arch/powerpc/kernel/hw_breakpoint_constraints.c | 7 +- arch/powerpc/perf/hv-24x7.c | 2 +- arch/x86/kernel/cpu/bugs.c | 4 +- arch/x86/kernel/cpu/common.c | 2 +- arch/xtensa/boot/Makefile | 3 +- arch/xtensa/boot/lib/zmem.c | 5 +- arch/xtensa/include/asm/core.h | 4 + arch/xtensa/platforms/iss/network.c | 4 +- drivers/ata/ahci.c | 111 +++--- drivers/ata/ahci_brcm.c | 2 +- drivers/ata/ahci_xgene.c | 4 - drivers/ata/libahci.c | 49 +-- drivers/ata/libata-core.c | 47 ++- drivers/ata/libata-eh.c | 13 +- drivers/ata/libata-sata.c | 2 +- drivers/ata/libata-scsi.c | 2 +- drivers/ata/libata-transport.c | 9 +- drivers/ata/libata.h | 2 + drivers/bus/ti-sysc.c | 31 +- drivers/char/agp/parisc-agp.c | 2 - drivers/clk/tegra/clk-bpmp.c | 2 +- drivers/firmware/imx/imx-dsp.c | 1 + drivers/gpio/gpio-pmic-eic-sprd.c | 1 + drivers/gpio/gpio-tb10x.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 17 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 4 +- drivers/gpu/drm/bridge/ti-sn65dsi83.c | 4 +- drivers/gpu/drm/meson/meson_encoder_hdmi.c | 2 + drivers/i2c/busses/i2c-i801.c | 1 + drivers/i2c/busses/i2c-npcm7xx.c | 17 +- drivers/i2c/muxes/i2c-demux-pinctrl.c | 4 + drivers/i2c/muxes/i2c-mux-gpio.c | 47 +-- .../serio/{i8042-x86ia64io.h => i8042-acpipnpio.h} | 13 +- drivers/input/serio/i8042.h | 2 +- drivers/interconnect/core.c | 1 + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 27 +- drivers/media/common/videobuf2/frame_vector.c | 6 +- drivers/misc/cardreader/rts5227.c | 55 +-- drivers/misc/cardreader/rts5228.c | 57 +-- drivers/misc/cardreader/rts5249.c | 56 +-- drivers/misc/cardreader/rts5260.c | 43 +-- drivers/misc/cardreader/rts5261.c | 52 +-- drivers/misc/cardreader/rtsx_pcr.c | 51 ++- drivers/net/ethernet/amazon/ena/ena_netdev.c | 3 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 9 + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 13 +- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 9 + drivers/net/ethernet/intel/i40e/i40e_main.c | 138 ++++++- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 16 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 3 +- drivers/net/ethernet/intel/igc/igc_ethtool.c | 31 +- drivers/net/ethernet/intel/igc/igc_main.c | 2 +- drivers/net/ethernet/pensando/ionic/ionic_dev.h | 1 + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 10 +- drivers/net/team/team.c | 10 +- drivers/net/thunderbolt.c | 3 +- drivers/nvme/host/pci.c | 121 ++++--- drivers/parisc/iosapic.c | 4 +- drivers/parisc/iosapic_private.h | 4 +- drivers/platform/mellanox/Kconfig | 1 + drivers/platform/x86/intel_scu_ipc.c | 66 ++-- drivers/power/supply/ucs1002_power.c | 3 +- drivers/scsi/pm8001/pm8001_hwi.c | 2 +- drivers/scsi/pm8001/pm80xx_hwi.c | 4 +- drivers/scsi/qedf/qedf_io.c | 10 +- drivers/scsi/qedf/qedf_main.c | 7 +- drivers/scsi/qla2xxx/qla_def.h | 3 + drivers/scsi/qla2xxx/qla_init.c | 5 +- drivers/scsi/qla2xxx/qla_inline.h | 58 +++ drivers/scsi/qla2xxx/qla_isr.c | 12 +- drivers/scsi/qla2xxx/qla_nvme.c | 4 + drivers/scsi/qla2xxx/qla_os.c | 6 + drivers/scsi/qla2xxx/qla_target.c | 3 +- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 +- drivers/scsi/ufs/ufshcd.c | 6 +- drivers/soc/imx/soc-imx8m.c | 10 + drivers/spi/spi-nxp-fspi.c | 7 + drivers/spi/spi-stm32.c | 8 + drivers/spi/spi-sun6i.c | 31 +- drivers/tty/n_gsm.c | 4 +- drivers/tty/serial/8250/8250_port.c | 5 +- drivers/video/fbdev/Kconfig | 2 +- drivers/watchdog/iTCO_wdt.c | 26 +- fs/binfmt_elf_fdpic.c | 5 +- fs/btrfs/delayed-inode.c | 7 +- fs/btrfs/extent_io.c | 8 +- fs/btrfs/super.c | 2 +- fs/cifs/inode.c | 2 +- fs/cifs/smb2ops.c | 6 +- fs/ext4/ext4.h | 2 +- fs/ext4/mballoc.c | 67 ++-- fs/nfs/direct.c | 25 +- fs/nfs/flexfilelayout/flexfilelayout.c | 1 + fs/nfs/nfs4client.c | 9 +- fs/nfs/nfs4proc.c | 4 + fs/nfs/write.c | 23 +- fs/nilfs2/gcinode.c | 6 +- fs/proc/task_nommu.c | 27 +- fs/xfs/scrub/common.c | 25 -- fs/xfs/scrub/common.h | 2 - fs/xfs/scrub/fscounters.c | 13 +- fs/xfs/scrub/scrub.c | 2 - fs/xfs/scrub/scrub.h | 1 - fs/xfs/xfs_icache.c | 92 +++-- fs/xfs/xfs_icache.h | 1 + fs/xfs/xfs_mount.h | 5 +- fs/xfs/xfs_qm_syscalls.c | 9 +- fs/xfs/xfs_super.c | 12 +- fs/xfs/xfs_trace.h | 1 + include/linux/btf_ids.h | 2 +- include/linux/cgroup.h | 3 +- include/linux/if_team.h | 2 + include/linux/libata.h | 4 +- include/linux/nfs_fs_sb.h | 1 + include/linux/nfs_page.h | 4 +- include/linux/seqlock.h | 2 +- include/net/netfilter/nf_tables.h | 127 +++---- include/uapi/linux/bpf.h | 4 +- io_uring/io_uring.c | 2 +- kernel/bpf/queue_stack_maps.c | 21 +- kernel/dma/debug.c | 20 +- kernel/sched/core.c | 2 +- kernel/sched/cpuacct.c | 4 +- kernel/sched/cpupri.c | 1 + kernel/sched/idle.c | 1 + kernel/trace/ring_buffer.c | 10 + kernel/trace/trace.c | 45 ++- kernel/trace/trace.h | 2 + kernel/trace/trace_events.c | 6 +- kernel/trace/trace_events_inject.c | 3 +- net/bridge/br_forward.c | 4 +- net/bridge/br_input.c | 4 +- net/core/flow_dissector.c | 2 +- net/dccp/ipv4.c | 9 +- net/dccp/ipv6.c | 9 +- net/ipv4/route.c | 4 +- net/ncsi/ncsi-aen.c | 5 + net/netfilter/ipset/ip_set_core.c | 12 +- net/netfilter/nf_tables_api.c | 400 +++++++++++++++++---- net/netfilter/nft_exthdr.c | 110 +++++- net/netfilter/nft_set_hash.c | 87 +++-- net/netfilter/nft_set_pipapo.c | 71 ++-- net/netfilter/nft_set_rbtree.c | 161 +++++---- net/rds/rdma_transport.c | 12 +- net/sunrpc/clnt.c | 15 +- security/smack/smack.h | 1 + security/smack/smack_lsm.c | 65 +++- sound/pci/hda/hda_intel.c | 1 + sound/soc/fsl/imx-audmix.c | 2 +- sound/soc/fsl/imx-pcm-rpmsg.c | 1 + sound/soc/fsl/imx-rpmsg.c | 8 + sound/soc/meson/axg-spdifin.c | 49 +-- tools/build/Makefile.build | 10 + tools/include/linux/btf_ids.h | 2 +- tools/include/uapi/linux/bpf.h | 4 +- tools/perf/Makefile.config | 19 + tools/perf/Makefile.perf | 1 + tools/perf/pmu-events/Build | 19 +- tools/perf/pmu-events/empty-pmu-events.c | 158 ++++++++ tools/perf/util/Build | 6 + tools/perf/util/metricgroup.c | 3 + .../ftrace/test.d/instances/instance-event.tc | 2 +- tools/testing/selftests/kselftest_deps.sh | 77 +++- tools/testing/selftests/net/tls.c | 8 +- 332 files changed, 2602 insertions(+), 1896 deletions(-)

1 year, 3 months

14
212
0 0

[PATCH v2] drm/i915: Flush WC GGTT only on required platforms

by Nirmoy Das

gen8_ggtt_invalidate() is only needed for limited set of platforms where GGTT is mapped as WC otherwise this can cause unwanted side-effects on XE_HP platforms where GFX_FLSH_CNTL_GEN6 is not valid. v2: Add a func to detect wc ggtt detection (Ville) Fixes: d2eae8e98d59 ("drm/i915/dg2: Drop force_probe requirement") Cc: Rodrigo Vivi <rodrigo.vivi(a)intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin(a)linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen(a)linux.intel.com> Cc: Jani Nikula <jani.nikula(a)linux.intel.com> Cc: Jonathan Cavitt <jonathan.cavitt(a)intel.com> Cc: John Harrison <john.c.harrison(a)intel.com> Cc: Andi Shyti <andi.shyti(a)linux.intel.com> Cc: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Cc: <stable(a)vger.kernel.org> # v6.2+ Suggested-by: Matt Roper <matthew.d.roper(a)intel.com> Signed-off-by: Nirmoy Das <nirmoy.das(a)intel.com> Acked-by: Andi Shyti <andi.shyti(a)linux.intel.com> --- drivers/gpu/drm/i915/gt/intel_ggtt.c | 35 +++++++++++++++++++--------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c index 4d7d88b92632..401667f83f96 100644 --- a/drivers/gpu/drm/i915/gt/intel_ggtt.c +++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c @@ -195,6 +195,21 @@ void gen6_ggtt_invalidate(struct i915_ggtt *ggtt) spin_unlock_irq(&uncore->lock); } +static bool needs_wc_ggtt_mapping(struct drm_i915_private *i915) +{ + /* + * On BXT+/ICL+ writes larger than 64 bit to the GTT pagetable range + * will be dropped. For WC mappings in general we have 64 byte burst + * writes when the WC buffer is flushed, so we can't use it, but have to + * resort to an uncached mapping. The WC issue is easily caught by the + * readback check when writing GTT PTE entries. + */ + if (!IS_GEN9_LP(i915) && GRAPHICS_VER(i915) < 11) + return true; + + return false; +} + static void gen8_ggtt_invalidate(struct i915_ggtt *ggtt) { struct intel_uncore *uncore = ggtt->vm.gt->uncore; @@ -202,8 +217,12 @@ static void gen8_ggtt_invalidate(struct i915_ggtt *ggtt) /* * Note that as an uncached mmio write, this will flush the * WCB of the writes into the GGTT before it triggers the invalidate. + * + * Only perform this when GGTT is mapped as WC, see ggtt_probe_common(). */ - intel_uncore_write_fw(uncore, GFX_FLSH_CNTL_GEN6, GFX_FLSH_CNTL_EN); + if (needs_wc_ggtt_mapping(ggtt->vm.i915)) + intel_uncore_write_fw(uncore, GFX_FLSH_CNTL_GEN6, + GFX_FLSH_CNTL_EN); } static void guc_ggtt_invalidate(struct i915_ggtt *ggtt) @@ -1126,17 +1145,11 @@ static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size) GEM_WARN_ON(pci_resource_len(pdev, GEN4_GTTMMADR_BAR) != gen6_gttmmadr_size(i915)); phys_addr = pci_resource_start(pdev, GEN4_GTTMMADR_BAR) + gen6_gttadr_offset(i915); - /* - * On BXT+/ICL+ writes larger than 64 bit to the GTT pagetable range - * will be dropped. For WC mappings in general we have 64 byte burst - * writes when the WC buffer is flushed, so we can't use it, but have to - * resort to an uncached mapping. The WC issue is easily caught by the - * readback check when writing GTT PTE entries. - */ - if (IS_GEN9_LP(i915) || GRAPHICS_VER(i915) >= 11) - ggtt->gsm = ioremap(phys_addr, size); - else + if (needs_wc_ggtt_mapping(i915)) ggtt->gsm = ioremap_wc(phys_addr, size); + else + ggtt->gsm = ioremap(phys_addr, size); + if (!ggtt->gsm) { drm_err(&i915->drm, "Failed to map the ggtt page table\n"); return -ENOMEM; -- 2.41.0

1 year, 3 months

3
3
0 0

FAILED: patch "[PATCH] x86/alternatives: Disable KASAN in apply_alternatives()" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x d35652a5fc9944784f6f50a5c979518ff8dacf61 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023101547-captivate-regress-4cb0@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: d35652a5fc99 ("x86/alternatives: Disable KASAN in apply_alternatives()") 6becb5026b81 ("x86/alternative: Make debug-alternative selective") ac0ee0a9560c ("x86/alternatives: Teach text_poke_bp() to patch Jcc.d32 instructions") 5d1dd961e743 ("x86/alternatives: Add alt_instr.flags") 931ab63664f0 ("x86/ibt: Implement FineIBT") b341b20d648b ("x86: Add prefix symbols for function padding") 3b6c1747da48 ("x86/retpoline: Add SKL retthunk retpolines") 52354973573c ("x86/asm: Provide ALTERNATIVE_3") eaf44c816ed8 ("x86/modules: Add call patching") e81dc127ef69 ("x86/callthunks: Add call patching for call depth tracking") 80e4c1cd42ff ("x86/retbleed: Add X86_FEATURE_CALL_DEPTH") bea75b33895f ("x86/Kconfig: Introduce function padding") 8f7c0d8b23c3 ("x86/Kconfig: Add CONFIG_CALL_THUNKS") 8eb5d34e77c6 ("x86/asm: Differentiate between code and function alignment") d49a0626216b ("arch: Introduce CONFIG_FUNCTION_ALIGNMENT") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From d35652a5fc9944784f6f50a5c979518ff8dacf61 Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" <kirill.shutemov(a)linux.intel.com> Date: Thu, 12 Oct 2023 13:04:24 +0300 Subject: [PATCH] x86/alternatives: Disable KASAN in apply_alternatives() Fei has reported that KASAN triggers during apply_alternatives() on a 5-level paging machine: BUG: KASAN: out-of-bounds in rcu_is_watching() Read of size 4 at addr ff110003ee6419a0 by task swapper/0/0 ... __asan_load4() rcu_is_watching() trace_hardirqs_on() text_poke_early() apply_alternatives() ... On machines with 5-level paging, cpu_feature_enabled(X86_FEATURE_LA57) gets patched. It includes KASAN code, where KASAN_SHADOW_START depends on __VIRTUAL_MASK_SHIFT, which is defined with cpu_feature_enabled(). KASAN gets confused when apply_alternatives() patches the KASAN_SHADOW_START users. A test patch that makes KASAN_SHADOW_START static, by replacing __VIRTUAL_MASK_SHIFT with 56, works around the issue. Fix it for real by disabling KASAN while the kernel is patching alternatives. [ mingo: updated the changelog ] Fixes: 6657fca06e3f ("x86/mm: Allow to boot without LA57 if CONFIG_X86_5LEVEL=y") Reported-by: Fei Yang <fei.yang(a)intel.com> Signed-off-by: Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> Signed-off-by: Ingo Molnar <mingo(a)kernel.org> Acked-by: Peter Zijlstra (Intel) <peterz(a)infradead.org> Cc: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: stable(a)vger.kernel.org Link: https://lore.kernel.org/r/20231012100424.1456-1-kirill.shutemov@linux.intel… diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 517ee01503be..73be3931e4f0 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -403,6 +403,17 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start, u8 insn_buff[MAX_PATCH_LEN]; DPRINTK(ALT, "alt table %px, -> %px", start, end); + + /* + * In the case CONFIG_X86_5LEVEL=y, KASAN_SHADOW_START is defined using + * cpu_feature_enabled(X86_FEATURE_LA57) and is therefore patched here. + * During the process, KASAN becomes confused seeing partial LA57 + * conversion and triggers a false-positive out-of-bound report. + * + * Disable KASAN until the patching is complete. + */ + kasan_disable_current(); + /* * The scan order should be from start to end. A later scanned * alternative code can overwrite previously scanned alternative code. @@ -452,6 +463,8 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start, text_poke_early(instr, insn_buff, insn_buff_sz); } + + kasan_enable_current(); } static inline bool is_jcc32(struct insn *insn)

1 year, 3 months

3
2
0 0

FAILED: patch "[PATCH] x86/cpu: Fix AMD erratum #1485 on Zen4-based CPUs" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x f454b18e07f518bcd0c05af17a2239138bff52de # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023101526-mumbling-theft-3113@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: f454b18e07f5 ("x86/cpu: Fix AMD erratum #1485 on Zen4-based CPUs") 77245f1c3c64 ("x86/CPU/AMD: Do not leak quotient data after a division by 0") 138bcddb86d8 ("Merge tag 'x86_bugs_srso' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From f454b18e07f518bcd0c05af17a2239138bff52de Mon Sep 17 00:00:00 2001 From: "Borislav Petkov (AMD)" <bp(a)alien8.de> Date: Sat, 7 Oct 2023 12:57:02 +0200 Subject: [PATCH] x86/cpu: Fix AMD erratum #1485 on Zen4-based CPUs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix erratum #1485 on Zen4 parts where running with STIBP disabled can cause an #UD exception. The performance impact of the fix is negligible. Reported-by: René Rebe <rene(a)exactcode.de> Signed-off-by: Borislav Petkov (AMD) <bp(a)alien8.de> Tested-by: René Rebe <rene(a)exactcode.de> Cc: <stable(a)kernel.org> Link: https://lore.kernel.org/r/D99589F4-BC5D-430B-87B2-72C20370CF57@exactcode.com diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 1d111350197f..b37abb55e948 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -637,12 +637,17 @@ /* AMD Last Branch Record MSRs */ #define MSR_AMD64_LBR_SELECT 0xc000010e -/* Fam 17h MSRs */ -#define MSR_F17H_IRPERF 0xc00000e9 +/* Zen4 */ +#define MSR_ZEN4_BP_CFG 0xc001102e +#define MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT 5 +/* Zen 2 */ #define MSR_ZEN2_SPECTRAL_CHICKEN 0xc00110e3 #define MSR_ZEN2_SPECTRAL_CHICKEN_BIT BIT_ULL(1) +/* Fam 17h MSRs */ +#define MSR_F17H_IRPERF 0xc00000e9 + /* Fam 16h MSRs */ #define MSR_F16H_L2I_PERF_CTL 0xc0010230 #define MSR_F16H_L2I_PERF_CTR 0xc0010231 diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 03ef962a6992..ece2b5b7b0fe 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -80,6 +80,10 @@ static const int amd_div0[] = AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0x00, 0x0, 0x2f, 0xf), AMD_MODEL_RANGE(0x17, 0x50, 0x0, 0x5f, 0xf)); +static const int amd_erratum_1485[] = + AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x19, 0x10, 0x0, 0x1f, 0xf), + AMD_MODEL_RANGE(0x19, 0x60, 0x0, 0xaf, 0xf)); + static bool cpu_has_amd_erratum(struct cpuinfo_x86 *cpu, const int *erratum) { int osvw_id = *erratum++; @@ -1149,6 +1153,10 @@ static void init_amd(struct cpuinfo_x86 *c) pr_notice_once("AMD Zen1 DIV0 bug detected. Disable SMT for full protection.\n"); setup_force_cpu_bug(X86_BUG_DIV0); } + + if (!cpu_has(c, X86_FEATURE_HYPERVISOR) && + cpu_has_amd_erratum(c, amd_erratum_1485)) + msr_set_bit(MSR_ZEN4_BP_CFG, MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT); } #ifdef CONFIG_X86_32

1 year, 3 months

3
2
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror October 2023