From patchwork Thu Apr 20 22:06:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 86058 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp655637vqo; Thu, 20 Apr 2023 15:25:07 -0700 (PDT) X-Google-Smtp-Source: AKy350acGOPzHUEPnYNzUeiFZ6wnE3VpsVKoVkbUxcwUnKWku9kHHqXudF7inZnizpW073V+LEx/ X-Received: by 2002:a05:6a00:1143:b0:63d:3ae4:7c72 with SMTP id b3-20020a056a00114300b0063d3ae47c72mr3688617pfm.0.1682029507051; Thu, 20 Apr 2023 15:25:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682029507; cv=none; d=google.com; s=arc-20160816; b=FgeBRIV+tf8rs85cO6neYWStTelBFPbfE2v2LSeCWSCnRbGXcS07dtOs58VaB5g5rg eHoeZpii8GvjHheNtopYbNpyZUpQVjj+h0nGCOE6xoQ4amsJF7iMvjMkOHBmVx9Ykk1g WcvcqaBXTaJxtc+1iw5mcqw+MZ++T7fIJ6TSNFjqvglZphNRR5mvr6OispXhyKHMDEF5 SES7kt7BaDKd/et6CFUsFZ1+O7ZGhGM6tYPvDWO19IbQJlc9VU2UwNj8e9N6FjsjraIf IcLblXWUFScB/0vnMbSwNoBkwnaX3YU/yKNixrqc6JhskjxQfZWG0t9pR+ODmluA8zUh 6vUQ== 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 :dkim-signature; bh=HqGajp8//BYUzpcQOyJzZMV83pMyXF6V/bxXyLpkhio=; b=x4vkFN1CRDUnqAtls8T6SDsUV20vWB7PXnjheP7+7tLwDLdBqu3BmxisdTBKbaF2+U fhrBMyBZ9ClHeXjBm4+y0h/V0GgM/iQQT3Eiya+KOvIjxwDqkiS6rMuEZjdkmFDN09/C ZBwFOmOGOXhI5gmkgwBxUQv0Wl0gCz3yavmvDgCNkqQLKYZd7Dzx5kSJKupKChlqhnlv 8kdT18tufFjI4zP5q7HIyKCUd8seOcINGW9afqsArBAKihlifXjhYbULkAJBotJEYu7X C7MiBNrCsVvyWrDSKy3hyYKJ9hhttqmLkuDDh5DNh2K1Drl7A10VMhui48t+byhcDtL3 l+ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=N1EzTJuu; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r17-20020aa79891000000b0063b8eec0832si2717216pfl.114.2023.04.20.15.24.55; Thu, 20 Apr 2023 15:25:06 -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; dkim=pass header.i=@intel.com header.s=Intel header.b=N1EzTJuu; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232888AbjDTWGw (ORCPT + 99 others); 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 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1763735772406043423?= X-GMAIL-MSGID: =?utf-8?q?1763735772406043423?= 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; }; +/** + * 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/resctrl/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; +static LIST_HEAD(drivers); +static bool resctrl_is_mounted; + static struct seq_buf last_cmd_status; static char last_cmd_status_buf[512]; @@ -2437,6 +2440,42 @@ static int schemata_list_create(void) return ret; } +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 = 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); } + list_for_each_entry(d, &drivers, list) + driver_up(d); + resctrl_is_mounted = true; + goto out; out_psl: @@ -2761,6 +2805,7 @@ static void rmdir_all_sub(void) static void rdt_kill_sb(struct super_block *sb) { + struct resctrl_driver *d; struct rdt_resource *r; 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 = false; + mutex_unlock(&rdtgroup_mutex); cpus_read_unlock(); } From patchwork Thu Apr 20 22:06:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 86050 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp647118vqo; Thu, 20 Apr 2023 15:08:48 -0700 (PDT) X-Google-Smtp-Source: AKy350aPoGVNTo2H5BoBDLJ49IMAO5M5Ps0DRLevvYP5yor3k8cyKH5oomskSZlfTAt/RT06zZBO X-Received: by 2002:a17:90a:8545:b0:246:d185:bd7c with SMTP id a5-20020a17090a854500b00246d185bd7cmr3372097pjw.5.1682028528200; Thu, 20 Apr 2023 15:08:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682028528; cv=none; d=google.com; s=arc-20160816; b=aBqvwyO+3qbANRUqx43qOr4GmT+06U7cSbf5Pe8a1QV6YSRlQUVOxjDWk6sEypJQCQ W2X2pY6/EltkdbwtWM31YGpbRMtHzqJ7cGKJDs5XPK8ANJmnfmpAjNn7Y/Hmk8aD4uH6 ZsCpCqXK9S5XtpXfEPflgLNWtrndBuelha3+zgQUIf+v7jDQKYogYcgFBipWS3z+kPPy EKhTxvy4xhe3kryb97AkddK31Ba0ifE/ElhYDBDEggnuKiysHheB7eh7aTLLp3QAAYFH 1QnHzArVfzLUvJeXBwLtim4C3Ys2z1cYu0+jM15SSZdd35VDzQP68eA+w1zSlzpJmf/0 ztvg== 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 :dkim-signature; bh=/R9gB0APH7kAHh3vOqqMVdPnrZW+MdWL8VUTwpJ+PXk=; b=exE9Ii/OK+2teEdG705jqNJuH4rZt7Q7unrg6LQkZFZgXTc16X3/vdZ0MQhDjRTH3n u83tIyN/O1kJPgKT09CUeISlGyJpQUxlFD9L6MLZvzR5nYnuGf8TltnDam6Wrimq3erL CdluyxVoVHXPKiWoV+N0Er+002iJscYhJ1eHKMSB5gz4wNspcY3Tv2sEXm8EgNYVVHOR YrKnHECX6PFSHX4Ocjdg/wTl6zHUZYBixc3HQwkqjMKbew+rqfvUd77U9LJF4jbndiQ3 zQ21jq+TC8Z9+UxAUgJKlZmhf86RYYfItL9kKogSUK1jRaxKXg7XjqpkjwMxyaa51huR KzVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IufHl083; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nl11-20020a17090b384b00b0024667ac567csi2379559pjb.38.2023.04.20.15.08.32; Thu, 20 Apr 2023 15:08:48 -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; dkim=pass header.i=@intel.com header.s=Intel header.b=IufHl083; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232938AbjDTWG5 (ORCPT + 99 others); Thu, 20 Apr 2023 18:06:57 -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 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1763734745996057858?= X-GMAIL-MSGID: =?utf-8?q?1763734745996057858?= 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; }; +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; }; int resctrl_register_driver(struct resctrl_driver *d); diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/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; } +#define F_ACTIVATE BIT(0) +#define F_PRIV BIT(1) + +static int addfiles(struct kernfs_node *parent, struct resctrl_fileinfo *files, + int flags, void *priv) +{ + struct resctrl_fileinfo *f; + struct kernfs_node *kn; + umode_t mode; + void *p; + + for (f = files; f->name; f++) { + mode = (f->ops->write) ? 0644 : 0444; + p = (flags & F_PRIV) ? priv : f->priv; + kn = __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 *files) +{ + struct kernfs_node *kn_subdir; + int ret; + + if (!files) { + kn_subdir = kernfs_find_and_get_ns(kn_info, name, NULL); + if (kn_subdir) + kernfs_remove(kn_subdir); + return 0; + } + + kn_subdir = kernfs_create_dir(kn_info, name, 0755, NULL); + if (IS_ERR(kn_subdir)) + return PTR_ERR(kn_subdir); + + ret = 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); } static void driver_down(struct resctrl_driver *d) { if (d->mount) d->mount(false); + if (d->infodir) + rdtgroup_update_info_dir(d->infodir, NULL); } int resctrl_register_driver(struct resctrl_driver *d) From patchwork Thu Apr 20 22:06:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 86051 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp647924vqo; Thu, 20 Apr 2023 15:10:13 -0700 (PDT) X-Google-Smtp-Source: AKy350ZH7qvNrb3PYMZa912Gn05jMn+uffiXEenGSUsCV5RMuyNo1PROFwEBHJ9UwldLVN4DSLqZ X-Received: by 2002:a17:902:e80a:b0:1a6:34ea:6bc6 with SMTP id u10-20020a170902e80a00b001a634ea6bc6mr3472837plg.14.1682028613127; Thu, 20 Apr 2023 15:10:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682028613; cv=none; d=google.com; s=arc-20160816; b=B1FdfVLsuXPLYO7oLVskgl/kkjeN5o+4BLxO3nTCUA3ha6qlpBBw+KYyZOJl0d6cMl MDJub5yS+FL/lOe3i/B34oxd5uPpV89sH1bojc+YUOcHXkCqa6mvYKYUz0VFiIw7wJ8q CpRwQzZnoer4uiht59WR5h8lGA71UJ8QYY/xYeT/XrOMHTmqY1qoyNPqTUKDqxhMv6rQ dO+idD53yqCkb8h6cIhiEvgG+83lCnq/u3jeq6KRwEVxLaHEnDDkHW9r6yQvF/MXMPhY 3QpcFUe1VaHjEwZLCmneLZFptCNi0cO57Bww6wap65ttfOfexWwCwIV4ZYdKxHkQUIvF vrUA== 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 :dkim-signature; bh=DA2h/JJkJhtuwyBJSZHb0l934sMqVcliWVMIvEirt1s=; b=x7x27b9VzbsIu9T17Du79LOsAhgWYQshMDlDpdPXmw+B/zLTH3fQ5tmQvQ7VG6+jRN lsLoFoQOw+KeDPJazYTPtvGLYXqLEMIwGBRTPrR37SjbmPSZuf9RJwJR89aY5+3LY1/i uXcA7SPipUZqPZpUHwdkC7V3OJuXIN6cwVO7/OJ902tGhFTzkNYGHz/kVQlnGfvmkLHe 6ZBUVHT0uunBJwwG+HPqKQm/LnD5iAu5ogsbaJFEE/pZ3rwJebDDRggkTLUEu0gyd/e1 qRZ0wOvJxYqeJzdXjBsTv1rFxfRzKVU9D8eTCvP6yXx9XnFSrOw0By5a5lowW9Wgu9e4 a4vA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=jqGi6I1Y; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nl11-20020a17090b384b00b0024667ac567csi2379559pjb.38.2023.04.20.15.09.57; Thu, 20 Apr 2023 15:10:13 -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; dkim=pass header.i=@intel.com header.s=Intel header.b=jqGi6I1Y; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231739AbjDTWHI (ORCPT + 99 others); Thu, 20 Apr 2023 18:07:08 -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 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1763734834764508824?= X-GMAIL-MSGID: =?utf-8?q?1763734834764508824?= 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); }; int resctrl_register_driver(struct resctrl_driver *d); diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/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 *parent_kn, const char *name, static int rdtgroup_rmdir_mon(struct rdtgroup *rdtgrp, cpumask_var_t tmpmask) { struct rdtgroup *prdtgrp = rdtgrp->mon.parent; + struct resctrl_driver *d; int cpu; /* Give any tasks back to the parent group */ rdt_move_group_tasks(rdtgrp, prdtgrp, tmpmask); + 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) = prdtgrp->mon.rmid; @@ -3535,6 +3542,7 @@ static int rdtgroup_ctrl_remove(struct rdtgroup *rdtgrp) static int rdtgroup_rmdir_ctrl(struct rdtgroup *rdtgrp, cpumask_var_t tmpmask) { + struct resctrl_driver *d; int cpu; /* Give any tasks back to the default group */ @@ -3544,6 +3552,11 @@ static int rdtgroup_rmdir_ctrl(struct rdtgroup *rdtgrp, cpumask_var_t tmpmask) cpumask_or(&rdtgroup_default.cpu_mask, &rdtgroup_default.cpu_mask, &rdtgrp->cpu_mask); + 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) = rdtgroup_default.closid; From patchwork Thu Apr 20 22:06:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 86052 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp652385vqo; Thu, 20 Apr 2023 15:18:48 -0700 (PDT) X-Google-Smtp-Source: AKy350Z1YwtoolywBtBi+2a1DgjsVCMxCgW9uYZYcwiNpudJlodYzj9ImTTCEMPjyhA3m+SuIJBz X-Received: by 2002:a05:6a20:3c90:b0:f0:790c:44a8 with SMTP id b16-20020a056a203c9000b000f0790c44a8mr4534325pzj.21.1682029128149; Thu, 20 Apr 2023 15:18:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682029128; cv=none; d=google.com; s=arc-20160816; b=tOHjnPJfeCq/5kx1hGZvUI/kATqVIF0Mj/n0Kg2c3dO+lB82jRzjbdDWL3epTIr95t rKxSyYxupz7mcKcwe9kKdmlPV+r0Zf0rBEAtjvVUAux+MtokEMJ3ZoeTV1SBQrrw+yMe 6g2xViZhyyH+G0lkFcBZ59RbkkBJQAYF4PfCJBojquspSwLYVj8r1PmbW+LUAw7Z3hXv Jshz2f8Xwu6tibR+dEY3CrnnfJgSP4wTo60cD+3CKmOh0bJOGYGXML2nylu7VF7VQnVs dQQUlv6CdCKutOQQC4HHwaNlmTuiBaeK5BIePoYqnX1pOqHCGnnDnXQi0++aieTZYeOS oauQ== 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 :dkim-signature; bh=fVi1+idFQ6wnO7BmPN8BygWutJgqnW1qmM+Jz6pTf3Y=; b=SLyD5cgv16OeRxxaeAr2WY8iiEBmO/noeaGxo13R2tevLVTb//RRZRsO6/9NIuw3r6 +SXwUf/RiXJfqDgUdfiFi9PhcYIz6gJV00ujMJ4/nnlLri8SlQvAuyHnrJXmTawVkvXi z8y63MGdMMw5ZPVYrn51ypJKjKg1YITqofLhJOD5e5Rde0kEW7TS++nVubHDmBXiQ7Ks LM6Iu/mPs0BxLy78UmGEVM7Q7tC5dA3uRzHkH/X0DlbCiF54fBQIVsizS75v8HPRdxW6 OlrDMqhppw2iNpJ4p85u5WkSVtlWIOGY+T+RFnf7eLMc+/RmBHx8aE4HLtf3I4//YkA1 DaeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=F0SR9pxx; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x24-20020a63db58000000b0050f66d3f72csi2663413pgi.532.2023.04.20.15.18.31; Thu, 20 Apr 2023 15:18:48 -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; dkim=pass header.i=@intel.com header.s=Intel header.b=F0SR9pxx; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233004AbjDTWHL (ORCPT + 99 others); Thu, 20 Apr 2023 18:07:11 -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 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1763735374615469887?= X-GMAIL-MSGID: =?utf-8?q?1763735374615469887?= 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; }; int resctrl_register_driver(struct resctrl_driver *d); diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/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, struct resctrl_fileinfo *files, return 0; } +static void rmfiles(struct kernfs_node *parent, struct resctrl_fileinfo *files) +{ + struct resctrl_fileinfo *f; + struct kernfs_node *kn; + + for (f = files; f->name; f++) { + kn = 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, struct resctrl_fileinfo *files) return ret; } +/* + * 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 = (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 = (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); } 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); } int resctrl_register_driver(struct resctrl_driver *d) @@ -3375,6 +3426,7 @@ static int rdtgroup_mkdir_mon(struct kernfs_node *parent_kn, const char *name, umode_t mode) { struct rdtgroup *rdtgrp, *prgrp; + struct resctrl_driver *d; int ret; ret = mkdir_rdt_prepare(parent_kn, name, mode, RDTMON_GROUP, &rdtgrp); @@ -3384,6 +3436,14 @@ static int rdtgroup_mkdir_mon(struct kernfs_node *parent_kn, prgrp = rdtgrp->mon.parent; rdtgrp->closid = prgrp->closid; + list_for_each_entry(d, &drivers, list) { + unsigned long priv = (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 *parent_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_node *parent_kn, list_add(&rdtgrp->rdtgroup_list, &rdt_all_groups); + list_for_each_entry(d, &drivers, list) { + unsigned long priv = (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 From patchwork Thu Apr 20 22:06:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 86057 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp655471vqo; Thu, 20 Apr 2023 15:24:44 -0700 (PDT) X-Google-Smtp-Source: AKy350anxYN6cm0KSJy93NkfJ+XzBw59l44HteazVV9uCQbREySm1p2NTtVIGluSZuC/d17WrVEl X-Received: by 2002:a17:90a:c281:b0:23b:2ce5:2ddb with SMTP id f1-20020a17090ac28100b0023b2ce52ddbmr3456986pjt.8.1682029484618; Thu, 20 Apr 2023 15:24:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682029484; cv=none; d=google.com; s=arc-20160816; b=YIa8m7OtE/ZvrCZ8JVhX+BvKX5KhD+DZASrjI2Z0DmqCKva9RLQxjvCUUZoGnh6wy+ b+WpMf5KWz1UOehQGZNtqS1obV/7hop+9/Ts2Adf5ys04xgtzUDX1XTgjhoVLFmLXXJG HmA4jw9PGTs1I9ISzSvRTD6oFfv2CIUlUE731DRsF7cZLxKW3SVbi2/5NZckXMQghVpD hRRC0l3KdWIPbjGLfeVOmKoZ6KtU5Xor+EF82TtBvc0jd6sg9uVc4hAr5vmyxwYLrebj GQ0b/ZKvz9kYidzKi7itV0ruVmKYQAUW5hSZhkCPvTsy6rNHoO46TuKhj/xlTUscdb6U 4J6Q== 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 :dkim-signature; bh=iuBdrt86GWue/2DmDyAs5xSsBdl48IACwHrQqgUd6H8=; b=E7tnGO96djAFQyq4oOE6aF4IG3c33nNNdG+BlRRPMVHYDj2i3yWSDBbpsXtT33yEA8 kfI7EaEOm2p1MWUiLzkTi0YKIdvT1N5zpmp0Xl0Cc0AYVB/P46fqJAwRUapOEfD26/rK dAgrEfMZHdHCYKzkqEvgVCu0pvdOKDp5lnf5GYul4kSjaQicmY/4hwJDnH8AukWGvV6N VoEznt8g5D9172WBzTOa05uI0jtlovY5nDtCt0AafGVO4zFrkQRAMuwncrfsUTPlbeNC 3pxn2L1xBRZk07m0ZZvRU5nD4pcGMqd2mkQuJLkjqugV1j0HN/lIkRWyDFpDdf64XvoH Pvqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Ad8T2j2N; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d9-20020a631d09000000b00518785a7bfasi2616042pgd.870.2023.04.20.15.24.31; Thu, 20 Apr 2023 15:24:44 -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; dkim=pass header.i=@intel.com header.s=Intel header.b=Ad8T2j2N; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232921AbjDTWHE (ORCPT + 99 others); Thu, 20 Apr 2023 18:07:04 -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 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1763735748819765102?= X-GMAIL-MSGID: =?utf-8?q?1763735748819765102?= 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 monitored. * @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, }; #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; }; @@ -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; }; int resctrl_register_driver(struct resctrl_driver *d); diff --git a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c b/arch/x86/kernel/cpu/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; 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 == 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", resname); return -EINVAL; @@ -419,10 +423,11 @@ ssize_t rdtgroup_schemata_write(struct kernfs_open_file *of, r = s->res; /* + * 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 == DRIVER || is_mba_sc(r)) continue; ret = resctrl_arch_update_domains(r, rdtgrp->closid); @@ -464,6 +469,12 @@ static void show_doms(struct seq_file *s, struct resctrl_schema *schema, int clo u32 ctrl_val; seq_printf(s, "%*s:", max_name_width, schema->name); + + if (schema->conf_type == 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/resctrl/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_node *parent_kn) /* loop over enabled controls, these are all alloc_capable */ list_for_each_entry(s, &resctrl_schema_all, list) { + if (s->conf_type == DRIVER) + continue; r = s->res; fflags = r->fflags | RF_CTRL_INFO; ret = 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 = ""; break; + case DRIVER: + kfree(s); + return -EINVAL; } ret = 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); + 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); + 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; list_for_each_entry_safe(s, tmp, &resctrl_schema_all, list) { + if (s->conf_type == DRIVER) + continue; list_del(&s->list); kfree(s); } @@ -3285,6 +3299,8 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp) rdt_staged_configs_clear(); list_for_each_entry(s, &resctrl_schema_all, list) { + if (s->conf_type == DRIVER) + continue; r = s->res; if (r->rid == RDT_RESOURCE_MBA || r->rid == RDT_RESOURCE_SMBA) { From patchwork Thu Apr 20 22:06:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 86056 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp655124vqo; Thu, 20 Apr 2023 15:24:04 -0700 (PDT) X-Google-Smtp-Source: AKy350YCbdwLoA0DJJY8q9YdZKzQGi4UUgU2+t98zzTPWo7oHrLp0Pld5vsIlb0C0Au2SYWDW/ri X-Received: by 2002:a17:903:1209:b0:1a6:4606:6e06 with SMTP id l9-20020a170903120900b001a646066e06mr3633319plh.17.1682029444123; Thu, 20 Apr 2023 15:24:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682029444; cv=none; d=google.com; s=arc-20160816; b=MZ1Qs06KCwFk/Y3W+AT8BKE1DrnegBjXRYSPrGcye0AsgpMBDz7e2AQ5sGgIJu7Tn8 rea4UXGeZv/MvGeiKFuSDEstnZhdH3WqGJlAg/MA+rx3eZDQx+7hhkUmeUqbeR9xNoP0 pRfpFkjzZG8B4eoxZSTSQxnQnqjwyWVcBYBYpFjmTyBKtGuJGlOKlUdxOa0VLv7QvBei GsF27NRRV08I1LHL2DxPUFNtBoJhcEcEqfaR6wCMdsnkVkY1BWAEkbj44p3MrrY/lENR 0s0MKSLsF22Wso0YH55N+YQGZVOTLz8PcjwgaC2BVDFF3GrVxvalSBQJu9p4rGa6cAxL hftA== 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 :dkim-signature; bh=2B2mcKHhEYd18xP71xl+xOrPm3aabEurHrX7dpGipNk=; b=oMeMGZ3FUioeQ9NCk1M0SDHzP9wTXXCqmIfwKd6T6g/1qNtQKTpnNtmreUoSUcJOU2 Zix3p/zSDyBjpxWi2ffc8woP5SfwaX2OMKSWPS1hsvnhsI36bD7tgP4lUMHnDvi961vB 3veLO2XZlQQRDqmlpMPBNvq+jal52FbP2Rvzp9kef/s6e0XQOp738Uh87JJFdHcEmvgT pLzmcm7/D8U3VXZUNDZo/QiReSN/UA+9zsfXVQBOGj2D3u7ujTvzt8bc2MeHcVMun59H yTkgMiQXkMk1euLyrysEiWaj1Vi1NVngfd5ew0jAWOxFHkiJvr7ZgRIGcPTpUu+EEA6a nfAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IlRVFUrA; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y17-20020a17090322d100b001a654cdcce0si3174644plg.103.2023.04.20.15.23.52; Thu, 20 Apr 2023 15:24:04 -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; dkim=pass header.i=@intel.com header.s=Intel header.b=IlRVFUrA; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233014AbjDTWHP (ORCPT + 99 others); Thu, 20 Apr 2023 18:07:15 -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 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1763735706729234753?= X-GMAIL-MSGID: =?utf-8?q?1763735706729234753?= 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; }; int resctrl_register_driver(struct resctrl_driver *d); diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/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) } } +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); + 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); + 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); From patchwork Thu Apr 20 22:06:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 86053 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp653490vqo; Thu, 20 Apr 2023 15:20:56 -0700 (PDT) X-Google-Smtp-Source: AKy350YjOeye8o7sp25UloAXRvWPDxn2j/ss6JYeLCZ4FCSpgPg52xw+rLYadWIPE57m32mKUGBy X-Received: by 2002:aa7:88d1:0:b0:63b:8778:99f7 with SMTP id k17-20020aa788d1000000b0063b877899f7mr3718158pff.9.1682029255963; Thu, 20 Apr 2023 15:20:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682029255; cv=none; d=google.com; s=arc-20160816; b=SXacDQy3D2TPS6rvJgUJRXY75YiTBRS1vwuOT5akkxlZws3TrpdIHqnLso7E8/7nTK i2G5QkWzc7G4G9UfpWCf5K9ECu5NVPvuXxTGUaKrwP7TOE4xNH5C8RfKEceKJxYk8M6Y DCJLs5KCy+BF9Jv3U/KAaPO/fijgj8NprxX+TpJ5XEzoNbzh9Hx2eBT7HpPynDy64whG t7UzDz4GK3KLHTt4I2QCubXbCij9OHNgUhqWOLnUQZafmNR9iVAJzxQRkyD2WGqMMEJ6 kJz42TfFWqSMA8tENE49YaLOllvJZJWIwUqC1bgq+1x1Y29PBb5grp1ZN5Mp33E3rKEa 465A== 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 :dkim-signature; bh=gm5KokjVt6oTedN+6gGV0IEDHCipvrzJsqGV/QNQSJk=; b=LvSsTrmKlSEk8+BjsFcrP/X3OqlxbfzE5oHeN64zT+rrhah/LgwSu7UQHjIpZOrbUd y9MGV8kbrCRuvHJwIef8DhS2ajLBF9KKaa7MR2hHTzZxEOmcLjpxx5KxfK1EvdxIVtGL rp2ZPcBVmX28XlYB7loXlkmeSHZ3/Nn9y2X4rcdn2hHToD4KG2kgD88qoBacmdQKXEU6 rrR/UClcG62RYrGWu3FXdLwBADIwATiZFT9kjHFW/zNmkUqSf68KxtGX5uVANl6U683w KRhi/AKKqtrexrkCBI1j9JHAxk4UoUIY4IFmKVzPbBoJVSB8FHjuDxREHRcPSEKBWLhb Rsng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=BBz6ORoP; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y8-20020aa79e08000000b0063d24857c5bsi2749251pfq.43.2023.04.20.15.20.40; Thu, 20 Apr 2023 15:20:55 -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; dkim=pass header.i=@intel.com header.s=Intel header.b=BBz6ORoP; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233034AbjDTWHV (ORCPT + 99 others); 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 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1763735508895459233?= X-GMAIL-MSGID: =?utf-8?q?1763735508895459233?= 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/x86/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 = sf->private; + unsigned long priv = (unsigned long)of->kn->priv; + u32 closid = 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 = sf->private; + unsigned long priv = (unsigned long)of->kn->priv; + u32 rmid = priv & 0xffff; + + seq_printf(sf, "%d\n", rmid); + + return 0; +} + +static struct kernfs_ops closid_ops = { + .seq_show = closid_show, +}; + +static struct kernfs_ops rmid_ops = { + .seq_show = rmid_show, +}; + +static struct resctrl_fileinfo files[] = { + { + .name = "closid", .ops = &closid_ops + }, + { + .name = "rmid", .ops = &rmid_ops + }, + { + } +}; + +static struct resctrl_driver ops = { + .ctrlfiles = 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 Say N if unsure. +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/resctrl/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) += core.o rdtgroup.o monitor.o obj-$(CONFIG_X86_CPU_RESCTRL) += ctrlmondata.o pseudo_lock.o +obj-$(CONFIG_X86_CPU_RESCTRL_DRIVERS) += drivers/ CFLAGS_pseudo_lock.o = -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) += resctrl_example.o