[PATCH] ia64 build fixes

[PATCH] ia64 build fixes

[Alex Williamson]

Keir,

   The patch below is necessary to get ia64 building on current
xen-unstable.hg.  Thanks,

	Alex

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff -r 3983e4f1b054 xen/arch/ia64/Rules.mk
--- a/xen/arch/ia64/Rules.mk	Sun Mar 12 10:03:33 2006 +0100
+++ b/xen/arch/ia64/Rules.mk	Mon Mar 13 09:36:01 2006 -0700
@@ -12,7 +12,7 @@ CPPFLAGS  += -I$(BASEDIR)/include -I$(BA
 	     -I$(BASEDIR)/include/asm-ia64/linux-null 			\
              -I$(BASEDIR)/arch/ia64/linux -I$(BASEDIR)/arch/ia64/linux-xen
 
-CFLAGS  := -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
+CFLAGS  += -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
 #CFLAGS  += -O3		# -O3 over-inlines making debugging tough!
 CFLAGS  += -O2		# but no optimization causes compile errors!
 #CFLAGS  += -iwithprefix include -Wall -DMONITOR_BASE=$(MONITOR_BASE)
diff -r 3983e4f1b054 xen/include/asm-ia64/xensystem.h
--- a/xen/include/asm-ia64/xensystem.h	Sun Mar 12 10:03:33 2006 +0100
+++ b/xen/include/asm-ia64/xensystem.h	Mon Mar 13 09:36:02 2006 -0700
@@ -75,5 +75,7 @@ extern struct task_struct *vmx_ia64_swit
 // FIXME SMP... see system.h, does this need to be different?
 #define switch_to(prev,next,last)	__switch_to(prev, next, last)
 
+#define local_irq_is_enabled() (!irqs_disabled())
+
 #endif // __ASSEMBLY__
 #endif // _ASM_IA64_XENSYSTEM_H

[PATCH] ia64 build fixes

[Alex Williamson]

   Include features header in xenbus_probe and build features.c

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff -r d76a7a40f3a9 linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile
--- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile	Fri Mar 31 17:44:26 2006 +0100
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile	Fri Mar 31 16:31:41 2006 -0700
@@ -10,7 +10,7 @@ CPPFLAGS_vmlinux.lds += -U$(XENARCH)
 	@ln -fsn $(srctree)/arch/$(XENARCH)/kernel/vmlinux.lds.S $@
 
 
-obj-y   := gnttab.o
+obj-y   := gnttab.o features.o
 obj-$(CONFIG_PROC_FS) += xen_proc.o
 
 ifeq ($(ARCH),ia64)
diff -r d76a7a40f3a9 linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Fri Mar 31 17:44:26 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Fri Mar 31 16:31:41 2006 -0700
@@ -49,6 +49,7 @@
 #include <xen/xenbus.h>
 #include <xen/xen_proc.h>
 #include <xen/evtchn.h>
+#include <xen/features.h>
 
 #include "xenbus_comms.h"

Re: [PATCH] ia64 build fixes

[Keir Fraser]

On 1 Apr 2006, at 00:44, Alex Williamson wrote:

>    Include features header in xenbus_probe and build features.c
>
> Signed-off-by: Alex Williamson <alex.williamson@hp.com>

Taken, thanks. Can you also look at supporting HYPERVISOR_sched_op() 
before 3.0.2, in addition to the old HYPERVISOR_sched_op_compat()? It 
should be pretty trivial to do. You'd want to base the patch on a tree 
after changeset 9510, as I internally rename sched_op/sched_op_new in 
that patch.

After 3.0.2 we'll be removing the fallback to sched_op_compat in the 
Linux tree (it's fairly pointless as we broke compatibility of new 
guest on old Xen in other ways too since 3.0.1). If we do that before 
you add support for the new hypercall, we'll break ia64.

  -- Keir

Re: [PATCH] ia64 build fixes

[Alex Williamson]

On Sat, 2006-04-01 at 11:10 +0100, Keir Fraser wrote:
> Taken, thanks. Can you also look at supporting HYPERVISOR_sched_op() 
> before 3.0.2, in addition to the old HYPERVISOR_sched_op_compat()?

Keir,

   Here's a patch that enables HYPERVISOR_sched_op() and
HYPERVISOR_sched_opt_compat() for ia64.  We currently have no users of
this call, but there's no harm in enabling it (tested by adding a
HYPERVISOR_yield() call to default_idle()).  I did notice a problem with
the compat interface though, nothing defines __XEN_INTERFACE_VERSION__
for the build of xen.  We're therefore stuck on interface version
0x00000000 where __HYPERVISOR_sched_op_compat == __HYPERVISOR_sched_op.
Thanks,

	Alex

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff -r 60071beccf18 xen/arch/ia64/xen/hypercall.c
--- a/xen/arch/ia64/xen/hypercall.c	Sat Apr  1 14:59:12 2006 +0100
+++ b/xen/arch/ia64/xen/hypercall.c	Sat Apr  1 14:35:19 2006 -0700
@@ -38,7 +38,7 @@ hypercall_t ia64_hypercall_table[] =
 	(hypercall_t)do_ni_hypercall,		/* do_stack_switch */
 	(hypercall_t)do_ni_hypercall,		/* do_set_callbacks */
 	(hypercall_t)do_ni_hypercall,		/* do_fpu_taskswitch */		/*  5 */
-	(hypercall_t)do_ni_hypercall,		/* do_sched_op_compat */
+	(hypercall_t)do_sched_op_compat,
 	(hypercall_t)do_dom0_op,
 	(hypercall_t)do_ni_hypercall,		/* do_set_debugreg */
 	(hypercall_t)do_ni_hypercall,		/* do_get_debugreg */
@@ -61,7 +61,7 @@ hypercall_t ia64_hypercall_table[] =
 	(hypercall_t)do_ni_hypercall,		/* do_mmuext_op */
 	(hypercall_t)do_ni_hypercall,		/* do_acm_op */
 	(hypercall_t)do_ni_hypercall,		/* do_nmi_op */
-	(hypercall_t)do_ni_hypercall,		/*  */
+	(hypercall_t)do_sched_op,
 	(hypercall_t)do_ni_hypercall,		/*  */				/* 30 */
 	(hypercall_t)do_ni_hypercall		/*  */
 	};
@@ -70,6 +70,11 @@ xen_hypercall (struct pt_regs *regs)
 xen_hypercall (struct pt_regs *regs)
 {
 	switch (regs->r2) {
+	    case __HYPERVISOR_sched_op_compat:
+		regs->r8 = do_sched_op_compat((int) regs->r14,
+		                              (unsigned long) regs->r15);
+		break;
+
 	    case __HYPERVISOR_dom0_op:
 		regs->r8 = do_dom0_op(guest_handle_from_ptr(regs->r14,
 							    dom0_op_t));
@@ -116,6 +121,13 @@ xen_hypercall (struct pt_regs *regs)
 	    case __HYPERVISOR_multicall:
 		regs->r8 = do_multicall(guest_handle_from_ptr(regs->r14, multicall_entry_t), (unsigned int) regs->r15);
 		break;
+
+#if __XEN_INTERFACE_VERSION__ >= 0x00030101
+	    case __HYPERVISOR_sched_op:
+		regs->r8 = do_sched_op((int) regs->r14,
+		                       guest_handle_from_ptr(regs->r15, void));
+		break;
+#endif
 
 	    default:
 		printf("unknown xen hypercall %lx\n", regs->r2);

Re: [PATCH] ia64 build fixes

[Keir Fraser]

On 1 Apr 2006, at 22:46, Alex Williamson wrote:

>    Here's a patch that enables HYPERVISOR_sched_op() and
> HYPERVISOR_sched_opt_compat() for ia64.  We currently have no users of
> this call, but there's no harm in enabling it (tested by adding a
> HYPERVISOR_yield() call to default_idle()).  I did notice a problem 
> with
> the compat interface though, nothing defines __XEN_INTERFACE_VERSION__
> for the build of xen.  We're therefore stuck on interface version
> 0x00000000 where __HYPERVISOR_sched_op_compat == __HYPERVISOR_sched_op.

Well, it doesn't actually matter right now since Xen itself does not 
use the __HYPERVISOR_foo numbers. But yes, I can see this might bite us 
later so we ought to define it.

  -- Keir

Re: Re: [PATCH] ia64 build fixes

[Keir Fraser]

On 2 Apr 2006, at 09:20, Keir Fraser wrote:

>>    Here's a patch that enables HYPERVISOR_sched_op() and
>> HYPERVISOR_sched_opt_compat() for ia64.  We currently have no users of
>> this call, but there's no harm in enabling it (tested by adding a
>> HYPERVISOR_yield() call to default_idle()).  I did notice a problem 
>> with
>> the compat interface though, nothing defines __XEN_INTERFACE_VERSION__
>> for the build of xen.  We're therefore stuck on interface version
>> 0x00000000 where __HYPERVISOR_sched_op_compat == 
>> __HYPERVISOR_sched_op.
>
> Well, it doesn't actually matter right now since Xen itself does not 
> use the __HYPERVISOR_foo numbers. But yes, I can see this might bite 
> us later so we ought to define it.

Ah, I'm forgetting you have a hypercall switch statement. I'll add the 
version number.

With regard to your patch, actually I was thinking more about the vmx 
hypercall interface which already supports sched_op_compat --- should 
that one have sched_op added too, in vmx_hypercall.c?

  -- Keir

Re: Re: [PATCH] ia64 build fixes

[Ian Campbell]

On Sun, 2006-04-02 at 09:20 +0100, Keir Fraser wrote:
> On 1 Apr 2006, at 22:46, Alex Williamson wrote:
> 
> >    Here's a patch that enables HYPERVISOR_sched_op() and
> > HYPERVISOR_sched_opt_compat() for ia64.  We currently have no users of
> > this call, but there's no harm in enabling it (tested by adding a
> > HYPERVISOR_yield() call to default_idle()).  I did notice a problem 
> > with
> > the compat interface though, nothing defines __XEN_INTERFACE_VERSION__
> > for the build of xen.  We're therefore stuck on interface version
> > 0x00000000 where __HYPERVISOR_sched_op_compat == __HYPERVISOR_sched_op.
> 
> Well, it doesn't actually matter right now since Xen itself does not 
> use the __HYPERVISOR_foo numbers. But yes, I can see this might bite us 
> later so we ought to define it.

I was using them in some debugging code the other day and it bit me :-( 

Christian suggested changing xen-compat.h to use the maximum version
when compiling Xen. e.g.
        
        #ifndef __XEN_INTERFACE_VERSION__
        #ifdef __XEN__
        #define __XEN_INTERFACE_VERSION__ 0xffffffff
        #else
        #define __XEN_INTERFACE_VERSION__ 0x00000000
        #endif
        #endif

Ian.

[PATCH] ia64: build fixes

[Jan Beulich]

[-- Attachment #1: Type: text/plain, Size: 3813 bytes --]

Signed-off-by: Jan Beulich <jbeulich@novell.com>

--- 2010-05-04.orig/xen/arch/ia64/xen/dom0_ops.c	2010-01-21 15:36:53.000000000 +0100
+++ 2010-05-04/xen/arch/ia64/xen/dom0_ops.c	2010-05-04 14:03:40.000000000 +0200
@@ -735,20 +735,13 @@ long arch_do_sysctl(xen_sysctl_t *op, XE
     {
     case XEN_SYSCTL_physinfo:
     {
-        int i;
-        uint32_t max_array_ent;
-        XEN_GUEST_HANDLE_64(uint32) cpu_to_node_arr;
-
         xen_sysctl_physinfo_t *pi = &op->u.physinfo;
 
-        max_array_ent = pi->max_cpu_id;
-        cpu_to_node_arr = pi->cpu_to_node;
-
         memset(pi, 0, sizeof(*pi));
-        pi->cpu_to_node = cpu_to_node_arr;
         pi->threads_per_core = cpus_weight(per_cpu(cpu_sibling_map, 0));
         pi->cores_per_socket =
             cpus_weight(per_cpu(cpu_core_map, 0)) / pi->threads_per_core;
+        pi->nr_nodes         = (u32)num_online_nodes();
         pi->nr_cpus          = (u32)num_online_cpus();
         pi->total_pages      = total_pages; 
         pi->free_pages       = avail_domheap_pages();
@@ -757,21 +750,55 @@ long arch_do_sysctl(xen_sysctl_t *op, XE
 
         pi->max_node_id = last_node(node_online_map);
         pi->max_cpu_id = last_cpu(cpu_online_map);
-        max_array_ent = min_t(uint32_t, max_array_ent, pi->max_cpu_id);
 
-        ret = 0;
+        if ( copy_field_to_guest(u_sysctl, op, u.physinfo) )
+            ret = -EFAULT;
+    }
+    break;
+
+    case XEN_SYSCTL_topologyinfo:
+    {
+        xen_sysctl_topologyinfo_t *ti = &op->u.topologyinfo;
+        XEN_GUEST_HANDLE_64(uint32) arr;
+        uint32_t i, val, max_array_ent = ti->max_cpu_index;
+
+        ti->max_cpu_index = last_cpu(cpu_online_map);
+        max_array_ent = min(max_array_ent, ti->max_cpu_index);
+
+        arr = ti->cpu_to_core;
+        if ( !guest_handle_is_null(arr) )
+        {
+            for ( i = 0; ret == 0 && i <= max_array_ent; i++ )
+            {
+                val = cpu_online(i) ? cpu_to_core(i) : ~0u;
+                if ( copy_to_guest_offset(arr, i, &val, 1) )
+                    ret = -EFAULT;
+            }
+        }
+
+        arr = ti->cpu_to_socket;
+        if ( !guest_handle_is_null(arr) )
+        {
+            for ( i = 0; ret == 0 && i <= max_array_ent; i++ )
+            {
+                val = cpu_online(i) ? cpu_to_socket(i) : ~0u;
+                if ( copy_to_guest_offset(arr, i, &val, 1) )
+                    ret = -EFAULT;
+            }
+        }
 
-        if (!guest_handle_is_null(cpu_to_node_arr)) {
-            for (i = 0; i <= max_array_ent; i++) {
-                uint32_t node = cpu_online(i) ? cpu_to_node(i) : ~0u;
-                if (copy_to_guest_offset(cpu_to_node_arr, i, &node, 1)) {
+        arr = ti->cpu_to_node;
+        if ( !guest_handle_is_null(arr) )
+        {
+            for ( i = 0; ret == 0 && i <= max_array_ent; i++ )
+            {
+                val = cpu_online(i) ? cpu_to_node(i) : ~0u;
+                if ( copy_to_guest_offset(arr, i, &val, 1) )
                     ret = -EFAULT;
-                    break;
-                }
             }
         }
 
-        if ( copy_to_guest(u_sysctl, op, 1) )
+        if ( copy_field_to_guest(u_sysctl, op, u.topologyinfo.max_cpu_index) )
             ret = -EFAULT;
     }
     break;
--- 2010-05-04.orig/xen/common/domain.c	2010-04-22 14:43:25.000000000 +0200
+++ 2010-05-04/xen/common/domain.c	2010-05-04 13:34:25.000000000 +0200
@@ -625,8 +625,10 @@ static void complete_domain_destroy(stru
 
     xfree(d->pirq_mask);
     xfree(d->pirq_to_evtchn);
+#ifdef dom_vmce
     xfree(dom_vmce(d)->mci_ctl);
     xfree(dom_vmce(d));
+#endif
 
     xsm_free_security_domain(d);
     free_domain_struct(d);




[-- Attachment #2: ia64-build-fixes.patch --]
[-- Type: text/plain, Size: 3807 bytes --]

Signed-off-by: Jan Beulich <jbeulich@novell.com>

--- 2010-05-04.orig/xen/arch/ia64/xen/dom0_ops.c	2010-01-21 15:36:53.000000000 +0100
+++ 2010-05-04/xen/arch/ia64/xen/dom0_ops.c	2010-05-04 14:03:40.000000000 +0200
@@ -735,20 +735,13 @@ long arch_do_sysctl(xen_sysctl_t *op, XE
     {
     case XEN_SYSCTL_physinfo:
     {
-        int i;
-        uint32_t max_array_ent;
-        XEN_GUEST_HANDLE_64(uint32) cpu_to_node_arr;
-
         xen_sysctl_physinfo_t *pi = &op->u.physinfo;
 
-        max_array_ent = pi->max_cpu_id;
-        cpu_to_node_arr = pi->cpu_to_node;
-
         memset(pi, 0, sizeof(*pi));
-        pi->cpu_to_node = cpu_to_node_arr;
         pi->threads_per_core = cpus_weight(per_cpu(cpu_sibling_map, 0));
         pi->cores_per_socket =
             cpus_weight(per_cpu(cpu_core_map, 0)) / pi->threads_per_core;
+        pi->nr_nodes         = (u32)num_online_nodes();
         pi->nr_cpus          = (u32)num_online_cpus();
         pi->total_pages      = total_pages; 
         pi->free_pages       = avail_domheap_pages();
@@ -757,21 +750,55 @@ long arch_do_sysctl(xen_sysctl_t *op, XE
 
         pi->max_node_id = last_node(node_online_map);
         pi->max_cpu_id = last_cpu(cpu_online_map);
-        max_array_ent = min_t(uint32_t, max_array_ent, pi->max_cpu_id);
 
-        ret = 0;
+        if ( copy_field_to_guest(u_sysctl, op, u.physinfo) )
+            ret = -EFAULT;
+    }
+    break;
+
+    case XEN_SYSCTL_topologyinfo:
+    {
+        xen_sysctl_topologyinfo_t *ti = &op->u.topologyinfo;
+        XEN_GUEST_HANDLE_64(uint32) arr;
+        uint32_t i, val, max_array_ent = ti->max_cpu_index;
+
+        ti->max_cpu_index = last_cpu(cpu_online_map);
+        max_array_ent = min(max_array_ent, ti->max_cpu_index);
+
+        arr = ti->cpu_to_core;
+        if ( !guest_handle_is_null(arr) )
+        {
+            for ( i = 0; ret == 0 && i <= max_array_ent; i++ )
+            {
+                val = cpu_online(i) ? cpu_to_core(i) : ~0u;
+                if ( copy_to_guest_offset(arr, i, &val, 1) )
+                    ret = -EFAULT;
+            }
+        }
+
+        arr = ti->cpu_to_socket;
+        if ( !guest_handle_is_null(arr) )
+        {
+            for ( i = 0; ret == 0 && i <= max_array_ent; i++ )
+            {
+                val = cpu_online(i) ? cpu_to_socket(i) : ~0u;
+                if ( copy_to_guest_offset(arr, i, &val, 1) )
+                    ret = -EFAULT;
+            }
+        }
 
-        if (!guest_handle_is_null(cpu_to_node_arr)) {
-            for (i = 0; i <= max_array_ent; i++) {
-                uint32_t node = cpu_online(i) ? cpu_to_node(i) : ~0u;
-                if (copy_to_guest_offset(cpu_to_node_arr, i, &node, 1)) {
+        arr = ti->cpu_to_node;
+        if ( !guest_handle_is_null(arr) )
+        {
+            for ( i = 0; ret == 0 && i <= max_array_ent; i++ )
+            {
+                val = cpu_online(i) ? cpu_to_node(i) : ~0u;
+                if ( copy_to_guest_offset(arr, i, &val, 1) )
                     ret = -EFAULT;
-                    break;
-                }
             }
         }
 
-        if ( copy_to_guest(u_sysctl, op, 1) )
+        if ( copy_field_to_guest(u_sysctl, op, u.topologyinfo.max_cpu_index) )
             ret = -EFAULT;
     }
     break;
--- 2010-05-04.orig/xen/common/domain.c	2010-04-22 14:43:25.000000000 +0200
+++ 2010-05-04/xen/common/domain.c	2010-05-04 13:34:25.000000000 +0200
@@ -625,8 +625,10 @@ static void complete_domain_destroy(stru
 
     xfree(d->pirq_mask);
     xfree(d->pirq_to_evtchn);
+#ifdef dom_vmce
     xfree(dom_vmce(d)->mci_ctl);
     xfree(dom_vmce(d));
+#endif
 
     xsm_free_security_domain(d);
     free_domain_struct(d);

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel