Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3050502pxj; Mon, 14 Jun 2021 13:12:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJziXUQwFgM/dL6ng/FUApVfPVMEXqGSJifRFMkNRuPPoOabzY8LRQfQBtAFYzLGAsZJaanO X-Received: by 2002:a50:fc84:: with SMTP id f4mr19355210edq.252.1623701527117; Mon, 14 Jun 2021 13:12:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623701527; cv=none; d=google.com; s=arc-20160816; b=GmbDkXXplM44RI20y5517xnPNUy/g2MHmOWKGZkIqLhXV4yOTuh0MKwCUfvl/rWyHJ 2eDk+ZJUahAh9hi81/ujz7Z/insZs2jp48zvPzcFe8HnFgie+6eyymvDMFAp8OsnzuVg cBukBGotxh/5NBc6D5E8SpPjPrGdvPx5aso7WQVsQKiVGeJvtUm5uct7/GVGEkOzIb// t8gmO0B0GLhWhEfyJIv94D/DQKOMuTtUK5X5dID7S+dVj84/fiFd5Ee3SGg/y/LBTzXX 6ykpbeRL6nOxnC/jboQN8Y/9+HAhdIFmIlKUrCx4aLX6OFNkdVHV+LTFeu/SjqDPeZne R7gA== 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=A4cDRr7gPJ6tbeDnzYUwN5Zg2PdHz7NuO50MeQTqwhE=; b=QHMvCRbB2Vlkace9CSqrThTJpn8+4Us0cFKqOK6q6mdg2/MPQ86/QOpNOnOe61H1j8 ZAN/N88LMK69vqd6mAqQGtnSw18LS7mwXjB6mD82XR6ikz4BtdtXHOdqqaOd5WO+y0CA wM2QFWtjMofeIp411HZqECAzeT7DKty5P4T27nFb21aYxRdB265zQ7EtclIfTHFAYpoB 48FHxeE2tAneYt646L7AeaTAY2yQmoaE9QrV7E7lkk/NzN7owznubjAyQHG8xe1Qjyfy amE7lP9QdSV3m2m3MwimIH/jQ0fpPRZrTq4LAAjyRr5rwGv9OA5EyFATY87N8ynUv6S9 1SBg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ha1si12462553ejb.743.2021.06.14.13.11.44; Mon, 14 Jun 2021 13:12:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S234922AbhFNUMT (ORCPT + 99 others); Mon, 14 Jun 2021 16:12:19 -0400 Received: from foss.arm.com ([217.140.110.172]:45452 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234876AbhFNUMH (ORCPT ); Mon, 14 Jun 2021 16:12:07 -0400 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 E6D8E11D4; Mon, 14 Jun 2021 13:10:03 -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 172F23F694; Mon, 14 Jun 2021 13:10:01 -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, Jamie Iles , D Scott Phillips OS , lcherian@marvell.com Subject: [PATCH v4 03/24] x86/resctrl: Add a separate schema list for resctrl Date: Mon, 14 Jun 2021 20:09:20 +0000 Message-Id: <20210614200941.12383-4-james.morse@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210614200941.12383-1-james.morse@arm.com> References: <20210614200941.12383-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 Resctrl exposes schemata to user-space, which allow the control values to be specified for a group of tasks. User-visible properties of the interface, (such as the schemata names and how the values are parsed) are rooted in a struct provided by the architecture code. (struct rdt_hw_resource). Once a second architecture uses resctrl, this would allow user-visible properties to diverge between architectures. These properties should come from the resctrl code that will be common to all architectures. Resctrl has no per-schema structure, only struct rdt_{hw_,}resource. Create a struct resctrl_schema to hold the rdt_resource. Before a second architecture can be supported, this structure will also need to hold the schema name visible to user-space and the type of configuration values for resctrl. Reviewed-by: Jamie Iles Signed-off-by: James Morse --- Changes since v3: * Fixed a spelling mistake, removed a space. Changes since v2: * Expanded comments. * Shuffled commit message, Changes since v1: * Renamed resctrl_all_schema list * Used schemata_list as a prefix to make these easier to search for * Added kerneldoc string * Removed 'pending configuration' reference in commit message --- arch/x86/kernel/cpu/resctrl/internal.h | 1 + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 43 +++++++++++++++++++++++++- include/linux/resctrl.h | 11 +++++++ 3 files changed, 54 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h index 235cf621c878..f6790d03f056 100644 --- a/arch/x86/kernel/cpu/resctrl/internal.h +++ b/arch/x86/kernel/cpu/resctrl/internal.h @@ -106,6 +106,7 @@ extern unsigned int resctrl_cqm_threshold; extern bool rdt_alloc_capable; extern bool rdt_mon_capable; extern unsigned int rdt_mon_features; +extern struct list_head resctrl_schema_all; enum rdt_group_type { RDTCTRL_GROUP = 0, diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index 9a8665c8ab89..14ea1212f476 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -39,6 +39,9 @@ static struct kernfs_root *rdt_root; struct rdtgroup rdtgroup_default; LIST_HEAD(rdt_all_groups); +/* list of entries for the schemata file */ +LIST_HEAD(resctrl_schema_all); + /* Kernel fs node for "info" directory under root */ static struct kernfs_node *kn_info; @@ -2109,6 +2112,35 @@ static int rdt_enable_ctx(struct rdt_fs_context *ctx) return ret; } +static int schemata_list_create(void) +{ + struct resctrl_schema *s; + struct rdt_resource *r; + + for_each_alloc_enabled_rdt_resource(r) { + s = kzalloc(sizeof(*s), GFP_KERNEL); + if (!s) + return -ENOMEM; + + s->res = r; + + INIT_LIST_HEAD(&s->list); + list_add(&s->list, &resctrl_schema_all); + } + + return 0; +} + +static void schemata_list_destroy(void) +{ + struct resctrl_schema *s, *tmp; + + list_for_each_entry_safe(s, tmp, &resctrl_schema_all, list) { + list_del(&s->list); + kfree(s); + } +} + static int rdt_get_tree(struct fs_context *fc) { struct rdt_fs_context *ctx = rdt_fc2context(fc); @@ -2130,11 +2162,17 @@ static int rdt_get_tree(struct fs_context *fc) if (ret < 0) goto out_cdp; + ret = schemata_list_create(); + if (ret) { + schemata_list_destroy(); + goto out_mba; + } + closid_init(); ret = rdtgroup_create_info_dir(rdtgroup_default.kn); if (ret < 0) - goto out_mba; + goto out_schemata_free; if (rdt_mon_capable) { ret = mongroup_create_dir(rdtgroup_default.kn, @@ -2184,6 +2222,8 @@ static int rdt_get_tree(struct fs_context *fc) kernfs_remove(kn_mongrp); out_info: kernfs_remove(kn_info); +out_schemata_free: + schemata_list_destroy(); out_mba: if (ctx->enable_mba_mbps) set_mba_sc(false); @@ -2425,6 +2465,7 @@ static void rdt_kill_sb(struct super_block *sb) rmdir_all_sub(); rdt_pseudo_lock_release(); rdtgroup_default.mode = RDT_MODE_SHAREABLE; + schemata_list_destroy(); static_branch_disable_cpuslocked(&rdt_alloc_enable_key); static_branch_disable_cpuslocked(&rdt_mon_enable_key); static_branch_disable_cpuslocked(&rdt_enable_key); diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h index be6f5df78e31..425e7913dc8d 100644 --- a/include/linux/resctrl.h +++ b/include/linux/resctrl.h @@ -154,4 +154,15 @@ struct rdt_resource { }; +/** + * struct resctrl_schema - configuration abilities of a resource presented to + * user-space + * @list: Member of resctrl_schema_all. + * @res: The resource structure exported by the architecture to describe + * the hardware that is configured by this schema. + */ +struct resctrl_schema { + struct list_head list; + struct rdt_resource *res; +}; #endif /* _RESCTRL_H */ -- 2.30.2