| Message ID | 20190724084638.24982-2-npiggin@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 31f210cf42d4b308eacef89b6cb0b1459338b8de |
| Headers | show |
| Series | [1/5] powerpc/64s/radix: Fix memory hotplug section page table creation | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch next (f3365d1a959d5c6527efe3d38276acc9b58e3f3f) |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 10 lines checked |
Nicholas Piggin <npiggin@gmail.com> writes: > create_physical_mapping expects physical addresses, but splitting > these mapping on hot unplug is supplying virtual (effective) > addresses. > > [I'm not sure how to test this one] > Memory hot unplug with kvm? Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> > Cc: Balbir Singh <bsingharora@gmail.com> > Fixes: 4dd5f8a99e791 ("powerpc/mm/radix: Split linear mapping on hot-unplug") > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > --- > arch/powerpc/mm/book3s64/radix_pgtable.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c > index c5cc16ab1954..2204d8eeb784 100644 > --- a/arch/powerpc/mm/book3s64/radix_pgtable.c > +++ b/arch/powerpc/mm/book3s64/radix_pgtable.c > @@ -737,8 +737,8 @@ static int __meminit stop_machine_change_mapping(void *data) > > spin_unlock(&init_mm.page_table_lock); > pte_clear(&init_mm, params->aligned_start, params->pte); > - create_physical_mapping(params->aligned_start, params->start, -1); > - create_physical_mapping(params->end, params->aligned_end, -1); > + create_physical_mapping(__pa(params->aligned_start), __pa(params->start), -1); > + create_physical_mapping(__pa(params->end), __pa(params->aligned_end), -1); > spin_lock(&init_mm.page_table_lock); > return 0; > } > -- > 2.22.0
diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c index c5cc16ab1954..2204d8eeb784 100644 --- a/arch/powerpc/mm/book3s64/radix_pgtable.c +++ b/arch/powerpc/mm/book3s64/radix_pgtable.c @@ -737,8 +737,8 @@ static int __meminit stop_machine_change_mapping(void *data) spin_unlock(&init_mm.page_table_lock); pte_clear(&init_mm, params->aligned_start, params->pte); - create_physical_mapping(params->aligned_start, params->start, -1); - create_physical_mapping(params->end, params->aligned_end, -1); + create_physical_mapping(__pa(params->aligned_start), __pa(params->start), -1); + create_physical_mapping(__pa(params->end), __pa(params->aligned_end), -1); spin_lock(&init_mm.page_table_lock); return 0; }
create_physical_mapping expects physical addresses, but splitting these mapping on hot unplug is supplying virtual (effective) addresses. [I'm not sure how to test this one] Cc: Balbir Singh <bsingharora@gmail.com> Fixes: 4dd5f8a99e791 ("powerpc/mm/radix: Split linear mapping on hot-unplug") Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- arch/powerpc/mm/book3s64/radix_pgtable.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)