From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) (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 80B0E84DE7 for ; Fri, 28 Jun 2024 21:56:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.21 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719611796; cv=none; b=sr5vi6FNj+uS/+VTashon1poTuipneVyAy0YJzksoCqC55IpQg8opnOcs5ltoTD9XTfwn4BeSMp+9x/hVsfkhpHWLw5NXa5CxlwSnmG0wMU5kvYa5dpFe7NgVd/5+P1NEx2pyNeMo+qqN7umbYgKJPFMW5u+u/Idzz7xYJxaUFo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719611796; c=relaxed/simple; bh=7UpWt0Wp9+zR/Uq/c6LkPQAMz/OkGruwVpBwVVZoADg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mH+GGH6Yz2/X9ndljsYQrCxNjQg9eC5kWW1Co9vFBCq0wb1FhnCMuKTTbaeZhpjoiMa60QxKtKet4k03tON3/++4kaM8tyewhRR/Fdl01SwCMpmmsVCgbwfjm4Ff34lNh30Ij9dLcjW8Z7D3BSX+AgBRJadomllzfGavK/9FPIM= 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=F8j6axQp; arc=none smtp.client-ip=198.175.65.21 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="F8j6axQp" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1719611795; x=1751147795; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7UpWt0Wp9+zR/Uq/c6LkPQAMz/OkGruwVpBwVVZoADg=; b=F8j6axQpvw8vzaOl+P1Uvwi3fP2UkLS6zXQv1shgOVgtUHC6TQfKezco S1kV9zcqGKfkpme/XRaQXUHWj8QjByMUfrozPP1b+WBxZn9zcbV3391vO m5WHiolZHRko01cmsU4UTdr/D9rEao0mvX5RdO/mFNGdVwj6y2Tu1LYNx dojn+dEEoxn9Tg6oK9BR/WNjRxX/v+3z679DWZftwW/S2VkSGow8gJJ7L 63VycEpmzG0G90HPKo5/2VORpj8k9pfSKEuW7QTSLkXKs9mC5DlE4oX1F Juchy6Jarx/p8Fu8p27RZXBR9299fCaZWEmBanvMV/J1Iq4z5fOcwbLcg A==; X-CSE-ConnectionGUID: oC4TCEMOSzShqJJUD+nxyw== X-CSE-MsgGUID: 42rjiX6ARwezxzc8ZClbiw== X-IronPort-AV: E=McAfee;i="6700,10204,11117"; a="16762599" X-IronPort-AV: E=Sophos;i="6.09,170,1716274800"; d="scan'208";a="16762599" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jun 2024 14:56:28 -0700 X-CSE-ConnectionGUID: TsChAdLqQqu3dCT6nCbR1A== X-CSE-MsgGUID: phvLMc5gRxOQ/3Caw9K07A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,170,1716274800"; d="scan'208";a="68065663" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jun 2024 14:56:27 -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 v23 10/19] x86/resctrl: Initialize on-stack struct rmid_read instances Date: Fri, 28 Jun 2024 14:56:10 -0700 Message-ID: <20240628215619.76401-11-tony.luck@intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240628215619.76401-1-tony.luck@intel.com> References: <20240628215619.76401-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 New semantics rely on some struct rmid_read members having NULL values to distinguish between the SNC and non-SNC scenarios. resctrl can thus no longer rely on this struct not being initialized properly. Initialize all on-stack declarations of struct rmid_read: rdtgroup_mondata_show() mbm_update() mkdir_mondata_subdir() to ensure that garbage values from the stack are not passed down to other functions. Remove redundant rr->val = 0; from mon_event_read() and rr.first = false; from mbm_update() since the rmid_read structure is cleared by compiler. Signed-off-by: Tony Luck Reviewed-by: Reinette Chatre --- arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 3 +-- arch/x86/kernel/cpu/resctrl/monitor.c | 3 +-- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c index 3b9383612c35..4d76ff31a9e0 100644 --- a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c +++ b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c @@ -529,7 +529,6 @@ void mon_event_read(struct rmid_read *rr, struct rdt_resource *r, rr->evtid = evtid; rr->r = r; rr->d = d; - rr->val = 0; rr->first = first; rr->arch_mon_ctx = resctrl_arch_mon_ctx_alloc(r, evtid); if (IS_ERR(rr->arch_mon_ctx)) { @@ -557,12 +556,12 @@ int rdtgroup_mondata_show(struct seq_file *m, void *arg) { struct kernfs_open_file *of = m->private; struct rdt_domain_hdr *hdr; + struct rmid_read rr = {0}; struct rdt_mon_domain *d; u32 resid, evtid, domid; struct rdtgroup *rdtgrp; struct rdt_resource *r; union mon_data_bits md; - struct rmid_read rr; int ret = 0; rdtgrp = rdtgroup_kn_lock_live(of->kn); diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c index ff4e74594a19..ca309c93a56b 100644 --- a/arch/x86/kernel/cpu/resctrl/monitor.c +++ b/arch/x86/kernel/cpu/resctrl/monitor.c @@ -780,9 +780,8 @@ static void update_mba_bw(struct rdtgroup *rgrp, struct rdt_mon_domain *dom_mbm) static void mbm_update(struct rdt_resource *r, struct rdt_mon_domain *d, u32 closid, u32 rmid) { - struct rmid_read rr; + struct rmid_read rr = {0}; - rr.first = false; rr.r = r; rr.d = d; diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index 70d41a8fd788..d0443589cd86 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -3029,10 +3029,10 @@ static int mkdir_mondata_subdir(struct kernfs_node *parent_kn, struct rdt_mon_domain *d, struct rdt_resource *r, struct rdtgroup *prgrp) { + struct rmid_read rr = {0}; union mon_data_bits priv; struct kernfs_node *kn; struct mon_evt *mevt; - struct rmid_read rr; char name[32]; int ret; -- 2.45.2