From patchwork Tue Jan 17 10:51:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yong-Xuan Wang X-Patchwork-Id: 44639 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1686985wrn; Tue, 17 Jan 2023 02:59:51 -0800 (PST) X-Google-Smtp-Source: AMrXdXsy0p5GHTq9vuKEc7SAxyB3fX3U7En26/T9428oIyEohWWzW+qkE2aRBVsIiYiFLoehq8c/ X-Received: by 2002:a50:ec82:0:b0:491:ae82:b7b4 with SMTP id e2-20020a50ec82000000b00491ae82b7b4mr2369267edr.30.1673953190871; Tue, 17 Jan 2023 02:59:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673953190; cv=none; d=google.com; s=arc-20160816; b=p8eBvNhKx8wfbS3+WR85jsov8I1/zZUVJQv0smOPT0ROKqwgCc4Uog05nMR0UrIgs7 HbSGFn/04vZWAN2SU7rl36G1LxhqtDeFAonWIOazlRsdNaXAfCVQFUmcAuqmRYE7geoO N9/+zM1ctJO69YTZ/l57mSOJ3qViBop3amNAWo4GBsq0klGrI8vq20t3l3Tlm0n0Pq4R kB6UbyZOawDub9JtYtSjX70GOhyC9h0ECJhAlN1V6JJxAShQhtmG3OXWzNrFDYQhpMM4 +mvDVVwRRvQcC++R+LnCa8AobwxPLhdWEtHLrUV2ARxFu3roLnRRkomZOZLtdpbntcWQ BXnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=7/muQR36FzdhRlp2NSJbCS4oM2tTMQvy93n5Di6qIkk=; b=wVLTtxnof11N68x32OCLnl4CpYvRudvKS6S7HEPxmsIz9EZUzER8g9nwSqAwhm15z7 +RRjqgcqKzlUZmo9CtQ5Ufz0gjhAjcZCVy68tmqzynPJco6QVEDm/PuO8QwJhj5/78LR XS7mC8KPm2SAfX9wNpfY49JFEjUK6/WHq5XdWcpKrmKbtUoUta7hh3U7bcTxHsNFE7hc aqXcO6jP0kcpncfbaSdO17ii1UZnQYq1/e0LzUeuyjSyKU/UGbyyTc5mKpIiv0CeXGaQ A5epYTSmpQ8gE/FE92VwehgzrtsZ3Av9Fgt9Dr61J31SfZRcKLICpMX+/2hHkVLn4Wu5 HjHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=fHtxGEY0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b17-20020a056402279100b0049e369ed236si1730344ede.260.2023.01.17.02.59.26; Tue, 17 Jan 2023 02:59:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=fHtxGEY0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236648AbjAQKwD (ORCPT + 99 others); Tue, 17 Jan 2023 05:52:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236456AbjAQKvt (ORCPT ); Tue, 17 Jan 2023 05:51:49 -0500 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90E98301A2 for ; Tue, 17 Jan 2023 02:51:40 -0800 (PST) Received: by mail-pl1-x633.google.com with SMTP id v23so28215918plo.1 for ; Tue, 17 Jan 2023 02:51:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=7/muQR36FzdhRlp2NSJbCS4oM2tTMQvy93n5Di6qIkk=; b=fHtxGEY0+0tj3Evx93ZJ+Vt1JdvQFW66gp8LIt3jLp+7B75+1BG0xXwqwjUEwLX4RR i/crUhbEH9L8Q6QdIoyCCstL75R1yuPhpgh0qnQpBx5Iqm0WtimbDvuArVmVT3auWQkn g+uklRQmWPeA068mhBKVkFiTB5eAPDVzD6FJJrT9CO0Ia3OMwgn5y6dO5kT3BiQ8r8Yt kNCywArK7nYSJT+9NCF/4p690eZO0aq70pOHsiYl0NOfc0U2CPB6KTCVFfb9O1pkyDh/ idSLtFSX5FfNsTFBAbMLBVyMs5ljqphudBS1sdHfy+R/rtPclvfYdaJTDW4KtiS1YOjk wwqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=7/muQR36FzdhRlp2NSJbCS4oM2tTMQvy93n5Di6qIkk=; b=veq+qv3BH59n5vvRtqEHM97Vliv8NMiKHxQIg4Ojpap/+wDE95iEEkC7IuM6ljmRq4 bbR4icP8wCa5EbIbty4zb5pIqxLCHWiEubg1oF/T9X/Src0CqShPt2p4elLlNBaf7yvC uJPDujJNRyObF6v7HQzRiapH84xTwDJn0bjiDGelIcnKFp/b7BmnvbJ3CVdPAHwU64tk CNYsYgCFWnZ6ySX6A4X9KZVcGS2w6o03zl+SGaVVpYgg2Z/rSaiJzu0RYERr+9s3oPeW dbsNagefPd6xdfr0D03aIArG8zF6f0JBiJkNDMEiZ8Z1fu5gNOk9ez8OWx2J1tF/FwZO 0SAw== X-Gm-Message-State: AFqh2kp5QuweFCpIEYUB73oZwRFyyRfmDr9BBvFRSGiQkhgYY6HAPNcO d0+t9MYLD2U1FlDv46UhZlRPhQ== X-Received: by 2002:a17:902:e495:b0:192:8bee:3e29 with SMTP id i21-20020a170902e49500b001928bee3e29mr2492814ple.2.1673952700115; Tue, 17 Jan 2023 02:51:40 -0800 (PST) Received: from hsinchu26.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id q11-20020a170902eb8b00b00189c93ce5easm20848645plg.166.2023.01.17.02.51.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 02:51:39 -0800 (PST) From: Yong-Xuan Wang To: Greg Kroah-Hartman , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, Sudeep Holla Cc: Pierre Gondois , Vincent Chen , Greentime Hu , Yong-Xuan Wang Subject: [PATCH -next v4 1/1] drivers: base: cacheinfo: fix shared_cpu_map Date: Tue, 17 Jan 2023 10:51:33 +0000 Message-Id: <20230117105133.4445-2-yongxuan.wang@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230117105133.4445-1-yongxuan.wang@sifive.com> References: <20230117105133.4445-1-yongxuan.wang@sifive.com> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753426738447243748?= X-GMAIL-MSGID: =?utf-8?q?1755267141050005842?= 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 Signed-off-by: Yong-Xuan Wang --- 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 950b22cdb5f7..f05acf3c16c6 100644 --- a/drivers/base/cacheinfo.c +++ b/drivers/base/cacheinfo.c @@ -256,7 +256,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) @@ -284,11 +284,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 */ @@ -302,7 +304,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); @@ -313,9 +315,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; + } + } } } }