From: tip-bot for Borislav Petkov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: peterz@infradead.org, sudeep.holla@arm.com, bp@suse.de,
andre.przywara@arm.com, mingo@kernel.org, philm@manjaro.org,
linux-kernel@vger.kernel.org, tglx@linutronix.de,
torvalds@linux-foundation.org, linux@roeck-us.net, hpa@zytor.com
Subject: [tip:x86/urgent] x86/cpu/cacheinfo: Fix teardown path
Date: Wed, 5 Aug 2015 13:14:53 -0700 [thread overview]
Message-ID: <tip-680ac028240f8747f31c03986fbcf18b2b521e93@git.kernel.org> (raw)
In-Reply-To: <20150727075805.GA20416@nazgul.tnic>
Commit-ID: 680ac028240f8747f31c03986fbcf18b2b521e93
Gitweb: http://git.kernel.org/tip/680ac028240f8747f31c03986fbcf18b2b521e93
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Mon, 27 Jul 2015 09:58:05 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 5 Aug 2015 10:08:17 +0200
x86/cpu/cacheinfo: Fix teardown path
Philip Müller reported a hang when booting 32-bit 4.1 kernel on
an AMD box. A fragment of the splat was enough to pinpoint the
issue:
task: f58e0000 ti: f58e8000 task.ti: f58e800
EIP: 0060:[<c135a903>] EFLAGS: 00010206 CPU: 0
EIP is at free_cache_attributes+0x83/0xd0
EAX: 00000001 EBX: f589d46c ECX: 00000090 EDX: 360c2000
ESI: 00000000 EDI: c1724a80 EBP: f58e9ec0 ESP: f58e9ea0
DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
CR0: 8005003b CR2: 000000ac CR3: 01731000 CR4: 000006d0
cache_shared_cpu_map_setup() did check sibling CPUs cacheinfo
descriptor while the respective teardown path
cache_shared_cpu_map_remove() didn't. Fix that.
>From tglx's version: to be on the safe side, move the cacheinfo
descriptor check to free_cache_attributes(), thus cleaning up
the hotplug path a little and making this even more robust.
Reported-by: Philip Müller <philm@manjaro.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: <stable@vger.kernel.org> # v4.1+
Cc: Andre Przywara <andre.przywara@arm.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Cc: manjaro-dev@manjaro.org
Link: http://lkml.kernel.org/r/20150727075805.GA20416@nazgul.tnic
Link: https://lkml.kernel.org/r/55B47BB8.6080202@manjaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
drivers/base/cacheinfo.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
index 764280a..e9fd32e 100644
--- a/drivers/base/cacheinfo.c
+++ b/drivers/base/cacheinfo.c
@@ -148,7 +148,11 @@ static void cache_shared_cpu_map_remove(unsigned int cpu)
if (sibling == cpu) /* skip itself */
continue;
+
sib_cpu_ci = get_cpu_cacheinfo(sibling);
+ if (!sib_cpu_ci->info_list)
+ continue;
+
sib_leaf = sib_cpu_ci->info_list + index;
cpumask_clear_cpu(cpu, &sib_leaf->shared_cpu_map);
cpumask_clear_cpu(sibling, &this_leaf->shared_cpu_map);
@@ -159,6 +163,9 @@ static void cache_shared_cpu_map_remove(unsigned int cpu)
static void free_cache_attributes(unsigned int cpu)
{
+ if (!per_cpu_cacheinfo(cpu))
+ return;
+
cache_shared_cpu_map_remove(cpu);
kfree(per_cpu_cacheinfo(cpu));
@@ -514,8 +521,7 @@ static int cacheinfo_cpu_callback(struct notifier_block *nfb,
break;
case CPU_DEAD:
cache_remove_dev(cpu);
- if (per_cpu_cacheinfo(cpu))
- free_cache_attributes(cpu);
+ free_cache_attributes(cpu);
break;
}
return notifier_from_errno(rc);
next prev parent reply other threads:[~2015-08-05 20:15 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-23 22:23 [linux41] Kernel panic at i686 Philip Müller
2015-07-26 6:18 ` [linux41] regression with 'x86/cacheinfo: Move cacheinfo sysfs code to generic infrastructure' on AMD i686 Philip Müller
2015-07-26 8:13 ` Thomas Gleixner
2015-07-26 8:41 ` Borislav Petkov
2015-07-26 10:54 ` Philip Müller
2015-07-26 14:42 ` Borislav Petkov
2015-07-26 15:59 ` Philip Müller
2015-07-26 16:11 ` Guenter Roeck
2015-09-16 23:52 ` Josh Boyer
2015-09-17 5:36 ` Philip Müller
2015-09-17 7:15 ` Borislav Petkov
2015-09-17 12:54 ` Greg KH
2015-07-27 7:58 ` [PATCH] cpu/cacheinfo: Fix teardown path Borislav Petkov
2015-07-27 8:56 ` Sudeep Holla
2015-07-27 11:10 ` Thomas Gleixner
2015-07-27 18:49 ` Philip Müller
2015-08-05 20:14 ` tip-bot for Borislav Petkov [this message]
2015-08-08 8:46 ` Borislav Petkov
2015-08-08 15:41 ` Greg KH
2015-08-08 18:23 ` Philip Müller
2015-08-08 19:42 ` Borislav Petkov
2015-08-08 19:47 ` Borislav Petkov
2015-09-13 7:03 ` Philip Müller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-680ac028240f8747f31c03986fbcf18b2b521e93@git.kernel.org \
--to=tipbot@zytor.com \
--cc=andre.przywara@arm.com \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=philm@manjaro.org \
--cc=sudeep.holla@arm.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).