| From 87f6ef87aaff2ca4774c5ff323cfebf42a71e78b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 11 Jun 2019 23:45:04 -0500 |
| Subject: powerpc/cacheinfo: add cacheinfo_teardown, cacheinfo_rebuild |
| |
| From: Nathan Lynch <nathanl@linux.ibm.com> |
| |
| [ Upstream commit d4aa219a074a5abaf95a756b9f0d190b5c03a945 ] |
| |
| Allow external callers to force the cacheinfo code to release all its |
| references to cache nodes, e.g. before processing device tree updates |
| post-migration, and to rebuild the hierarchy afterward. |
| |
| CPU online/offline must be blocked by callers; enforce this. |
| |
| Fixes: 410bccf97881 ("powerpc/pseries: Partition migration in the kernel") |
| Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com> |
| Reviewed-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/powerpc/kernel/cacheinfo.c | 17 +++++++++++++++++ |
| arch/powerpc/kernel/cacheinfo.h | 4 ++++ |
| 2 files changed, 21 insertions(+) |
| |
| --- a/arch/powerpc/kernel/cacheinfo.c |
| +++ b/arch/powerpc/kernel/cacheinfo.c |
| @@ -867,4 +867,21 @@ void cacheinfo_cpu_offline(unsigned int |
| if (cache) |
| cache_cpu_clear(cache, cpu_id); |
| } |
| + |
| +void cacheinfo_teardown(void) |
| +{ |
| + unsigned int cpu; |
| + |
| + for_each_online_cpu(cpu) |
| + cacheinfo_cpu_offline(cpu); |
| +} |
| + |
| +void cacheinfo_rebuild(void) |
| +{ |
| + unsigned int cpu; |
| + |
| + for_each_online_cpu(cpu) |
| + cacheinfo_cpu_online(cpu); |
| +} |
| + |
| #endif /* (CONFIG_PPC_PSERIES && CONFIG_SUSPEND) || CONFIG_HOTPLUG_CPU */ |
| --- a/arch/powerpc/kernel/cacheinfo.h |
| +++ b/arch/powerpc/kernel/cacheinfo.h |
| @@ -5,4 +5,8 @@ |
| extern void cacheinfo_cpu_online(unsigned int cpu_id); |
| extern void cacheinfo_cpu_offline(unsigned int cpu_id); |
| |
| +/* Allow migration/suspend to tear down and rebuild the hierarchy. */ |
| +extern void cacheinfo_teardown(void); |
| +extern void cacheinfo_rebuild(void); |
| + |
| #endif /* _PPC_CACHEINFO_H */ |