From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753469AbaBQVsl (ORCPT ); Mon, 17 Feb 2014 16:48:41 -0500 Received: from v094114.home.net.pl ([79.96.170.134]:59392 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752885AbaBQVsj (ORCPT ); Mon, 17 Feb 2014 16:48:39 -0500 From: "Rafael J. Wysocki" To: Viresh Kumar Cc: swarren@nvidia.com, linaro-kernel@lists.linaro.org, cpufreq@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] cpufreq: remove sysfs link when a cpu != policy->cpu, is removed Date: Mon, 17 Feb 2014 23:03:27 +0100 Message-ID: <1848612.IZFZXgfmHj@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/3.13.0+; KDE/4.11.5; x86_64; ; ) In-Reply-To: <324f43fc664f51eec355b08b6c2d4cedd2140b4c.1392628861.git.viresh.kumar@linaro.org> References: <324f43fc664f51eec355b08b6c2d4cedd2140b4c.1392628861.git.viresh.kumar@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Monday, February 17, 2014 02:52:11 PM Viresh Kumar wrote: > Earlier patch tried to do this but missed this piece of code to fix. > > 42f921a cpufreq: remove sysfs files for CPUs which failed to come back after > resume > > Currently we are getting this on suspend/resume: > > ------------[ cut here ]------------ > WARNING: CPU: 0 PID: 877 at fs/sysfs/dir.c:52 sysfs_warn_dup+0x68/0x84() > sysfs: cannot create duplicate filename '/devices/system/cpu/cpu1/cpufreq' > Modules linked in: brcmfmac brcmutil > CPU: 0 PID: 877 Comm: test-rtc-resume Not tainted 3.14.0-rc2-00259-g9398a10cd964 #12 > [] (unwind_backtrace) from [] (show_stack+0x10/0x14) > [] (show_stack) from [] (dump_stack+0x80/0xcc) > [] (dump_stack) from [] (warn_slowpath_common+0x64/0x88) > [] (warn_slowpath_common) from [] (warn_slowpath_fmt+0x30/0x40) > [] (warn_slowpath_fmt) from [] (sysfs_warn_dup+0x68/0x84) > [] (sysfs_warn_dup) from [] (sysfs_do_create_link_sd+0xb0/0xb8) > [] (sysfs_do_create_link_sd) from [] (__cpufreq_add_dev.isra.27+0x2a8/0x814) > [] (__cpufreq_add_dev.isra.27) from [] (cpufreq_cpu_callback+0x70/0x8c) > [] (cpufreq_cpu_callback) from [] (notifier_call_chain+0x44/0x84) > [] (notifier_call_chain) from [] (__cpu_notify+0x28/0x44) > [] (__cpu_notify) from [] (_cpu_up+0xf0/0x140) > [] (_cpu_up) from [] (enable_nonboot_cpus+0x68/0xb0) > [] (enable_nonboot_cpus) from [] (suspend_devices_and_enter+0x198/0x2dc) > [] (suspend_devices_and_enter) from [] (pm_suspend+0x174/0x1e8) > [] (pm_suspend) from [] (state_store+0x6c/0xbc) > [] (state_store) from [] (kobj_attr_store+0x14/0x20) > [] (kobj_attr_store) from [] (sysfs_kf_write+0x44/0x48) > [] (sysfs_kf_write) from [] (kernfs_fop_write+0xb4/0x14c) > [] (kernfs_fop_write) from [] (vfs_write+0xa8/0x180) > [] (vfs_write) from [] (SyS_write+0x3c/0x70) > [] (SyS_write) from [] (ret_fast_syscall+0x0/0x30) > ---[ end trace 76969904b614c18f ]--- > > Fix this by removing sysfs link for cpufreq directory when cpu removed isn't > policy->cpu. > > Reported-by: Stephen Warren > Signed-off-by: Viresh Kumar > --- > > Fix for 3.14 only. Queued up for 3.14, thanks! > drivers/cpufreq/cpufreq.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c > index 08ca8c9..cb003a6 100644 > --- a/drivers/cpufreq/cpufreq.c > +++ b/drivers/cpufreq/cpufreq.c > @@ -1323,8 +1323,7 @@ static int __cpufreq_remove_dev_prepare(struct device *dev, > up_read(&policy->rwsem); > > if (cpu != policy->cpu) { > - if (!frozen) > - sysfs_remove_link(&dev->kobj, "cpufreq"); > + sysfs_remove_link(&dev->kobj, "cpufreq"); > } else if (cpus > 1) { > new_cpu = cpufreq_nominate_new_policy_cpu(policy, cpu); > if (new_cpu >= 0) { > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.