From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24868C4332B for ; Fri, 12 Mar 2021 18:00:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D77AE64F48 for ; Fri, 12 Mar 2021 18:00:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232933AbhCLSAM (ORCPT ); Fri, 12 Mar 2021 13:00:12 -0500 Received: from foss.arm.com ([217.140.110.172]:58490 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232389AbhCLR76 (ORCPT ); Fri, 12 Mar 2021 12:59:58 -0500 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 B21AA1042; Fri, 12 Mar 2021 09:59:57 -0800 (PST) Received: from merodach.members.linode.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E5EB33F7D7; Fri, 12 Mar 2021 09:59:55 -0800 (PST) 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, Jamie Iles , D Scott Phillips OS Subject: [PATCH v2 07/24] x86/resctrl: Store the effective num_closid in the schema Date: Fri, 12 Mar 2021 17:58:32 +0000 Message-Id: <20210312175849.8327-8-james.morse@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210312175849.8327-1-james.morse@arm.com> References: <20210312175849.8327-1-james.morse@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The resctrl_schema struct holds properties that vary with the style of configuration that resctrl applies to a resource. There are already two values for the hardware's num_closid, depending on whether the architecture presents the L3 or L3CODE/L3DATA resources. As the way CDP changes the number of control groups that resctrl can create is part of the user-space interface, it should be managed by the filesystem parts of resctrl. This allows the architecture code to only describe the value the hardware supports. Add num_closid to resctrl_schema. This is the value seen by the filesystem, and when the CDP resources are merged, will be different to the value described by the arch code when CDP is enabled. These functions operate on the num_closid value that is exposed to user-space: rdtgroup_parse_resource() rdtgroup_schemata_show() rdt_num_closids_show() closid_init() These are changed to use the schema value instead. schemata_list_create() sets this value, and reaches into the architecture specific structure to get the value. This will eventually be replaced with a helper. Reviewed-by: Jamie Iles Signed-off-by: James Morse --- Changes since v1: * Added missing : in a comment. * Expanded commit message. * Reordered patches --- arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 9 +++------ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 13 ++++--------- include/linux/resctrl.h | 2 ++ 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c index a6f9548a8a59..fcd6ca73ac41 100644 --- a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c +++ b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c @@ -286,14 +286,12 @@ int update_domains(struct rdt_resource *r, int closid) static int rdtgroup_parse_resource(char *resname, char *tok, struct rdtgroup *rdtgrp) { - struct rdt_hw_resource *hw_res; struct resctrl_schema *s; struct rdt_resource *r; list_for_each_entry(s, &resctrl_schema_all, list) { r = s->res; - hw_res = resctrl_to_arch_res(s->res); - if (!strcmp(resname, r->name) && rdtgrp->closid < hw_res->num_closid) + if (!strcmp(resname, r->name) && rdtgrp->closid < s->num_closid) return parse_line(tok, r, rdtgrp); } rdt_last_cmd_printf("Unknown or unsupported resource name '%s'\n", resname); @@ -404,7 +402,6 @@ static void show_doms(struct seq_file *s, struct rdt_resource *r, int closid) int rdtgroup_schemata_show(struct kernfs_open_file *of, struct seq_file *s, void *v) { - struct rdt_hw_resource *hw_res; struct resctrl_schema *schema; struct rdtgroup *rdtgrp; struct rdt_resource *r; @@ -432,8 +429,8 @@ int rdtgroup_schemata_show(struct kernfs_open_file *of, } else { closid = rdtgrp->closid; list_for_each_entry(schema, &resctrl_schema_all, list) { - hw_res = resctrl_to_arch_res(schema->res); - if (closid < hw_res->num_closid) + r = schema->res; + if (closid < schema->num_closid) show_doms(s, r, closid); } } diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index 4f25c3c6f6e8..1ff883f68ee1 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -103,15 +103,12 @@ int closids_supported(void) static void closid_init(void) { - struct rdt_hw_resource *hw_res; struct resctrl_schema *s; int rdt_min_closid = 32; /* Compute rdt_min_closid across all resources */ - list_for_each_entry(s, &resctrl_schema_all, list) { - hw_res = resctrl_to_arch_res(s->res); - rdt_min_closid = min(rdt_min_closid, hw_res->num_closid); - } + list_for_each_entry(s, &resctrl_schema_all, list) + rdt_min_closid = min(rdt_min_closid, s->num_closid); closid_free_map = BIT_MASK(rdt_min_closid) - 1; @@ -849,11 +846,8 @@ static int rdt_num_closids_show(struct kernfs_open_file *of, struct seq_file *seq, void *v) { struct resctrl_schema *s = of->kn->parent->priv; - struct rdt_resource *r = s->res; - struct rdt_hw_resource *hw_res; - hw_res = resctrl_to_arch_res(r); - seq_printf(seq, "%d\n", hw_res->num_closid); + seq_printf(seq, "%u\n", s->num_closid); return 0; } @@ -2140,6 +2134,7 @@ static int schemata_list_create(void) s->res = r; s->conf_type = resctrl_to_arch_res(r)->conf_type; + s->num_closid = resctrl_to_arch_res(r)->num_closid; INIT_LIST_HEAD(&s->list); list_add(&s->list, &resctrl_schema_all); diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h index c6f749f54765..0ff10468940b 100644 --- a/include/linux/resctrl.h +++ b/include/linux/resctrl.h @@ -165,10 +165,12 @@ struct rdt_resource { * @list: Member of resctrl's schema list * @conf_type: Whether this entry is for code/data/both * @res: The rdt_resource for this entry + * @num_closid: Number of CLOSIDs available for this resource */ struct resctrl_schema { struct list_head list; enum resctrl_conf_type conf_type; struct rdt_resource *res; + int num_closid; }; #endif /* _RESCTRL_H */ -- 2.30.0