From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Yong-Xuan Wang <yongxuan.wang@sifive.com>,
Pierre Gondois <pierre.gondois@arm.com>,
Sudeep Holla <sudeep.holla@arm.com>,
Sasha Levin <sashal@kernel.org>,
gregkh@linuxfoundation.org
Subject: [PATCH AUTOSEL 6.1 10/60] cacheinfo: Fix shared_cpu_map to handle shared caches at different levels
Date: Fri, 3 Mar 2023 16:42:24 -0500 [thread overview]
Message-ID: <20230303214315.1447666-10-sashal@kernel.org> (raw)
In-Reply-To: <20230303214315.1447666-1-sashal@kernel.org>
From: Yong-Xuan Wang <yongxuan.wang@sifive.com>
[ Upstream commit 198102c9103fc78d8478495971947af77edb05c1 ]
The cacheinfo sets up the shared_cpu_map by checking whether the caches
with the same index are shared between CPUs. However, this will trigger
slab-out-of-bounds access if the CPUs do not have the same cache hierarchy.
Another problem is the mismatched shared_cpu_map when the shared cache does
not have the same index between CPUs.
CPU0 I D L3
index 0 1 2 x
^ ^ ^ ^
index 0 1 2 3
CPU1 I D L2 L3
This patch checks each cache is shared with all caches on other CPUs.
Reviewed-by: Pierre Gondois <pierre.gondois@arm.com>
Signed-off-by: Yong-Xuan Wang <yongxuan.wang@sifive.com>
Link: https://lore.kernel.org/r/20230117105133.4445-2-yongxuan.wang@sifive.com
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/base/cacheinfo.c | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
index 4b5cd08c5a657..f30256a524be6 100644
--- a/drivers/base/cacheinfo.c
+++ b/drivers/base/cacheinfo.c
@@ -251,7 +251,7 @@ static int cache_shared_cpu_map_setup(unsigned int cpu)
{
struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
struct cacheinfo *this_leaf, *sib_leaf;
- unsigned int index;
+ unsigned int index, sib_index;
int ret = 0;
if (this_cpu_ci->cpu_map_populated)
@@ -279,11 +279,13 @@ static int cache_shared_cpu_map_setup(unsigned int cpu)
if (i == cpu || !sib_cpu_ci->info_list)
continue;/* skip if itself or no cacheinfo */
-
- sib_leaf = per_cpu_cacheinfo_idx(i, index);
- if (cache_leaves_are_shared(this_leaf, sib_leaf)) {
- cpumask_set_cpu(cpu, &sib_leaf->shared_cpu_map);
- cpumask_set_cpu(i, &this_leaf->shared_cpu_map);
+ for (sib_index = 0; sib_index < cache_leaves(i); sib_index++) {
+ sib_leaf = per_cpu_cacheinfo_idx(i, sib_index);
+ if (cache_leaves_are_shared(this_leaf, sib_leaf)) {
+ cpumask_set_cpu(cpu, &sib_leaf->shared_cpu_map);
+ cpumask_set_cpu(i, &this_leaf->shared_cpu_map);
+ break;
+ }
}
}
/* record the maximum cache line size */
@@ -297,7 +299,7 @@ static int cache_shared_cpu_map_setup(unsigned int cpu)
static void cache_shared_cpu_map_remove(unsigned int cpu)
{
struct cacheinfo *this_leaf, *sib_leaf;
- unsigned int sibling, index;
+ unsigned int sibling, index, sib_index;
for (index = 0; index < cache_leaves(cpu); index++) {
this_leaf = per_cpu_cacheinfo_idx(cpu, index);
@@ -308,9 +310,14 @@ static void cache_shared_cpu_map_remove(unsigned int cpu)
if (sibling == cpu || !sib_cpu_ci->info_list)
continue;/* skip if itself or no cacheinfo */
- sib_leaf = per_cpu_cacheinfo_idx(sibling, index);
- cpumask_clear_cpu(cpu, &sib_leaf->shared_cpu_map);
- cpumask_clear_cpu(sibling, &this_leaf->shared_cpu_map);
+ for (sib_index = 0; sib_index < cache_leaves(sibling); sib_index++) {
+ sib_leaf = per_cpu_cacheinfo_idx(sibling, sib_index);
+ if (cache_leaves_are_shared(this_leaf, sib_leaf)) {
+ cpumask_clear_cpu(cpu, &sib_leaf->shared_cpu_map);
+ cpumask_clear_cpu(sibling, &this_leaf->shared_cpu_map);
+ break;
+ }
+ }
}
if (of_have_populated_dt())
of_node_put(this_leaf->fw_token);
--
2.39.2
next prev parent reply other threads:[~2023-03-03 22:41 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-03 21:42 [PATCH AUTOSEL 6.1 01/60] IB/hfi1: Update RMT size calculation Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 02/60] iommu/amd: Fix error handling for pdev_pri_ats_enable() Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 03/60] PCI/ACPI: Account for _S0W of the target bridge in acpi_pci_bridge_d3() Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 04/60] media: uvcvideo: Remove format descriptions Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 05/60] media: uvcvideo: Handle cameras with invalid descriptors Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 06/60] media: uvcvideo: Handle errors from calls to usb_string Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 07/60] media: uvcvideo: Quirk for autosuspend in Logitech B910 and C910 Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 08/60] media: uvcvideo: Silence memcpy() run-time false positive warnings Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 09/60] USB: fix memory leak with using debugfs_lookup() Sasha Levin
2023-03-03 21:42 ` Sasha Levin [this message]
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 11/60] staging: emxx_udc: Add checks for dma_alloc_coherent() Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 12/60] tty: fix out-of-bounds access in tty_driver_lookup_tty() Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 13/60] tty: serial: fsl_lpuart: disable the CTS when send break signal Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 14/60] serial: sc16is7xx: setup GPIO controller later in probe Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 15/60] mei: bus-fixup:upon error print return values of send and receive Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 16/60] parport_pc: Set up mode and ECR masks for Oxford Semiconductor devices Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 17/60] tools/iio/iio_utils:fix memory leak Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 18/60] bus: mhi: ep: Fix the debug message for MHI_PKT_TYPE_RESET_CHAN_CMD cmd Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 19/60] iio: accel: mma9551_core: Prevent uninitialized variable in mma9551_read_status_word() Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 20/60] iio: accel: mma9551_core: Prevent uninitialized variable in mma9551_read_config_word() Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 21/60] media: uvcvideo: Add GUID for BGRA/X 8:8:8:8 Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 22/60] firmware: coreboot: framebuffer: Ignore reserved pixel color bits Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 23/60] soundwire: bus_type: Avoid lockdep assert in sdw_drv_probe() Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 24/60] PCI: loongson: Prevent LS7A MRRS increases Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 25/60] staging: pi433: fix memory leak with using debugfs_lookup() Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 26/60] USB: dwc3: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 27/60] USB: chipidea: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 28/60] USB: ULPI: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 29/60] USB: uhci: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 30/60] USB: sl811: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 31/60] USB: fotg210: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 32/60] USB: isp116x: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 33/60] USB: isp1362: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 34/60] USB: gadget: gr_udc: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 35/60] USB: gadget: bcm63xx_udc: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 36/60] USB: gadget: lpc32xx_udc: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 37/60] USB: gadget: pxa25x_udc: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 38/60] USB: gadget: pxa27x_udc: " Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 39/60] usb: host: xhci: mvebu: Iterate over array indexes instead of using pointer math Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 40/60] USB: ene_usb6250: Allocate enough memory for full object Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 41/60] usb: uvc: Enumerate valid values for color matching Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 42/60] usb: gadget: uvc: Make bSourceID read/write Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 43/60] PCI: Align extra resources for hotplug bridges properly Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 44/60] PCI: Take other bus devices into account when distributing resources Sasha Levin
2023-03-03 21:42 ` [PATCH AUTOSEL 6.1 45/60] PCI: Distribute available resources for root buses, too Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 46/60] tty: pcn_uart: fix memory leak with using debugfs_lookup() Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 47/60] misc: vmw_balloon: " Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 48/60] drivers: base: component: " Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 49/60] drivers: base: dd: " Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 50/60] kernel/time/test_udelay.c: " Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 51/60] kernel/power/energy_model.c: " Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 52/60] kernel/fail_function: " Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 53/60] PCI: loongson: Add more devices that need MRRS quirk Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 54/60] PCI: Add ACS quirk for Wangxun NICs Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 55/60] PCI: pciehp: Add Qualcomm quirk for Command Completed erratum Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 56/60] phy: rockchip-typec: Fix unsigned comparison with less than zero Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 57/60] RDMA/cma: Distinguish between sockaddr_in and sockaddr_in6 by size Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 58/60] iommu: Attach device group to old domain in error path Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 59/60] soundwire: cadence: Remove wasted space in response_buf Sasha Levin
2023-03-03 21:43 ` [PATCH AUTOSEL 6.1 60/60] soundwire: cadence: Drain the RX FIFO after an IO timeout Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230303214315.1447666-10-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pierre.gondois@arm.com \
--cc=stable@vger.kernel.org \
--cc=sudeep.holla@arm.com \
--cc=yongxuan.wang@sifive.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).