Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp1429701rwr; Thu, 20 Apr 2023 15:09:32 -0700 (PDT) X-Google-Smtp-Source: AKy350amvXi+vm4MojTGc7PciTIld3dW2T0KuckArjrWYw76lVj0fHQUeV/lGAi0enbcR5mzv+0l X-Received: by 2002:a17:903:24f:b0:1a6:4032:ef2 with SMTP id j15-20020a170903024f00b001a640320ef2mr3052243plh.28.1682028572180; Thu, 20 Apr 2023 15:09:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682028572; cv=none; d=google.com; s=arc-20160816; b=Cy4tGDo1sJrJXpwDZHf2RuDEdw3UX13w+FPTrzC7ImAgCWWqYzRRKqo4v5URq6/JxO jQ9C38drHu+oJT+/xYdbKJzVmtB+33PjNFsLGsML1Y5/bp1YbdRWyDynTDwEZdtSqFQa wjWA4ZonLV4iQwG87xhGmyYzqlY5ZPZ6Ey62Efapce3uz6vSkmlFpEHLKDB7xJ2qNq86 y4uL0hU1q7ojKZxAXtpKgrST4gzP0lJVp2+9zKrZirmTD8pR229HSoID8MbuD4URQDlz 0QxLf25DjUriGog4exVWhLQVuyhISJs+9MtWT6O650j+4m5aWLjB9RNjJ7Rpji+4KXJR ea2w== 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jg21-20020a17090326d500b00189efa12957si2625420plb.126.2023.04.20.15.09.20; Thu, 20 Apr 2023 15:09:32 -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 S232934AbjDTWG5 (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 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 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) -- 2.39.2