From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 64AD02EEE63 for ; Sun, 2 Aug 2026 16:18:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785687489; cv=none; b=hssdHffkUBN2AyUmi0uBPYLmGB3kkxWMnEBy0zisFMmanpwD/1OxHPHq4GBCk6axkJo90GitxPGoJNlb306aKWLegd8wraCLnseWmELdVWoT6Ny9pS7mVRIdeMiQmYfkFXfE3ll7qoMIDbfGQs1Jp8EokghE30UoiLq7uqeWui8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785687489; c=relaxed/simple; bh=BJmPELbSGJl/ti/VktErMzTOBLwRbwdsGm1KUYrXvdM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=enEwm/ljgEwDr6fjPdDyx4uXUhj9alDTrDMV3ttpVO5aPJDB1gC5Qm6QSSq4QYst64PplZJdpDVgL1I30qzVWfABaRV4+BIvRPyGmkKF7dkujTxCX6aZL7SBMglXNQfiI4O+O4hNO8Bh3DkuAsFyzovwNROj0OmqOq1USsrKoI4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ftWn63+l; arc=none smtp.client-ip=198.175.65.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ftWn63+l" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1785687488; x=1817223488; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BJmPELbSGJl/ti/VktErMzTOBLwRbwdsGm1KUYrXvdM=; b=ftWn63+lm/1SixcgKy8eo9LYctrQZ/J1m5W8tR9h4YlRIvOy7u820wjw Eo1lbdhdPDK8AehrUlxuCF6D1zTDubF6DqR3T6vvd9Z/j6nLBZboH+mhd dVj3pRiMBCHZH+I1uMJ5v4VmweArRLXMY7tvRRjYRDis31bm3+OwTytqg +SuP1i7WjsAPpRBLigbzH/vwira5A6OPKSkDfZsGjOaPgrt4H87Iuy8rK HpzIk7Y6hETfB09XrKqf4pfzGqvpSdJ8AjmoKS5nkJMANz3jTu8GqGLuo Dmc2dTD6CFllTsyus/EMeY287MrN+MGVSwgxnbkWZFiwXKDydjuuPXaQ8 Q==; X-CSE-ConnectionGUID: iuboablkQpeRDuzkfO6f1A== X-CSE-MsgGUID: QvM0JOn8T2WRLP7T3TexoQ== X-IronPort-AV: E=McAfee;i="6800,10657,11863"; a="86191237" X-IronPort-AV: E=Sophos;i="6.25,200,1779174000"; d="scan'208";a="86191237" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2026 09:18:08 -0700 X-CSE-ConnectionGUID: mMm/UOSRTYCS/B1bUMRn7w== X-CSE-MsgGUID: 3kdPY2I1QUeGuWaibfNBVg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,200,1779174000"; d="scan'208";a="257099885" Received: from chenyu-dev.sh.intel.com ([10.239.62.107]) by fmviesa010.fm.intel.com with ESMTP; 02 Aug 2026 09:18:04 -0700 From: Chen Yu To: Reinette Chatre , Tony Luck Cc: Ben Horgan , "James Morse" , Dave Martin , Babu Moger , Fenghua Yu , Borislav Petkov , Thomas Gleixner , "Dave Hansen" , Peter Newman , chen.yu@linux.dev, x86@kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 30/31] fs/resctrl: Fix excessive padding in schemata output Date: Mon, 3 Aug 2026 00:08:23 +0800 Message-Id: <957225f0ebe1f27802333b60514c5527a93d80a8.1785680802.git.yu.c.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When a resource has several controls (such as the region-aware MBA controls), the schemata and size files pad every line with a large amount of leading whitespace and the control names no longer line up into a table. Compute the column width from the longest single control name and format the full control name within that width so the output is aligned again. Reported-by: Tony Luck Link: https://lore.kernel.org/all/aiB2oJFPF-sqUVQx@agluck-desk3/ Signed-off-by: Chen Yu --- fs/resctrl/ctrlmondata.c | 19 +++++++++++-------- fs/resctrl/rdtgroup.c | 11 ++++++----- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/fs/resctrl/ctrlmondata.c b/fs/resctrl/ctrlmondata.c index d65036f7079e..66483c83e99d 100644 --- a/fs/resctrl/ctrlmondata.c +++ b/fs/resctrl/ctrlmondata.c @@ -405,16 +405,16 @@ static struct resctrl_ctrl *resctrl_resource_ctrl_get(struct rdt_resource *r, size_t resctrl_resource_ctrl_max_len(struct rdt_resource *r) { struct resctrl_ctrl *ctrl; - size_t total = 0; + size_t max = 0; size_t len; for_each_resource_ctrl(ctrl,r) { len = strlen(resctrl_ctrl_name_str(ctrl->name)); if (len) - total += 1 + len; + max = max_t(size_t, max, 1 + len); } - return total; + return max; } static int rdtgroup_parse_ctrl(char *ctrlname, char *tok, @@ -522,6 +522,7 @@ static void show_doms(struct seq_file *s, struct rdt_resource_final *f, bool print_ctrl, int closid, struct resctrl_ctrl *ctrl) { struct rdt_resource *r = f->res; + char ctrl_full_name[20]; struct rdt_ctrl_domain *dom; bool sep = false; u32 ctrl_val; @@ -529,11 +530,13 @@ static void show_doms(struct seq_file *s, struct rdt_resource_final *f, /* Walking r->domains, ensure it can't race with cpuhp */ lockdep_assert_cpus_held(); - if (print_ctrl) - seq_printf(s, "%*s%s%s:", max_name_width, f->name, - resctrl_ctrl_is_default(ctrl) ? "" : "_", - resctrl_ctrl_is_default(ctrl) ? - "" : resctrl_ctrl_name_str(ctrl->name)); + if (print_ctrl) { + snprintf(ctrl_full_name, sizeof(ctrl_full_name), "%s%s%s", f->name, + resctrl_ctrl_is_default(ctrl) ? "" : "_", + resctrl_ctrl_is_default(ctrl) ? + "" : resctrl_ctrl_name_str(ctrl->name)); + seq_printf(s, "%*s:", max_name_width, ctrl_full_name); + } list_for_each_entry(dom, &ctrl->domains, hdr.list) { if (sep) seq_puts(s, ";"); diff --git a/fs/resctrl/rdtgroup.c b/fs/resctrl/rdtgroup.c index 31bea5a9833b..7d615502a892 100644 --- a/fs/resctrl/rdtgroup.c +++ b/fs/resctrl/rdtgroup.c @@ -1653,6 +1653,7 @@ static int rdtgroup_size_show(struct kernfs_open_file *of, struct resctrl_ctrl *ctrl; struct rdtgroup *rdtgrp; struct rdt_resource *r; + char ctrl_full_name[20]; unsigned int size; u32 ctrl_val; int ret = 0; @@ -1693,11 +1694,11 @@ static int rdtgroup_size_show(struct kernfs_open_file *of, type = f->conf_type; for_each_resource_ctrl(ctrl, r) { sep = false; - seq_printf(s, "%*s", max_name_width, f->name); - if (!resctrl_ctrl_is_default(ctrl)) - seq_printf(s, "_%s:", resctrl_ctrl_name_str(ctrl->name)); - else - seq_putc(s, ':'); + snprintf(ctrl_full_name, sizeof(ctrl_full_name), "%s%s%s", f->name, + resctrl_ctrl_is_default(ctrl) ? "" : "_", + resctrl_ctrl_is_default(ctrl) ? + "" : resctrl_ctrl_name_str(ctrl->name)); + seq_printf(s, "%*s:", max_name_width, ctrl_full_name); list_for_each_entry(d, &ctrl->domains, hdr.list) { if (sep) seq_putc(s, ';'); -- 2.43.0