H_SVM_PAGE_IN hcall takes a flag parameter. This parameter specifies the
way in which a page will be treated. H_PAGE_IN_NONSHARED indicates
that the page will be shared with the Secure VM, and H_PAGE_IN_SHARED
indicates that the page will not be shared but its contents will
be copied.
However H_PAGE_IN_NONSHARED is not defined in the header file, though
it is defined and documented in the API captured in
Documentation/powerpc/ultravisor.rst
Define H_PAGE_IN_NONSHARED in the header file.
Reported-by: Julia Lawall <julia.law...@inria.fr>
Signed-off-by: Ram Pai <linux...@us.ibm.com>
---
arch/powerpc/include/asm/hvcall.h | 4 +++-
arch/powerpc/kvm/book3s_hv_uvmem.c | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/include/asm/hvcall.h
b/arch/powerpc/include/asm/hvcall.h
index e90c073..43e3f8d 100644
--- a/arch/powerpc/include/asm/hvcall.h
+++ b/arch/powerpc/include/asm/hvcall.h
@@ -343,7 +343,9 @@
#define H_COPY_TOFROM_GUEST 0xF80C
/* Flags for H_SVM_PAGE_IN */
-#define H_PAGE_IN_SHARED 0x1
+#define H_PAGE_IN_NONSHARED 0x0 /* Page is not shared with the UV */
+#define H_PAGE_IN_SHARED 0x1 /* Page is shared with UV */
+#define H_PAGE_IN_MASK 0x1
/* Platform-specific hcalls used by the Ultravisor */
#define H_SVM_PAGE_IN 0xEF00
diff --git a/arch/powerpc/kvm/book3s_hv_uvmem.c
b/arch/powerpc/kvm/book3s_hv_uvmem.c
index 2dde0fb..2806983 100644
--- a/arch/powerpc/kvm/book3s_hv_uvmem.c
+++ b/arch/powerpc/kvm/book3s_hv_uvmem.c
@@ -947,12 +947,13 @@ unsigned long kvmppc_h_svm_page_in(struct kvm *kvm,
unsigned long gpa,
if (page_shift != PAGE_SHIFT)
return H_P3;
- if (flags & ~H_PAGE_IN_SHARED)
+ if (flags & ~H_PAGE_IN_MASK)
return H_P2;
if (flags & H_PAGE_IN_SHARED)
return kvmppc_share_page(kvm, gpa, page_shift);
+ /* handle H_PAGE_IN_NONSHARED */
ret = H_PARAMETER;
srcu_idx = srcu_read_lock(&kvm->srcu);
mmap_read_lock(kvm->mm);
--
1.8.3.1
--
Ram Pai
