Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932691AbcCHJ0u (ORCPT ); Tue, 8 Mar 2016 04:26:50 -0500 Received: from www.linutronix.de ([62.245.132.108]:49748 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932107AbcCHJ0d (ORCPT ); Tue, 8 Mar 2016 04:26:33 -0500 Date: Tue, 8 Mar 2016 10:25:08 +0100 (CET) From: Thomas Gleixner To: Vikas Shivappa cc: Vikas Shivappa , linux-kernel@vger.kernel.org, x86@kernel.org, hpa@zytor.com, mingo@kernel.org, peterz@infradead.org, ravi.v.shankar@intel.com, tony.luck@intel.com, fenghua.yu@intel.com, h.peter.anvin@intel.com Subject: Re: [PATCH 3/6] x86/mbm: Intel Memory B/W Monitoring enumeration and init In-Reply-To: Message-ID: References: <1456876108-28770-4-git-send-email-vikas.shivappa@linux.intel.com> <1456962966-29395-1-git-send-email-vikas.shivappa@linux.intel.com> User-Agent: Alpine 2.11 (DEB 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1332 Lines: 42 On Thu, 3 Mar 2016, Thomas Gleixner wrote: > On Thu, 3 Mar 2016, Vikas Shivappa wrote: > > > > > > > On Wed, 2 Mar 2016, Thomas Gleixner wrote: > > > > > On Wed, 2 Mar 2016, Vikas Shivappa wrote: > > > > + if (cqm_enabled && mbm_enabled) > > > > + intel_cqm_events_group.attrs = intel_cmt_mbm_events_attr; > > > > + else if (!cqm_enabled && mbm_enabled) > > > > + intel_cqm_events_group.attrs = intel_mbm_events_attr; > > > > + else if (cqm_enabled && !mbm_enabled) > > > > + intel_cqm_events_group.attrs = intel_cqm_events_attr; > > > > + > > > > ret = perf_pmu_register(&intel_cqm_pmu, "intel_cqm", -1); > > > > if (ret) { > > > > pr_err("Intel CQM perf registration failed: %d\n", ret); > > > > goto out; > > > > > > So what cleans up mbm_local and mbm_total in that case? > > > > I put all the cleanup code in the cqm_cleanup .. - please see copy below > > Ok, missed that. > > > @@ -1331,6 +1427,39 @@ static void cqm_cleanup(void) > > kfree(cqm_rmid_ptrs[r]); > > > > kfree(cqm_rmid_ptrs); > > + kfree(mbm_local); > > + kfree(mbm_total); > > + mbm_enabled = false; > > + cqm_enabled = false; > > +} After looking at it closely, you really need a separate mbm_cleanup() function, so you can utilize it from mbm_init() and in the exit path. Thanks, tglx