From nobody Wed Dec 17 10:00:47 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B992FC7618E for ; Thu, 20 Apr 2023 22:06:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232912AbjDTWGw (ORCPT ); Thu, 20 Apr 2023 18:06:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229736AbjDTWGt (ORCPT ); Thu, 20 Apr 2023 18:06:49 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4757F270C for ; Thu, 20 Apr 2023 15:06:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682028407; x=1713564407; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TX3utSJkvuG87gr/i0jCm7n2nnIrYB4p9WSinKZRLsI=; b=N1EzTJuu92cE7L979Zhqxd68LQQQ+ZId+6J9f3DFK8okBe9W7tUWnQof Sg8ENeCs5pl0h0YQeJZy9jzbVJyum3kf8nvSSS4SuoCA6UZ+rQ0H8vjGL liJnGmGb/nzN553Mo23N1P1GElEvTgt2mXg18PQ6QtvPmta+YOJ0A75ru QnwRvMbxuAeZ3QvKjYiwqh6cAays6HjVlVHLHRggUZl4zgXFxkVjj+iJO /szTx1OFdSxtUWmYqyIVgxEit/Z0keCWoKtBvXsUYS0nro8yMTK/XeGpl b8VBcM5nulXGNJaj5BLqijJD0k0UcIsqRDXoapUPPhHOHT1NWgwsYWTMh Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10686"; a="348650896" X-IronPort-AV: E=Sophos;i="5.99,213,1677571200"; d="scan'208";a="348650896" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2023 15:06:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10686"; a="724583749" X-IronPort-AV: E=Sophos;i="5.99,213,1677571200"; d="scan'208";a="724583749" Received: from agluck-desk3.sc.intel.com ([172.25.222.78]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2023 15:06:44 -0700 From: Tony Luck To: Fenghua Yu , Reinette Chatre , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Shaopeng Tan , Jamie Iles , James Morse , Babu Moger Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Tony Luck Subject: [RFC PATCH 1/7] x86/resctrl: Add register/unregister functions for driver to hook into resctrl Date: Thu, 20 Apr 2023 15:06:30 -0700 Message-Id: <20230420220636.53527-2-tony.luck@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230420220636.53527-1-tony.luck@intel.com> References: <20230420220636.53527-1-tony.luck@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Just one callback at the point for the driver to be notified when the resctrl filesystem is mounted or unmounted. Virtually all drivers will need this hook to enable/disable their feature(s) as part of mount/unmount. Signed-off-by: Tony Luck --- include/linux/resctrl.h | 13 +++++++ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 50 ++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h index 8334eeacfec5..78513edddca0 100644 --- a/include/linux/resctrl.h +++ b/include/linux/resctrl.h @@ -204,6 +204,19 @@ struct resctrl_schema { u32 num_closid; }; =20 +/** + * struct resctrl_driver - interface for driver to attach to resctrl + * @list: List of registered drivers + * @mount: Callback for mount/unmount + */ +struct resctrl_driver { + struct list_head list; + void (*mount)(bool mount); +}; + +int resctrl_register_driver(struct resctrl_driver *d); +void resctrl_unregister_driver(struct resctrl_driver *d); + /* The number of closid supported by this resource regardless of CDP */ u32 resctrl_arch_get_num_closid(struct rdt_resource *r); int resctrl_arch_update_domains(struct rdt_resource *r, u32 closid); diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index 6ad33f355861..3e6778bde427 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -51,6 +51,9 @@ static struct kernfs_node *kn_mongrp; /* Kernel fs node for "mon_data" directory under root */ static struct kernfs_node *kn_mondata; =20 +static LIST_HEAD(drivers); +static bool resctrl_is_mounted; + static struct seq_buf last_cmd_status; static char last_cmd_status_buf[512]; =20 @@ -2437,6 +2440,42 @@ static int schemata_list_create(void) return ret; } =20 +static void driver_up(struct resctrl_driver *d) +{ + if (d->mount) + d->mount(true); +} + +static void driver_down(struct resctrl_driver *d) +{ + if (d->mount) + d->mount(false); +} + +int resctrl_register_driver(struct resctrl_driver *d) +{ + mutex_lock(&rdtgroup_mutex); + list_add(&d->list, &drivers); + + if (resctrl_is_mounted) + driver_up(d); + mutex_unlock(&rdtgroup_mutex); + + return 0; +} +EXPORT_SYMBOL_GPL(resctrl_register_driver); + +void resctrl_unregister_driver(struct resctrl_driver *d) +{ + mutex_lock(&rdtgroup_mutex); + list_del(&d->list); + + if (resctrl_is_mounted) + driver_down(d); + mutex_unlock(&rdtgroup_mutex); +} +EXPORT_SYMBOL_GPL(resctrl_unregister_driver); + static void schemata_list_destroy(void) { struct resctrl_schema *s, *tmp; @@ -2450,6 +2489,7 @@ static void schemata_list_destroy(void) static int rdt_get_tree(struct fs_context *fc) { struct rdt_fs_context *ctx =3D rdt_fc2context(fc); + struct resctrl_driver *d; struct rdt_domain *dom; struct rdt_resource *r; int ret; @@ -2516,6 +2556,10 @@ static int rdt_get_tree(struct fs_context *fc) mbm_setup_overflow_handler(dom, MBM_OVERFLOW_INTERVAL); } =20 + list_for_each_entry(d, &drivers, list) + driver_up(d); + resctrl_is_mounted =3D true; + goto out; =20 out_psl: @@ -2761,6 +2805,7 @@ static void rmdir_all_sub(void) =20 static void rdt_kill_sb(struct super_block *sb) { + struct resctrl_driver *d; struct rdt_resource *r; =20 cpus_read_lock(); @@ -2780,6 +2825,11 @@ static void rdt_kill_sb(struct super_block *sb) static_branch_disable_cpuslocked(&rdt_mon_enable_key); static_branch_disable_cpuslocked(&rdt_enable_key); kernfs_kill_sb(sb); + + list_for_each_entry(d, &drivers, list) + driver_down(d); + resctrl_is_mounted =3D false; + mutex_unlock(&rdtgroup_mutex); cpus_read_unlock(); } --=20 2.39.2 From nobody Wed Dec 17 10:00:47 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53FAEC77B7C for ; Thu, 20 Apr 2023 22:07:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232710AbjDTWG6 (ORCPT ); Thu, 20 Apr 2023 18:06:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232630AbjDTWGt (ORCPT ); Thu, 20 Apr 2023 18:06:49 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CEE32723 for ; Thu, 20 Apr 2023 15:06:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682028407; x=1713564407; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=f6vRZH9J4bl0VYCw/gMa81FWWCa1ygl87qFy76CeLYY=; b=IufHl0839MtbMtaL7xi0+aeggMaFTrTZVHsRcZKuDDO0wFKBZDbCzX3O cFXD+vatn84mZ5U+rzqN42Ah06H85Kqp7BlkKJBW95SLJXJAljGNp8yuv ftV0ySNoI4CWL1zR0fd9oosrHsheBmGlVc91GlvciLKJQ7eh3xC5CeqbX t2K92R6xVXpbx0kZ1MvB6GRAUKviPk4NUjTCNQ8l/LOv9q8mUsCUaaGeo TgwVbnqLMDPAAbmISU++b0GoTzIvgLRRhY7H/zQnV0zgUuMKtO7pMlhd9 9AB1iZCwpGpYBFrQ0d6jWiwIFEQDBUyTLPhOwQeAo6mB5710bbWgltg65 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10686"; a="348650906" X-IronPort-AV: E=Sophos;i="5.99,213,1677571200"; d="scan'208";a="348650906" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2023 15:06:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10686"; a="724583753" X-IronPort-AV: E=Sophos;i="5.99,213,1677571200"; d="scan'208";a="724583753" Received: from agluck-desk3.sc.intel.com ([172.25.222.78]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2023 15:06:44 -0700 From: Tony Luck To: Fenghua Yu , Reinette Chatre , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Shaopeng Tan , Jamie Iles , James Morse , Babu Moger Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Tony Luck Subject: [RFC PATCH 2/7] x86/resctrl: Add an interface to add/remove a new info/directory Date: Thu, 20 Apr 2023 15:06:31 -0700 Message-Id: <20230420220636.53527-3-tony.luck@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230420220636.53527-1-tony.luck@intel.com> References: <20230420220636.53527-1-tony.luck@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Extend the resctrl_driver structure so that a driver may request creation of a directory in the info/ hierarchy and populate it with files. Remove that info directory and contents when the resctrl file system is unmounted, or the driver unregisters. Signed-off-by: Tony Luck --- include/linux/resctrl.h | 10 +++++ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 59 ++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h index 78513edddca0..7847be48edae 100644 --- a/include/linux/resctrl.h +++ b/include/linux/resctrl.h @@ -204,14 +204,24 @@ struct resctrl_schema { u32 num_closid; }; =20 +struct resctrl_fileinfo { + char *name; + struct kernfs_ops *ops; + void *priv; +}; + /** * struct resctrl_driver - interface for driver to attach to resctrl * @list: List of registered drivers * @mount: Callback for mount/unmount + * @infodir: Name of directory to create in resctrl/info. + * @infofiles: Array of files to create under infodir. */ struct resctrl_driver { struct list_head list; void (*mount)(bool mount); + char *infodir; + struct resctrl_fileinfo *infofiles; }; =20 int resctrl_register_driver(struct resctrl_driver *d); diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index 3e6778bde427..4c662e827097 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -2440,16 +2440,75 @@ static int schemata_list_create(void) return ret; } =20 +#define F_ACTIVATE BIT(0) +#define F_PRIV BIT(1) + +static int addfiles(struct kernfs_node *parent, struct resctrl_fileinfo *f= iles, + int flags, void *priv) +{ + struct resctrl_fileinfo *f; + struct kernfs_node *kn; + umode_t mode; + void *p; + + for (f =3D files; f->name; f++) { + mode =3D (f->ops->write) ? 0644 : 0444; + p =3D (flags & F_PRIV) ? priv : f->priv; + kn =3D __kernfs_create_file(parent, f->name, mode, + GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, 0, + f->ops, p, NULL, NULL); + if (IS_ERR(kn)) + return PTR_ERR(kn); + if (flags & F_ACTIVATE) + kernfs_activate(kn); + } + + return 0; +} + +/* + * Add or remove a directory from the resctrl/info directory + */ +static int rdtgroup_update_info_dir(char *name, struct resctrl_fileinfo *f= iles) +{ + struct kernfs_node *kn_subdir; + int ret; + + if (!files) { + kn_subdir =3D kernfs_find_and_get_ns(kn_info, name, NULL); + if (kn_subdir) + kernfs_remove(kn_subdir); + return 0; + } + + kn_subdir =3D kernfs_create_dir(kn_info, name, 0755, NULL); + if (IS_ERR(kn_subdir)) + return PTR_ERR(kn_subdir); + + ret =3D addfiles(kn_subdir, files, 0, 0); + + if (ret) + kernfs_remove(kn_subdir); + else + kernfs_activate(kn_subdir); + + return ret; +} + static void driver_up(struct resctrl_driver *d) { if (d->mount) d->mount(true); + if (d->infodir) + rdtgroup_update_info_dir(d->infodir, d->infofiles); } =20 static void driver_down(struct resctrl_driver *d) { if (d->mount) d->mount(false); + if (d->infodir) + rdtgroup_update_info_dir(d->infodir, NULL); } =20 int resctrl_register_driver(struct resctrl_driver *d) --=20 2.39.2 From nobody Wed Dec 17 10:00:47 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5627C7618E for ; Thu, 20 Apr 2023 22:07:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233002AbjDTWHJ (ORCPT ); Thu, 20 Apr 2023 18:07:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232854AbjDTWGu (ORCPT ); Thu, 20 Apr 2023 18:06:50 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CB9B30F2 for ; Thu, 20 Apr 2023 15:06:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682028409; x=1713564409; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JvSi0JTqnA0+W3DiLgdLyG89ldY/9UClUErFaxrrnJs=; b=jqGi6I1Y8Tnc89MVEDaQvpTsz0fFHMi20pFwVP2JFEpauN/xstqWSSOw gvdjApAw1mrP+FVdTIp6paferz49rQ8Mn0mXKJKtgSL7E4pjSsxJBKJN3 5pGbfcq/EKlXE020/eU4D2IPzATk7RAiqmbqyBBzT2/QnAn5z6nOwD6xb r+Cxo165bZtAvhrrwufn+nVPrHq/L8FH4hxHziwff0cxxDiGeNzdhM1iG 3J6MUM1dWwHrzGMyunXS0hxBg06m3fMMUNcgIdTfwOO1Y1YZLSF8pKVZ9 RdA48jXWB1tblfSz72jLpwI03uXvCHP8uDKKrnvu2H4RXrfG3PVFiRqWs g==; X-IronPort-AV: E=McAfee;i="6600,9927,10686"; a="348650917" X-IronPort-AV: E=Sophos;i="5.99,213,1677571200"; d="scan'208";a="348650917" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2023 15:06:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10686"; a="724583758" X-IronPort-AV: E=Sophos;i="5.99,213,1677571200"; d="scan'208";a="724583758" Received: from agluck-desk3.sc.intel.com ([172.25.222.78]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2023 15:06:44 -0700 From: Tony Luck To: Fenghua Yu , Reinette Chatre , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Shaopeng Tan , Jamie Iles , James Morse , Babu Moger Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Tony Luck Subject: [RFC PATCH 3/7] x86/resctrl: Add driver callback when directories are removed Date: Thu, 20 Apr 2023 15:06:32 -0700 Message-Id: <20230420220636.53527-4-tony.luck@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230420220636.53527-1-tony.luck@intel.com> References: <20230420220636.53527-1-tony.luck@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" When a resctrl directory is removed, entities attached to that directory are reassigned with the CLOSID and RMID of the parent directory. Add a callback function so a driver can reset the CLOSID and RMID of any resources attached to the removed directory. Signed-off-by: Tony Luck --- include/linux/resctrl.h | 2 ++ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h index 7847be48edae..44dd811cb552 100644 --- a/include/linux/resctrl.h +++ b/include/linux/resctrl.h @@ -216,12 +216,14 @@ struct resctrl_fileinfo { * @mount: Callback for mount/unmount * @infodir: Name of directory to create in resctrl/info. * @infofiles: Array of files to create under infodir. + * @rmdir: Callback when a resctrl directory is removed. */ struct resctrl_driver { struct list_head list; void (*mount)(bool mount); char *infodir; struct resctrl_fileinfo *infofiles; + int (*rmdir)(int oclos, int ormid, int nclos, int nrmid); }; =20 int resctrl_register_driver(struct resctrl_driver *d); diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index 4c662e827097..8ca3b17bd671 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -3495,11 +3495,18 @@ static int rdtgroup_mkdir(struct kernfs_node *paren= t_kn, const char *name, static int rdtgroup_rmdir_mon(struct rdtgroup *rdtgrp, cpumask_var_t tmpma= sk) { struct rdtgroup *prdtgrp =3D rdtgrp->mon.parent; + struct resctrl_driver *d; int cpu; =20 /* Give any tasks back to the parent group */ rdt_move_group_tasks(rdtgrp, prdtgrp, tmpmask); =20 + list_for_each_entry(d, &drivers, list) { + if (d->rmdir) + d->rmdir(rdtgrp->closid, rdtgrp->mon.rmid, + prdtgrp->closid, prdtgrp->mon.rmid); + } + /* Update per cpu rmid of the moved CPUs first */ for_each_cpu(cpu, &rdtgrp->cpu_mask) per_cpu(pqr_state.default_rmid, cpu) =3D prdtgrp->mon.rmid; @@ -3535,6 +3542,7 @@ static int rdtgroup_ctrl_remove(struct rdtgroup *rdtg= rp) =20 static int rdtgroup_rmdir_ctrl(struct rdtgroup *rdtgrp, cpumask_var_t tmpm= ask) { + struct resctrl_driver *d; int cpu; =20 /* Give any tasks back to the default group */ @@ -3544,6 +3552,11 @@ static int rdtgroup_rmdir_ctrl(struct rdtgroup *rdtg= rp, cpumask_var_t tmpmask) cpumask_or(&rdtgroup_default.cpu_mask, &rdtgroup_default.cpu_mask, &rdtgrp->cpu_mask); =20 + list_for_each_entry(d, &drivers, list) { + if (d->rmdir) + d->rmdir(rdtgrp->closid, rdtgrp->mon.rmid, 0, 0); + } + /* Update per cpu closid and rmid of the moved CPUs first */ for_each_cpu(cpu, &rdtgrp->cpu_mask) { per_cpu(pqr_state.default_closid, cpu) =3D rdtgroup_default.closid; --=20 2.39.2 From nobody Wed Dec 17 10:00:47 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 014F5C7618E for ; Thu, 20 Apr 2023 22:07:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232486AbjDTWHN (ORCPT ); Thu, 20 Apr 2023 18:07:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232862AbjDTWGu (ORCPT ); Thu, 20 Apr 2023 18:06:50 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5284935AA for ; Thu, 20 Apr 2023 15:06:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682028409; x=1713564409; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oyN/jlwNsbSH8AgIgVgPY6yTXuGt35RnjrIqFZ99+pY=; b=F0SR9pxxZufNPjK5UzsNZiGYStvN1cdS6uHsS1y8HXNnlo2YLXZhp4Ej vhdPCFBDwUs/97wiSjdZTHPEx1rDx3P3WtfU+/H9t6wsCdd8gXcMNdPDX FPz+xf1OyurP7LwbTqA6kY0+tErmInngzZ/29IKMm6PYNAdtURowvBZ1n hw0dYCSN2v6AoYRjCvBJoELlzL7aMKn6RerdoqDTAgO027KMqnFO/Ae9y YE+CXDHmQGQ11R7OcxJtgNXqbKsrRJTIENpEWCGDCFf9txUKtV3LUWUkz gq6tVDXDNcoCoTvJ1pYbPVynnGGvGvxT+8dgrOcnqAI8QkW72OkaGliv6 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10686"; a="348650928" X-IronPort-AV: E=Sophos;i="5.99,213,1677571200"; d="scan'208";a="348650928" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2023 15:06:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10686"; a="724583761" X-IronPort-AV: E=Sophos;i="5.99,213,1677571200"; d="scan'208";a="724583761" Received: from agluck-desk3.sc.intel.com ([172.25.222.78]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2023 15:06:45 -0700 From: Tony Luck To: Fenghua Yu , Reinette Chatre , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Shaopeng Tan , Jamie Iles , James Morse , Babu Moger Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Tony Luck Subject: [RFC PATCH 4/7] x86/resctrl: Add capability to driver registration to create control files Date: Thu, 20 Apr 2023 15:06:33 -0700 Message-Id: <20230420220636.53527-5-tony.luck@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230420220636.53527-1-tony.luck@intel.com> References: <20230420220636.53527-1-tony.luck@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add a control file to each ctrlmon directory. Hook into the mkdir() functions to add the control file to any new directories that are created. Signed-off-by: Tony Luck --- include/linux/resctrl.h | 2 + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 70 ++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h index 44dd811cb552..8668480cea51 100644 --- a/include/linux/resctrl.h +++ b/include/linux/resctrl.h @@ -217,6 +217,7 @@ struct resctrl_fileinfo { * @infodir: Name of directory to create in resctrl/info. * @infofiles: Array of files to create under infodir. * @rmdir: Callback when a resctrl directory is removed. + * @ctrlfiles: Array of files to create in ctrlmon directories. */ struct resctrl_driver { struct list_head list; @@ -224,6 +225,7 @@ struct resctrl_driver { char *infodir; struct resctrl_fileinfo *infofiles; int (*rmdir)(int oclos, int ormid, int nclos, int nrmid); + struct resctrl_fileinfo *ctrlfiles; }; =20 int resctrl_register_driver(struct resctrl_driver *d); diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index 8ca3b17bd671..e2fdd5819336 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -2466,6 +2466,18 @@ static int addfiles(struct kernfs_node *parent, stru= ct resctrl_fileinfo *files, return 0; } =20 +static void rmfiles(struct kernfs_node *parent, struct resctrl_fileinfo *f= iles) +{ + struct resctrl_fileinfo *f; + struct kernfs_node *kn; + + for (f =3D files; f->name; f++) { + kn =3D kernfs_find_and_get_ns(parent, f->name, NULL); + if (kn) + kernfs_remove(kn); + } +} + /* * Add or remove a directory from the resctrl/info directory */ @@ -2495,12 +2507,49 @@ static int rdtgroup_update_info_dir(char *name, str= uct resctrl_fileinfo *files) return ret; } =20 +/* + * Create/remove a new control file in all current and future control and + * monitor groups. + */ +static void rdtgroup_update_ctrl_dir(struct resctrl_fileinfo *files, bool = add) +{ + struct rdtgroup *rdtgrp; + + if (!add) { + list_for_each_entry(rdtgrp, &rdt_all_groups, rdtgroup_list) { + struct rdtgroup *crg; + + rmfiles(rdtgrp->kn, files); + + list_for_each_entry(crg, &rdtgrp->mon.crdtgrp_list, mon.crdtgrp_list) { + rmfiles(crg->kn, files); + } + } + + return; + } + + list_for_each_entry(rdtgrp, &rdt_all_groups, rdtgroup_list) { + unsigned long priv =3D (rdtgrp->closid << 16) | rdtgrp->mon.rmid; + struct rdtgroup *crg; + + addfiles(rdtgrp->kn, files, F_PRIV | F_ACTIVATE, (void *)priv); + + list_for_each_entry(crg, &rdtgrp->mon.crdtgrp_list, mon.crdtgrp_list) { + priv =3D (crg->closid << 16) | crg->mon.rmid; + addfiles(crg->kn, files, F_PRIV | F_ACTIVATE, (void *)priv); + } + } +} + static void driver_up(struct resctrl_driver *d) { if (d->mount) d->mount(true); if (d->infodir) rdtgroup_update_info_dir(d->infodir, d->infofiles); + if (d->ctrlfiles) + rdtgroup_update_ctrl_dir(d->ctrlfiles, true); } =20 static void driver_down(struct resctrl_driver *d) @@ -2509,6 +2558,8 @@ static void driver_down(struct resctrl_driver *d) d->mount(false); if (d->infodir) rdtgroup_update_info_dir(d->infodir, NULL); + if (d->ctrlfiles) + rdtgroup_update_ctrl_dir(d->ctrlfiles, false); } =20 int resctrl_register_driver(struct resctrl_driver *d) @@ -3375,6 +3426,7 @@ static int rdtgroup_mkdir_mon(struct kernfs_node *par= ent_kn, const char *name, umode_t mode) { struct rdtgroup *rdtgrp, *prgrp; + struct resctrl_driver *d; int ret; =20 ret =3D mkdir_rdt_prepare(parent_kn, name, mode, RDTMON_GROUP, &rdtgrp); @@ -3384,6 +3436,14 @@ static int rdtgroup_mkdir_mon(struct kernfs_node *pa= rent_kn, prgrp =3D rdtgrp->mon.parent; rdtgrp->closid =3D prgrp->closid; =20 + list_for_each_entry(d, &drivers, list) { + unsigned long priv =3D (rdtgrp->closid << 16) | rdtgrp->mon.rmid; + + if (!d->ctrlfiles) + continue; + addfiles(rdtgrp->kn, d->ctrlfiles, F_PRIV | F_ACTIVATE, (void *)priv); + } + /* * Add the rdtgrp to the list of rdtgrps the parent * ctrl_mon group has to track. @@ -3401,6 +3461,7 @@ static int rdtgroup_mkdir_mon(struct kernfs_node *par= ent_kn, static int rdtgroup_mkdir_ctrl_mon(struct kernfs_node *parent_kn, const char *name, umode_t mode) { + struct resctrl_driver *d; struct rdtgroup *rdtgrp; struct kernfs_node *kn; u32 closid; @@ -3426,6 +3487,15 @@ static int rdtgroup_mkdir_ctrl_mon(struct kernfs_nod= e *parent_kn, =20 list_add(&rdtgrp->rdtgroup_list, &rdt_all_groups); =20 + list_for_each_entry(d, &drivers, list) { + unsigned long priv =3D (rdtgrp->closid << 16) | rdtgrp->mon.rmid; + + if (!d->ctrlfiles) + continue; + + addfiles(kn, d->ctrlfiles, F_PRIV | F_ACTIVATE, (void *)priv); + } + if (rdt_mon_capable) { /* * Create an empty mon_groups directory to hold the subset --=20 2.39.2 From nobody Wed Dec 17 10:00:47 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20A74C7618E for ; Thu, 20 Apr 2023 22:07:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232972AbjDTWHF (ORCPT ); Thu, 20 Apr 2023 18:07:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232873AbjDTWGv (ORCPT ); Thu, 20 Apr 2023 18:06:51 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9363C270C for ; Thu, 20 Apr 2023 15:06:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682028409; x=1713564409; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=snGRPrZmk44dmEkOaizzRRz9f19/ahGzyDW4YNPDoy4=; b=Ad8T2j2NRVzZJ4nxk2QZ3RrW0ESgxe/hBRCZwi0NGAucyLN4r30qUYp/ VjSpc4+/5siiKcxA1KityOcfUMwTdn0u0Uij/rG2OlkRX86NzWoZSpcn/ V0JsKbxpWkZIlEyEfU+ixQ5D1xTEsIqx9dIs+YQp0AEJeiVtsjxMeL9Aw yAAiR0lwYfHX2cucZtpfiYQeqfvQdk7ZeodnIOtfu2fWVWSc6kDwGOP6D aJ0arnx+eD7fAhOMzv9Dc/dHBuKKNgzzNMT4wr9t81IPkRno4hqYami0S H3ofb3IZ8tz5RLsNW5UEUMGMcQdfR/DGlYS/ducGs7tMw6DWXsbR7yFwz A==; X-IronPort-AV: E=McAfee;i="6600,9927,10686"; a="348650938" X-IronPort-AV: E=Sophos;i="5.99,213,1677571200"; d="scan'208";a="348650938" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2023 15:06:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10686"; a="724583766" X-IronPort-AV: E=Sophos;i="5.99,213,1677571200"; d="scan'208";a="724583766" Received: from agluck-desk3.sc.intel.com ([172.25.222.78]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2023 15:06:45 -0700 From: Tony Luck To: Fenghua Yu , Reinette Chatre , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Shaopeng Tan , Jamie Iles , James Morse , Babu Moger Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Tony Luck Subject: [RFC PATCH 5/7] x86/resctrl: Enhance driver registration to hook into schemata files Date: Thu, 20 Apr 2023 15:06:34 -0700 Message-Id: <20230420220636.53527-6-tony.luck@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230420220636.53527-1-tony.luck@intel.com> References: <20230420220636.53527-1-tony.luck@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add a new configuration type "DRIVER" for lines in the schemata files with a show() and update() callback functions to the driver to maintain these lines. Signed-off-by: Tony Luck --- include/linux/resctrl.h | 6 ++++++ arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 17 ++++++++++++++--- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 16 ++++++++++++++++ 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h index 8668480cea51..691805214f41 100644 --- a/include/linux/resctrl.h +++ b/include/linux/resctrl.h @@ -23,11 +23,13 @@ int proc_resctrl_show(struct seq_file *m, * @CDP_NONE: No prioritisation, both code and data are controlled or moni= tored. * @CDP_CODE: Configuration applies to instruction fetches. * @CDP_DATA: Configuration applies to reads and writes. + * @DRIVER: Resource managed by driver. */ enum resctrl_conf_type { CDP_NONE, CDP_CODE, CDP_DATA, + DRIVER, }; =20 #define CDP_NUM_TYPES (CDP_DATA + 1) @@ -201,6 +203,8 @@ struct resctrl_schema { char name[8]; enum resctrl_conf_type conf_type; struct rdt_resource *res; + void (*show)(struct seq_file *s, int closid); + int (*update)(char *s, int closid); u32 num_closid; }; =20 @@ -218,6 +222,7 @@ struct resctrl_fileinfo { * @infofiles: Array of files to create under infodir. * @rmdir: Callback when a resctrl directory is removed. * @ctrlfiles: Array of files to create in ctrlmon directories. + * @schema: Driver supplied to manage a line in schemata file. */ struct resctrl_driver { struct list_head list; @@ -226,6 +231,7 @@ struct resctrl_driver { struct resctrl_fileinfo *infofiles; int (*rmdir)(int oclos, int ormid, int nclos, int nrmid); struct resctrl_fileinfo *ctrlfiles; + struct resctrl_schema schema; }; =20 int resctrl_register_driver(struct resctrl_driver *d); diff --git a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c b/arch/x86/kernel/cp= u/resctrl/ctrlmondata.c index b44c487727d4..7a59d6eab576 100644 --- a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c +++ b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c @@ -356,8 +356,12 @@ static int rdtgroup_parse_resource(char *resname, char= *tok, struct resctrl_schema *s; =20 list_for_each_entry(s, &resctrl_schema_all, list) { - if (!strcmp(resname, s->name) && rdtgrp->closid < s->num_closid) - return parse_line(tok, s, rdtgrp); + if (!strcmp(resname, s->name) && rdtgrp->closid < s->num_closid) { + if (s->conf_type =3D=3D DRIVER) + return s->update(tok, rdtgrp->closid); + else + return parse_line(tok, s, rdtgrp); + } } rdt_last_cmd_printf("Unknown or unsupported resource name '%s'\n", resnam= e); return -EINVAL; @@ -419,10 +423,11 @@ ssize_t rdtgroup_schemata_write(struct kernfs_open_fi= le *of, r =3D s->res; =20 /* + * Resources controlled by a driver are updated by that driver. * Writes to mba_sc resources update the software controller, * not the control MSR. */ - if (is_mba_sc(r)) + if (s->conf_type =3D=3D DRIVER || is_mba_sc(r)) continue; =20 ret =3D resctrl_arch_update_domains(r, rdtgrp->closid); @@ -464,6 +469,12 @@ static void show_doms(struct seq_file *s, struct resct= rl_schema *schema, int clo u32 ctrl_val; =20 seq_printf(s, "%*s:", max_name_width, schema->name); + + if (schema->conf_type =3D=3D DRIVER) { + schema->show(s, closid); + return; + } + list_for_each_entry(dom, &r->domains, list) { if (sep) seq_puts(s, ";"); diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index e2fdd5819336..cc2292a7435b 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -2043,6 +2043,8 @@ static int rdtgroup_create_info_dir(struct kernfs_nod= e *parent_kn) =20 /* loop over enabled controls, these are all alloc_capable */ list_for_each_entry(s, &resctrl_schema_all, list) { + if (s->conf_type =3D=3D DRIVER) + continue; r =3D s->res; fflags =3D r->fflags | RF_CTRL_INFO; ret =3D rdtgroup_mkdir_info_resdir(s, s->name, fflags); @@ -2390,6 +2392,9 @@ static int schemata_list_add(struct rdt_resource *r, = enum resctrl_conf_type type case CDP_NONE: suffix =3D ""; break; + case DRIVER: + kfree(s); + return -EINVAL; } =20 ret =3D snprintf(s->name, sizeof(s->name), "%s%s", r->name, suffix); @@ -2567,6 +2572,9 @@ int resctrl_register_driver(struct resctrl_driver *d) mutex_lock(&rdtgroup_mutex); list_add(&d->list, &drivers); =20 + if (d->schema.name[0]) + list_add(&d->schema.list, &resctrl_schema_all); + if (resctrl_is_mounted) driver_up(d); mutex_unlock(&rdtgroup_mutex); @@ -2578,8 +2586,12 @@ EXPORT_SYMBOL_GPL(resctrl_register_driver); void resctrl_unregister_driver(struct resctrl_driver *d) { mutex_lock(&rdtgroup_mutex); + list_del(&d->list); =20 + if (d->schema.name[0]) + list_del(&d->schema.list); + if (resctrl_is_mounted) driver_down(d); mutex_unlock(&rdtgroup_mutex); @@ -2591,6 +2603,8 @@ static void schemata_list_destroy(void) struct resctrl_schema *s, *tmp; =20 list_for_each_entry_safe(s, tmp, &resctrl_schema_all, list) { + if (s->conf_type =3D=3D DRIVER) + continue; list_del(&s->list); kfree(s); } @@ -3285,6 +3299,8 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgr= p) rdt_staged_configs_clear(); =20 list_for_each_entry(s, &resctrl_schema_all, list) { + if (s->conf_type =3D=3D DRIVER) + continue; r =3D s->res; if (r->rid =3D=3D RDT_RESOURCE_MBA || r->rid =3D=3D RDT_RESOURCE_SMBA) { --=20 2.39.2 From nobody Wed Dec 17 10:00:47 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8453BC7618E for ; Thu, 20 Apr 2023 22:07:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233017AbjDTWHR (ORCPT ); Thu, 20 Apr 2023 18:07:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229736AbjDTWG4 (ORCPT ); Thu, 20 Apr 2023 18:06:56 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D49F340CA for ; Thu, 20 Apr 2023 15:06:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682028410; x=1713564410; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vE1A0+aVMvRyEXkILJnKwNrogCJkhjI/aeL766efMHE=; b=IlRVFUrAp+S/rdewxqmrObH5a42HGCBtWPIDhywjtnryRmEUZ/cAqQuZ /bl6EYoN8goW8ijyVS3l8UCZ6uJSoBMOBdBO8ph1Fmx6NLA74LymmN6LJ 9hVXhUy/k2mmE+GU4LsMKEV1B0H4DUYOMlh++FD/S64U615WGuBwOzU8Q zHxdEqA+W1Hk7/IE2NR3xYCxP6aOrQLTv50kkAuB7d9Zc4q/zHYm02L7U enIerfkRkG0ggySKYKahMCKV+hkpH5hhfXdfwLQlyKDXNXJDxZBlTxx1H Tr0hbQiCJudYK8MDXdjaQAZM7cxwn3Fzh/o6aCw/J0PE7rHDyLSWUPiCR Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10686"; a="348650948" X-IronPort-AV: E=Sophos;i="5.99,213,1677571200"; d="scan'208";a="348650948" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2023 15:06:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10686"; a="724583770" X-IronPort-AV: E=Sophos;i="5.99,213,1677571200"; d="scan'208";a="724583770" Received: from agluck-desk3.sc.intel.com ([172.25.222.78]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2023 15:06:45 -0700 From: Tony Luck To: Fenghua Yu , Reinette Chatre , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Shaopeng Tan , Jamie Iles , James Morse , Babu Moger Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Tony Luck Subject: [RFC PATCH 6/7] x86/resctrl: Allow a device to override an existing schemata entry Date: Thu, 20 Apr 2023 15:06:35 -0700 Message-Id: <20230420220636.53527-7-tony.luck@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230420220636.53527-1-tony.luck@intel.com> References: <20230420220636.53527-1-tony.luck@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove that entry from the resctrl_schema_all list when driver is loaded. Put it back again when driver is unloaded. Signed-off-by: Tony Luck --- include/linux/resctrl.h | 4 ++++ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h index 691805214f41..246644f53bde 100644 --- a/include/linux/resctrl.h +++ b/include/linux/resctrl.h @@ -223,6 +223,8 @@ struct resctrl_fileinfo { * @rmdir: Callback when a resctrl directory is removed. * @ctrlfiles: Array of files to create in ctrlmon directories. * @schema: Driver supplied to manage a line in schemata file. + * @schema_override: Name of resource in schemata to override. + * @save_schema: List to save overridden schema while driver loaded */ struct resctrl_driver { struct list_head list; @@ -232,6 +234,8 @@ struct resctrl_driver { int (*rmdir)(int oclos, int ormid, int nclos, int nrmid); struct resctrl_fileinfo *ctrlfiles; struct resctrl_schema schema; + char *schema_override; + struct list_head save_schema; }; =20 int resctrl_register_driver(struct resctrl_driver *d); diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index cc2292a7435b..4fc12ad56843 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -2547,6 +2547,19 @@ static void rdtgroup_update_ctrl_dir(struct resctrl_= fileinfo *files, bool add) } } =20 +static void driver_override(struct resctrl_driver *d) +{ + struct resctrl_schema *rs; + + list_for_each_entry(rs, &resctrl_schema_all, list) { + if (strncmp(d->schema_override, rs->name, sizeof(rs->name))) + continue; + INIT_LIST_HEAD(&d->save_schema); + list_move(&rs->list, &d->save_schema); + break; + } +} + static void driver_up(struct resctrl_driver *d) { if (d->mount) @@ -2575,6 +2588,9 @@ int resctrl_register_driver(struct resctrl_driver *d) if (d->schema.name[0]) list_add(&d->schema.list, &resctrl_schema_all); =20 + if (d->schema_override) + driver_override(d); + if (resctrl_is_mounted) driver_up(d); mutex_unlock(&rdtgroup_mutex); @@ -2592,6 +2608,9 @@ void resctrl_unregister_driver(struct resctrl_driver = *d) if (d->schema.name[0]) list_del(&d->schema.list); =20 + if (d->schema_override && !list_empty(&d->save_schema)) + list_move(d->save_schema.next, &resctrl_schema_all); + if (resctrl_is_mounted) driver_down(d); mutex_unlock(&rdtgroup_mutex); --=20 2.39.2 From nobody Wed Dec 17 10:00:47 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9CAAC7618E for ; Thu, 20 Apr 2023 22:07:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233036AbjDTWHV (ORCPT ); Thu, 20 Apr 2023 18:07:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229907AbjDTWG4 (ORCPT ); Thu, 20 Apr 2023 18:06:56 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BB523C1B for ; Thu, 20 Apr 2023 15:06:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682028410; x=1713564410; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RoRP+ak75xtj8epEFOITeTaJ3nELbWFyH3TBq416Xuw=; b=BBz6ORoP2MZoNfI7gXrvJJL0s/dyk1tc1HB6TtbWXm+pVn2sKY4Hu/aA pQsypLzc4FnWQylhJwpkM1DhlM/eMHS7b0yZKeci6UhOSVnvoF4ROj0rA DoPTEvmWcnwOa0oaxPQDsu9NoqJ5rg7EWMuy99id6j72Nr1IiMiASV+lW 9WvNx+s94zHm3Gcy/uQMvMhSMA3iV8FGkvrWkI2zUzIErBy6PMjPMaNvN ONx13eMiKEB5G3EOYfR/MLtqweVtU9yhk+O3P1IIH2ffeR9OvaoNQ4EJq 4pGe3jlwdd5o1M47YwCYNt1j17/TEzRXSvAlvKFgxwef6CHyJCssxt3o4 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10686"; a="348650958" X-IronPort-AV: E=Sophos;i="5.99,213,1677571200"; d="scan'208";a="348650958" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2023 15:06:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10686"; a="724583774" X-IronPort-AV: E=Sophos;i="5.99,213,1677571200"; d="scan'208";a="724583774" Received: from agluck-desk3.sc.intel.com ([172.25.222.78]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2023 15:06:46 -0700 From: Tony Luck To: Fenghua Yu , Reinette Chatre , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Shaopeng Tan , Jamie Iles , James Morse , Babu Moger Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Tony Luck Subject: [RFC PATCH 7/7] x86/resctrl: Example resctrl driver Date: Thu, 20 Apr 2023 15:06:36 -0700 Message-Id: <20230420220636.53527-8-tony.luck@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230420220636.53527-1-tony.luck@intel.com> References: <20230420220636.53527-1-tony.luck@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Simply add two files to each ctrlmon directory that show the closid and rmid respectively. Signed-off-by: Tony Luck --- .../cpu/resctrl/drivers/resctrl_example.c | 77 +++++++++++++++++++ arch/x86/Kconfig | 11 +++ arch/x86/kernel/cpu/resctrl/Makefile | 1 + arch/x86/kernel/cpu/resctrl/drivers/Makefile | 1 + 4 files changed, 90 insertions(+) create mode 100644 arch/x86/kernel/cpu/resctrl/drivers/resctrl_example.c create mode 100644 arch/x86/kernel/cpu/resctrl/drivers/Makefile diff --git a/arch/x86/kernel/cpu/resctrl/drivers/resctrl_example.c b/arch/x= 86/kernel/cpu/resctrl/drivers/resctrl_example.c new file mode 100644 index 000000000000..24998e0dc3c2 --- /dev/null +++ b/arch/x86/kernel/cpu/resctrl/drivers/resctrl_example.c @@ -0,0 +1,77 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright(c) 2023 Intel Corporation. */ + +/* + * Example resctrl driver + */ +#include +#include +#include +#include +#include +#include + +#undef pr_fmt +#define pr_fmt(fmt) "exampleresctrl: " fmt + +static int closid_show(struct seq_file *sf, void *arg) +{ + struct kernfs_open_file *of =3D sf->private; + unsigned long priv =3D (unsigned long)of->kn->priv; + u32 closid =3D priv >> 16; + + seq_printf(sf, "%d\n", closid); + + return 0; +} + +static int rmid_show(struct seq_file *sf, void *arg) +{ + struct kernfs_open_file *of =3D sf->private; + unsigned long priv =3D (unsigned long)of->kn->priv; + u32 rmid =3D priv & 0xffff; + + seq_printf(sf, "%d\n", rmid); + + return 0; +} + +static struct kernfs_ops closid_ops =3D { + .seq_show =3D closid_show, +}; + +static struct kernfs_ops rmid_ops =3D { + .seq_show =3D rmid_show, +}; + +static struct resctrl_fileinfo files[] =3D { + { + .name =3D "closid", .ops =3D &closid_ops + }, + { + .name =3D "rmid", .ops =3D &rmid_ops + }, + { + } +}; + +static struct resctrl_driver ops =3D { + .ctrlfiles =3D files, +}; + +static int __init init_example(void) +{ + resctrl_register_driver(&ops); + + return 0; +} + +static void __exit cleanup_example(void) +{ + resctrl_unregister_driver(&ops); +} + +module_init(init_example); +module_exit(cleanup_example); + +MODULE_LICENSE("GPL"); diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a825bf031f49..7f2faec17365 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -500,6 +500,17 @@ config X86_CPU_RESCTRL =20 Say N if unsure. =20 +config X86_CPU_RESCTRL_DRIVERS + bool "resctrl driver" + +config X86_CPU_RESCTRL_EXAMPLE_DRIVER + tristate "example x86 resctrl driver" + depends on X86_CPU_RESCTRL + select X86_CPU_RESCTRL_DRIVERS + help + Example driver to show one possible use case for + resctrl driver registration. + if X86_32 config X86_BIGSMP bool "Support for big SMP systems with more than 8 CPUs" diff --git a/arch/x86/kernel/cpu/resctrl/Makefile b/arch/x86/kernel/cpu/res= ctrl/Makefile index 4a06c37b9cf1..7db4d729afbc 100644 --- a/arch/x86/kernel/cpu/resctrl/Makefile +++ b/arch/x86/kernel/cpu/resctrl/Makefile @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_X86_CPU_RESCTRL) +=3D core.o rdtgroup.o monitor.o obj-$(CONFIG_X86_CPU_RESCTRL) +=3D ctrlmondata.o pseudo_lock.o +obj-$(CONFIG_X86_CPU_RESCTRL_DRIVERS) +=3D drivers/ CFLAGS_pseudo_lock.o =3D -I$(src) diff --git a/arch/x86/kernel/cpu/resctrl/drivers/Makefile b/arch/x86/kernel= /cpu/resctrl/drivers/Makefile new file mode 100644 index 000000000000..27db936eb947 --- /dev/null +++ b/arch/x86/kernel/cpu/resctrl/drivers/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_X86_CPU_RESCTRL_EXAMPLE_DRIVER) +=3D resctrl_example.o --=20 2.39.2