| Message ID | 20200730232101.GB5882@oc0525413822.ibm.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | KVM: PPC: Book3S HV: Define H_PAGE_IN_NONSHARED for H_SVM_PAGE_IN hcall | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/merge (a3dcfbc2456df1a2d416b7d0b627d9cededa1432) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/next (2075ec9896c5aef01e837198381d04cfa6452317) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch linus/master (3208167a865e862fff5045d7910387941ff7e114) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/fixes (909adfc66b9a1db21b5e8733e9ebfa6cd5135d74) |
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch linux-next (de44d2b59b0fc49b84d711d815dfc2ef0a272912) |
| snowpatch_ozlabs/build-ppc64le | warning | Upstream build failed, couldn't test patch |
| snowpatch_ozlabs/build-ppc64be | warning | Upstream build failed, couldn't test patch |
| snowpatch_ozlabs/build-ppc64e | warning | Upstream build failed, couldn't test patch |
| snowpatch_ozlabs/build-pmac32 | warning | Upstream build failed, couldn't test patch |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 24 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
On Thu, Jul 30, 2020 at 04:21:01PM -0700, Ram Pai wrote: > 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. Looks like you got the definitions of shared and non-shared interchanged. > > 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. What is the use of defining this? Is this used directly in any place? Or, are youp planning to introduce such a usage? Regards, Bharata.
On Fri, Jul 31, 2020 at 10:03:34AM +0530, Bharata B Rao wrote: > On Thu, Jul 30, 2020 at 04:21:01PM -0700, Ram Pai wrote: > > 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. > > Looks like you got the definitions of shared and non-shared interchanged. Yes. Realized it after sending the patch. Will fix it. > > > > > 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. > > What is the use of defining this? Is this used directly in any place? > Or, are youp planning to introduce such a usage? I know the Hypervisor code currently has no use for that define. It assumes H_PAGE_IN_NONSHARED to be !H_PAGE_IN_SHARED. But H_PAGE_IN_NONSHARED is defined in the Ultravisor API, and hence has to be captured in the header, to stay consistent. RP
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);
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.lawall@inria.fr> Signed-off-by: Ram Pai <linuxram@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(-)