Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp1430110rwr; Thu, 20 Apr 2023 15:09:58 -0700 (PDT) X-Google-Smtp-Source: AKy350a7KOtAc17vQsJt0sLBE2KgTuHerZFdupe1WoroZ5XhHraLM1mfLy5u6YCF6KznVByjebFl X-Received: by 2002:a05:6a20:914f:b0:d9:8a1b:3315 with SMTP id x15-20020a056a20914f00b000d98a1b3315mr4233684pzc.59.1682028598605; Thu, 20 Apr 2023 15:09:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682028598; cv=none; d=google.com; s=arc-20160816; b=fJ9ctYalgMwtv4DHSPYUTfMFsKxk/MewxAt1naDmitC+YLv+tY11/hA0WSRLBsp5rW 2KnBBiIgg7FuIYJ6YPEXUOvFWTl6thTry8pSHpuWVVry+y++Ys5wWgOAZURfrfZcPSE6 YdgClpQxjg8GEeYYwT6MPGKcwCfmws+qkAxJpZHJ50klhbRUJois79/lBrtpxVGqQFGB nkrOjEYFETyrTAxkyHWvRWtN/gvmTBMOQ+zFixXmhSWhmIuVhmBV1PDB7Ugh7Zq/BhBN LpxuUO16fTBYpdF5VT1ubzUF/IfzhwIACYj2k4VKdYPoVQsUmBaraEt5Qv5dgfNtbzXX UI3Q== 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l190-20020a6388c7000000b0051b5e96024asi2699432pgd.591.2023.04.20.15.09.44; Thu, 20 Apr 2023 15:09:58 -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 S232950AbjDTWHL (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 Content-Transfer-Encoding: 8bit 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 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 -- 2.39.2