From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (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 3A7BB16F82E for ; Fri, 21 Jun 2024 22:39:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719009557; cv=none; b=bNxb5AN94Xxnu9za6NNzX6mqtADbZ7+Yv6WbMzElKPwQlh0yBj5tJ5HmOMC5n4I56K9bfEoeTe05kUCiFA98whXRlyJDxWU5cozuOeFVZtpIIIjrEG0Dev4VZLivbeRCP2alR2aqQIyk+qJCwZjvzBvus7QKela1rVozrIZxWfc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719009557; c=relaxed/simple; bh=hmo69CunjI36OOiYYgLJcwmxmsCeQ4UATusjRMecQWY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ngiOlk8o+RXIABT2+Kpl0mHpI9gsl5fxT24Xonh5a/rREpRSMP4foyd34TLjf8t3yLfJ7JB5jA8bsU7NuLlU9BkGDRja9pBT0uNF8xxDzkINiddMDRJhZ/Vvmmni4OGx/h3CNs7Gq1FcIGeeU/K++yYDeX+Z3EVRqvXrQomskaA= 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=EyBeL/3S; arc=none smtp.client-ip=192.198.163.11 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="EyBeL/3S" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1719009555; x=1750545555; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hmo69CunjI36OOiYYgLJcwmxmsCeQ4UATusjRMecQWY=; b=EyBeL/3SeB0pRnIkWZiVQCu2epwGtI/TSe9KGOZek+PcgrwY66I4RoXk IkdMOH+sQG1G5FIo1NjkGsgSa/cTK88crBlzY1FtbVPtjwnH5y+WPxBL7 yy/KEFW2UEgSuWjWlU1ch7GENxeXzg5QR0ZBSu7i0U9MRy09li/8c+a5U Xb/idBb0/klG2QumTI5+cztIYiDJQuUhRPueKswBrK3nsXi5ntSDAXK0g eP+mNN1s7z0fvXaCQ/GturjVQlnI1V+K20rpaLSq/l+tDaVSoL1ItroBC y5mdWiF7W3jzUXEoZbU7ZSB2x5OKKalrx3/8kMk8zUbFooCjLmYmxzTcW A==; X-CSE-ConnectionGUID: C+PlQKF7Ryi8Nt8Wsc+4Ug== X-CSE-MsgGUID: AD3ZyUFnS36CkR6CEJWBmw== X-IronPort-AV: E=McAfee;i="6700,10204,11110"; a="26691320" X-IronPort-AV: E=Sophos;i="6.08,256,1712646000"; d="scan'208";a="26691320" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jun 2024 15:39:08 -0700 X-CSE-ConnectionGUID: d6tNP99pRMa/YhfI8A0dAQ== X-CSE-MsgGUID: AIwNBIHGRa6j0QSxDh4X7A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,256,1712646000"; d="scan'208";a="73935669" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jun 2024 15:39:08 -0700 From: Tony Luck To: Fenghua Yu , Reinette Chatre , Maciej Wieczor-Retman , Peter Newman , James Morse , Babu Moger , Drew Fustini , Dave Martin Cc: x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v21 10/18] x86/resctrl: Refactor mkdir_mondata_subdir() with a helper function Date: Fri, 21 Jun 2024 15:38:51 -0700 Message-ID: <20240621223859.43471-11-tony.luck@intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240621223859.43471-1-tony.luck@intel.com> References: <20240621223859.43471-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In Sub-NUMA Cluster (SNC) mode Linux must create the monitor files in the original "mon_L3_XX" directories and also in each of the "mon_sub_L3_YY" directories. Refactor mkdir_mondata_subdir() to move the creation of monitoring files into a helper function to avoid the need to duplicate code later. No functional change. Signed-off-by: Tony Luck Reviewed-by: Reinette Chatre --- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 45 ++++++++++++++++---------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index 70d41a8fd788..bc5a8a169336 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -3025,14 +3025,37 @@ static void rmdir_mondata_subdir_allrdtgrp(struct rdt_resource *r, } } +static int mon_add_all_files(struct kernfs_node *kn, struct rdt_mon_domain *d, + struct rdt_resource *r, struct rdtgroup *prgrp) +{ + union mon_data_bits priv; + struct mon_evt *mevt; + struct rmid_read rr; + int ret; + + if (WARN_ON(list_empty(&r->evt_list))) + return -EPERM; + + priv.u.rid = r->rid; + priv.u.domid = d->hdr.id; + list_for_each_entry(mevt, &r->evt_list, list) { + priv.u.evtid = mevt->evtid; + ret = mon_addfile(kn, mevt->name, priv.priv); + if (ret) + return ret; + + if (is_mbm_event(mevt->evtid)) + mon_event_read(&rr, r, d, prgrp, mevt->evtid, true); + } + + return 0; +} + static int mkdir_mondata_subdir(struct kernfs_node *parent_kn, struct rdt_mon_domain *d, struct rdt_resource *r, struct rdtgroup *prgrp) { - union mon_data_bits priv; struct kernfs_node *kn; - struct mon_evt *mevt; - struct rmid_read rr; char name[32]; int ret; @@ -3046,22 +3069,10 @@ static int mkdir_mondata_subdir(struct kernfs_node *parent_kn, if (ret) goto out_destroy; - if (WARN_ON(list_empty(&r->evt_list))) { - ret = -EPERM; + ret = mon_add_all_files(kn, d, r, prgrp); + if (ret) goto out_destroy; - } - priv.u.rid = r->rid; - priv.u.domid = d->hdr.id; - list_for_each_entry(mevt, &r->evt_list, list) { - priv.u.evtid = mevt->evtid; - ret = mon_addfile(kn, mevt->name, priv.priv); - if (ret) - goto out_destroy; - - if (is_mbm_event(mevt->evtid)) - mon_event_read(&rr, r, d, prgrp, mevt->evtid, true); - } kernfs_activate(kn); return 0; -- 2.45.2