From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA553C43603 for ; Fri, 13 Dec 2019 05:07:29 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 96682214D8 for ; Fri, 13 Dec 2019 05:07:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 96682214D8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 237196E27C; Fri, 13 Dec 2019 05:07:29 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2C4B36E27C for ; Fri, 13 Dec 2019 05:07:28 +0000 (UTC) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Dec 2019 21:07:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,308,1571727600"; d="scan'208";a="220849771" Received: from linux.fm.intel.com (HELO intel.com) ([10.1.27.42]) by fmsmga001.fm.intel.com with ESMTP; 12 Dec 2019 21:07:26 -0800 Date: Thu, 12 Dec 2019 21:07:26 -0800 From: Venkata Sandeep Dhanalakota To: Lucas De Marchi Message-ID: <20191213050726.GA62244@intel.com> References: <20191212073522.27785-1-venkata.s.dhanalakota@intel.com> <20191212213423.oaxeeohppe7wegtn@ldmartin-desk1> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20191212213423.oaxeeohppe7wegtn@ldmartin-desk1> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/perf: Register sysctl path globally X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org, chris.p.wilson@intel.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 19/12/12 01:34, Lucas De Marchi wrote: > On Wed, Dec 11, 2019 at 11:35:21PM -0800, Venkata Sandeep Dhanalakota wrote: > > We do not require to register the sysctl paths per instance, > > so making registration global. > > > > v2: make sysctl path register and unregister function driver > > specific (Tvrtko and Lucas). > > > > Cc: Sudeep Dutt > > Cc: Rodrigo Vivi > > Cc: Daniel Vetter > > Cc: Chris Wilson > > Cc: Jani Nikula > > Signed-off-by: Venkata Sandeep Dhanalakota > > --- > > drivers/gpu/drm/i915/i915_pci.c | 6 ++++++ > > drivers/gpu/drm/i915/i915_perf.c | 19 ++++++++++++++++--- > > drivers/gpu/drm/i915/i915_perf.h | 2 ++ > > drivers/gpu/drm/i915/i915_perf_types.h | 1 - > > 4 files changed, 24 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c > > index bba6b50e6beb..c5a2bb5e87fe 100644 > > --- a/drivers/gpu/drm/i915/i915_pci.c > > +++ b/drivers/gpu/drm/i915/i915_pci.c > > @@ -30,6 +30,7 @@ > > #include "display/intel_fbdev.h" > > > > #include "i915_drv.h" > > +#include "i915_perf.h" > > #include "i915_globals.h" > > #include "i915_selftest.h" > > > > @@ -1051,6 +1052,10 @@ static int __init i915_init(void) > > return 0; > > } > > > > + err = i915_perf_sysctl_register(); > > + if (err) > > + return err; > > + > > return pci_register_driver(&i915_pci_driver); > > } > > > > @@ -1059,6 +1064,7 @@ static void __exit i915_exit(void) > > if (!i915_pci_driver.driver.owner) > > return; > > > > + i915_perf_sysctl_unregister(); > > honoring the init order means to unregister this after > pci_unregister_driver() I think we should reverse the init order, because if we cannot register pci driver successfully then we dont need to register sysctl table. > > > pci_unregister_driver(&i915_pci_driver); > > i915_globals_exit(); > > } > > diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c > > index 8d2e37949f46..f039beed1771 100644 > > --- a/drivers/gpu/drm/i915/i915_perf.c > > +++ b/drivers/gpu/drm/i915/i915_perf.c > > @@ -387,6 +387,8 @@ struct i915_oa_config_bo { > > struct i915_vma *vma; > > }; > > > > +static struct ctl_table_header *sysctl_header; > > + > > static enum hrtimer_restart oa_poll_check_timer_cb(struct hrtimer *hrtimer); > > > > void i915_oa_config_release(struct kref *ref) > > @@ -4345,7 +4347,6 @@ void i915_perf_init(struct drm_i915_private *i915) > > > > oa_sample_rate_hard_limit = 1000 * > > (RUNTIME_INFO(i915)->cs_timestamp_frequency_khz / 2); > > - perf->sysctl_header = register_sysctl_table(dev_root); > > doc for this function also needs an update with > s/module load/module bind/ sure. > > > > > mutex_init(&perf->metrics_lock); > > idr_init(&perf->metrics_idr); > > @@ -4381,6 +4382,20 @@ static int destroy_config(int id, void *p, void *data) > > return 0; > > } > > > > +int i915_perf_sysctl_register(void) > > +{ > > + sysctl_header = register_sysctl_table(dev_root); > > + if (!sysctl_header) > > + return -ENOMEM; > > Not sure about this return code here. grepping other drivers, this seems > to be common, but checking register_sysctl_table() it can actually fail > for other reasons. > > The previous behavior was to ignore it and not fail the entire thing... > just living without this sysctl. I'd say to keep that behavior. > Sure, we could ignore the return code for now. > Lucas De Marchi > > > + > > + return 0; > > +} > > + > > +void i915_perf_sysctl_unregister(void) > > +{ > > + unregister_sysctl_table(sysctl_header); > > +} > > + > > /** > > * i915_perf_fini - Counter part to i915_perf_init() > > * @i915: i915 device instance > > @@ -4395,8 +4410,6 @@ void i915_perf_fini(struct drm_i915_private *i915) > > idr_for_each(&perf->metrics_idr, destroy_config, perf); > > idr_destroy(&perf->metrics_idr); > > > > - unregister_sysctl_table(perf->sysctl_header); > > - > > memset(&perf->ops, 0, sizeof(perf->ops)); > > perf->i915 = NULL; > > } > > diff --git a/drivers/gpu/drm/i915/i915_perf.h b/drivers/gpu/drm/i915/i915_perf.h > > index 4ceebce72060..1d1329e5af3a 100644 > > --- a/drivers/gpu/drm/i915/i915_perf.h > > +++ b/drivers/gpu/drm/i915/i915_perf.h > > @@ -23,6 +23,8 @@ void i915_perf_fini(struct drm_i915_private *i915); > > void i915_perf_register(struct drm_i915_private *i915); > > void i915_perf_unregister(struct drm_i915_private *i915); > > int i915_perf_ioctl_version(void); > > +int i915_perf_sysctl_register(void); > > +void i915_perf_sysctl_unregister(void); > > > > int i915_perf_open_ioctl(struct drm_device *dev, void *data, > > struct drm_file *file); > > diff --git a/drivers/gpu/drm/i915/i915_perf_types.h b/drivers/gpu/drm/i915/i915_perf_types.h > > index 74ddc20a0d37..45e581455f5d 100644 > > --- a/drivers/gpu/drm/i915/i915_perf_types.h > > +++ b/drivers/gpu/drm/i915/i915_perf_types.h > > @@ -380,7 +380,6 @@ struct i915_perf { > > struct drm_i915_private *i915; > > > > struct kobject *metrics_kobj; > > - struct ctl_table_header *sysctl_header; > > > > /* > > * Lock associated with adding/modifying/removing OA configs > > -- > > 2.21.0.5.gaeb582a983 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx