From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (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 690C61509B9 for ; Mon, 10 Jun 2024 18:35:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718044548; cv=none; b=GlUvZmn1DzY8nEMnahkXVw2gbZcITjZtXLN/BT0KXU6C04h5R2JDq3KrNJESJ/FnmP8toBYonQGDWrVhKTfeZ4LJbDCjOB6yHOkKHnJ6CMC1eesQseXDf39W952H8mGZJoRDJjh3M4JRWTiEiezwtW0cJ+TkO9kWuA8oi4Y/yCk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718044548; c=relaxed/simple; bh=4oqidBc9DHvPZDAc4/HvrQudL3M7ozY8EMl1oGEhk+o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aES0KD22/oXrAldVtdKD4l7O5IWCYVOoKwaElVT6s6YQihiazWA2QWtZI6He9YVLdAmpPRbhXGEcHxiWwd9k1EIdw3A4UH1Kg3UhWCvnnwz4/DSU9BNM4bVp+XY0zjgl1dI1g3WLmFkD0MQl9Yvfmk3E3E0Uab0nZke9FI8umjU= 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=VPOz5yrO; arc=none smtp.client-ip=192.198.163.16 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="VPOz5yrO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718044546; x=1749580546; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4oqidBc9DHvPZDAc4/HvrQudL3M7ozY8EMl1oGEhk+o=; b=VPOz5yrOaJXc1OJf0PlIn/VUQg6+8XKwULLzRpB2Y4cj1mc3GsuLxQxG 4jtHXe19AMaZkwJ0jd97QFcUrtLbdX10CZ+1/3wpuEHGGB0uldCiRDwln EPDHlaM4kiUDlytxh1dpcmJ0A6dySOoA8HDWg5+NVNrD4Ckh8NSzSGM4C GPCs0t3SaPMWkW6Y1hck0lKK1sZKqA+qpArguTDGfDboixAF9JhZ6dLTJ gaHEu1jY0KPhEgZRQQEFXMimvLbSU30yfRRwmN4Ji/KEZyZkMUSiPR6Vn ZJcDcRlmkYrfajjfttg2H/cfsOXO/p3b0OILVL0JqbeVaDz6mUDyyggDc g==; X-CSE-ConnectionGUID: fiWngtm0QP2+Ss/aMAR+8A== X-CSE-MsgGUID: Kodf6p2GTwemGpz/O8ldpQ== X-IronPort-AV: E=McAfee;i="6600,9927,11099"; a="12004839" X-IronPort-AV: E=Sophos;i="6.08,227,1712646000"; d="scan'208";a="12004839" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2024 11:35:38 -0700 X-CSE-ConnectionGUID: AcPYkZgkRiiE39yzdHP7gw== X-CSE-MsgGUID: GqajRRP4QKCBjYU+QMFCUg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,227,1712646000"; d="scan'208";a="43576578" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2024 11:35:38 -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 v20 10/18] x86/resctrl: Refactor mkdir_mondata_subdir() with a helper function Date: Mon, 10 Jun 2024 11:35:20 -0700 Message-ID: <20240610183528.349198-11-tony.luck@intel.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240610183528.349198-1-tony.luck@intel.com> References: <20240610183528.349198-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 --- 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 869dd1973b5d..66acbad1c585 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -3021,14 +3021,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; @@ -3042,22 +3065,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.0