* [PATCH] xen: use correct type for HYPERVISOR_memory_op()
@ 2015-09-04 12:50 Juergen Gross
2015-09-14 12:48 ` Juergen Gross
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Juergen Gross @ 2015-09-04 12:50 UTC (permalink / raw)
To: linux-kernel, xen-devel, konrad.wilk, david.vrabel,
boris.ostrovsky
Cc: Juergen Gross
HYPERVISOR_memory_op() is defined to return an "int" value. This is
wrong, as the Xen hypervisor will return "long".
The sub-function XENMEM_maximum_reservation returns the maximum
number of pages for the current domain. An int will overflow for a
domain configured with 8TB of memory or more.
Correct this by using the correct type.
Signed-off-by: Juergen Gross <jgross@suse.com>
---
arch/x86/include/asm/xen/hypercall.h | 4 ++--
arch/x86/xen/setup.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h
index ca08a27..b7a735f 100644
--- a/arch/x86/include/asm/xen/hypercall.h
+++ b/arch/x86/include/asm/xen/hypercall.h
@@ -336,10 +336,10 @@ HYPERVISOR_update_descriptor(u64 ma, u64 desc)
return _hypercall4(int, update_descriptor, ma, ma>>32, desc, desc>>32);
}
-static inline int
+static inline long
HYPERVISOR_memory_op(unsigned int cmd, void *arg)
{
- return _hypercall2(int, memory_op, cmd, arg);
+ return _hypercall2(long, memory_op, cmd, arg);
}
static inline int
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index f5ef674..4ebfcec 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -548,7 +548,7 @@ static unsigned long __init xen_get_max_pages(void)
{
unsigned long max_pages, limit;
domid_t domid = DOMID_SELF;
- int ret;
+ long ret;
limit = xen_get_pages_limit();
max_pages = limit;
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] xen: use correct type for HYPERVISOR_memory_op()
2015-09-04 12:50 [PATCH] xen: use correct type for HYPERVISOR_memory_op() Juergen Gross
@ 2015-09-14 12:48 ` Juergen Gross
2015-09-14 12:56 ` Julien Grall
2015-09-28 13:23 ` David Vrabel
2 siblings, 0 replies; 6+ messages in thread
From: Juergen Gross @ 2015-09-14 12:48 UTC (permalink / raw)
To: linux-kernel, xen-devel, konrad.wilk, david.vrabel,
boris.ostrovsky
Ping?
On 09/04/2015 02:50 PM, Juergen Gross wrote:
> HYPERVISOR_memory_op() is defined to return an "int" value. This is
> wrong, as the Xen hypervisor will return "long".
>
> The sub-function XENMEM_maximum_reservation returns the maximum
> number of pages for the current domain. An int will overflow for a
> domain configured with 8TB of memory or more.
>
> Correct this by using the correct type.
>
> Signed-off-by: Juergen Gross <jgross@suse.com>
> ---
> arch/x86/include/asm/xen/hypercall.h | 4 ++--
> arch/x86/xen/setup.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h
> index ca08a27..b7a735f 100644
> --- a/arch/x86/include/asm/xen/hypercall.h
> +++ b/arch/x86/include/asm/xen/hypercall.h
> @@ -336,10 +336,10 @@ HYPERVISOR_update_descriptor(u64 ma, u64 desc)
> return _hypercall4(int, update_descriptor, ma, ma>>32, desc, desc>>32);
> }
>
> -static inline int
> +static inline long
> HYPERVISOR_memory_op(unsigned int cmd, void *arg)
> {
> - return _hypercall2(int, memory_op, cmd, arg);
> + return _hypercall2(long, memory_op, cmd, arg);
> }
>
> static inline int
> diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
> index f5ef674..4ebfcec 100644
> --- a/arch/x86/xen/setup.c
> +++ b/arch/x86/xen/setup.c
> @@ -548,7 +548,7 @@ static unsigned long __init xen_get_max_pages(void)
> {
> unsigned long max_pages, limit;
> domid_t domid = DOMID_SELF;
> - int ret;
> + long ret;
>
> limit = xen_get_pages_limit();
> max_pages = limit;
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Xen-devel] [PATCH] xen: use correct type for HYPERVISOR_memory_op()
2015-09-04 12:50 [PATCH] xen: use correct type for HYPERVISOR_memory_op() Juergen Gross
@ 2015-09-14 12:56 ` Julien Grall
2015-09-14 12:56 ` Julien Grall
2015-09-28 13:23 ` David Vrabel
2 siblings, 0 replies; 6+ messages in thread
From: Julien Grall @ 2015-09-14 12:56 UTC (permalink / raw)
To: Juergen Gross, linux-kernel, xen-devel, konrad.wilk, david.vrabel,
boris.ostrovsky
Hi Juergen,
On 04/09/15 13:50, Juergen Gross wrote:
> HYPERVISOR_memory_op() is defined to return an "int" value. This is
> wrong, as the Xen hypervisor will return "long".
>
> The sub-function XENMEM_maximum_reservation returns the maximum
> number of pages for the current domain. An int will overflow for a
> domain configured with 8TB of memory or more.
>
> Correct this by using the correct type.
Can you also fix the ARM version of the prototype
(arm/include/asm/xen/hypercall.h) in order to keep them in sync?
Regards,
> Signed-off-by: Juergen Gross <jgross@suse.com>
> ---
> arch/x86/include/asm/xen/hypercall.h | 4 ++--
> arch/x86/xen/setup.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h
> index ca08a27..b7a735f 100644
> --- a/arch/x86/include/asm/xen/hypercall.h
> +++ b/arch/x86/include/asm/xen/hypercall.h
> @@ -336,10 +336,10 @@ HYPERVISOR_update_descriptor(u64 ma, u64 desc)
> return _hypercall4(int, update_descriptor, ma, ma>>32, desc, desc>>32);
> }
>
> -static inline int
> +static inline long
> HYPERVISOR_memory_op(unsigned int cmd, void *arg)
> {
> - return _hypercall2(int, memory_op, cmd, arg);
> + return _hypercall2(long, memory_op, cmd, arg);
> }
>
> static inline int
> diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
> index f5ef674..4ebfcec 100644
> --- a/arch/x86/xen/setup.c
> +++ b/arch/x86/xen/setup.c
> @@ -548,7 +548,7 @@ static unsigned long __init xen_get_max_pages(void)
> {
> unsigned long max_pages, limit;
> domid_t domid = DOMID_SELF;
> - int ret;
> + long ret;
>
> limit = xen_get_pages_limit();
> max_pages = limit;
>
--
Julien Grall
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Xen-devel] [PATCH] xen: use correct type for HYPERVISOR_memory_op()
@ 2015-09-14 12:56 ` Julien Grall
0 siblings, 0 replies; 6+ messages in thread
From: Julien Grall @ 2015-09-14 12:56 UTC (permalink / raw)
To: Juergen Gross, linux-kernel, xen-devel, konrad.wilk, david.vrabel,
boris.ostrovsky
Hi Juergen,
On 04/09/15 13:50, Juergen Gross wrote:
> HYPERVISOR_memory_op() is defined to return an "int" value. This is
> wrong, as the Xen hypervisor will return "long".
>
> The sub-function XENMEM_maximum_reservation returns the maximum
> number of pages for the current domain. An int will overflow for a
> domain configured with 8TB of memory or more.
>
> Correct this by using the correct type.
Can you also fix the ARM version of the prototype
(arm/include/asm/xen/hypercall.h) in order to keep them in sync?
Regards,
> Signed-off-by: Juergen Gross <jgross@suse.com>
> ---
> arch/x86/include/asm/xen/hypercall.h | 4 ++--
> arch/x86/xen/setup.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h
> index ca08a27..b7a735f 100644
> --- a/arch/x86/include/asm/xen/hypercall.h
> +++ b/arch/x86/include/asm/xen/hypercall.h
> @@ -336,10 +336,10 @@ HYPERVISOR_update_descriptor(u64 ma, u64 desc)
> return _hypercall4(int, update_descriptor, ma, ma>>32, desc, desc>>32);
> }
>
> -static inline int
> +static inline long
> HYPERVISOR_memory_op(unsigned int cmd, void *arg)
> {
> - return _hypercall2(int, memory_op, cmd, arg);
> + return _hypercall2(long, memory_op, cmd, arg);
> }
>
> static inline int
> diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
> index f5ef674..4ebfcec 100644
> --- a/arch/x86/xen/setup.c
> +++ b/arch/x86/xen/setup.c
> @@ -548,7 +548,7 @@ static unsigned long __init xen_get_max_pages(void)
> {
> unsigned long max_pages, limit;
> domid_t domid = DOMID_SELF;
> - int ret;
> + long ret;
>
> limit = xen_get_pages_limit();
> max_pages = limit;
>
--
Julien Grall
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Xen-devel] [PATCH] xen: use correct type for HYPERVISOR_memory_op()
2015-09-04 12:50 [PATCH] xen: use correct type for HYPERVISOR_memory_op() Juergen Gross
@ 2015-09-28 13:23 ` David Vrabel
2015-09-14 12:56 ` Julien Grall
2015-09-28 13:23 ` David Vrabel
2 siblings, 0 replies; 6+ messages in thread
From: David Vrabel @ 2015-09-28 13:23 UTC (permalink / raw)
To: Juergen Gross, linux-kernel, xen-devel, konrad.wilk, david.vrabel,
boris.ostrovsky
On 04/09/15 13:50, Juergen Gross wrote:
> HYPERVISOR_memory_op() is defined to return an "int" value. This is
> wrong, as the Xen hypervisor will return "long".
>
> The sub-function XENMEM_maximum_reservation returns the maximum
> number of pages for the current domain. An int will overflow for a
> domain configured with 8TB of memory or more.
>
> Correct this by using the correct type.
Applied to for-linus-4.3, thanks.
David
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Xen-devel] [PATCH] xen: use correct type for HYPERVISOR_memory_op()
@ 2015-09-28 13:23 ` David Vrabel
0 siblings, 0 replies; 6+ messages in thread
From: David Vrabel @ 2015-09-28 13:23 UTC (permalink / raw)
To: Juergen Gross, linux-kernel, xen-devel, konrad.wilk, david.vrabel,
boris.ostrovsky
On 04/09/15 13:50, Juergen Gross wrote:
> HYPERVISOR_memory_op() is defined to return an "int" value. This is
> wrong, as the Xen hypervisor will return "long".
>
> The sub-function XENMEM_maximum_reservation returns the maximum
> number of pages for the current domain. An int will overflow for a
> domain configured with 8TB of memory or more.
>
> Correct this by using the correct type.
Applied to for-linus-4.3, thanks.
David
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-09-28 13:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-04 12:50 [PATCH] xen: use correct type for HYPERVISOR_memory_op() Juergen Gross
2015-09-14 12:48 ` Juergen Gross
2015-09-14 12:56 ` [Xen-devel] " Julien Grall
2015-09-14 12:56 ` Julien Grall
2015-09-28 13:23 ` David Vrabel
2015-09-28 13:23 ` David Vrabel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.