Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2018-10-31 14:02:00 +0100
committerMichal Suchanek <msuchanek@suse.de>2018-10-31 23:28:45 +0100
commit2d0e8e4c9a06a4c9ceffc457b59ef83bffba017d (patch)
tree2de31c6e12262c74b9002010ecd543a1cb16fcd8
parent1e43c4c7f3f63756e079bfdc99e7550c87b71d74 (diff)
kabi/severities: ignore ppc64 realmode helpers.
KVM fixes remove exports of realmode_pfn_to_page iommu_tce_xchg_rm mm_iommu_lookup_rm mm_iommu_ua_to_hpa_rm. Some are no longer used and others are no longer exported because the code was consolideted in one place. These helpers are to be called in realmode and linking to them from non-KVM modules is a bug. Hence removing them does not break KABI. - Refresh patches.kabi/KABI-powerpc-mmu_context-provide-old-version-of-mm_i.patch.
-rw-r--r--kabi/severities5
-rw-r--r--patches.kabi/KABI-powerpc-mmu_context-provide-old-version-of-mm_i.patch38
2 files changed, 12 insertions, 31 deletions
diff --git a/kabi/severities b/kabi/severities
index 2d3e20ccbc..c2e8b78a77 100644
--- a/kabi/severities
+++ b/kabi/severities
@@ -20,6 +20,11 @@ arch/powerpc/kvm/* PASS
arch/x86/kvm/* PASS
kvmppc_* PASS
__xive_vm_h_* PASS
+realmode_pfn_to_page PASS
+iommu_tce_xchg_rm PASS
+mm_iommu_lookup_rm PASS
+mm_iommu_ua_to_hpa_rm PASS
+mm_iommu_ua_to_hpa_shift_rm PASS
# removed upstream, not included in inlines/defines
x86_spec_ctrl_get_default PASS
diff --git a/patches.kabi/KABI-powerpc-mmu_context-provide-old-version-of-mm_i.patch b/patches.kabi/KABI-powerpc-mmu_context-provide-old-version-of-mm_i.patch
index 1db23125d0..c0661e6c47 100644
--- a/patches.kabi/KABI-powerpc-mmu_context-provide-old-version-of-mm_i.patch
+++ b/patches.kabi/KABI-powerpc-mmu_context-provide-old-version-of-mm_i.patch
@@ -9,36 +9,34 @@ Patch-mainline: Never, kabi
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
- arch/powerpc/include/asm/mmu_context.h | 3 +++
- arch/powerpc/mm/mmu_context_iommu.c | 43 ++++++++++++++++++++++++++++++++++
- 2 files changed, 46 insertions(+)
+ arch/powerpc/include/asm/mmu_context.h | 2 ++
+ arch/powerpc/mm/mmu_context_iommu.c | 20 ++++++++++++++++++++
+ 2 files changed, 22 insertions(+)
diff --git a/arch/powerpc/include/asm/mmu_context.h b/arch/powerpc/include/asm/mmu_context.h
-index 2bfb46efb4e4..04a557e2bb07 100644
+index 6caaecd7e911..27937b3cf817 100644
--- a/arch/powerpc/include/asm/mmu_context.h
+++ b/arch/powerpc/include/asm/mmu_context.h
-@@ -33,6 +33,9 @@ extern struct mm_iommu_table_group_mem_t *mm_iommu_lookup_rm(
+@@ -33,6 +33,8 @@ extern struct mm_iommu_table_group_mem_t *mm_iommu_lookup_rm(
struct mm_struct *mm, unsigned long ua, unsigned long size);
extern struct mm_iommu_table_group_mem_t *mm_iommu_find(struct mm_struct *mm,
unsigned long ua, unsigned long entries);
+/* rename so old compat version can be provided */
+#define mm_iommu_ua_to_hpa mm_iommu_ua_to_hpa_shift
-+#define mm_iommu_ua_to_hpa_rm mm_iommu_ua_to_hpa_shift_rm
extern long mm_iommu_ua_to_hpa(struct mm_iommu_table_group_mem_t *mem,
unsigned long ua, unsigned int pageshift, unsigned long *hpa);
extern long mm_iommu_ua_to_hpa_rm(struct mm_iommu_table_group_mem_t *mem,
diff --git a/arch/powerpc/mm/mmu_context_iommu.c b/arch/powerpc/mm/mmu_context_iommu.c
-index 78ff91f13e45..d0dbc56967d4 100644
+index 3d0d8650ecc2..a71135c6260e 100644
--- a/arch/powerpc/mm/mmu_context_iommu.c
+++ b/arch/powerpc/mm/mmu_context_iommu.c
-@@ -438,3 +438,46 @@ void mm_iommu_init(struct mm_struct *mm)
+@@ -466,3 +466,23 @@ void mm_iommu_init(struct mm_struct *mm)
{
INIT_LIST_HEAD_RCU(&mm->context.iommu_group_mem_list);
}
+
+/* old version for KABI compatibility */
+#undef mm_iommu_ua_to_hpa
-+#undef mm_iommu_ua_to_hpa_rm
+
+long mm_iommu_ua_to_hpa(struct mm_iommu_table_group_mem_t *mem,
+ unsigned long ua, unsigned long *hpa)
@@ -56,28 +54,6 @@ index 78ff91f13e45..d0dbc56967d4 100644
+ return 0;
+}
+EXPORT_SYMBOL_GPL(mm_iommu_ua_to_hpa);
-+
-+long mm_iommu_ua_to_hpa_rm(struct mm_iommu_table_group_mem_t *mem,
-+ unsigned long ua, unsigned long *hpa)
-+{
-+ const long entry = (ua - mem->ua) >> PAGE_SHIFT;
-+ void *va = &mem->hpas[entry];
-+ unsigned long *pa;
-+
-+ WARN("Use of old and insecure %s API\n", __func__);
-+
-+ if (entry >= mem->entries)
-+ return -EFAULT;
-+
-+ pa = (void *) vmalloc_to_phys(va);
-+ if (!pa)
-+ return -EFAULT;
-+
-+ *hpa = *pa | (ua & ~PAGE_MASK);
-+
-+ return 0;
-+}
-+EXPORT_SYMBOL_GPL(mm_iommu_ua_to_hpa_rm);
--
2.13.7