add vfbdev and long page granting

Author: clemdiep

so3/arch/arm64/domain.c

@@ -131,6 +131,16 @@ void __setup_dom_pgtable(struct domain *d, addr_t paddr_start, unsigned long map
 		d->grant_pfn[i].pfn = phys_to_pfn(memslot[slotID].ipa_addr + map_size + 2 * PAGE_SIZE) + i;
 		d->grant_pfn[i].free = true;
 	}
+
+	/* Initialize the long grant pfn area. As page count for them is unknown, they will all be mapped
+	 * contiguously from a starting point, which is behind the last normal grant pfn.
+	 */
+	for (i = 0; i < NR_LONG_GRANT_PFN; i++) {
+		d->long_grant_pfn[i].pfn = 0;
+		d->long_grant_pfn[i].page_count = 0;
+		d->long_grant_pfn[i].free = true;
+	}
+	d->long_grant_start_pfn = phys_to_pfn(memslot[slotID].ipa_addr + map_size + 2 * PAGE_SIZE) + NR_GRANT_PFN;
 #endif /* CONFIG_SOO */
 }
 

so3/arch/arm64/virt64/include/mach/ipamap.h

@@ -27,6 +27,24 @@ ipamap_t agency_ipamap[] = {
 		.phys_addr = 0x08000000,
 		.size = 0x3000000,
 	},
+	{
+		/* PCIe mapping */
+		.ipa_addr = 0x4010000000,
+		.phys_addr = 0x4010000000,
+		.size = 0x10000000
+	},
+	{
+		/* PCIe mapping */
+		.ipa_addr = 0x10000000,
+		.phys_addr = 0x10000000,
+		.size = 0x40000000
+	},
+	{
+		/* PCIe mapping */
+		.ipa_addr = 0x8000000000,
+		.phys_addr = 0x8000000000,
+		.size = 0x8000000000
+	},
 };
 
 /**

so3/avz/include/avz/domain.h

@@ -54,9 +54,11 @@
 #include <list.h>
 
 #define NR_GRANT_PFN 32
+#define NR_LONG_GRANT_PFN 8
 
 typedef struct {
 	addr_t pfn;
+	size_t page_count;
 	bool free;
 } grant_pfn_t;
 
@@ -117,6 +119,10 @@ struct domain {
 
 	/* IPA reserved page frame numbers for mapping granted pages belonging to other domains */
 	grant_pfn_t grant_pfn[NR_GRANT_PFN];
+
+	/* IPA reserved information for long mapping granted pages belonging to other domains */
+	grant_pfn_t long_grant_pfn[NR_LONG_GRANT_PFN];
+	addr_t long_grant_start_pfn;
 #endif /* CONFIG_SOO */
 
 	int processor;

so3/avz/include/avz/gnttab.h

@@ -32,6 +32,11 @@ struct gnttab {
 	/* (Real) physical frame number to be granted */
 	addr_t pfn;
 
+	/* Page count to be granted, if set to 0 then normal granting is used
+	 * mapping one page.
+	 */
+	size_t page_count;
+
 	/* Unique ref ID used by the domain which refers to this page */
 	grant_ref_t ref;
 };

so3/avz/include/avz/injector.h

@@ -55,6 +55,10 @@ struct dom_context {
 	/* IPA reserved page frame numbers for granted pages */
 	grant_pfn_t grant_pfn[NR_GRANT_PFN];
 
+	/* IPA reserved page frame numbers for long granted pages */
+	grant_pfn_t long_grant_pfn[NR_LONG_GRANT_PFN];
+	addr_t long_grant_start_pfn;
+
 	/* Stack frame of this domain */
 	struct cpu_regs stack_frame;
 

so3/avz/kernel/gnttab.c

@@ -81,12 +81,13 @@ gnttab_t *pick_granted_entry(grant_ref_t ref, domid_t origin_domid)
 
 /**
  * @brief Create a new grant table entry in the gnttab of a domain
- * 
+ *
  * @param d The domain containing the grant table
  * @param target_domid The domain concerned by this grant
  * @param pfn The real frame number of the page to be granted
+ * @param page_count The number of page to grant
  */
-gnttab_t *new_gnttab_entry(struct domain *d, domid_t target_domid, addr_t pfn)
+gnttab_t *new_gnttab_entry(struct domain *d, domid_t target_domid, addr_t pfn, size_t page_count)
 {
 	gnttab_t *gnttab;
 
@@ -96,6 +97,7 @@ gnttab_t *new_gnttab_entry(struct domain *d, domid_t target_domid, addr_t pfn)
 	gnttab->origin_domid = d->avz_shared->domID;
 	gnttab->target_domid = target_domid;
 	gnttab->pfn = pfn;
+	gnttab->page_count = page_count;
 
 	/* Determine the ref number for this entry */
 	gnttab->ref = get_ref_max(&d->gnttab) + 1;
@@ -142,6 +144,31 @@ addr_t allocate_grant_pfn(struct domain *d)
 	return 0; /* Make gcc happy :-) */
 }
 
+/**
+ * @brief Find a free long grant pfn
+ *
+ * @param d Domain to search for the free pfn
+ * @return grant pfn object to be used for mapping the granted pages
+ */
+grant_pfn_t *allocate_long_grant_pfn(struct domain *d)
+{
+	int i;
+	addr_t start_pfn = d->long_grant_start_pfn;
+
+	for (i = 0; i < NR_LONG_GRANT_PFN; i++) {
+		if (d->long_grant_pfn[i].free) {
+			d->long_grant_pfn[i].free = false;
+			d->long_grant_pfn[i].pfn = start_pfn;
+			return &d->long_grant_pfn[i];
+		}
+
+		start_pfn += d->long_grant_pfn[i].page_count;
+	}
+
+	BUG();
+	return NULL;
+}
+
 /**
  * @brief Map the grant page associated to vbstore in the IPA domain of the ME
  *
@@ -179,14 +206,16 @@ addr_t map_vbstore_pfn(int target_domid, int pfn)
 
 /**
  * @brief Hypercall entry for grant table related operations.
- * 
+ *
  * @param args gnttab detail structure
  */
 void do_gnttab(gnttab_op_t *args)
 {
 	struct domain *d;
 	addr_t paddr, grant_paddr;
+	size_t page_count;
 	gnttab_t *gnttab;
+	grant_pfn_t *grant_pfn;
 
 	spin_lock(&gnttab_lock);
 
@@ -198,8 +227,9 @@ void do_gnttab(gnttab_op_t *args)
 		/* Create a new entry in the list of gnttab page */
 
 		paddr = ipa_to_pa(DOM_TO_MEMSLOT(d->avz_shared->domID), pfn_to_phys(args->pfn));
+		page_count = args->page_count == 0 ? 1 : args->page_count;
 
-		gnttab = new_gnttab_entry(d, args->domid, phys_to_pfn(paddr));
+		gnttab = new_gnttab_entry(d, args->domid, phys_to_pfn(paddr), page_count);
 
 		args->ref = gnttab->ref;
 
@@ -215,13 +245,23 @@ void do_gnttab(gnttab_op_t *args)
 		gnttab = pick_granted_entry(args->ref, args->domid);
 		BUG_ON(!gnttab);
 
-		/* Here, we get an IPA address corresponding to the grant page */
-		grant_paddr = pfn_to_phys(allocate_grant_pfn(d));
+		page_count = gnttab->page_count;
+		if (page_count == 1) {
+			/* Here, we get an IPA address corresponding to the grant page */
+			grant_paddr = pfn_to_phys(allocate_grant_pfn(d));
+		} else {
+			grant_pfn = allocate_long_grant_pfn(d);
+
+			grant_pfn->page_count = page_count;
+			grant_paddr = pfn_to_phys(grant_pfn->pfn);
+		}
 
 		/* This pfn will be exported to the domain */
 		args->pfn = phys_to_pfn(grant_paddr);
+		args->page_count = page_count;
 
-		__create_mapping((addr_t *) d->pagetable_vaddr, grant_paddr, pfn_to_phys(gnttab->pfn), PAGE_SIZE, true, S2);
+		__create_mapping((addr_t *) d->pagetable_vaddr, grant_paddr, pfn_to_phys(gnttab->pfn), PAGE_SIZE * page_count,
+				 true, S2);
 
 		break;
 

so3/avz/kernel/injector.c

@@ -165,6 +165,8 @@ static void build_domain_context(unsigned int ME_slotID, struct domain *me, stru
 	domctxt->pause_flags = me->pause_flags;
 
 	memcpy(&domctxt->grant_pfn, &me->grant_pfn, sizeof(me->grant_pfn));
+	memcpy(&domctxt->long_grant_pfn, &me->long_grant_pfn, sizeof(me->long_grant_pfn));
+	memcpy(&domctxt->long_grant_start_pfn, &me->long_grant_start_pfn, sizeof(me->long_grant_start_pfn));
 
 	memcpy(&(domctxt->pause_count), &(me->pause_count), sizeof(me->pause_count));
 
@@ -281,6 +283,8 @@ void restore_domain_context(unsigned int ME_slotID, struct domain *me, struct do
 	me->pause_flags = domctxt->pause_flags;
 
 	memcpy(&me->grant_pfn, &domctxt->grant_pfn, sizeof(me->grant_pfn));
+	memcpy(&me->long_grant_pfn, &domctxt->long_grant_pfn, sizeof(me->long_grant_pfn));
+	memcpy(&me->long_grant_start_pfn, &domctxt->long_grant_start_pfn, sizeof(me->long_grant_start_pfn));
 
 	memcpy(&(me->pause_count), &(domctxt->pause_count), sizeof(me->pause_count));
 

so3/configs/virt64_capsule_defconfig

@@ -104,3 +104,4 @@ CONFIG_VUART_FRONTEND=y
 # CONFIG_VSENSELED_FRONTEND is not set
 # CONFIG_VSENSEJ_FRONTEND is not set
 CONFIG_VLOGS_FRONTEND=y
+CONFIG_VFBDEV_FRONTEND=y

so3/devices/fb/pl111.c

@@ -106,7 +106,7 @@ int fb_mmap(int fd, addr_t virt_addr, uint32_t page_count, off_t offset)
 		create_mapping(pcb->pgtable, virt_addr + (i * PAGE_SIZE), page, PAGE_SIZE, false);
 	}
 
-	return virt_addr;
+	return 0;
 }
 
 int fb_ioctl(int fd, unsigned long cmd, unsigned long args)

so3/devices/fb/ramfb.c

@@ -281,7 +281,7 @@ int fb_mmap(int fd, addr_t virt_addr, uint32_t page_count, off_t offset)
 	}
 #endif
 
-	return virt_addr;
+	return 0;
 }
 
 int fb_ioctl(int fd, unsigned long cmd, unsigned long args)