Introduce XEN_PAGE_* definitions for mapping guests memory
cover Introduce XEN_PAGE_* definitions for mapping guests memory
This series tries to fix a side-effect introduced by commits 0dbb4be7 and d1b32abd which added a dependency to xenctrl for foreignmemory and gnntab libraries library only because they needed to use the XC_PAGE_* values.
These changes introduce the XEN_PAGE_* definitions that will be used by any toolstack component that doesn't need a dependency to xenctrl library.
Costin Lupu (4):
public: Add page related definitions for accessing guests memory libs/ctrl: Use Xen values for XC_PAGE_* definitions libs/foreignmemory: Use XEN_PAGE_* definitions libs/gnttab: Use XEN_PAGE_* definitions
tools/include/xenctrl.h | 7 +++--- tools/libs/foreignmemory/core.c | 2 +- tools/libs/foreignmemory/freebsd.c | 10 ++++---- tools/libs/foreignmemory/linux.c | 18 +++++++------- tools/libs/foreignmemory/minios.c | 10 +------- tools/libs/foreignmemory/netbsd.c | 10 ++++---- tools/libs/foreignmemory/private.h | 2 +- tools/libs/foreignmemory/solaris.c | 6 ++--- tools/libs/gnttab/freebsd.c | 20 ++++++++-------- tools/libs/gnttab/linux.c | 20 ++++++++-------- tools/libs/gnttab/netbsd.c | 20 ++++++++-------- xen/include/public/arch-arm/page.h | 34 ++++++++++++++++++++++++++ xen/include/public/arch-x86/page.h | 34 ++++++++++++++++++++++++++ xen/include/public/page.h | 38 ++++++++++++++++++++++++++++++ 14 files changed, 165 insertions(+), 66 deletions(-) create mode 100644 xen/include/public/arch-arm/page.h create mode 100644 xen/include/public/arch-x86/page.h create mode 100644 xen/include/public/page.h
Signature · 1 line
2.20.1
PATCH 1/4 public: Add page related definitions for accessing guests memory
These changes introduce the page related definitions needed for mapping and accessing guests memory. These values are intended to be used by any toolstack component that needs to map guests memory. Until now, the values were defined by the xenctrl.h header, therefore whenever a component had to use them it also had to add a dependency for the xenctrl library.
For this patch we set the same values for both x86 and ARM architectures.
--- xen/include/public/arch-arm/page.h | 34 ++++++++++++++++++++++++++ xen/include/public/arch-x86/page.h | 34 ++++++++++++++++++++++++++ xen/include/public/page.h | 38 ++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 xen/include/public/arch-arm/page.h create mode 100644 xen/include/public/arch-x86/page.h create mode 100644 xen/include/public/page.h
xen/include/public/arch-arm/page.h new file +34 -0
@@ -0,0 +1,34 @@ +/****************************************************************************** +* page.h +* +* Page definitions for accessing guests memory on ARM +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to +* deal in the Software without restriction, including without limitation the +* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +* sell copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +* DEALINGS IN THE SOFTWARE. +* +* Copyright (c) 2021, Costin Lupu +*/ + +#ifndef __XEN_PUBLIC_ARCH_ARM_PAGE_H__ +#define __XEN_PUBLIC_ARCH_ARM_PAGE_H__ + +#define XEN_PAGE_SHIFT 12 +#define XEN_PAGE_SIZE (1UL << XEN_PAGE_SHIFT) +#define XEN_PAGE_MASK (~(XEN_PAGE_SIZE - 1)) + +#endif /* __XEN_PUBLIC_ARCH_ARM_PAGE_H__ */
xen/include/public/arch-x86/page.h new file +34 -0
@@ -0,0 +1,34 @@ +/****************************************************************************** +* page.h +* +* Page definitions for accessing guests memory on x86 +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to +* deal in the Software without restriction, including without limitation the +* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +* sell copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +* DEALINGS IN THE SOFTWARE. +* +* Copyright (c) 2021, Costin Lupu +*/ + +#ifndef __XEN_PUBLIC_ARCH_X86_PAGE_H__ +#define __XEN_PUBLIC_ARCH_X86_PAGE_H__ + +#define XEN_PAGE_SHIFT 12 +#define XEN_PAGE_SIZE (1UL << XEN_PAGE_SHIFT) +#define XEN_PAGE_MASK (~(XEN_PAGE_SIZE - 1)) + +#endif /* __XEN_PUBLIC_ARCH_X86_PAGE_H__ */
xen/include/public/page.h new file +38 -0
@@ -0,0 +1,38 @@ +/****************************************************************************** +* page.h +* +* Page definitions for accessing guests memory +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to +* deal in the Software without restriction, including without limitation the +* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +* sell copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +* DEALINGS IN THE SOFTWARE. +* +* Copyright (c) 2021, Costin Lupu +*/ + +#ifndef __XEN_PUBLIC_PAGE_H__ +#define __XEN_PUBLIC_PAGE_H__ + +#if defined(__i386__) || defined(__x86_64__) +#include "arch-x86/page.h" +#elif defined (__arm__) || defined (__aarch64__) +#include "arch-arm/page.h" +#else +#error "Unsupported architecture" +#endif + +#endif /* __XEN_PUBLIC_PAGE_H__ */
Signature · 1 line
2.20.1
Re: [PATCH 1/4] public: Add page related definitions for accessing guests memory
Quoted 9 lines · Costin Lupu
These changes introduce the page related definitions needed for mapping and accessing guests memory. These values are intended to be used by any toolstack component that needs to map guests memory. Until now, the values were defined by the
xenctrl.hheader, therefore whenever a component had to use them it also had to add a dependency for the xenctrl library.For this patch we set the same values for both x86 and ARM architectures.
Signed-off-by Costin Lupu <[email protected]>
Quoted 8 lines
--- xen/include/public/arch-arm/page.h | 34 ++++++++++++++++++++++++++ xen/include/public/arch-x86/page.h | 34 ++++++++++++++++++++++++++ xen/include/public/page.h | 38 ++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 xen/include/public/arch-arm/page.h create mode 100644 xen/include/public/arch-x86/page.h create mode 100644 xen/include/public/page.h
I'm not convinced of these warranting introduction of new headers, but I'm also not meaning to say that I'm strictly opposed. I don't recall this aspect having had any consideration, yet.
Quoted 25 lines
xen/include/public/arch-arm/page.h new file +22
-0@@ -0,0 +1,34 @@ +/****************************************************************************** +* page.h +* +* Page definitions for accessing guests memory on ARM +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to +* deal in the Software without restriction, including without limitation the +* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +* sell copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +* DEALINGS IN THE SOFTWARE.
xen/include/public/arch-arm/page.h line 32
Quoted 10 lines
xen/include/public/arch-arm/page.h new file +10
-0+* +* Copyright (c) 2021, Costin Lupu +*/ + +#ifndef __XEN_PUBLIC_ARCH_ARM_PAGE_H__ +#define __XEN_PUBLIC_ARCH_ARM_PAGE_H__ + +#define XEN_PAGE_SHIFT 12 +#define XEN_PAGE_SIZE (1UL << XEN_PAGE_SHIFT) +#define XEN_PAGE_MASK (~(XEN_PAGE_SIZE - 1))
The latter two, being identical ...
Quoted 25 lines
xen/include/public/arch-x86/page.h new file +22
-0@@ -0,0 +1,34 @@ +/****************************************************************************** +* page.h +* +* Page definitions for accessing guests memory on x86 +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to +* deal in the Software without restriction, including without limitation the +* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +* sell copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +* DEALINGS IN THE SOFTWARE.
xen/include/public/arch-x86/page.h line 32
Quoted 10 lines
xen/include/public/arch-x86/page.h new file +10
-0+* +* Copyright (c) 2021, Costin Lupu +*/ + +#ifndef __XEN_PUBLIC_ARCH_X86_PAGE_H__ +#define __XEN_PUBLIC_ARCH_X86_PAGE_H__ + +#define XEN_PAGE_SHIFT 12 +#define XEN_PAGE_SIZE (1UL << XEN_PAGE_SHIFT) +#define XEN_PAGE_MASK (~(XEN_PAGE_SIZE - 1))
... not just for x86, but in general, should imo move ...
Quoted 29 lines
xen/include/public/page.h new file +26
-0@@ -0,0 +1,38 @@ +/****************************************************************************** +* page.h +* +* Page definitions for accessing guests memory +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to +* deal in the Software without restriction, including without limitation the +* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +* sell copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +* DEALINGS IN THE SOFTWARE. +* +* Copyright (c) 2021, Costin Lupu +*/ +
xen/include/public/page.h line 36
Quoted 10 lines
xen/include/public/page.h new file +10
-0+#ifndef __XEN_PUBLIC_PAGE_H__ +#define __XEN_PUBLIC_PAGE_H__ + +#if defined(__i386__) || defined(__x86_64__) +#include "arch-x86/page.h" +#elif defined (__arm__) || defined (__aarch64__) +#include "arch-arm/page.h" +#else +#error "Unsupported architecture" +#endif
... here. I don't think though that 1UL is an appropriate construct to use: Imo the smallest type this should evaluate to is xen_ulong_t, the constant should also be usable in assembly sources, and it would better also suitably sign-extend when used in e.g. XEN_PAGE_MASK.
Jan
Quoted 2 lines
xen/include/public/page.h new file +1
-0+#endif /* __XEN_PUBLIC_PAGE_H__ */
Re: [PATCH 1/4] public: Add page related definitions for accessing guests memory
Hi Jan,
Thanks for your comments. I've just sent a v2.
Cheers,
Costin
Quoted 149 lines · Jan Beulich
Quoted 9 lines · Costin Lupu
These changes introduce the page related definitions needed for mapping and accessing guests memory. These values are intended to be used by any toolstack component that needs to map guests memory. Until now, the values were defined by the
xenctrl.hheader, therefore whenever a component had to use them it also had to add a dependency for the xenctrl library.For this patch we set the same values for both x86 and ARM architectures.
Signed-off-by Costin Lupu <[email protected]>Quoted 8 lines
--- xen/include/public/arch-arm/page.h | 34 ++++++++++++++++++++++++++ xen/include/public/arch-x86/page.h | 34 ++++++++++++++++++++++++++ xen/include/public/page.h | 38 ++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 xen/include/public/arch-arm/page.h create mode 100644 xen/include/public/arch-x86/page.h create mode 100644 xen/include/public/page.hI'm not convinced of these warranting introduction of new headers, but I'm also not meaning to say that I'm strictly opposed. I don't recall this aspect having had any consideration, yet.
Quoted 25 lines
xen/include/public/arch-arm/page.h new file +22
-0@@ -0,0 +1,34 @@ +/****************************************************************************** +* page.h +* +* Page definitions for accessing guests memory on ARM +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to +* deal in the Software without restriction, including without limitation the +* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +* sell copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +* DEALINGS IN THE SOFTWARE. xen/include/public/arch-arm/page.h line 32
Quoted 10 lines
xen/include/public/arch-arm/page.h new file +10
-0+* +* Copyright (c) 2021, Costin Lupu +*/ + +#ifndef __XEN_PUBLIC_ARCH_ARM_PAGE_H__ +#define __XEN_PUBLIC_ARCH_ARM_PAGE_H__ + +#define XEN_PAGE_SHIFT 12 +#define XEN_PAGE_SIZE (1UL << XEN_PAGE_SHIFT) +#define XEN_PAGE_MASK (~(XEN_PAGE_SIZE - 1))The latter two, being identical ...
Quoted 25 lines
xen/include/public/arch-x86/page.h new file +22
-0@@ -0,0 +1,34 @@ +/****************************************************************************** +* page.h +* +* Page definitions for accessing guests memory on x86 +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to +* deal in the Software without restriction, including without limitation the +* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +* sell copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +* DEALINGS IN THE SOFTWARE. xen/include/public/arch-x86/page.h line 32
Quoted 10 lines
xen/include/public/arch-x86/page.h new file +10
-0+* +* Copyright (c) 2021, Costin Lupu +*/ + +#ifndef __XEN_PUBLIC_ARCH_X86_PAGE_H__ +#define __XEN_PUBLIC_ARCH_X86_PAGE_H__ + +#define XEN_PAGE_SHIFT 12 +#define XEN_PAGE_SIZE (1UL << XEN_PAGE_SHIFT) +#define XEN_PAGE_MASK (~(XEN_PAGE_SIZE - 1))... not just for x86, but in general, should imo move ...
Quoted 29 lines
xen/include/public/page.h new file +26
-0@@ -0,0 +1,38 @@ +/****************************************************************************** +* page.h +* +* Page definitions for accessing guests memory +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to +* deal in the Software without restriction, including without limitation the +* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +* sell copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +* DEALINGS IN THE SOFTWARE. +* +* Copyright (c) 2021, Costin Lupu +*/ +xen/include/public/page.h line 36
Quoted 10 lines
xen/include/public/page.h new file +10
-0+#ifndef __XEN_PUBLIC_PAGE_H__ +#define __XEN_PUBLIC_PAGE_H__ + +#if defined(__i386__) || defined(__x86_64__) +#include "arch-x86/page.h" +#elif defined (__arm__) || defined (__aarch64__) +#include "arch-arm/page.h" +#else +#error "Unsupported architecture" +#endif ... here. I don't think though that 1UL is an appropriate construct to use: Imo the smallest type this should evaluate to is
xen_ulong_t, the constant should also be usable in assembly sources, and it would better also suitably sign-extend when used in e.g.XEN_PAGE_MASK.Jan
Quoted 2 lines
xen/include/public/page.h new file +1
-0+#endif /* __XEN_PUBLIC_PAGE_H__ */
PATCH 2/4 libs/ctrl: Use Xen values for XC_PAGE_* definitions
In reply to Costin LupuWe use the values provided by the Xen public interface for defining the XC_PAGE_* macros.
--- tools/include/xenctrl.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
tools/include/xenctrl.h +4 -3
@@ -54,10 +54,11 @@#include <xen/foreign/x86_64.h> #include <xen/arch-x86/xen-mca.h> #endif +#include <xen/page.h> -#define XC_PAGE_SHIFT 12 -#define XC_PAGE_SIZE (1UL << XC_PAGE_SHIFT) -#define XC_PAGE_MASK (~(XC_PAGE_SIZE-1)) +#define XC_PAGE_SHIFT XEN_PAGE_SHIFT +#define XC_PAGE_SIZE XEN_PAGE_SIZE +#define XC_PAGE_MASK XEN_PAGE_MASK#define INVALID_MFN (~0UL)
Signature · 1 line
2.20.1
PATCH 3/4 libs/foreignmemory: Use XEN_PAGE_* definitions
In reply to Costin LupuThese changes refine the changes in 0dbb4be7 which added a dependency to xenctrl library. We use the XEN_PAGE_* definitions instead of the XC_PAGE_* definitions and therefore we get rid of the unnecessary dependency.
--- tools/libs/foreignmemory/core.c | 2 +- tools/libs/foreignmemory/freebsd.c | 10 +++++----- tools/libs/foreignmemory/linux.c | 18 +++++++++--------- tools/libs/foreignmemory/minios.c | 10 +--------- tools/libs/foreignmemory/netbsd.c | 10 +++++----- tools/libs/foreignmemory/private.h | 2 +- tools/libs/foreignmemory/solaris.c | 6 +++--- 7 files changed, 25 insertions(+), 33 deletions(-)
tools/libs/foreignmemory/core.c +1 -1
@@ -202,7 +202,7 @@ int xenforeignmemory_resource_size(if ( rc )return rc; - *size = fres.nr_frames <<XC_PAGE_SHIFT ; + *size = fres.nr_frames <<XEN_PAGE_SHIFT ;return 0 ; }
tools/libs/foreignmemory/freebsd.c +5 -5
@@ -63,7 +63,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem,privcmd_mmapbatch_t ioctlx;int rc; - addr =mmap (addr, num <<XC_PAGE_SHIFT , prot, flags |MAP_SHARED , fd,0 ); + addr =mmap (addr, num <<XEN_PAGE_SHIFT , prot, flags |MAP_SHARED , fd,0 );if ( addr ==MAP_FAILED )return NULL ;
@@ -78,7 +78,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, {int saved_errno = errno; - (void )munmap (addr, num <<XC_PAGE_SHIFT ); + (void )munmap (addr, num <<XEN_PAGE_SHIFT ); errno = saved_errno;return NULL ; }
@@ -89,7 +89,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem,int osdep_xenforeignmemory_unmap (xenforeignmemory_handle *fmem,void *addr,size_t num) { -return munmap (addr, num <<XC_PAGE_SHIFT ); +return munmap (addr, num <<XEN_PAGE_SHIFT ); } int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem,
@@ -101,7 +101,7 @@ int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem,int osdep_xenforeignmemory_unmap_resource (xenforeignmemory_handle *fmem,xenforeignmemory_resource_handle *fres) { -return fres ?munmap (fres->addr, fres->nr_frames <<XC_PAGE_SHIFT ) :0 ; +return fres ?munmap (fres->addr, fres->nr_frames <<XEN_PAGE_SHIFT ) :0 ; } int osdep_xenforeignmemory_map_resource(xenforeignmemory_handle *fmem,
@@ -120,7 +120,7 @@ int osdep_xenforeignmemory_map_resource(xenforeignmemory_handle *fmem,/* Request for resource size. Skip mmap(). */ goto skip_mmap; - fres->addr =mmap (fres->addr, fres->nr_frames <<XC_PAGE_SHIFT , + fres->addr =mmap (fres->addr, fres->nr_frames <<XEN_PAGE_SHIFT , fres->prot, fres->flags |MAP_SHARED , fmem->fd,0 );if ( fres->addr ==MAP_FAILED )return -1 ;
tools/libs/foreignmemory/linux.c +9 -9
@@ -134,7 +134,7 @@ static int retry_paged(int fd, uint32_t dom, void *addr,/* At least one gfn is still in paging state */ ioctlx.num =1 ; ioctlx.dom = dom; - ioctlx.addr = (unsigned long )addr + (i<<XC_PAGE_SHIFT ); + ioctlx.addr = (unsigned long )addr + (i<<XEN_PAGE_SHIFT ); ioctlx.arr = arr + i; ioctlx.err = err + i;
@@ -168,7 +168,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem,size_t i;int rc; - addr =mmap (addr, num <<XC_PAGE_SHIFT , prot, flags |MAP_SHARED , + addr =mmap (addr, num <<XEN_PAGE_SHIFT , prot, flags |MAP_SHARED , fd,0 );if ( addr ==MAP_FAILED )return NULL ;
@@ -198,7 +198,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem,*/ privcmd_mmapbatch_t ioctlx;xen_pfn_t *pfn; -unsigned int pfn_arr_size =ROUNDUP ((num *sizeof (*pfn)),XC_PAGE_SHIFT ); +unsigned int pfn_arr_size =ROUNDUP ((num *sizeof (*pfn)),XEN_PAGE_SHIFT );int os_page_size =sysconf (_SC_PAGESIZE);if ( pfn_arr_size <= os_page_size )
@@ -210,7 +210,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem,if ( pfn ==MAP_FAILED ) {PERROR ("mmap of pfn array failed" ); - (void )munmap (addr, num <<XC_PAGE_SHIFT ); + (void )munmap (addr, num <<XEN_PAGE_SHIFT );return NULL ; } }
@@ -243,7 +243,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem,continue ; } rc =map_foreign_batch_single (fd, dom, pfn + i, - (unsigned long )addr + (i<<XC_PAGE_SHIFT )); + (unsigned long )addr + (i<<XEN_PAGE_SHIFT ));if ( rc <0 ) { rc = -errno;
@@ -271,7 +271,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, {int saved_errno = errno; - (void )munmap (addr, num <<XC_PAGE_SHIFT ); + (void )munmap (addr, num <<XEN_PAGE_SHIFT ); errno = saved_errno;return NULL ; }
@@ -282,7 +282,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem,int osdep_xenforeignmemory_unmap (xenforeignmemory_handle *fmem,void *addr,size_t num) { -return munmap (addr, num <<XC_PAGE_SHIFT ); +return munmap (addr, num <<XEN_PAGE_SHIFT ); } int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem,
@@ -294,7 +294,7 @@ int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem,int osdep_xenforeignmemory_unmap_resource (xenforeignmemory_handle *fmem,xenforeignmemory_resource_handle *fres) { -return fres ?munmap (fres->addr, fres->nr_frames <<XC_PAGE_SHIFT ) :0 ; +return fres ?munmap (fres->addr, fres->nr_frames <<XEN_PAGE_SHIFT ) :0 ; } int osdep_xenforeignmemory_map_resource(
@@ -313,7 +313,7 @@ int osdep_xenforeignmemory_map_resource(/* Request for resource size. Skip mmap(). */ goto skip_mmap; - fres->addr =mmap (fres->addr, fres->nr_frames <<XC_PAGE_SHIFT , + fres->addr =mmap (fres->addr, fres->nr_frames <<XEN_PAGE_SHIFT , fres->prot, fres->flags |MAP_SHARED , fmem->fd,0 );if ( fres->addr ==MAP_FAILED )return -1 ;
tools/libs/foreignmemory/minios.c +1 -9
@@ -17,14 +17,6 @@* Copyright 2007-2008 Samuel Thibault <[email protected]>. */ -/* -* xenctrl.h currently defines __XEN_TOOLS__ which affects what is -* exposed by Xen headers. As the define needs to be set consistently, -* we want to include xenctrl.h before the mini-os headers (they include -* public headers). -*/ -#include <xenctrl.h> -#include <mini-os/types.h> #include <mini-os/os.h> #include <mini-os/mm.h>
@@ -63,7 +55,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem,int osdep_xenforeignmemory_unmap (xenforeignmemory_handle *fmem,void *addr,size_t num) { -return munmap (addr, num <<XC_PAGE_SHIFT ); +return munmap (addr, num <<XEN_PAGE_SHIFT ); }/*
tools/libs/foreignmemory/netbsd.c +5 -5
@@ -76,7 +76,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, {int fd = fmem->fd;privcmd_mmapbatch_v2_t ioctlx; - addr =mmap (addr, num *XC_PAGE_SIZE , prot, + addr =mmap (addr, num *XEN_PAGE_SIZE , prot, flags |MAP_ANON |MAP_SHARED ,-1 ,0 );if ( addr ==MAP_FAILED ) {PERROR ("osdep_xenforeignmemory_map: mmap failed" );
@@ -93,7 +93,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, {int saved_errno = errno;PERROR ("osdep_xenforeignmemory_map: ioctl failed" ); -munmap (addr, num *XC_PAGE_SIZE ); +munmap (addr, num *XEN_PAGE_SIZE ); errno = saved_errno;return NULL ; }
@@ -104,7 +104,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem,int osdep_xenforeignmemory_unmap (xenforeignmemory_handle *fmem,void *addr,size_t num) { -return munmap (addr, num *XC_PAGE_SIZE ); +return munmap (addr, num *XEN_PAGE_SIZE ); } int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem,
@@ -117,7 +117,7 @@ int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem,int osdep_xenforeignmemory_unmap_resource (xenforeignmemory_handle *fmem,xenforeignmemory_resource_handle *fres) { -return fres ?munmap (fres->addr, fres->nr_frames <<XC_PAGE_SHIFT ) :0 ; +return fres ?munmap (fres->addr, fres->nr_frames <<XEN_PAGE_SHIFT ) :0 ; } int osdep_xenforeignmemory_map_resource(
@@ -136,7 +136,7 @@ int osdep_xenforeignmemory_map_resource(/* Request for resource size. Skip mmap(). */ goto skip_mmap; - fres->addr =mmap (fres->addr, fres->nr_frames <<XC_PAGE_SHIFT , + fres->addr =mmap (fres->addr, fres->nr_frames <<XEN_PAGE_SHIFT , fres->prot, fres->flags |MAP_ANON |MAP_SHARED ,-1 ,0 );if ( fres->addr ==MAP_FAILED )return -1 ;
tools/libs/foreignmemory/private.h +1 -1
@@ -1,7 +1,6 @@#ifndef XENFOREIGNMEMORY_PRIVATE_H #define XENFOREIGNMEMORY_PRIVATE_H -#include <xenctrl.h> #include <xentoollog.h> #include <xenforeignmemory.h>
@@ -9,6 +8,7 @@#include <xentoolcore_internal.h> #include <xen/xen.h> +#include <xen/page.h> #include <xen/sys/privcmd.h> struct xenforeignmemory_handle {
tools/libs/foreignmemory/solaris.c +3 -3
@@ -72,7 +72,7 @@ void *osdep_map_foreign_batch(xenforeignmem_handle *fmem, uint32_t dom, {int fd = fmem->fd;privcmd_mmapbatch_t ioctlx; - addr =mmap (addr, num*XC_PAGE_SIZE , prot, flags |MAP_SHARED , fd,0 ); + addr =mmap (addr, num*XEN_PAGE_SIZE , prot, flags |MAP_SHARED , fd,0 );if ( addr ==MAP_FAILED )return NULL ;
@@ -84,7 +84,7 @@ void *osdep_map_foreign_batch(xenforeignmem_handle *fmem, uint32_t dom, {int saved_errno = errno; - (void )munmap (addr, num*XC_PAGE_SIZE ); + (void )munmap (addr, num*XEN_PAGE_SIZE ); errno = saved_errno;return NULL ; }
@@ -94,7 +94,7 @@ void *osdep_map_foreign_batch(xenforeignmem_handle *fmem, uint32_t dom,int osdep_xenforeignmemory_unmap (xenforeignmemory_handle *fmem,void *addr,size_t num) { -return munmap (addr, num*XC_PAGE_SIZE ); +return munmap (addr, num*XEN_PAGE_SIZE ); }/*
Signature · 1 line
2.20.1
PATCH 4/4 libs/gnttab: Use XEN_PAGE_* definitions
In reply to Costin LupuThese changes refine the changes in d1b32abd which added a dependency to xenctrl library. We use the XEN_PAGE_* definitions instead of the XC_PAGE_* definitions and therefore we get rid of the unnecessary dependency.
--- tools/libs/gnttab/freebsd.c | 20 ++++++++++---------- tools/libs/gnttab/linux.c | 20 ++++++++++---------- tools/libs/gnttab/netbsd.c | 20 ++++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-)
tools/libs/gnttab/freebsd.c +10 -10
@@ -28,9 +28,9 @@#include <sys/ioctl.h> #include <sys/mman.h> +#include <xen/page.h> #include <xen/sys/gntdev.h> -#include <xenctrl.h> #include <xen-tools/libs.h> #include "private.h"
@@ -74,7 +74,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt,int domids_stride;unsigned int refs_size =ROUNDUP (count *sizeof (struct ioctl_gntdev_grant_ref ), -XC_PAGE_SHIFT ); +XEN_PAGE_SHIFT );int os_page_size =getpagesize (); domids_stride = (flags &XENGNTTAB_GRANT_MAP_SINGLE_DOMAIN ) ?0 :1 ;
@@ -105,7 +105,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, goto out; } - addr =mmap (NULL ,XC_PAGE_SIZE * count, prot,MAP_SHARED , fd, + addr =mmap (NULL ,XEN_PAGE_SIZE * count, prot,MAP_SHARED , fd, map.index);if ( addr !=MAP_FAILED ) {
@@ -114,7 +114,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, notify.index = map.index; notify.action =0 ; -if ( notify_offset <XC_PAGE_SIZE * count ) +if ( notify_offset <XEN_PAGE_SIZE * count ) { notify.index += notify_offset; notify.action |=UNMAP_NOTIFY_CLEAR_BYTE ;
@@ -129,7 +129,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt,if ( rv ) {GTERROR (xgt->logger,"ioctl SET_UNMAP_NOTIFY failed" ); -munmap (addr, count *XC_PAGE_SIZE ); +munmap (addr, count *XEN_PAGE_SIZE ); addr =MAP_FAILED ; } }
@@ -187,7 +187,7 @@ int osdep_gnttab_unmap(xengnttab_handle *xgt, }/* Next, unmap the memory. */ -if ( (rc =munmap (start_address, count *XC_PAGE_SIZE )) ) +if ( (rc =munmap (start_address, count *XEN_PAGE_SIZE )) )return rc;/* Finally, unmap the driver slots used to store the grant information. */
@@ -254,7 +254,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs, goto out; } - area =mmap (NULL , count *XC_PAGE_SIZE ,PROT_READ |PROT_WRITE ,MAP_SHARED , + area =mmap (NULL , count *XEN_PAGE_SIZE ,PROT_READ |PROT_WRITE ,MAP_SHARED , fd, gref_info.index);if ( area ==MAP_FAILED )
@@ -266,7 +266,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs, notify.index = gref_info.index; notify.action =0 ; -if ( notify_offset <XC_PAGE_SIZE * count ) +if ( notify_offset <XEN_PAGE_SIZE * count ) { notify.index += notify_offset; notify.action |=UNMAP_NOTIFY_CLEAR_BYTE ;
@@ -281,7 +281,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs,if ( err ) {GSERROR (xgs->logger,"ioctl SET_UNMAP_NOTIFY failed" ); -munmap (area, count *XC_PAGE_SIZE ); +munmap (area, count *XEN_PAGE_SIZE ); area =NULL ; }
@@ -304,7 +304,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs,int osdep_gntshr_unshare (xengntshr_handle *xgs,void *start_address,uint32_t count) { -return munmap (start_address, count *XC_PAGE_SIZE ); +return munmap (start_address, count *XEN_PAGE_SIZE ); }/*
tools/libs/gnttab/linux.c +10 -10
@@ -29,10 +29,10 @@#include <sys/ioctl.h> #include <sys/mman.h> +#include <xen/page.h> #include <xen/sys/gntdev.h> #include <xen/sys/gntalloc.h> -#include <xenctrl.h> #include <xen-tools/libs.h> #include "private.h"
@@ -101,7 +101,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, map =alloca (map_size); else { - map_size =ROUNDUP (map_size,XC_PAGE_SHIFT ); + map_size =ROUNDUP (map_size,XEN_PAGE_SHIFT ); map =mmap (NULL , map_size,PROT_READ |PROT_WRITE ,MAP_PRIVATE |MAP_ANON |MAP_POPULATE ,-1 ,0 );if ( map ==MAP_FAILED )
@@ -125,7 +125,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, } retry: - addr =mmap (NULL ,XC_PAGE_SIZE * count, prot,MAP_SHARED , fd, + addr =mmap (NULL ,XEN_PAGE_SIZE * count, prot,MAP_SHARED , fd, map->index);if (addr ==MAP_FAILED && errno ==EAGAIN )
@@ -150,7 +150,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt,struct ioctl_gntdev_unmap_notify notify; notify.index = map->index; notify.action =0 ; -if (notify_offset <XC_PAGE_SIZE * count) { +if (notify_offset <XEN_PAGE_SIZE * count) { notify.index += notify_offset; notify.action |=UNMAP_NOTIFY_CLEAR_BYTE ; }
@@ -162,7 +162,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, rv =ioctl (fd,IOCTL_GNTDEV_SET_UNMAP_NOTIFY , ¬ify);if (rv) {GTERROR (xgt->logger,"ioctl SET_UNMAP_NOTIFY failed" ); -munmap (addr, count *XC_PAGE_SIZE ); +munmap (addr, count *XEN_PAGE_SIZE ); addr =MAP_FAILED ; } }
@@ -218,7 +218,7 @@ int osdep_gnttab_unmap(xengnttab_handle *xgt, }/* Next, unmap the memory. */ -if ( (rc =munmap (start_address, count *XC_PAGE_SIZE )) ) +if ( (rc =munmap (start_address, count *XEN_PAGE_SIZE )) )return rc;/* Finally, unmap the driver slots used to store the grant information. */
@@ -464,7 +464,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs, goto out; } - area =mmap (NULL , count *XC_PAGE_SIZE ,PROT_READ |PROT_WRITE , + area =mmap (NULL , count *XEN_PAGE_SIZE ,PROT_READ |PROT_WRITE ,MAP_SHARED , fd, gref_info->index);if (area ==MAP_FAILED ) {
@@ -475,7 +475,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs, notify.index = gref_info->index; notify.action =0 ; -if (notify_offset <XC_PAGE_SIZE * count) { +if (notify_offset <XEN_PAGE_SIZE * count) { notify.index += notify_offset; notify.action |=UNMAP_NOTIFY_CLEAR_BYTE ; }
@@ -487,7 +487,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs, err =ioctl (fd,IOCTL_GNTALLOC_SET_UNMAP_NOTIFY , ¬ify);if (err) {GSERROR (xgs->logger,"ioctl SET_UNMAP_NOTIFY failed" ); -munmap (area, count *XC_PAGE_SIZE ); +munmap (area, count *XEN_PAGE_SIZE ); area =NULL ; }
@@ -508,7 +508,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs,int osdep_gntshr_unshare (xengntshr_handle *xgs,void *start_address,uint32_t count) { -return munmap (start_address, count *XC_PAGE_SIZE ); +return munmap (start_address, count *XEN_PAGE_SIZE ); }/*
tools/libs/gnttab/netbsd.c +10 -10
@@ -28,8 +28,8 @@#include <sys/ioctl.h> #include <sys/mman.h> -#include <xenctrl.h> #include <xen/xen.h> +#include <xen/page.h> #include <xen/xenio.h> #include "private.h"
@@ -84,19 +84,19 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, } map.count = count; - addr =mmap (NULL , count *XC_PAGE_SIZE , + addr =mmap (NULL , count *XEN_PAGE_SIZE , prot, flags |MAP_ANON |MAP_SHARED ,-1 ,0 );if ( map.va ==MAP_FAILED ) {GTERROR (xgt->logger,"osdep_gnttab_grant_map: mmap failed" ); -munmap ((void *)map.va, count *XC_PAGE_SIZE ); +munmap ((void *)map.va, count *XEN_PAGE_SIZE ); addr =MAP_FAILED ; } map.va = addr; map.notify.offset =0 ; map.notify.action =0 ; -if ( notify_offset <XC_PAGE_SIZE * count ) +if ( notify_offset <XEN_PAGE_SIZE * count ) { map.notify.offset = notify_offset; map.notify.action |=UNMAP_NOTIFY_CLEAR_BYTE ;
@@ -112,7 +112,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, {GTERROR (xgt->logger,"ioctl IOCTL_GNTDEV_MMAP_GRANT_REF failed: %d" , rv); -munmap (addr, count *XC_PAGE_SIZE ); +munmap (addr, count *XEN_PAGE_SIZE ); addr =MAP_FAILED ; }
@@ -133,7 +133,7 @@ int osdep_gnttab_unmap(xengnttab_handle *xgt, }/* Next, unmap the memory. */ - rc =munmap (start_address, count *XC_PAGE_SIZE ); + rc =munmap (start_address, count *XEN_PAGE_SIZE );return rc; }
@@ -184,7 +184,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs, alloc.domid = domid; alloc.flags = writable ?GNTDEV_ALLOC_FLAG_WRITABLE :0 ; alloc.count = count; - area =mmap (NULL , count *XC_PAGE_SIZE , + area =mmap (NULL , count *XEN_PAGE_SIZE ,PROT_READ |PROT_WRITE ,MAP_ANON |MAP_SHARED ,-1 ,0 );if ( area ==MAP_FAILED )
@@ -197,7 +197,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs, alloc.notify.offset =0 ; alloc.notify.action =0 ; -if ( notify_offset <XC_PAGE_SIZE * count ) +if ( notify_offset <XEN_PAGE_SIZE * count ) { alloc.notify.offset = notify_offset; alloc.notify.action |=UNMAP_NOTIFY_CLEAR_BYTE ;
@@ -212,7 +212,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs,if ( err ) {GSERROR (xgs->logger,"IOCTL_GNTDEV_ALLOC_GRANT_REF failed" ); -munmap (area, count *XC_PAGE_SIZE ); +munmap (area, count *XEN_PAGE_SIZE ); area =MAP_FAILED ; goto out; }
@@ -227,7 +227,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs,int osdep_gntshr_unshare (xengntshr_handle *xgs,void *start_address,uint32_t count) { -return munmap (start_address, count *XC_PAGE_SIZE ); +return munmap (start_address, count *XEN_PAGE_SIZE ); }/*
Signature · 1 line
2.20.1