From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965879AbcKLBDm (ORCPT ); Fri, 11 Nov 2016 20:03:42 -0500 Received: from mga11.intel.com ([192.55.52.93]:7540 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S938705AbcKLBDW (ORCPT ); Fri, 11 Nov 2016 20:03:22 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,475,1473145200"; d="scan'208";a="1058482008" From: "Fenghua Yu" To: "Thomas Gleixner" Cc: "H. Peter Anvin" , "Ingo Molnar" , "Tony Luck" , "Ravi V Shankar" , "Sai Prakhya" , "Vikas Shivappa" , "linux-kernel" , "x86" , "Fenghua Yu" Subject: [PATCH 2/3] x86/intel_rdt: Return state to default on umount Date: Fri, 11 Nov 2016 17:02:37 -0800 Message-Id: <1478912558-55514-2-git-send-email-fenghua.yu@intel.com> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1478912558-55514-1-git-send-email-fenghua.yu@intel.com> References: <1478912558-55514-1-git-send-email-fenghua.yu@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Fenghua Yu All CPUs in a rdtgroup are given back to the default rdtgroup before the rdtgroup is removed during umount. After umount, the default rdtgroup contains all online CPUs. cpu_closid needs to be cleared for each cpu in root rdtgroup during umount. Otherwise, PQR_ASSOC will be written to the non-zero value stored in cpu_closid after next mount. Signed-off-by: Fenghua Yu --- arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c index cff286e..416b95e 100644 --- a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c +++ b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c @@ -801,6 +801,7 @@ static void rmdir_all_sub(void) { struct rdtgroup *rdtgrp, *tmp; struct task_struct *p, *t; + int cpu; /* move all tasks to default resource group */ read_lock(&tasklist_lock); @@ -819,10 +820,19 @@ static void rmdir_all_sub(void) /* Remove each rdtgroup other than root */ if (rdtgrp == &rdtgroup_default) continue; + + /* Give any CPUs back to the default group */ + cpumask_or(&rdtgroup_default.cpu_mask, + &rdtgroup_default.cpu_mask, &rdtgrp->cpu_mask); + kernfs_remove(rdtgrp->kn); list_del(&rdtgrp->rdtgroup_list); kfree(rdtgrp); } + + for_each_cpu(cpu, &rdtgroup_default.cpu_mask) + per_cpu(cpu_closid, cpu) = 0; + kernfs_remove(kn_info); } -- 2.5.0