On Fri, 2019-08-09 at 14:11 +0530, Bharata B Rao wrote: > KVMPPC driver to manage page transitions of secure guest > via H_SVM_PAGE_IN and H_SVM_PAGE_OUT hcalls. > > H_SVM_PAGE_IN: Move the content of a normal page to secure page > H_SVM_PAGE_OUT: Move the content of a secure page to normal page > > Private ZONE_DEVICE memory equal to the amount of secure memory > available in the platform for running secure guests is created > via a char device. Whenever a page belonging to the guest becomes > secure, a page from this private device memory is used to > represent and track that secure page on the HV side. The movement > of pages between normal and secure memory is done via > migrate_vma_pages() using UV_PAGE_IN and UV_PAGE_OUT ucalls. Hi Bharata, please see my patch where I define the bits which define the type of the rmap entry: https://patchwork.ozlabs.org/patch/1149791/ Please add an entry for the devm pfn type like: #define KVMPPC_RMAP_PFN_DEVM 0x0200000000000000 /* secure guest devm pfn */ And the following in the appropriate header file static inline bool kvmppc_rmap_is_pfn_demv(unsigned long *rmapp) { return !!((*rmapp & KVMPPC_RMAP_TYPE_MASK) == KVMPPC_RMAP_PFN_DEVM)); } Also see comment below. Thanks, Suraj > > Signed-off-by: Bharata B Rao <bharata@xxxxxxxxxxxxx> > --- > arch/powerpc/include/asm/hvcall.h | 4 + > arch/powerpc/include/asm/kvm_book3s_devm.h | 29 ++ > arch/powerpc/include/asm/kvm_host.h | 12 + > arch/powerpc/include/asm/ultravisor-api.h | 2 + > arch/powerpc/include/asm/ultravisor.h | 14 + > arch/powerpc/kvm/Makefile | 3 + > arch/powerpc/kvm/book3s_hv.c | 19 + > arch/powerpc/kvm/book3s_hv_devm.c | 492 > +++++++++++++++++++++ > 8 files changed, 575 insertions(+) > create mode 100644 arch/powerpc/include/asm/kvm_book3s_devm.h > create mode 100644 arch/powerpc/kvm/book3s_hv_devm.c > [snip] > + > +struct kvmppc_devm_page_pvt { > + unsigned long *rmap; > + unsigned int lpid; > + unsigned long gpa; > +}; > + > +struct kvmppc_devm_copy_args { > + unsigned long *rmap; > + unsigned int lpid; > + unsigned long gpa; > + unsigned long page_shift; > +}; > + > +/* > + * Bits 60:56 in the rmap entry will be used to identify the > + * different uses/functions of rmap. This definition with move > + * to a proper header when all other functions are defined. > + */ > +#define KVMPPC_PFN_DEVM (0x2ULL << 56) > + > +static inline bool kvmppc_is_devm_pfn(unsigned long pfn) > +{ > + return !!(pfn & KVMPPC_PFN_DEVM); > +} > + > +/* > + * Get a free device PFN from the pool > + * > + * Called when a normal page is moved to secure memory (UV_PAGE_IN). > Device > + * PFN will be used to keep track of the secure page on HV side. > + * > + * @rmap here is the slot in the rmap array that corresponds to > @gpa. > + * Thus a non-zero rmap entry indicates that the corresonding guest > + * page has become secure, and is not mapped on the HV side. > + * > + * NOTE: In this and subsequent functions, we pass around and access > + * individual elements of kvm_memory_slot->arch.rmap[] without any > + * protection. Should we use lock_rmap() here? > + */ > +static struct page *kvmppc_devm_get_page(unsigned long *rmap, > + unsigned long gpa, unsigned > int lpid) > +{ > + struct page *dpage = NULL; > + unsigned long bit, devm_pfn; > + unsigned long nr_pfns = kvmppc_devm.pfn_last - > + kvmppc_devm.pfn_first; > + unsigned long flags; > + struct kvmppc_devm_page_pvt *pvt; > + > + if (kvmppc_is_devm_pfn(*rmap)) > + return NULL; > + > + spin_lock_irqsave(&kvmppc_devm_lock, flags); > + bit = find_first_zero_bit(kvmppc_devm.pfn_bitmap, nr_pfns); > + if (bit >= nr_pfns) > + goto out; > + > + bitmap_set(kvmppc_devm.pfn_bitmap, bit, 1); > + devm_pfn = bit + kvmppc_devm.pfn_first; > + dpage = pfn_to_page(devm_pfn); > + > + if (!trylock_page(dpage)) > + goto out_clear; > + > + *rmap = devm_pfn | KVMPPC_PFN_DEVM; > + pvt = kzalloc(sizeof(*pvt), GFP_ATOMIC); > + if (!pvt) > + goto out_unlock; > + pvt->rmap = rmap; Am I missing something, why does the rmap need to be stored in pvt? Given the gpa is already stored and this is enough to get back to the rmap entry, right? > + pvt->gpa = gpa; > + pvt->lpid = lpid; > + dpage->zone_device_data = pvt; > + spin_unlock_irqrestore(&kvmppc_devm_lock, flags); > + > + get_page(dpage); > + return dpage; > + > +out_unlock: > + unlock_page(dpage); > +out_clear: > + bitmap_clear(kvmppc_devm.pfn_bitmap, > + devm_pfn - kvmppc_devm.pfn_first, 1); > +out: > + spin_unlock_irqrestore(&kvmppc_devm_lock, flags); > + return NULL; > +} > + > [snip]