PowerPC Linux patches, rev 2

3 files changed, 27 insertions(+), 18 deletions(-)
arch/ia64/xen/hypervisor.c |    5 +++++
drivers/xen/core/gnttab.c  |   38 ++++++++++++++++++++------------------
include/xen/gnttab.h       |    2 ++

# HG changeset patch
# User Hollis Blanchard <[email protected]>
# Date 1183674347 18000
# Node ID 9def23611685442dc9688ad8f81db9a5031b4b5f
# Parent 790e4d5567dcd8bfb42ae1e67ad1f3dffd29ece1 [XEN][LINUX] Refactor grant table allocation into arch-specific code.

Signed-off-by Hollis Blanchard <[email protected]>

diff -r 790e4d5567dc -r 9def23611685 arch/ia64/xen/hypervisor.c

arch/ia64/xen/hypervisor.c Thu Jul 05 17:25:47 2007 -0500 renamed from arch/ia64/xen/hypervisor.c Thu Jul 05 16:58:26 2007 -0500 +5 -0

@@ -408,6 +408,11 @@ __xen_destroy_contiguous_region(unsigned
 #include <linux/mm.h>
 #include <xen/interface/xen.h>
 #include <xen/gnttab.h>
+
+void *arch_gnttab_alloc_shared(unsigned long *frames)
+{
+ return __va(frames[0] << PAGE_SHIFT);
+}
 
 static void
 gnttab_map_grant_ref_pre(struct gnttab_map_grant_ref *uop)

diff -r 790e4d5567dc -r 9def23611685 drivers/xen/core/gnttab.c

drivers/xen/core/gnttab.c Thu Jul 05 17:25:47 2007 -0500 renamed from drivers/xen/core/gnttab.c Thu Jul 05 16:58:26 2007 -0500 +20 -18

@@ -430,7 +430,7 @@ static inline unsigned int max_nr_grant_
 
 #ifdef CONFIG_XEN
 
-#ifndef __ia64__
+#ifdef __x86__
 static int map_pte_fn(pte_t *pte, struct page *pmd_page,
     unsigned long addr, void *data)
 {

@@ -448,7 +448,22 @@ static int unmap_pte_fn(pte_t *pte, stru
 set_pte_at(&init_mm, addr, pte, __pte(0));
 return 0;
 }
-#endif
+
+void *arch_gnttab_alloc_shared(unsigned long *frames)
+{
+ unsigned long *_frames = frames;
+ struct vm_struct *area;
+
+ area = alloc_vm_area(PAGE_SIZE * max_nr_grant_frames());
+ BUG_ON(area == NULL);
+
+ rc = apply_to_page_range(&init_mm, (unsigned long)area->addr,
+   PAGE_SIZE * nr_gframes,
+   map_pte_fn, &_frames);
+ BUG_ON(rc);
+ return area->addr;
+}
+#endif /* __x86__ */
 
 static int gnttab_map(unsigned int start_idx, unsigned int end_idx)
 {

@@ -473,21 +488,8 @@ static int gnttab_map(unsigned int start
 
 BUG_ON(rc || setup.status);
 
-#ifndef __ia64__
- if (shared == NULL) {
-  struct vm_struct *area;
-  area = alloc_vm_area(PAGE_SIZE * max_nr_grant_frames());
-  BUG_ON(area == NULL);
-  shared = area->addr;
- }
- rc = apply_to_page_range(&init_mm, (unsigned long)shared,
-     PAGE_SIZE * nr_gframes,
-     map_pte_fn, &frames);
- BUG_ON(rc);
-        frames -= nr_gframes; /* adjust after map_pte_fn() */
-#else
- shared = __va(frames[0] << PAGE_SHIFT);
-#endif
+ if (shared == NULL)
+  shared = arch_gnttab_alloc_shared(frames);
 
 kfree(frames);
 

@@ -623,7 +625,7 @@ int gnttab_resume(void)
 
 int gnttab_suspend(void)
 {
-#ifndef __ia64__
+#ifdef CONFIG_X86
 apply_to_page_range(&init_mm, (unsigned long)shared,
   PAGE_SIZE * nr_grant_frames,
   unmap_pte_fn, NULL);

diff -r 790e4d5567dc -r 9def23611685 include/xen/gnttab.h

include/xen/gnttab.h Thu Jul 05 17:25:47 2007 -0500 renamed from include/xen/gnttab.h Thu Jul 05 16:58:26 2007 -0500 +2 -0

@@ -117,6 +117,8 @@ int gnttab_suspend(void);
 int gnttab_suspend(void);
 int gnttab_resume(void);
 
+void *arch_gnttab_alloc_shared(unsigned long *frames);
+
 static inline void
 gnttab_set_map_op(struct gnttab_map_grant_ref *map, maddr_t addr,
 uint32_t flags, grant_ref_t ref, domid_t domid)

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

Quoted 5 lines

fs/compat_ioctl.c Thu Jul 05 17:26:48 2007 -0500 renamed from fs/compat_ioctl.c Thu Jul 05 17:25:47 2007 -0500 +0 -0

@@ -2948,6 +2953,18 @@ COMPATIBLE_IOCTL(LPRESET)
 /*LPGETSTATS not implemented, but no kernels seem to compile it in anyways*/
 COMPATIBLE_IOCTL(LPGETFLAGS)

fs/compat_ioctl.c Thu Jul 05 17:26:48 2007 -0500 COMPATIBLE_IOCTL(LPRESET) · line 2960

Quoted 6 lines

fs/compat_ioctl.c Thu Jul 05 17:26:48 2007 -0500 renamed from fs/compat_ioctl.c Thu Jul 05 17:25:47 2007 -0500 +5 -0

 HANDLE_IOCTL(LPSETTIMEOUT, lp_timeout_trans)
+
+#ifdef CONFIG_XEN
+HANDLE_IOCTL(IOCTL_PRIVCMD_MMAP_32, privcmd_ioctl_32)
+HANDLE_IOCTL(IOCTL_PRIVCMD_MMAPBATCH_32, privcmd_ioctl_32)
+COMPATIBLE_IOCTL(IOCTL_PRIVCMD_HYPERCALL)

Where does the hypercall argument translation happen?

fs/compat_ioctl.c Thu Jul 05 17:26:48 2007 -0500 COMPATIBLE_IOCTL(LPRESET) · line 2953

Quoted 4 lines

fs/compat_ioctl.c Thu Jul 05 17:26:48 2007 -0500 renamed from fs/compat_ioctl.c Thu Jul 05 17:25:47 2007 -0500 +0 -0

@@ -2948,6 +2953,18 @@ COMPATIBLE_IOCTL(LPRESET)
 /*LPGETSTATS not implemented, but no kernels seem to compile it in

anyways*/

fs/compat_ioctl.c Thu Jul 05 17:26:48 2007 -0500 COMPATIBLE_IOCTL(LPRESET) · line 2960

Quoted 7 lines

fs/compat_ioctl.c Thu Jul 05 17:26:48 2007 -0500 renamed from fs/compat_ioctl.c Thu Jul 05 17:25:47 2007 -0500 +5 -0

 COMPATIBLE_IOCTL(LPGETFLAGS)
 HANDLE_IOCTL(LPSETTIMEOUT, lp_timeout_trans)
+
+#ifdef CONFIG_XEN
+HANDLE_IOCTL(IOCTL_PRIVCMD_MMAP_32, privcmd_ioctl_32)
+HANDLE_IOCTL(IOCTL_PRIVCMD_MMAPBATCH_32, privcmd_ioctl_32)
+COMPATIBLE_IOCTL(IOCTL_PRIVCMD_HYPERCALL)

Where does the hypercall argument translation happen?

Quoted 2 lines

Quoted 1 line

Hollis Blanchard <[email protected]> 06.07.07 17:44 >>>

Where does the hypercall argument translation happen?

It happens inside privcmd_hypercall(). See
http://xenbits.xensource.com/ext/linux-ppc-2.6.hg?file/04f6ad5d9232/arch/powerpc/platforms/xen/hcall.c

(In that tree, the function is named "arch_privcmd_hypercall".) IA64 and PPC both implement this function now; only x86 is left with #ifdefs in drivers/xen/privcmd/privcmd.c .

COMPATIBLE_IOCTL is just about the ioctl itself, not the sub-structures.

Quoted 10 lines

Quoted 2 lines

Quoted 1 line

Hollis Blanchard <[email protected]> 06.07.07 17:44 >>>

Where does the hypercall argument translation happen?

It happens inside privcmd_hypercall(). See
http://xenbits.xensource.com/ext/linux-ppc-2.6.hg?file/04f6ad5d9232/arch/powerpc/platforms/xen/hcall.c

(In that tree, the function is named "arch_privcmd_hypercall".) IA64 and PPC both implement this function now; only x86 is left with #ifdefs in drivers/xen/privcmd/privcmd.c .

Quoted 1 line

COMPATIBLE_IOCTL is just about the ioctl itself, not the sub-structures.

Hmm, I can't really see any structures being translated there, all I see is guest handles getting dereferenced. So I'm still unclear where you do the 32-bit layout to 64-bit layout conversion, but obviously I must be missing something.

Which structures do you think need further conversion?

We've already fixed all the shared structures (e.g. sysctl) to use explicitly-sized types, so the PowerPC port has always had proper interfaces. For example, look at the definition of xen_ulong_t on the different architectures. The x86 interfaces were frozen too early, cementing this problem for you.

Quoted 5 lines

We've already fixed all the shared structures (e.g. sysctl) to use explicitly-sized types, so the PowerPC port has always had proper interfaces. For example, look at the definition of xen_ulong_t on the different architectures. The x86 interfaces were frozen too early, cementing this problem for you.

Oh, sorry, I forgot that you had this taken care of implicitly on PPC. I had hoped we could leverage the code you are adding for x86, but - no luck.