s390x: fixing I/O memory allocation
PATCH v2 1/1 s390x: fixing I/O memory allocation
The allocator allocate pages it follows the size must be rounded to pages before the allocation.
Fixes b0fe3988 "s390x: define UV compatible I/O allocation"
Signed-off-by Pierre Morel <[email protected]>
Reviewed-by Claudio Imbrenda <[email protected]>
--- lib/s390x/malloc_io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/s390x/malloc_io.c +2 -2
@@ -41,7 +41,7 @@ static void unshare_pages(void *p, int count)void *alloc_io_mem (int size,int flags) { -int order =get_order (size >>PAGE_SHIFT ); +int order =get_order (PAGE_ALIGN (size) >>PAGE_SHIFT );void *p;int n;
@@ -62,7 +62,7 @@ void *alloc_io_mem(int size, int flags)void free_io_mem (void *p,int size) { -int order =get_order (size >>PAGE_SHIFT ); +int order =get_order (PAGE_ALIGN (size) >>PAGE_SHIFT );assert (IS_ALIGNED ((uintptr_t )p,PAGE_SIZE ));
Signature · 1 line
2.25.1
Sorry ... manipulation error
Quoted 34 lines · Pierre Morel
The allocator allocate pages it follows the size must be rounded to pages before the allocation.
Fixes b0fe3988 "s390x: define UV compatible I/O allocation"Signed-off-by Pierre Morel <[email protected]>Reviewed-by Claudio Imbrenda <[email protected]>--- lib/s390x/malloc_io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)lib/s390x/malloc_io.c +2
-2@@ -41,7 +41,7 @@ static void unshare_pages(void *p, int count)void *alloc_io_mem (int size,int flags) { -int order =get_order (size >>PAGE_SHIFT ); +int order =get_order (PAGE_ALIGN (size) >>PAGE_SHIFT );void *p;int n;@@ -62,7 +62,7 @@ void *alloc_io_mem(int size, int flags)void free_io_mem (void *p,int size) { -int order =get_order (size >>PAGE_SHIFT ); +int order =get_order (PAGE_ALIGN (size) >>PAGE_SHIFT );assert (IS_ALIGNED ((uintptr_t )p,PAGE_SIZE ));
Signature · 2 lines
Pierre Morel IBM Lab Boeblingen