* [PATCH v1 1/1] intel_telemetry_debugfs: fix oops found while load/unload module test @ 2017-05-27 15:17 priyalee.kushwaha 2017-05-27 5:49 ` Darren Hart 2017-05-29 3:07 ` Chakravarty, Souvik K 0 siblings, 2 replies; 6+ messages in thread From: priyalee.kushwaha @ 2017-05-27 15:17 UTC (permalink / raw) To: dvhart, souvik.k.chakravarty, andy Cc: linux-kernel, platform-driver-x86, Priyalee Kushwaha From: Priyalee Kushwaha <priyalee.kushwaha@intel.com> This fix oops found while testing load/unload test of intel_telemetry_debugfs module. Module_init uses register_pm_notifier for PM callbacks, but unregister_pm_notifier was missing from module_exit. [ 97.481860] BUG: unable to handle kernel paging request at ffffffffa006f010 [ 97.489742] IP: blocking_notifier_chain_register+0x3a/0xa0 [ 97.495898] PGD 2e0a067 [ 97.495899] PUD 2e0b063 [ 97.498737] PMD 179e29067 [ 97.501573] PTE 0 [ 97.508423] Oops: 0000 1 PREEMPT SMP [ 97.512724] Modules linked in: intel_telemetry_debugfs intel_rapl gpio_keys dwc3 udc_core intel_telemetry_pltdrv intel_punit_ipc intel_telemetry_core rtc_cmos efivars x86_pkg_temp_thermal iwlwifi snd_hda_codec_hdmi soc_button_array btusb cfg80211 btrtl mei_me hci_uart btbcm mei btintel i915 bluetooth intel_pmc_ipc snd_hda_intel spi_pxa2xx_platform snd_hda_codec dwc3_pci snd_hda_core tpm_tis tpm_tis_core tpm efivarfs [ 97.558453] CPU: 0 PID: 889 Comm: modprobe Not tainted 4.11.0-rc6-intel-dev-bkc #1 [ 97.566950] Hardware name: Intel Corp. Joule DVT3/SDS, BIOS GTPP181A.X64.0143.B30.1701132137 01/13/2017 [ 97.577518] task: ffff8801793a21c0 task.stack: ffff8801793f0000 [ 97.584162] RIP: 0010:blocking_notifier_chain_register+0x3a/0xa0 [ 97.590903] RSP: 0018:ffff8801793f3c58 EFLAGS: 00010286 [ 97.596802] RAX: ffffffffa006f000 RBX: ffffffff81e3ea20 RCX: 0000000000000000 [ 97.604812] RDX: ffff880179eaf210 RSI: ffffffffa0131000 RDI: ffffffff81e3ea20 [ 97.612821] RBP: ffff8801793f3c68 R08: 0000000000000006 R09: 000000000000005c [ 97.620847] R10: 0000000000000000 R11: 0000000000000006 R12: ffffffffa0131000 [ 97.628855] R13: 0000000000000000 R14: ffff880176e35f48 R15: ffff8801793f3ea8 [ 97.636865] FS: 00007f7eeba07700(0000) GS:ffff88017fc00000(0000) knlGS:0000000000000000 [ 97.645948] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 97.652423] CR2: ffffffffa006f010 CR3: 00000001775ef000 CR4: 00000000003406f0 [ 97.660423] Call Trace: [ 97.663166] ? 0xffffffffa0031000 [ 97.666885] register_pm_notifier+0x18/0x20 [ 97.671581] telemetry_debugfs_init+0x92/0x1000 Signed-off-by: Priyalee Kushwaha <priyalee.kushwaha@intel.com> --- drivers/platform/x86/intel_telemetry_debugfs.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/intel_telemetry_debugfs.c b/drivers/platform/x86/intel_telemetry_debugfs.c index ef29f18..0f93975 100644 --- a/drivers/platform/x86/intel_telemetry_debugfs.c +++ b/drivers/platform/x86/intel_telemetry_debugfs.c @@ -966,8 +966,12 @@ static int __init telemetry_debugfs_init(void) #endif /* CONFIG_PM_SLEEP */ debugfs_conf->telemetry_dbg_dir = debugfs_create_dir("telemetry", NULL); - if (!debugfs_conf->telemetry_dbg_dir) + if (!debugfs_conf->telemetry_dbg_dir) { +#ifdef CONFIG_PM_SLEEP + unregister_pm_notifier(&pm_notifier); +#endif /* CONFIG_PM_SLEEP */ return -ENOMEM; + } f = debugfs_create_file("pss_info", S_IFREG | S_IRUGO, debugfs_conf->telemetry_dbg_dir, NULL, @@ -1014,6 +1018,9 @@ static int __init telemetry_debugfs_init(void) out: debugfs_remove_recursive(debugfs_conf->telemetry_dbg_dir); debugfs_conf->telemetry_dbg_dir = NULL; +#ifdef CONFIG_PM_SLEEP + unregister_pm_notifier(&pm_notifier); +#endif /* CONFIG_PM_SLEEP */ return err; } @@ -1022,6 +1029,9 @@ static void __exit telemetry_debugfs_exit(void) { debugfs_remove_recursive(debugfs_conf->telemetry_dbg_dir); debugfs_conf->telemetry_dbg_dir = NULL; +#ifdef CONFIG_PM_SLEEP + unregister_pm_notifier(&pm_notifier); +#endif /* CONFIG_PM_SLEEP */ } late_initcall(telemetry_debugfs_init); -- 2.10.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/1] intel_telemetry_debugfs: fix oops found while load/unload module test 2017-05-27 15:17 [PATCH v1 1/1] intel_telemetry_debugfs: fix oops found while load/unload module test priyalee.kushwaha @ 2017-05-27 5:49 ` Darren Hart 2017-05-27 6:54 ` Pavel Machek 2017-05-29 3:07 ` Chakravarty, Souvik K 1 sibling, 1 reply; 6+ messages in thread From: Darren Hart @ 2017-05-27 5:49 UTC (permalink / raw) To: priyalee.kushwaha Cc: souvik.k.chakravarty, andy, linux-kernel, platform-driver-x86, Rafael Wysocki, Len Brown, Pavel Machek, linux-pm On Sat, May 27, 2017 at 08:17:39AM -0700, priyalee.kushwaha@intel.com wrote: > From: Priyalee Kushwaha <priyalee.kushwaha@intel.com> > > This fix oops found while testing load/unload test of > intel_telemetry_debugfs module. Module_init uses register_pm_notifier > for PM callbacks, but unregister_pm_notifier was missing from > module_exit. > > [ 97.481860] BUG: unable to handle kernel paging request at ffffffffa006f010 > [ 97.489742] IP: blocking_notifier_chain_register+0x3a/0xa0 > [ 97.495898] PGD 2e0a067 > [ 97.495899] PUD 2e0b063 > [ 97.498737] PMD 179e29067 > [ 97.501573] PTE 0 > > [ 97.508423] Oops: 0000 1 PREEMPT SMP > [ 97.512724] Modules linked in: intel_telemetry_debugfs intel_rapl gpio_keys dwc3 udc_core intel_telemetry_pltdrv intel_punit_ipc intel_telemetry_core rtc_cmos efivars x86_pkg_temp_thermal iwlwifi snd_hda_codec_hdmi soc_button_array btusb cfg80211 btrtl mei_me hci_uart btbcm mei btintel i915 bluetooth intel_pmc_ipc snd_hda_intel spi_pxa2xx_platform snd_hda_codec dwc3_pci snd_hda_core tpm_tis tpm_tis_core tpm efivarfs > [ 97.558453] CPU: 0 PID: 889 Comm: modprobe Not tainted 4.11.0-rc6-intel-dev-bkc #1 > [ 97.566950] Hardware name: Intel Corp. Joule DVT3/SDS, BIOS GTPP181A.X64.0143.B30.1701132137 01/13/2017 > [ 97.577518] task: ffff8801793a21c0 task.stack: ffff8801793f0000 > [ 97.584162] RIP: 0010:blocking_notifier_chain_register+0x3a/0xa0 > [ 97.590903] RSP: 0018:ffff8801793f3c58 EFLAGS: 00010286 > [ 97.596802] RAX: ffffffffa006f000 RBX: ffffffff81e3ea20 RCX: 0000000000000000 > [ 97.604812] RDX: ffff880179eaf210 RSI: ffffffffa0131000 RDI: ffffffff81e3ea20 > [ 97.612821] RBP: ffff8801793f3c68 R08: 0000000000000006 R09: 000000000000005c > [ 97.620847] R10: 0000000000000000 R11: 0000000000000006 R12: ffffffffa0131000 > [ 97.628855] R13: 0000000000000000 R14: ffff880176e35f48 R15: ffff8801793f3ea8 > [ 97.636865] FS: 00007f7eeba07700(0000) GS:ffff88017fc00000(0000) knlGS:0000000000000000 > [ 97.645948] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > [ 97.652423] CR2: ffffffffa006f010 CR3: 00000001775ef000 CR4: 00000000003406f0 > [ 97.660423] Call Trace: > [ 97.663166] ? 0xffffffffa0031000 > [ 97.666885] register_pm_notifier+0x18/0x20 > [ 97.671581] telemetry_debugfs_init+0x92/0x1000 > > Signed-off-by: Priyalee Kushwaha <priyalee.kushwaha@intel.com> Hi Priyalee, Thanks for catching this, we should get a fix into the RC cycle. but I think we can make some small changes that will improve legibility here. > --- > drivers/platform/x86/intel_telemetry_debugfs.c | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/drivers/platform/x86/intel_telemetry_debugfs.c b/drivers/platform/x86/intel_telemetry_debugfs.c > index ef29f18..0f93975 100644 > --- a/drivers/platform/x86/intel_telemetry_debugfs.c > +++ b/drivers/platform/x86/intel_telemetry_debugfs.c > @@ -966,8 +966,12 @@ static int __init telemetry_debugfs_init(void) > #endif /* CONFIG_PM_SLEEP */ > > debugfs_conf->telemetry_dbg_dir = debugfs_create_dir("telemetry", NULL); > - if (!debugfs_conf->telemetry_dbg_dir) > + if (!debugfs_conf->telemetry_dbg_dir) { > +#ifdef CONFIG_PM_SLEEP > + unregister_pm_notifier(&pm_notifier); > +#endif /* CONFIG_PM_SLEEP */ > return -ENOMEM; > + } As a general rule, we try to avoid peppering code with #ifdef blocks, and prefer to create no-op functions, or similar. CONFIG_PM_SLEEP unfortunately doesn't have such no-op functions. Rather than add the CONFIG_PM_SLEEP block above, please convert the above to use an err= and goto statement, and create the appropriate labels below. +Rafael, Len, Pavel, linux-pm: Is there a preferred approach for dealing with CONFIG_PM_SLEEP? > > f = debugfs_create_file("pss_info", S_IFREG | S_IRUGO, > debugfs_conf->telemetry_dbg_dir, NULL, > @@ -1014,6 +1018,9 @@ static int __init telemetry_debugfs_init(void) > out: > debugfs_remove_recursive(debugfs_conf->telemetry_dbg_dir); > debugfs_conf->telemetry_dbg_dir = NULL; e.g. out_pm: > +#ifdef CONFIG_PM_SLEEP > + unregister_pm_notifier(&pm_notifier); > +#endif /* CONFIG_PM_SLEEP */ > > return err; > } > @@ -1022,6 +1029,9 @@ static void __exit telemetry_debugfs_exit(void) > { > debugfs_remove_recursive(debugfs_conf->telemetry_dbg_dir); > debugfs_conf->telemetry_dbg_dir = NULL; > +#ifdef CONFIG_PM_SLEEP > + unregister_pm_notifier(&pm_notifier); > +#endif /* CONFIG_PM_SLEEP */ > } > > late_initcall(telemetry_debugfs_init); > -- > 2.10.0 > > -- Darren Hart VMware Open Source Technology Center ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/1] intel_telemetry_debugfs: fix oops found while load/unload module test 2017-05-27 5:49 ` Darren Hart @ 2017-05-27 6:54 ` Pavel Machek 2017-05-27 10:52 ` Andy Shevchenko 0 siblings, 1 reply; 6+ messages in thread From: Pavel Machek @ 2017-05-27 6:54 UTC (permalink / raw) To: Darren Hart Cc: priyalee.kushwaha, souvik.k.chakravarty, andy, linux-kernel, platform-driver-x86, Rafael Wysocki, Len Brown, linux-pm [-- Attachment #1: Type: text/plain, Size: 4205 bytes --] Hi! > On Sat, May 27, 2017 at 08:17:39AM -0700, priyalee.kushwaha@intel.com wrote: > > From: Priyalee Kushwaha <priyalee.kushwaha@intel.com> > > > > This fix oops found while testing load/unload test of > > intel_telemetry_debugfs module. Module_init uses register_pm_notifier > > for PM callbacks, but unregister_pm_notifier was missing from > > module_exit. > > > > [ 97.481860] BUG: unable to handle kernel paging request at ffffffffa006f010 > > [ 97.489742] IP: blocking_notifier_chain_register+0x3a/0xa0 > > [ 97.495898] PGD 2e0a067 > > [ 97.495899] PUD 2e0b063 > > [ 97.498737] PMD 179e29067 > > [ 97.501573] PTE 0 > > > > [ 97.508423] Oops: 0000 1 PREEMPT SMP > > [ 97.512724] Modules linked in: intel_telemetry_debugfs intel_rapl gpio_keys dwc3 udc_core intel_telemetry_pltdrv intel_punit_ipc intel_telemetry_core rtc_cmos efivars x86_pkg_temp_thermal iwlwifi snd_hda_codec_hdmi soc_button_array btusb cfg80211 btrtl mei_me hci_uart btbcm mei btintel i915 bluetooth intel_pmc_ipc snd_hda_intel spi_pxa2xx_platform snd_hda_codec dwc3_pci snd_hda_core tpm_tis tpm_tis_core tpm efivarfs > > [ 97.558453] CPU: 0 PID: 889 Comm: modprobe Not tainted 4.11.0-rc6-intel-dev-bkc #1 > > [ 97.566950] Hardware name: Intel Corp. Joule DVT3/SDS, BIOS GTPP181A.X64.0143.B30.1701132137 01/13/2017 > > [ 97.577518] task: ffff8801793a21c0 task.stack: ffff8801793f0000 > > [ 97.584162] RIP: 0010:blocking_notifier_chain_register+0x3a/0xa0 > > [ 97.590903] RSP: 0018:ffff8801793f3c58 EFLAGS: 00010286 > > [ 97.596802] RAX: ffffffffa006f000 RBX: ffffffff81e3ea20 RCX: 0000000000000000 > > [ 97.604812] RDX: ffff880179eaf210 RSI: ffffffffa0131000 RDI: ffffffff81e3ea20 > > [ 97.612821] RBP: ffff8801793f3c68 R08: 0000000000000006 R09: 000000000000005c > > [ 97.620847] R10: 0000000000000000 R11: 0000000000000006 R12: ffffffffa0131000 > > [ 97.628855] R13: 0000000000000000 R14: ffff880176e35f48 R15: ffff8801793f3ea8 > > [ 97.636865] FS: 00007f7eeba07700(0000) GS:ffff88017fc00000(0000) knlGS:0000000000000000 > > [ 97.645948] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > > [ 97.652423] CR2: ffffffffa006f010 CR3: 00000001775ef000 CR4: 00000000003406f0 > > [ 97.660423] Call Trace: > > [ 97.663166] ? 0xffffffffa0031000 > > [ 97.666885] register_pm_notifier+0x18/0x20 > > [ 97.671581] telemetry_debugfs_init+0x92/0x1000 > > > > Signed-off-by: Priyalee Kushwaha <priyalee.kushwaha@intel.com> > > Hi Priyalee, > > Thanks for catching this, we should get a fix into the RC cycle. but I think we > can make some small changes that will improve legibility here. > > > --- > > drivers/platform/x86/intel_telemetry_debugfs.c | 12 +++++++++++- > > 1 file changed, 11 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/platform/x86/intel_telemetry_debugfs.c b/drivers/platform/x86/intel_telemetry_debugfs.c > > index ef29f18..0f93975 100644 > > --- a/drivers/platform/x86/intel_telemetry_debugfs.c > > +++ b/drivers/platform/x86/intel_telemetry_debugfs.c > > @@ -966,8 +966,12 @@ static int __init telemetry_debugfs_init(void) > > #endif /* CONFIG_PM_SLEEP */ > > > > debugfs_conf->telemetry_dbg_dir = debugfs_create_dir("telemetry", NULL); > > - if (!debugfs_conf->telemetry_dbg_dir) > > + if (!debugfs_conf->telemetry_dbg_dir) { > > +#ifdef CONFIG_PM_SLEEP > > + unregister_pm_notifier(&pm_notifier); > > +#endif /* CONFIG_PM_SLEEP */ > > return -ENOMEM; > > + } > > As a general rule, we try to avoid peppering code with #ifdef blocks, and prefer > to create no-op functions, or similar. CONFIG_PM_SLEEP unfortunately doesn't > have such no-op functions. > > Rather than add the CONFIG_PM_SLEEP block above, please convert the above to use > an err= and goto statement, and create the appropriate labels below. > > +Rafael, Len, Pavel, linux-pm: Is there a preferred approach for dealing with > CONFIG_PM_SLEEP? Yeah, empty "unregister_pm_notifier" in !CONFIG_PM_SLEEP case sounds like a good idea. Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 181 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/1] intel_telemetry_debugfs: fix oops found while load/unload module test 2017-05-27 6:54 ` Pavel Machek @ 2017-05-27 10:52 ` Andy Shevchenko 2017-05-31 19:21 ` Kushwaha, Priyalee 0 siblings, 1 reply; 6+ messages in thread From: Andy Shevchenko @ 2017-05-27 10:52 UTC (permalink / raw) To: Pavel Machek Cc: Darren Hart, priyalee.kushwaha, souvik.k.chakravarty, Andy Shevchenko, linux-kernel@vger.kernel.org, Platform Driver, Rafael Wysocki, Len Brown, linux-pm@vger.kernel.org On Sat, May 27, 2017 at 9:54 AM, Pavel Machek <pavel@ucw.cz> wrote: >> On Sat, May 27, 2017 at 08:17:39AM -0700, priyalee.kushwaha@intel.com wrote: >> +Rafael, Len, Pavel, linux-pm: Is there a preferred approach for dealing with >> CONFIG_PM_SLEEP? > > Yeah, empty "unregister_pm_notifier" in !CONFIG_PM_SLEEP case sounds > like a good idea. I like the idea, though I would let Rafael to speak up. -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH v1 1/1] intel_telemetry_debugfs: fix oops found while load/unload module test 2017-05-27 10:52 ` Andy Shevchenko @ 2017-05-31 19:21 ` Kushwaha, Priyalee 0 siblings, 0 replies; 6+ messages in thread From: Kushwaha, Priyalee @ 2017-05-31 19:21 UTC (permalink / raw) To: Andy Shevchenko, Pavel Machek Cc: Darren Hart, Chakravarty, Souvik K, Andy Shevchenko, linux-kernel@vger.kernel.org, Platform Driver, Rafael Wysocki, Brown, Len, linux-pm@vger.kernel.org I will resubmit the patch with suggested changes. -----Original Message----- From: Andy Shevchenko [mailto:andy.shevchenko@gmail.com] Sent: Saturday, May 27, 2017 3:52 AM To: Pavel Machek <pavel@ucw.cz> Cc: Darren Hart <dvhart@infradead.org>; Kushwaha, Priyalee <priyalee.kushwaha@intel.com>; Chakravarty, Souvik K <souvik.k.chakravarty@intel.com>; Andy Shevchenko <andy@infradead.org>; linux-kernel@vger.kernel.org; Platform Driver <platform-driver-x86@vger.kernel.org>; Rafael Wysocki <rjw@rjwysocki.net>; Brown, Len <len.brown@intel.com>; linux-pm@vger.kernel.org Subject: Re: [PATCH v1 1/1] intel_telemetry_debugfs: fix oops found while load/unload module test On Sat, May 27, 2017 at 9:54 AM, Pavel Machek <pavel@ucw.cz> wrote: >> On Sat, May 27, 2017 at 08:17:39AM -0700, priyalee.kushwaha@intel.com wrote: >> +Rafael, Len, Pavel, linux-pm: Is there a preferred approach for >> +dealing with >> CONFIG_PM_SLEEP? > > Yeah, empty "unregister_pm_notifier" in !CONFIG_PM_SLEEP case sounds > like a good idea. I like the idea, though I would let Rafael to speak up. -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH v1 1/1] intel_telemetry_debugfs: fix oops found while load/unload module test 2017-05-27 15:17 [PATCH v1 1/1] intel_telemetry_debugfs: fix oops found while load/unload module test priyalee.kushwaha 2017-05-27 5:49 ` Darren Hart @ 2017-05-29 3:07 ` Chakravarty, Souvik K 1 sibling, 0 replies; 6+ messages in thread From: Chakravarty, Souvik K @ 2017-05-29 3:07 UTC (permalink / raw) To: Kushwaha, Priyalee, dvhart@infradead.org, andy@infradead.org Cc: linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, Kushwaha, Priyalee Thanks for catching this. BR, Souvik > -----Original Message----- > From: platform-driver-x86-owner@vger.kernel.org [mailto:platform-driver- > x86-owner@vger.kernel.org] On Behalf Of priyalee.kushwaha@intel.com > Sent: Saturday, May 27, 2017 8:48 PM > To: dvhart@infradead.org; Chakravarty, Souvik K > <souvik.k.chakravarty@intel.com>; andy@infradead.org > Cc: linux-kernel@vger.kernel.org; platform-driver-x86@vger.kernel.org; > Kushwaha, Priyalee <priyalee.kushwaha@intel.com> > Subject: [PATCH v1 1/1] intel_telemetry_debugfs: fix oops found while > load/unload module test > > From: Priyalee Kushwaha <priyalee.kushwaha@intel.com> > > This fix oops found while testing load/unload test of > intel_telemetry_debugfs module. Module_init uses register_pm_notifier > for PM callbacks, but unregister_pm_notifier was missing from > module_exit. > > [ 97.481860] BUG: unable to handle kernel paging request at > ffffffffa006f010 [ 97.489742] IP: > blocking_notifier_chain_register+0x3a/0xa0 > [ 97.495898] PGD 2e0a067 > [ 97.495899] PUD 2e0b063 > [ 97.498737] PMD 179e29067 > [ 97.501573] PTE 0 > > [ 97.508423] Oops: 0000 1 PREEMPT SMP > [ 97.512724] Modules linked in: intel_telemetry_debugfs intel_rapl > gpio_keys dwc3 udc_core intel_telemetry_pltdrv intel_punit_ipc > intel_telemetry_core rtc_cmos efivars x86_pkg_temp_thermal iwlwifi > snd_hda_codec_hdmi soc_button_array btusb cfg80211 btrtl mei_me > hci_uart btbcm mei btintel i915 bluetooth intel_pmc_ipc snd_hda_intel > spi_pxa2xx_platform snd_hda_codec dwc3_pci snd_hda_core tpm_tis > tpm_tis_core tpm efivarfs [ 97.558453] CPU: 0 PID: 889 Comm: modprobe > Not tainted 4.11.0-rc6-intel-dev-bkc #1 [ 97.566950] Hardware name: Intel > Corp. Joule DVT3/SDS, BIOS GTPP181A.X64.0143.B30.1701132137 > 01/13/2017 [ 97.577518] task: ffff8801793a21c0 task.stack: > ffff8801793f0000 [ 97.584162] RIP: > 0010:blocking_notifier_chain_register+0x3a/0xa0 > [ 97.590903] RSP: 0018:ffff8801793f3c58 EFLAGS: 00010286 [ > 97.596802] RAX: ffffffffa006f000 RBX: ffffffff81e3ea20 RCX: > 0000000000000000 [ 97.604812] RDX: ffff880179eaf210 RSI: > ffffffffa0131000 RDI: ffffffff81e3ea20 [ 97.612821] RBP: ffff8801793f3c68 > R08: 0000000000000006 R09: 000000000000005c [ 97.620847] R10: > 0000000000000000 R11: 0000000000000006 R12: ffffffffa0131000 [ > 97.628855] R13: 0000000000000000 R14: ffff880176e35f48 R15: > ffff8801793f3ea8 [ 97.636865] FS: 00007f7eeba07700(0000) > GS:ffff88017fc00000(0000) knlGS:0000000000000000 [ 97.645948] CS: > 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 97.652423] CR2: > ffffffffa006f010 CR3: 00000001775ef000 CR4: 00000000003406f0 [ > 97.660423] Call Trace: > [ 97.663166] ? 0xffffffffa0031000 > [ 97.666885] register_pm_notifier+0x18/0x20 [ 97.671581] > telemetry_debugfs_init+0x92/0x1000 > > Signed-off-by: Priyalee Kushwaha <priyalee.kushwaha@intel.com> > --- > drivers/platform/x86/intel_telemetry_debugfs.c | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/drivers/platform/x86/intel_telemetry_debugfs.c > b/drivers/platform/x86/intel_telemetry_debugfs.c > index ef29f18..0f93975 100644 > --- a/drivers/platform/x86/intel_telemetry_debugfs.c > +++ b/drivers/platform/x86/intel_telemetry_debugfs.c > @@ -966,8 +966,12 @@ static int __init telemetry_debugfs_init(void) > #endif /* CONFIG_PM_SLEEP */ > > debugfs_conf->telemetry_dbg_dir = > debugfs_create_dir("telemetry", NULL); > - if (!debugfs_conf->telemetry_dbg_dir) > + if (!debugfs_conf->telemetry_dbg_dir) { #ifdef CONFIG_PM_SLEEP > + unregister_pm_notifier(&pm_notifier); > +#endif /* CONFIG_PM_SLEEP */ > return -ENOMEM; > + } > > f = debugfs_create_file("pss_info", S_IFREG | S_IRUGO, > debugfs_conf->telemetry_dbg_dir, NULL, > @@ -1014,6 +1018,9 @@ static int __init telemetry_debugfs_init(void) > out: > debugfs_remove_recursive(debugfs_conf->telemetry_dbg_dir); > debugfs_conf->telemetry_dbg_dir = NULL; > +#ifdef CONFIG_PM_SLEEP > + unregister_pm_notifier(&pm_notifier); > +#endif /* CONFIG_PM_SLEEP */ > > return err; > } > @@ -1022,6 +1029,9 @@ static void __exit telemetry_debugfs_exit(void) > { > debugfs_remove_recursive(debugfs_conf->telemetry_dbg_dir); > debugfs_conf->telemetry_dbg_dir = NULL; > +#ifdef CONFIG_PM_SLEEP > + unregister_pm_notifier(&pm_notifier); > +#endif /* CONFIG_PM_SLEEP */ > } > > late_initcall(telemetry_debugfs_init); > -- > 2.10.0 ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-05-31 19:22 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-05-27 15:17 [PATCH v1 1/1] intel_telemetry_debugfs: fix oops found while load/unload module test priyalee.kushwaha 2017-05-27 5:49 ` Darren Hart 2017-05-27 6:54 ` Pavel Machek 2017-05-27 10:52 ` Andy Shevchenko 2017-05-31 19:21 ` Kushwaha, Priyalee 2017-05-29 3:07 ` Chakravarty, Souvik K
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox