From patchwork Thu May 25 18:01:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Morse X-Patchwork-Id: 99151 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp557946vqr; Thu, 25 May 2023 11:05:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5BgVd3tbHiELYdDH27LQLt9481dm1fATBFzuHpVpaXAHeKOk1BBSrRc0hyaVWFl2T8iCjR X-Received: by 2002:a17:902:e74e:b0:1af:ccc9:ce4a with SMTP id p14-20020a170902e74e00b001afccc9ce4amr2898497plf.25.1685037901404; Thu, 25 May 2023 11:05:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685037901; cv=none; d=google.com; s=arc-20160816; b=T9HXG9vvRD5ftNucc2dTKSSg4YlCADAvZ44O+br5YBw4r/+4vvoIqjK/KK/3lZhqFo hQsdVBsxB5Y1dn8QJueW0/dMRxe1zxnRTZAE6kYkdnJ6rAM2L5BuQtCJ/JJNB+/ieP24 bVPmViWNcWJrKTZAL7qiC3Ps40OAhfSsmr9dDPzpeZx1nRcgJVffd//VaoU/+Owg18wl 7Ayc7urfW/LVMIKJ9wyoePY7t2XjmIehy562kebKP8qVA5vW3AxeqCw9FOyvxhW54RdR TGKnB3qc7HbvUAL/HkHLzChccdVV2zRpmh0bpg72qNqVCw9wuf2V5OAkvyREI5AH3Sqk cFkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=cHeh4HUe2Yl4W4QMrfcLl1AlGRcr36xp/cAtx3/4t1E=; b=DCpjIMbMJzcRy3Rj2JpOPy7yUVj+0XmLQ506VsfY1ySKpu6j/5tJ8BLS/iRX/stzxC k4tfsGGPq28ycuGbe6noRDZH9TtOZrKPCQWjM4XV3T26TBA+m60yRm0eOBKgJl0jfiPn 3wuncFv0KSMN8c/Mj3o3IbL9PQkzfYqTldXqqNSwLZgtINkZKifcWkasF5gr++T1e62n SM6Tn4Kn5t6/AV/MLX0fjABCwT6/AEGtGWavrUq/M9CZNc2WNzJwiyLfSXiHEE7hdJrw gL8Rt/6GG1BxU8duCWZ+nTUqxDnAaxDDYVnvB4IWCRSU8ApBHhBrOKe2MjoYL16iyY0b z19g== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i1-20020a17090332c100b001a64e7b702fsi2103219plr.447.2023.05.25.11.04.47; Thu, 25 May 2023 11:05:01 -0700 (PDT) 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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240865AbjEYSDJ (ORCPT + 99 others); Thu, 25 May 2023 14:03:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240888AbjEYSCy (ORCPT ); Thu, 25 May 2023 14:02:54 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id DA2411BB for ; Thu, 25 May 2023 11:02:48 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A077315BF; Thu, 25 May 2023 11:03:33 -0700 (PDT) Received: from merodach.members.linode.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D77C73F6C4; Thu, 25 May 2023 11:02:45 -0700 (PDT) From: James Morse To: x86@kernel.org, linux-kernel@vger.kernel.org Cc: Fenghua Yu , Reinette Chatre , Thomas Gleixner , Ingo Molnar , Borislav Petkov , H Peter Anvin , Babu Moger , James Morse , shameerali.kolothum.thodi@huawei.com, D Scott Phillips OS , carl@os.amperecomputing.com, lcherian@marvell.com, bobo.shaobowang@huawei.com, tan.shaopeng@fujitsu.com, xingxin.hx@openanolis.org, baolin.wang@linux.alibaba.com, Jamie Iles , Xin Hao , peternewman@google.com, dfustini@baylibre.com Subject: [PATCH v4 06/24] x86/resctrl: Track the number of dirty RMID a CLOSID has Date: Thu, 25 May 2023 18:01:51 +0000 Message-Id: <20230525180209.19497-7-james.morse@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230525180209.19497-1-james.morse@arm.com> References: <20230525180209.19497-1-james.morse@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1766890302530769815?= X-GMAIL-MSGID: =?utf-8?q?1766890302530769815?= MPAM's PMG bits extend its PARTID space, meaning the same PMG value can be used for different control groups. This means once a CLOSID is allocated, all its monitoring ids may still be dirty, and held in limbo. Keep track of the number of RMID held in limbo each CLOSID has. This will allow a future helper to find the 'cleanest' CLOSID when allocating. The array is only needed when CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID is defined. This will never be the case on x86. Signed-off-by: James Morse --- arch/x86/kernel/cpu/resctrl/monitor.c | 43 +++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c index 27e731c7de72..1e7fa40ee471 100644 --- a/arch/x86/kernel/cpu/resctrl/monitor.c +++ b/arch/x86/kernel/cpu/resctrl/monitor.c @@ -43,6 +43,13 @@ struct rmid_entry { */ static LIST_HEAD(rmid_free_lru); +/** + * @closid_num_dirty_rmid The number of dirty RMID each CLOSID has. + * Only allocated when CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID is defined. + * Indexed by CLOSID. Protected by rdtgroup_mutex. + */ +static int *closid_num_dirty_rmid; + /** * @rmid_limbo_count count of currently unused but (potentially) * dirty RMIDs. @@ -285,6 +292,17 @@ int resctrl_arch_rmid_read(struct rdt_resource *r, struct rdt_domain *d, return 0; } +static void limbo_release_entry(struct rmid_entry *entry) +{ + lockdep_assert_held(&rdtgroup_mutex); + + rmid_limbo_count--; + list_add_tail(&entry->list, &rmid_free_lru); + + if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) + closid_num_dirty_rmid[entry->closid]--; +} + /* * Check the RMIDs that are marked as busy for this domain. If the * reported LLC occupancy is below the threshold clear the busy bit and @@ -321,10 +339,8 @@ void __check_limbo(struct rdt_domain *d, bool force_free) if (force_free || !rmid_dirty) { clear_bit(idx, d->rmid_busy_llc); - if (!--entry->busy) { - rmid_limbo_count--; - list_add_tail(&entry->list, &rmid_free_lru); - } + if (!--entry->busy) + limbo_release_entry(entry); } cur_idx = idx + 1; } @@ -391,6 +407,8 @@ static void add_rmid_to_limbo(struct rmid_entry *entry) u64 val = 0; u32 idx; + lockdep_assert_held(&rdtgroup_mutex); + idx = resctrl_arch_rmid_idx_encode(entry->closid, entry->rmid); entry->busy = 0; @@ -420,6 +438,9 @@ static void add_rmid_to_limbo(struct rmid_entry *entry) rmid_limbo_count++; else list_add_tail(&entry->list, &rmid_free_lru); + + if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) + closid_num_dirty_rmid[entry->closid]++; } void free_rmid(u32 closid, u32 rmid) @@ -781,13 +802,25 @@ void mbm_setup_overflow_handler(struct rdt_domain *dom, unsigned long delay_ms) static int dom_data_init(struct rdt_resource *r) { u32 idx_limit = resctrl_arch_system_num_rmid_idx(); + u32 num_closid = resctrl_arch_get_num_closid(r); struct rmid_entry *entry = NULL; u32 idx; int i; + lockdep_assert_held(&rdtgroup_mutex); + + if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) { + closid_num_dirty_rmid = kcalloc(num_closid, sizeof(int), + GFP_KERNEL); + if (!closid_num_dirty_rmid) + return -ENOMEM; + } + rmid_ptrs = kcalloc(idx_limit, sizeof(struct rmid_entry), GFP_KERNEL); - if (!rmid_ptrs) + if (!rmid_ptrs) { + kfree(closid_num_dirty_rmid); return -ENOMEM; + } for (i = 0; i < idx_limit; i++) { entry = &rmid_ptrs[i];