| Message ID | 20210115123730.381612-5-imbrenda@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix and improve the page allocator | expand |
On 1/15/21 1:37 PM, Claudio Imbrenda wrote: > Fix the definitions of the memory areas. > > Bring the headers in line with the rest of the asm headers, by having the > appropriate #ifdef _ASM$ARCH_ guarding the headers. > > Fixes: d74708246bd9 ("lib/asm: Add definitions of memory areas") > > Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com> > Reviewed-by: Krish Sadhukhan <krish.sadhukhan@oracle.com> > --- > lib/asm-generic/memory_areas.h | 9 ++++----- > lib/arm/asm/memory_areas.h | 11 +++-------- > lib/arm64/asm/memory_areas.h | 11 +++-------- > lib/powerpc/asm/memory_areas.h | 11 +++-------- > lib/ppc64/asm/memory_areas.h | 11 +++-------- > lib/s390x/asm/memory_areas.h | 13 ++++++------- > lib/x86/asm/memory_areas.h | 27 ++++++++++++++++----------- > lib/alloc_page.h | 3 +++ > lib/alloc_page.c | 4 +--- > 9 files changed, 42 insertions(+), 58 deletions(-) > > diff --git a/lib/asm-generic/memory_areas.h b/lib/asm-generic/memory_areas.h > index 927baa7..3074afe 100644 > --- a/lib/asm-generic/memory_areas.h > +++ b/lib/asm-generic/memory_areas.h > @@ -1,11 +1,10 @@ > -#ifndef MEMORY_AREAS_H > -#define MEMORY_AREAS_H > +#ifndef __ASM_GENERIC_MEMORY_AREAS_H__ > +#define __ASM_GENERIC_MEMORY_AREAS_H__ > > #define AREA_NORMAL_PFN 0 > #define AREA_NORMAL_NUMBER 0 > -#define AREA_NORMAL 1 > +#define AREA_NORMAL (1 << AREA_NORMAL_NUMBER) > > -#define AREA_ANY -1 > -#define AREA_ANY_NUMBER 0xff > +#define MAX_AREAS 1 > > #endif > diff --git a/lib/arm/asm/memory_areas.h b/lib/arm/asm/memory_areas.h > index 927baa7..c723310 100644 > --- a/lib/arm/asm/memory_areas.h > +++ b/lib/arm/asm/memory_areas.h > @@ -1,11 +1,6 @@ > -#ifndef MEMORY_AREAS_H > -#define MEMORY_AREAS_H > +#ifndef _ASMARM_MEMORY_AREAS_H_ > +#define _ASMARM_MEMORY_AREAS_H_ > > -#define AREA_NORMAL_PFN 0 > -#define AREA_NORMAL_NUMBER 0 > -#define AREA_NORMAL 1 > - > -#define AREA_ANY -1 > -#define AREA_ANY_NUMBER 0xff > +#include <asm-generic/memory_areas.h> > > #endif > diff --git a/lib/arm64/asm/memory_areas.h b/lib/arm64/asm/memory_areas.h > index 927baa7..18e8ca8 100644 > --- a/lib/arm64/asm/memory_areas.h > +++ b/lib/arm64/asm/memory_areas.h > @@ -1,11 +1,6 @@ > -#ifndef MEMORY_AREAS_H > -#define MEMORY_AREAS_H > +#ifndef _ASMARM64_MEMORY_AREAS_H_ > +#define _ASMARM64_MEMORY_AREAS_H_ > > -#define AREA_NORMAL_PFN 0 > -#define AREA_NORMAL_NUMBER 0 > -#define AREA_NORMAL 1 > - > -#define AREA_ANY -1 > -#define AREA_ANY_NUMBER 0xff > +#include <asm-generic/memory_areas.h> > > #endif > diff --git a/lib/powerpc/asm/memory_areas.h b/lib/powerpc/asm/memory_areas.h > index 927baa7..76d1738 100644 > --- a/lib/powerpc/asm/memory_areas.h > +++ b/lib/powerpc/asm/memory_areas.h > @@ -1,11 +1,6 @@ > -#ifndef MEMORY_AREAS_H > -#define MEMORY_AREAS_H > +#ifndef _ASMPOWERPC_MEMORY_AREAS_H_ > +#define _ASMPOWERPC_MEMORY_AREAS_H_ > > -#define AREA_NORMAL_PFN 0 > -#define AREA_NORMAL_NUMBER 0 > -#define AREA_NORMAL 1 > - > -#define AREA_ANY -1 > -#define AREA_ANY_NUMBER 0xff > +#include <asm-generic/memory_areas.h> > > #endif > diff --git a/lib/ppc64/asm/memory_areas.h b/lib/ppc64/asm/memory_areas.h > index 927baa7..b9fd46b 100644 > --- a/lib/ppc64/asm/memory_areas.h > +++ b/lib/ppc64/asm/memory_areas.h > @@ -1,11 +1,6 @@ > -#ifndef MEMORY_AREAS_H > -#define MEMORY_AREAS_H > +#ifndef _ASMPPC64_MEMORY_AREAS_H_ > +#define _ASMPPC64_MEMORY_AREAS_H_ > > -#define AREA_NORMAL_PFN 0 > -#define AREA_NORMAL_NUMBER 0 > -#define AREA_NORMAL 1 > - > -#define AREA_ANY -1 > -#define AREA_ANY_NUMBER 0xff > +#include <asm-generic/memory_areas.h> > > #endif > diff --git a/lib/s390x/asm/memory_areas.h b/lib/s390x/asm/memory_areas.h > index 4856a27..827bfb3 100644 > --- a/lib/s390x/asm/memory_areas.h > +++ b/lib/s390x/asm/memory_areas.h > @@ -1,16 +1,15 @@ > -#ifndef MEMORY_AREAS_H > -#define MEMORY_AREAS_H > +#ifndef _ASMS390X_MEMORY_AREAS_H_ > +#define _ASMS390X_MEMORY_AREAS_H_ > > -#define AREA_NORMAL_PFN BIT(31-12) > +#define AREA_NORMAL_PFN (1 << 19) > #define AREA_NORMAL_NUMBER 0 > -#define AREA_NORMAL 1 > +#define AREA_NORMAL (1 << AREA_NORMAL_NUMBER) > > #define AREA_LOW_PFN 0 > #define AREA_LOW_NUMBER 1 > -#define AREA_LOW 2 > +#define AREA_LOW (1 << AREA_LOW_NUMBER) > > -#define AREA_ANY -1 > -#define AREA_ANY_NUMBER 0xff > +#define MAX_AREAS 2 > > #define AREA_DMA31 AREA_LOW > > diff --git a/lib/x86/asm/memory_areas.h b/lib/x86/asm/memory_areas.h > index 952f5bd..e84016f 100644 > --- a/lib/x86/asm/memory_areas.h > +++ b/lib/x86/asm/memory_areas.h > @@ -1,21 +1,26 @@ > -#ifndef MEMORY_AREAS_H > -#define MEMORY_AREAS_H > +#ifndef _ASM_X86_MEMORY_AREAS_H_ > +#define _ASM_X86_MEMORY_AREAS_H_ > > #define AREA_NORMAL_PFN BIT(36-12) > #define AREA_NORMAL_NUMBER 0 > -#define AREA_NORMAL 1 > +#define AREA_NORMAL (1 << AREA_NORMAL_NUMBER) > > -#define AREA_PAE_HIGH_PFN BIT(32-12) > -#define AREA_PAE_HIGH_NUMBER 1 > -#define AREA_PAE_HIGH 2 > +#define AREA_HIGH_PFN BIT(32-12) > +#define AREA_HIGH_NUMBER 1 > +#define AREA_HIGH (1 << AREA_HIGH_NUMBER) > > -#define AREA_LOW_PFN 0 > +#define AREA_LOW_PFN BIT(24-12) > #define AREA_LOW_NUMBER 2 > -#define AREA_LOW 4 > +#define AREA_LOW (1 << AREA_LOW_NUMBER) > > -#define AREA_PAE (AREA_PAE | AREA_LOW) > +#define AREA_LOWEST_PFN 0 > +#define AREA_LOWEST_NUMBER 3 > +#define AREA_LOWEST (1 << AREA_LOWEST_NUMBER) > > -#define AREA_ANY -1 > -#define AREA_ANY_NUMBER 0xff > +#define MAX_AREAS 4 > + > +#define AREA_DMA24 AREA_LOWEST > +#define AREA_DMA32 (AREA_LOWEST | AREA_LOW) > +#define AREA_PAE36 (AREA_LOWEST | AREA_LOW | AREA_HIGH) This confuses the heck out of me. The other things look ok to me though. > > #endif > diff --git a/lib/alloc_page.h b/lib/alloc_page.h > index 816ff5d..b6aace5 100644 > --- a/lib/alloc_page.h > +++ b/lib/alloc_page.h > @@ -10,6 +10,9 @@ > > #include <asm/memory_areas.h> > > +#define AREA_ANY -1 > +#define AREA_ANY_NUMBER 0xff > + > /* Returns true if the page allocator has been initialized */ > bool page_alloc_initialized(void); > > diff --git a/lib/alloc_page.c b/lib/alloc_page.c > index 685ab1e..ed0ff02 100644 > --- a/lib/alloc_page.c > +++ b/lib/alloc_page.c > @@ -19,8 +19,6 @@ > #define NLISTS ((BITS_PER_LONG) - (PAGE_SHIFT)) > #define PFN(x) ((uintptr_t)(x) >> PAGE_SHIFT) > > -#define MAX_AREAS 6 > - > #define ORDER_MASK 0x3f > #define ALLOC_MASK 0x40 > #define SPECIAL_MASK 0x80 > @@ -509,7 +507,7 @@ void page_alloc_init_area(u8 n, uintptr_t base_pfn, uintptr_t top_pfn) > return; > } > #ifdef AREA_HIGH_PFN > - __page_alloc_init_area(AREA_HIGH_NUMBER, AREA_HIGH_PFN), base_pfn, &top_pfn); > + __page_alloc_init_area(AREA_HIGH_NUMBER, AREA_HIGH_PFN, base_pfn, &top_pfn); > #endif > __page_alloc_init_area(AREA_NORMAL_NUMBER, AREA_NORMAL_PFN, base_pfn, &top_pfn); > #ifdef AREA_LOW_PFN >
On Tue, 19 Jan 2021 16:33:29 +0100 Janosch Frank <frankja@linux.ibm.com> wrote: > On 1/15/21 1:37 PM, Claudio Imbrenda wrote: > > Fix the definitions of the memory areas. > > > > Bring the headers in line with the rest of the asm headers, by > > having the appropriate #ifdef _ASM$ARCH_ guarding the headers. > > > > Fixes: d74708246bd9 ("lib/asm: Add definitions of memory areas") > > > > Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com> > > Reviewed-by: Krish Sadhukhan <krish.sadhukhan@oracle.com> > > --- > > lib/asm-generic/memory_areas.h | 9 ++++----- > > lib/arm/asm/memory_areas.h | 11 +++-------- > > lib/arm64/asm/memory_areas.h | 11 +++-------- > > lib/powerpc/asm/memory_areas.h | 11 +++-------- > > lib/ppc64/asm/memory_areas.h | 11 +++-------- > > lib/s390x/asm/memory_areas.h | 13 ++++++------- > > lib/x86/asm/memory_areas.h | 27 ++++++++++++++++----------- > > lib/alloc_page.h | 3 +++ > > lib/alloc_page.c | 4 +--- > > 9 files changed, 42 insertions(+), 58 deletions(-) > > > > diff --git a/lib/asm-generic/memory_areas.h > > b/lib/asm-generic/memory_areas.h index 927baa7..3074afe 100644 > > --- a/lib/asm-generic/memory_areas.h > > +++ b/lib/asm-generic/memory_areas.h > > @@ -1,11 +1,10 @@ > > -#ifndef MEMORY_AREAS_H > > -#define MEMORY_AREAS_H > > +#ifndef __ASM_GENERIC_MEMORY_AREAS_H__ > > +#define __ASM_GENERIC_MEMORY_AREAS_H__ > > > > #define AREA_NORMAL_PFN 0 > > #define AREA_NORMAL_NUMBER 0 > > -#define AREA_NORMAL 1 > > +#define AREA_NORMAL (1 << AREA_NORMAL_NUMBER) > > > > -#define AREA_ANY -1 > > -#define AREA_ANY_NUMBER 0xff > > +#define MAX_AREAS 1 > > > > #endif > > diff --git a/lib/arm/asm/memory_areas.h b/lib/arm/asm/memory_areas.h > > index 927baa7..c723310 100644 > > --- a/lib/arm/asm/memory_areas.h > > +++ b/lib/arm/asm/memory_areas.h > > @@ -1,11 +1,6 @@ > > -#ifndef MEMORY_AREAS_H > > -#define MEMORY_AREAS_H > > +#ifndef _ASMARM_MEMORY_AREAS_H_ > > +#define _ASMARM_MEMORY_AREAS_H_ > > > > -#define AREA_NORMAL_PFN 0 > > -#define AREA_NORMAL_NUMBER 0 > > -#define AREA_NORMAL 1 > > - > > -#define AREA_ANY -1 > > -#define AREA_ANY_NUMBER 0xff > > +#include <asm-generic/memory_areas.h> > > > > #endif > > diff --git a/lib/arm64/asm/memory_areas.h > > b/lib/arm64/asm/memory_areas.h index 927baa7..18e8ca8 100644 > > --- a/lib/arm64/asm/memory_areas.h > > +++ b/lib/arm64/asm/memory_areas.h > > @@ -1,11 +1,6 @@ > > -#ifndef MEMORY_AREAS_H > > -#define MEMORY_AREAS_H > > +#ifndef _ASMARM64_MEMORY_AREAS_H_ > > +#define _ASMARM64_MEMORY_AREAS_H_ > > > > -#define AREA_NORMAL_PFN 0 > > -#define AREA_NORMAL_NUMBER 0 > > -#define AREA_NORMAL 1 > > - > > -#define AREA_ANY -1 > > -#define AREA_ANY_NUMBER 0xff > > +#include <asm-generic/memory_areas.h> > > > > #endif > > diff --git a/lib/powerpc/asm/memory_areas.h > > b/lib/powerpc/asm/memory_areas.h index 927baa7..76d1738 100644 > > --- a/lib/powerpc/asm/memory_areas.h > > +++ b/lib/powerpc/asm/memory_areas.h > > @@ -1,11 +1,6 @@ > > -#ifndef MEMORY_AREAS_H > > -#define MEMORY_AREAS_H > > +#ifndef _ASMPOWERPC_MEMORY_AREAS_H_ > > +#define _ASMPOWERPC_MEMORY_AREAS_H_ > > > > -#define AREA_NORMAL_PFN 0 > > -#define AREA_NORMAL_NUMBER 0 > > -#define AREA_NORMAL 1 > > - > > -#define AREA_ANY -1 > > -#define AREA_ANY_NUMBER 0xff > > +#include <asm-generic/memory_areas.h> > > > > #endif > > diff --git a/lib/ppc64/asm/memory_areas.h > > b/lib/ppc64/asm/memory_areas.h index 927baa7..b9fd46b 100644 > > --- a/lib/ppc64/asm/memory_areas.h > > +++ b/lib/ppc64/asm/memory_areas.h > > @@ -1,11 +1,6 @@ > > -#ifndef MEMORY_AREAS_H > > -#define MEMORY_AREAS_H > > +#ifndef _ASMPPC64_MEMORY_AREAS_H_ > > +#define _ASMPPC64_MEMORY_AREAS_H_ > > > > -#define AREA_NORMAL_PFN 0 > > -#define AREA_NORMAL_NUMBER 0 > > -#define AREA_NORMAL 1 > > - > > -#define AREA_ANY -1 > > -#define AREA_ANY_NUMBER 0xff > > +#include <asm-generic/memory_areas.h> > > > > #endif > > diff --git a/lib/s390x/asm/memory_areas.h > > b/lib/s390x/asm/memory_areas.h index 4856a27..827bfb3 100644 > > --- a/lib/s390x/asm/memory_areas.h > > +++ b/lib/s390x/asm/memory_areas.h > > @@ -1,16 +1,15 @@ > > -#ifndef MEMORY_AREAS_H > > -#define MEMORY_AREAS_H > > +#ifndef _ASMS390X_MEMORY_AREAS_H_ > > +#define _ASMS390X_MEMORY_AREAS_H_ > > > > -#define AREA_NORMAL_PFN BIT(31-12) > > +#define AREA_NORMAL_PFN (1 << 19) > > #define AREA_NORMAL_NUMBER 0 > > -#define AREA_NORMAL 1 > > +#define AREA_NORMAL (1 << AREA_NORMAL_NUMBER) > > > > #define AREA_LOW_PFN 0 > > #define AREA_LOW_NUMBER 1 > > -#define AREA_LOW 2 > > +#define AREA_LOW (1 << AREA_LOW_NUMBER) > > > > -#define AREA_ANY -1 > > -#define AREA_ANY_NUMBER 0xff > > +#define MAX_AREAS 2 > > > > #define AREA_DMA31 AREA_LOW > > > > diff --git a/lib/x86/asm/memory_areas.h b/lib/x86/asm/memory_areas.h > > index 952f5bd..e84016f 100644 > > --- a/lib/x86/asm/memory_areas.h > > +++ b/lib/x86/asm/memory_areas.h > > @@ -1,21 +1,26 @@ > > -#ifndef MEMORY_AREAS_H > > -#define MEMORY_AREAS_H > > +#ifndef _ASM_X86_MEMORY_AREAS_H_ > > +#define _ASM_X86_MEMORY_AREAS_H_ > > > > #define AREA_NORMAL_PFN BIT(36-12) > > #define AREA_NORMAL_NUMBER 0 > > -#define AREA_NORMAL 1 > > +#define AREA_NORMAL (1 << AREA_NORMAL_NUMBER) > > > > -#define AREA_PAE_HIGH_PFN BIT(32-12) > > -#define AREA_PAE_HIGH_NUMBER 1 > > -#define AREA_PAE_HIGH 2 > > +#define AREA_HIGH_PFN BIT(32-12) > > +#define AREA_HIGH_NUMBER 1 > > +#define AREA_HIGH (1 << AREA_HIGH_NUMBER) > > > > -#define AREA_LOW_PFN 0 > > +#define AREA_LOW_PFN BIT(24-12) > > #define AREA_LOW_NUMBER 2 > > -#define AREA_LOW 4 > > +#define AREA_LOW (1 << AREA_LOW_NUMBER) > > > > -#define AREA_PAE (AREA_PAE | AREA_LOW) > > +#define AREA_LOWEST_PFN 0 > > +#define AREA_LOWEST_NUMBER 3 > > +#define AREA_LOWEST (1 << AREA_LOWEST_NUMBER) > > > > -#define AREA_ANY -1 > > -#define AREA_ANY_NUMBER 0xff > > +#define MAX_AREAS 4 > > + > > +#define AREA_DMA24 AREA_LOWEST > > +#define AREA_DMA32 (AREA_LOWEST | AREA_LOW) > > +#define AREA_PAE36 (AREA_LOWEST | AREA_LOW | AREA_HIGH) > > This confuses the heck out of me. > The other things look ok to me though. if you want a page below 4G, then you don't want to restrict yourself to the area between 16M and 32G; the area below 16M is good too. same for 64G. > > > > #endif > > diff --git a/lib/alloc_page.h b/lib/alloc_page.h > > index 816ff5d..b6aace5 100644 > > --- a/lib/alloc_page.h > > +++ b/lib/alloc_page.h > > @@ -10,6 +10,9 @@ > > > > #include <asm/memory_areas.h> > > > > +#define AREA_ANY -1 > > +#define AREA_ANY_NUMBER 0xff > > + > > /* Returns true if the page allocator has been initialized */ > > bool page_alloc_initialized(void); > > > > diff --git a/lib/alloc_page.c b/lib/alloc_page.c > > index 685ab1e..ed0ff02 100644 > > --- a/lib/alloc_page.c > > +++ b/lib/alloc_page.c > > @@ -19,8 +19,6 @@ > > #define NLISTS ((BITS_PER_LONG) - (PAGE_SHIFT)) > > #define PFN(x) ((uintptr_t)(x) >> PAGE_SHIFT) > > > > -#define MAX_AREAS 6 > > - > > #define ORDER_MASK 0x3f > > #define ALLOC_MASK 0x40 > > #define SPECIAL_MASK 0x80 > > @@ -509,7 +507,7 @@ void page_alloc_init_area(u8 n, uintptr_t > > base_pfn, uintptr_t top_pfn) return; > > } > > #ifdef AREA_HIGH_PFN > > - __page_alloc_init_area(AREA_HIGH_NUMBER, AREA_HIGH_PFN), > > base_pfn, &top_pfn); > > + __page_alloc_init_area(AREA_HIGH_NUMBER, AREA_HIGH_PFN, > > base_pfn, &top_pfn); #endif > > __page_alloc_init_area(AREA_NORMAL_NUMBER, > > AREA_NORMAL_PFN, base_pfn, &top_pfn); #ifdef AREA_LOW_PFN > > >
Hi Claudio, On Fri, Jan 15, 2021 at 8:07 AM Claudio Imbrenda <imbrenda@linux.ibm.com> wrote: > > Fix the definitions of the memory areas. The test x86/smat.flat started falling for me at this commit. I'm testing on Linux 5.7.17. Here are the logs: timeout -k 1s --foreground 90s /usr/bin/qemu-system-x86_64 --no-reboot -nodefaults -device pc-testdev -device isa-debug-exit,iobase=0xf4,iosize=0x4 -vnc none -serial stdio -device pci-testdev -machine accel=kvm -kernel x86/smap.flat -smp 1 -cpu host # -initrd /tmp/tmp.s4WKgsHkOh enabling apic paging enabled cr0 = 80010011 cr3 = 1007000 cr4 = 20 testing without INVLPG PASS: write to supervisor page PASS: read from user page with AC=1 PASS: read from user page with AC=0 FAIL: write to user page with AC=1 FAIL: read from user page with AC=0 FAIL: write to user stack with AC=1 FAIL: write to user stack with AC=0 Unhandled exception 6 #UD at ip 0000000001800003 error_code=0000 rflags=00010082 cs=00000008 rax=000000000000000a rcx=00000000000003fd rdx=00000000000003f8 rbx=0000000000000000 rbp=0000000000517700 rsi=0000000000416422 rdi=0000000000000000 r8=0000000000416422 r9=00000000000003f8 r10=000000000000000d r11=000ffffffffff000 r12=0000000000000000 r13=0000000001418700 r14=0000000000000000 r15=0000000000000000 cr0=0000000080010011 cr2=00000000015176d8 cr3=0000000001007000 cr4=0000000000200020 cr8=0000000000000000 STACK: @1800003 400368 b'0x0000000001800003: ?? ??:0' > > Bring the headers in line with the rest of the asm headers, by having the > appropriate #ifdef _ASM$ARCH_ guarding the headers. > > Fixes: d74708246bd9 ("lib/asm: Add definitions of memory areas") > > Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com> > Reviewed-by: Krish Sadhukhan <krish.sadhukhan@oracle.com> > --- > lib/asm-generic/memory_areas.h | 9 ++++----- > lib/arm/asm/memory_areas.h | 11 +++-------- > lib/arm64/asm/memory_areas.h | 11 +++-------- > lib/powerpc/asm/memory_areas.h | 11 +++-------- > lib/ppc64/asm/memory_areas.h | 11 +++-------- > lib/s390x/asm/memory_areas.h | 13 ++++++------- > lib/x86/asm/memory_areas.h | 27 ++++++++++++++++----------- > lib/alloc_page.h | 3 +++ > lib/alloc_page.c | 4 +--- > 9 files changed, 42 insertions(+), 58 deletions(-) > > diff --git a/lib/asm-generic/memory_areas.h b/lib/asm-generic/memory_areas.h > index 927baa7..3074afe 100644 > --- a/lib/asm-generic/memory_areas.h > +++ b/lib/asm-generic/memory_areas.h > @@ -1,11 +1,10 @@ > -#ifndef MEMORY_AREAS_H > -#define MEMORY_AREAS_H > +#ifndef __ASM_GENERIC_MEMORY_AREAS_H__ > +#define __ASM_GENERIC_MEMORY_AREAS_H__ > > #define AREA_NORMAL_PFN 0 > #define AREA_NORMAL_NUMBER 0 > -#define AREA_NORMAL 1 > +#define AREA_NORMAL (1 << AREA_NORMAL_NUMBER) > > -#define AREA_ANY -1 > -#define AREA_ANY_NUMBER 0xff > +#define MAX_AREAS 1 > > #endif > diff --git a/lib/arm/asm/memory_areas.h b/lib/arm/asm/memory_areas.h > index 927baa7..c723310 100644 > --- a/lib/arm/asm/memory_areas.h > +++ b/lib/arm/asm/memory_areas.h > @@ -1,11 +1,6 @@ > -#ifndef MEMORY_AREAS_H > -#define MEMORY_AREAS_H > +#ifndef _ASMARM_MEMORY_AREAS_H_ > +#define _ASMARM_MEMORY_AREAS_H_ > > -#define AREA_NORMAL_PFN 0 > -#define AREA_NORMAL_NUMBER 0 > -#define AREA_NORMAL 1 > - > -#define AREA_ANY -1 > -#define AREA_ANY_NUMBER 0xff > +#include <asm-generic/memory_areas.h> > > #endif > diff --git a/lib/arm64/asm/memory_areas.h b/lib/arm64/asm/memory_areas.h > index 927baa7..18e8ca8 100644 > --- a/lib/arm64/asm/memory_areas.h > +++ b/lib/arm64/asm/memory_areas.h > @@ -1,11 +1,6 @@ > -#ifndef MEMORY_AREAS_H > -#define MEMORY_AREAS_H > +#ifndef _ASMARM64_MEMORY_AREAS_H_ > +#define _ASMARM64_MEMORY_AREAS_H_ > > -#define AREA_NORMAL_PFN 0 > -#define AREA_NORMAL_NUMBER 0 > -#define AREA_NORMAL 1 > - > -#define AREA_ANY -1 > -#define AREA_ANY_NUMBER 0xff > +#include <asm-generic/memory_areas.h> > > #endif > diff --git a/lib/powerpc/asm/memory_areas.h b/lib/powerpc/asm/memory_areas.h > index 927baa7..76d1738 100644 > --- a/lib/powerpc/asm/memory_areas.h > +++ b/lib/powerpc/asm/memory_areas.h > @@ -1,11 +1,6 @@ > -#ifndef MEMORY_AREAS_H > -#define MEMORY_AREAS_H > +#ifndef _ASMPOWERPC_MEMORY_AREAS_H_ > +#define _ASMPOWERPC_MEMORY_AREAS_H_ > > -#define AREA_NORMAL_PFN 0 > -#define AREA_NORMAL_NUMBER 0 > -#define AREA_NORMAL 1 > - > -#define AREA_ANY -1 > -#define AREA_ANY_NUMBER 0xff > +#include <asm-generic/memory_areas.h> > > #endif > diff --git a/lib/ppc64/asm/memory_areas.h b/lib/ppc64/asm/memory_areas.h > index 927baa7..b9fd46b 100644 > --- a/lib/ppc64/asm/memory_areas.h > +++ b/lib/ppc64/asm/memory_areas.h > @@ -1,11 +1,6 @@ > -#ifndef MEMORY_AREAS_H > -#define MEMORY_AREAS_H > +#ifndef _ASMPPC64_MEMORY_AREAS_H_ > +#define _ASMPPC64_MEMORY_AREAS_H_ > > -#define AREA_NORMAL_PFN 0 > -#define AREA_NORMAL_NUMBER 0 > -#define AREA_NORMAL 1 > - > -#define AREA_ANY -1 > -#define AREA_ANY_NUMBER 0xff > +#include <asm-generic/memory_areas.h> > > #endif > diff --git a/lib/s390x/asm/memory_areas.h b/lib/s390x/asm/memory_areas.h > index 4856a27..827bfb3 100644 > --- a/lib/s390x/asm/memory_areas.h > +++ b/lib/s390x/asm/memory_areas.h > @@ -1,16 +1,15 @@ > -#ifndef MEMORY_AREAS_H > -#define MEMORY_AREAS_H > +#ifndef _ASMS390X_MEMORY_AREAS_H_ > +#define _ASMS390X_MEMORY_AREAS_H_ > > -#define AREA_NORMAL_PFN BIT(31-12) > +#define AREA_NORMAL_PFN (1 << 19) > #define AREA_NORMAL_NUMBER 0 > -#define AREA_NORMAL 1 > +#define AREA_NORMAL (1 << AREA_NORMAL_NUMBER) > > #define AREA_LOW_PFN 0 > #define AREA_LOW_NUMBER 1 > -#define AREA_LOW 2 > +#define AREA_LOW (1 << AREA_LOW_NUMBER) > > -#define AREA_ANY -1 > -#define AREA_ANY_NUMBER 0xff > +#define MAX_AREAS 2 > > #define AREA_DMA31 AREA_LOW > > diff --git a/lib/x86/asm/memory_areas.h b/lib/x86/asm/memory_areas.h > index 952f5bd..e84016f 100644 > --- a/lib/x86/asm/memory_areas.h > +++ b/lib/x86/asm/memory_areas.h > @@ -1,21 +1,26 @@ > -#ifndef MEMORY_AREAS_H > -#define MEMORY_AREAS_H > +#ifndef _ASM_X86_MEMORY_AREAS_H_ > +#define _ASM_X86_MEMORY_AREAS_H_ > > #define AREA_NORMAL_PFN BIT(36-12) > #define AREA_NORMAL_NUMBER 0 > -#define AREA_NORMAL 1 > +#define AREA_NORMAL (1 << AREA_NORMAL_NUMBER) > > -#define AREA_PAE_HIGH_PFN BIT(32-12) > -#define AREA_PAE_HIGH_NUMBER 1 > -#define AREA_PAE_HIGH 2 > +#define AREA_HIGH_PFN BIT(32-12) > +#define AREA_HIGH_NUMBER 1 > +#define AREA_HIGH (1 << AREA_HIGH_NUMBER) > > -#define AREA_LOW_PFN 0 > +#define AREA_LOW_PFN BIT(24-12) > #define AREA_LOW_NUMBER 2 > -#define AREA_LOW 4 > +#define AREA_LOW (1 << AREA_LOW_NUMBER) > > -#define AREA_PAE (AREA_PAE | AREA_LOW) > +#define AREA_LOWEST_PFN 0 > +#define AREA_LOWEST_NUMBER 3 > +#define AREA_LOWEST (1 << AREA_LOWEST_NUMBER) > > -#define AREA_ANY -1 > -#define AREA_ANY_NUMBER 0xff > +#define MAX_AREAS 4 > + > +#define AREA_DMA24 AREA_LOWEST > +#define AREA_DMA32 (AREA_LOWEST | AREA_LOW) > +#define AREA_PAE36 (AREA_LOWEST | AREA_LOW | AREA_HIGH) > > #endif > diff --git a/lib/alloc_page.h b/lib/alloc_page.h > index 816ff5d..b6aace5 100644 > --- a/lib/alloc_page.h > +++ b/lib/alloc_page.h > @@ -10,6 +10,9 @@ > > #include <asm/memory_areas.h> > > +#define AREA_ANY -1 > +#define AREA_ANY_NUMBER 0xff > + > /* Returns true if the page allocator has been initialized */ > bool page_alloc_initialized(void); > > diff --git a/lib/alloc_page.c b/lib/alloc_page.c > index 685ab1e..ed0ff02 100644 > --- a/lib/alloc_page.c > +++ b/lib/alloc_page.c > @@ -19,8 +19,6 @@ > #define NLISTS ((BITS_PER_LONG) - (PAGE_SHIFT)) > #define PFN(x) ((uintptr_t)(x) >> PAGE_SHIFT) > > -#define MAX_AREAS 6 > - > #define ORDER_MASK 0x3f > #define ALLOC_MASK 0x40 > #define SPECIAL_MASK 0x80 > @@ -509,7 +507,7 @@ void page_alloc_init_area(u8 n, uintptr_t base_pfn, uintptr_t top_pfn) > return; > } > #ifdef AREA_HIGH_PFN > - __page_alloc_init_area(AREA_HIGH_NUMBER, AREA_HIGH_PFN), base_pfn, &top_pfn); > + __page_alloc_init_area(AREA_HIGH_NUMBER, AREA_HIGH_PFN, base_pfn, &top_pfn); > #endif > __page_alloc_init_area(AREA_NORMAL_NUMBER, AREA_NORMAL_PFN, base_pfn, &top_pfn); > #ifdef AREA_LOW_PFN > -- > 2.26.2 >
On 21/01/2021 02.23, David Matlack wrote: > Hi Claudio, > > On Fri, Jan 15, 2021 at 8:07 AM Claudio Imbrenda <imbrenda@linux.ibm.com> wrote: >> >> Fix the definitions of the memory areas. > > The test x86/smat.flat started falling for me at this commit. I'm > testing on Linux 5.7.17. FWIW, seems like this was also happening on Travis, just before it became useless. Build #15 is still fine: https://travis-ci.com/gitlab/kvm-unit-tests/kvm-unit-tests/builds/213551621 But build #18 reported a broken smat test: https://travis-ci.com/gitlab/kvm-unit-tests/kvm-unit-tests/builds/213564672 The job logs say that the builders there use kernel version 5.4.0-1034-gcp Thomas
On Wed, 20 Jan 2021 17:23:33 -0800 David Matlack <dmatlack@google.com> wrote: > Hi Claudio, > > On Fri, Jan 15, 2021 at 8:07 AM Claudio Imbrenda > <imbrenda@linux.ibm.com> wrote: > > > > Fix the definitions of the memory areas. > > The test x86/smat.flat started falling for me at this commit. I'm > testing on Linux 5.7.17. > > Here are the logs: the test does not fail with the default configuration, maybe the default configuration should be changed? I would have noticed the issue otherwise. after a quick look at the testcase itself, it's quite obvious to me that it is broken, since it completely relied on the fact that the page allocator would not touch memory above 16M. this is not the case any more. I have fixed the testcase, I'll post a patch > timeout -k 1s --foreground 90s /usr/bin/qemu-system-x86_64 --no-reboot > -nodefaults -device pc-testdev -device > isa-debug-exit,iobase=0xf4,iosize=0x4 -vnc none -serial stdio -device > pci-testdev -machine accel=kvm -kernel x86/smap.flat -smp 1 -cpu host > # -initrd /tmp/tmp.s4WKgsHkOh > enabling apic > paging enabled > cr0 = 80010011 > cr3 = 1007000 > cr4 = 20 > testing without INVLPG > PASS: write to supervisor page > PASS: read from user page with AC=1 > PASS: read from user page with AC=0 > FAIL: write to user page with AC=1 > FAIL: read from user page with AC=0 > FAIL: write to user stack with AC=1 > FAIL: write to user stack with AC=0 > Unhandled exception 6 #UD at ip 0000000001800003 > error_code=0000 rflags=00010082 cs=00000008 > rax=000000000000000a rcx=00000000000003fd rdx=00000000000003f8 > rbx=0000000000000000 > rbp=0000000000517700 rsi=0000000000416422 rdi=0000000000000000 > r8=0000000000416422 r9=00000000000003f8 r10=000000000000000d > r11=000ffffffffff000 > r12=0000000000000000 r13=0000000001418700 r14=0000000000000000 > r15=0000000000000000 > cr0=0000000080010011 cr2=00000000015176d8 cr3=0000000001007000 > cr4=0000000000200020 > cr8=0000000000000000 > STACK: @1800003 400368 > b'0x0000000001800003: ?? ??:0' > > > > > > > Bring the headers in line with the rest of the asm headers, by > > having the appropriate #ifdef _ASM$ARCH_ guarding the headers. > > > > Fixes: d74708246bd9 ("lib/asm: Add definitions of memory areas") > > > > Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com> > > Reviewed-by: Krish Sadhukhan <krish.sadhukhan@oracle.com> > > --- > > lib/asm-generic/memory_areas.h | 9 ++++----- > > lib/arm/asm/memory_areas.h | 11 +++-------- > > lib/arm64/asm/memory_areas.h | 11 +++-------- > > lib/powerpc/asm/memory_areas.h | 11 +++-------- > > lib/ppc64/asm/memory_areas.h | 11 +++-------- > > lib/s390x/asm/memory_areas.h | 13 ++++++------- > > lib/x86/asm/memory_areas.h | 27 ++++++++++++++++----------- > > lib/alloc_page.h | 3 +++ > > lib/alloc_page.c | 4 +--- > > 9 files changed, 42 insertions(+), 58 deletions(-) > > > > diff --git a/lib/asm-generic/memory_areas.h > > b/lib/asm-generic/memory_areas.h index 927baa7..3074afe 100644 > > --- a/lib/asm-generic/memory_areas.h > > +++ b/lib/asm-generic/memory_areas.h > > @@ -1,11 +1,10 @@ > > -#ifndef MEMORY_AREAS_H > > -#define MEMORY_AREAS_H > > +#ifndef __ASM_GENERIC_MEMORY_AREAS_H__ > > +#define __ASM_GENERIC_MEMORY_AREAS_H__ > > > > #define AREA_NORMAL_PFN 0 > > #define AREA_NORMAL_NUMBER 0 > > -#define AREA_NORMAL 1 > > +#define AREA_NORMAL (1 << AREA_NORMAL_NUMBER) > > > > -#define AREA_ANY -1 > > -#define AREA_ANY_NUMBER 0xff > > +#define MAX_AREAS 1 > > > > #endif > > diff --git a/lib/arm/asm/memory_areas.h b/lib/arm/asm/memory_areas.h > > index 927baa7..c723310 100644 > > --- a/lib/arm/asm/memory_areas.h > > +++ b/lib/arm/asm/memory_areas.h > > @@ -1,11 +1,6 @@ > > -#ifndef MEMORY_AREAS_H > > -#define MEMORY_AREAS_H > > +#ifndef _ASMARM_MEMORY_AREAS_H_ > > +#define _ASMARM_MEMORY_AREAS_H_ > > > > -#define AREA_NORMAL_PFN 0 > > -#define AREA_NORMAL_NUMBER 0 > > -#define AREA_NORMAL 1 > > - > > -#define AREA_ANY -1 > > -#define AREA_ANY_NUMBER 0xff > > +#include <asm-generic/memory_areas.h> > > > > #endif > > diff --git a/lib/arm64/asm/memory_areas.h > > b/lib/arm64/asm/memory_areas.h index 927baa7..18e8ca8 100644 > > --- a/lib/arm64/asm/memory_areas.h > > +++ b/lib/arm64/asm/memory_areas.h > > @@ -1,11 +1,6 @@ > > -#ifndef MEMORY_AREAS_H > > -#define MEMORY_AREAS_H > > +#ifndef _ASMARM64_MEMORY_AREAS_H_ > > +#define _ASMARM64_MEMORY_AREAS_H_ > > > > -#define AREA_NORMAL_PFN 0 > > -#define AREA_NORMAL_NUMBER 0 > > -#define AREA_NORMAL 1 > > - > > -#define AREA_ANY -1 > > -#define AREA_ANY_NUMBER 0xff > > +#include <asm-generic/memory_areas.h> > > > > #endif > > diff --git a/lib/powerpc/asm/memory_areas.h > > b/lib/powerpc/asm/memory_areas.h index 927baa7..76d1738 100644 > > --- a/lib/powerpc/asm/memory_areas.h > > +++ b/lib/powerpc/asm/memory_areas.h > > @@ -1,11 +1,6 @@ > > -#ifndef MEMORY_AREAS_H > > -#define MEMORY_AREAS_H > > +#ifndef _ASMPOWERPC_MEMORY_AREAS_H_ > > +#define _ASMPOWERPC_MEMORY_AREAS_H_ > > > > -#define AREA_NORMAL_PFN 0 > > -#define AREA_NORMAL_NUMBER 0 > > -#define AREA_NORMAL 1 > > - > > -#define AREA_ANY -1 > > -#define AREA_ANY_NUMBER 0xff > > +#include <asm-generic/memory_areas.h> > > > > #endif > > diff --git a/lib/ppc64/asm/memory_areas.h > > b/lib/ppc64/asm/memory_areas.h index 927baa7..b9fd46b 100644 > > --- a/lib/ppc64/asm/memory_areas.h > > +++ b/lib/ppc64/asm/memory_areas.h > > @@ -1,11 +1,6 @@ > > -#ifndef MEMORY_AREAS_H > > -#define MEMORY_AREAS_H > > +#ifndef _ASMPPC64_MEMORY_AREAS_H_ > > +#define _ASMPPC64_MEMORY_AREAS_H_ > > > > -#define AREA_NORMAL_PFN 0 > > -#define AREA_NORMAL_NUMBER 0 > > -#define AREA_NORMAL 1 > > - > > -#define AREA_ANY -1 > > -#define AREA_ANY_NUMBER 0xff > > +#include <asm-generic/memory_areas.h> > > > > #endif > > diff --git a/lib/s390x/asm/memory_areas.h > > b/lib/s390x/asm/memory_areas.h index 4856a27..827bfb3 100644 > > --- a/lib/s390x/asm/memory_areas.h > > +++ b/lib/s390x/asm/memory_areas.h > > @@ -1,16 +1,15 @@ > > -#ifndef MEMORY_AREAS_H > > -#define MEMORY_AREAS_H > > +#ifndef _ASMS390X_MEMORY_AREAS_H_ > > +#define _ASMS390X_MEMORY_AREAS_H_ > > > > -#define AREA_NORMAL_PFN BIT(31-12) > > +#define AREA_NORMAL_PFN (1 << 19) > > #define AREA_NORMAL_NUMBER 0 > > -#define AREA_NORMAL 1 > > +#define AREA_NORMAL (1 << AREA_NORMAL_NUMBER) > > > > #define AREA_LOW_PFN 0 > > #define AREA_LOW_NUMBER 1 > > -#define AREA_LOW 2 > > +#define AREA_LOW (1 << AREA_LOW_NUMBER) > > > > -#define AREA_ANY -1 > > -#define AREA_ANY_NUMBER 0xff > > +#define MAX_AREAS 2 > > > > #define AREA_DMA31 AREA_LOW > > > > diff --git a/lib/x86/asm/memory_areas.h b/lib/x86/asm/memory_areas.h > > index 952f5bd..e84016f 100644 > > --- a/lib/x86/asm/memory_areas.h > > +++ b/lib/x86/asm/memory_areas.h > > @@ -1,21 +1,26 @@ > > -#ifndef MEMORY_AREAS_H > > -#define MEMORY_AREAS_H > > +#ifndef _ASM_X86_MEMORY_AREAS_H_ > > +#define _ASM_X86_MEMORY_AREAS_H_ > > > > #define AREA_NORMAL_PFN BIT(36-12) > > #define AREA_NORMAL_NUMBER 0 > > -#define AREA_NORMAL 1 > > +#define AREA_NORMAL (1 << AREA_NORMAL_NUMBER) > > > > -#define AREA_PAE_HIGH_PFN BIT(32-12) > > -#define AREA_PAE_HIGH_NUMBER 1 > > -#define AREA_PAE_HIGH 2 > > +#define AREA_HIGH_PFN BIT(32-12) > > +#define AREA_HIGH_NUMBER 1 > > +#define AREA_HIGH (1 << AREA_HIGH_NUMBER) > > > > -#define AREA_LOW_PFN 0 > > +#define AREA_LOW_PFN BIT(24-12) > > #define AREA_LOW_NUMBER 2 > > -#define AREA_LOW 4 > > +#define AREA_LOW (1 << AREA_LOW_NUMBER) > > > > -#define AREA_PAE (AREA_PAE | AREA_LOW) > > +#define AREA_LOWEST_PFN 0 > > +#define AREA_LOWEST_NUMBER 3 > > +#define AREA_LOWEST (1 << AREA_LOWEST_NUMBER) > > > > -#define AREA_ANY -1 > > -#define AREA_ANY_NUMBER 0xff > > +#define MAX_AREAS 4 > > + > > +#define AREA_DMA24 AREA_LOWEST > > +#define AREA_DMA32 (AREA_LOWEST | AREA_LOW) > > +#define AREA_PAE36 (AREA_LOWEST | AREA_LOW | AREA_HIGH) > > > > #endif > > diff --git a/lib/alloc_page.h b/lib/alloc_page.h > > index 816ff5d..b6aace5 100644 > > --- a/lib/alloc_page.h > > +++ b/lib/alloc_page.h > > @@ -10,6 +10,9 @@ > > > > #include <asm/memory_areas.h> > > > > +#define AREA_ANY -1 > > +#define AREA_ANY_NUMBER 0xff > > + > > /* Returns true if the page allocator has been initialized */ > > bool page_alloc_initialized(void); > > > > diff --git a/lib/alloc_page.c b/lib/alloc_page.c > > index 685ab1e..ed0ff02 100644 > > --- a/lib/alloc_page.c > > +++ b/lib/alloc_page.c > > @@ -19,8 +19,6 @@ > > #define NLISTS ((BITS_PER_LONG) - (PAGE_SHIFT)) > > #define PFN(x) ((uintptr_t)(x) >> PAGE_SHIFT) > > > > -#define MAX_AREAS 6 > > - > > #define ORDER_MASK 0x3f > > #define ALLOC_MASK 0x40 > > #define SPECIAL_MASK 0x80 > > @@ -509,7 +507,7 @@ void page_alloc_init_area(u8 n, uintptr_t > > base_pfn, uintptr_t top_pfn) return; > > } > > #ifdef AREA_HIGH_PFN > > - __page_alloc_init_area(AREA_HIGH_NUMBER, AREA_HIGH_PFN), > > base_pfn, &top_pfn); > > + __page_alloc_init_area(AREA_HIGH_NUMBER, AREA_HIGH_PFN, > > base_pfn, &top_pfn); #endif > > __page_alloc_init_area(AREA_NORMAL_NUMBER, AREA_NORMAL_PFN, > > base_pfn, &top_pfn); #ifdef AREA_LOW_PFN > > -- > > 2.26.2 > >
diff --git a/lib/asm-generic/memory_areas.h b/lib/asm-generic/memory_areas.h index 927baa7..3074afe 100644 --- a/lib/asm-generic/memory_areas.h +++ b/lib/asm-generic/memory_areas.h @@ -1,11 +1,10 @@ -#ifndef MEMORY_AREAS_H -#define MEMORY_AREAS_H +#ifndef __ASM_GENERIC_MEMORY_AREAS_H__ +#define __ASM_GENERIC_MEMORY_AREAS_H__ #define AREA_NORMAL_PFN 0 #define AREA_NORMAL_NUMBER 0 -#define AREA_NORMAL 1 +#define AREA_NORMAL (1 << AREA_NORMAL_NUMBER) -#define AREA_ANY -1 -#define AREA_ANY_NUMBER 0xff +#define MAX_AREAS 1 #endif diff --git a/lib/arm/asm/memory_areas.h b/lib/arm/asm/memory_areas.h index 927baa7..c723310 100644 --- a/lib/arm/asm/memory_areas.h +++ b/lib/arm/asm/memory_areas.h @@ -1,11 +1,6 @@ -#ifndef MEMORY_AREAS_H -#define MEMORY_AREAS_H +#ifndef _ASMARM_MEMORY_AREAS_H_ +#define _ASMARM_MEMORY_AREAS_H_ -#define AREA_NORMAL_PFN 0 -#define AREA_NORMAL_NUMBER 0 -#define AREA_NORMAL 1 - -#define AREA_ANY -1 -#define AREA_ANY_NUMBER 0xff +#include <asm-generic/memory_areas.h> #endif diff --git a/lib/arm64/asm/memory_areas.h b/lib/arm64/asm/memory_areas.h index 927baa7..18e8ca8 100644 --- a/lib/arm64/asm/memory_areas.h +++ b/lib/arm64/asm/memory_areas.h @@ -1,11 +1,6 @@ -#ifndef MEMORY_AREAS_H -#define MEMORY_AREAS_H +#ifndef _ASMARM64_MEMORY_AREAS_H_ +#define _ASMARM64_MEMORY_AREAS_H_ -#define AREA_NORMAL_PFN 0 -#define AREA_NORMAL_NUMBER 0 -#define AREA_NORMAL 1 - -#define AREA_ANY -1 -#define AREA_ANY_NUMBER 0xff +#include <asm-generic/memory_areas.h> #endif diff --git a/lib/powerpc/asm/memory_areas.h b/lib/powerpc/asm/memory_areas.h index 927baa7..76d1738 100644 --- a/lib/powerpc/asm/memory_areas.h +++ b/lib/powerpc/asm/memory_areas.h @@ -1,11 +1,6 @@ -#ifndef MEMORY_AREAS_H -#define MEMORY_AREAS_H +#ifndef _ASMPOWERPC_MEMORY_AREAS_H_ +#define _ASMPOWERPC_MEMORY_AREAS_H_ -#define AREA_NORMAL_PFN 0 -#define AREA_NORMAL_NUMBER 0 -#define AREA_NORMAL 1 - -#define AREA_ANY -1 -#define AREA_ANY_NUMBER 0xff +#include <asm-generic/memory_areas.h> #endif diff --git a/lib/ppc64/asm/memory_areas.h b/lib/ppc64/asm/memory_areas.h index 927baa7..b9fd46b 100644 --- a/lib/ppc64/asm/memory_areas.h +++ b/lib/ppc64/asm/memory_areas.h @@ -1,11 +1,6 @@ -#ifndef MEMORY_AREAS_H -#define MEMORY_AREAS_H +#ifndef _ASMPPC64_MEMORY_AREAS_H_ +#define _ASMPPC64_MEMORY_AREAS_H_ -#define AREA_NORMAL_PFN 0 -#define AREA_NORMAL_NUMBER 0 -#define AREA_NORMAL 1 - -#define AREA_ANY -1 -#define AREA_ANY_NUMBER 0xff +#include <asm-generic/memory_areas.h> #endif diff --git a/lib/s390x/asm/memory_areas.h b/lib/s390x/asm/memory_areas.h index 4856a27..827bfb3 100644 --- a/lib/s390x/asm/memory_areas.h +++ b/lib/s390x/asm/memory_areas.h @@ -1,16 +1,15 @@ -#ifndef MEMORY_AREAS_H -#define MEMORY_AREAS_H +#ifndef _ASMS390X_MEMORY_AREAS_H_ +#define _ASMS390X_MEMORY_AREAS_H_ -#define AREA_NORMAL_PFN BIT(31-12) +#define AREA_NORMAL_PFN (1 << 19) #define AREA_NORMAL_NUMBER 0 -#define AREA_NORMAL 1 +#define AREA_NORMAL (1 << AREA_NORMAL_NUMBER) #define AREA_LOW_PFN 0 #define AREA_LOW_NUMBER 1 -#define AREA_LOW 2 +#define AREA_LOW (1 << AREA_LOW_NUMBER) -#define AREA_ANY -1 -#define AREA_ANY_NUMBER 0xff +#define MAX_AREAS 2 #define AREA_DMA31 AREA_LOW diff --git a/lib/x86/asm/memory_areas.h b/lib/x86/asm/memory_areas.h index 952f5bd..e84016f 100644 --- a/lib/x86/asm/memory_areas.h +++ b/lib/x86/asm/memory_areas.h @@ -1,21 +1,26 @@ -#ifndef MEMORY_AREAS_H -#define MEMORY_AREAS_H +#ifndef _ASM_X86_MEMORY_AREAS_H_ +#define _ASM_X86_MEMORY_AREAS_H_ #define AREA_NORMAL_PFN BIT(36-12) #define AREA_NORMAL_NUMBER 0 -#define AREA_NORMAL 1 +#define AREA_NORMAL (1 << AREA_NORMAL_NUMBER) -#define AREA_PAE_HIGH_PFN BIT(32-12) -#define AREA_PAE_HIGH_NUMBER 1 -#define AREA_PAE_HIGH 2 +#define AREA_HIGH_PFN BIT(32-12) +#define AREA_HIGH_NUMBER 1 +#define AREA_HIGH (1 << AREA_HIGH_NUMBER) -#define AREA_LOW_PFN 0 +#define AREA_LOW_PFN BIT(24-12) #define AREA_LOW_NUMBER 2 -#define AREA_LOW 4 +#define AREA_LOW (1 << AREA_LOW_NUMBER) -#define AREA_PAE (AREA_PAE | AREA_LOW) +#define AREA_LOWEST_PFN 0 +#define AREA_LOWEST_NUMBER 3 +#define AREA_LOWEST (1 << AREA_LOWEST_NUMBER) -#define AREA_ANY -1 -#define AREA_ANY_NUMBER 0xff +#define MAX_AREAS 4 + +#define AREA_DMA24 AREA_LOWEST +#define AREA_DMA32 (AREA_LOWEST | AREA_LOW) +#define AREA_PAE36 (AREA_LOWEST | AREA_LOW | AREA_HIGH) #endif diff --git a/lib/alloc_page.h b/lib/alloc_page.h index 816ff5d..b6aace5 100644 --- a/lib/alloc_page.h +++ b/lib/alloc_page.h @@ -10,6 +10,9 @@ #include <asm/memory_areas.h> +#define AREA_ANY -1 +#define AREA_ANY_NUMBER 0xff + /* Returns true if the page allocator has been initialized */ bool page_alloc_initialized(void); diff --git a/lib/alloc_page.c b/lib/alloc_page.c index 685ab1e..ed0ff02 100644 --- a/lib/alloc_page.c +++ b/lib/alloc_page.c @@ -19,8 +19,6 @@ #define NLISTS ((BITS_PER_LONG) - (PAGE_SHIFT)) #define PFN(x) ((uintptr_t)(x) >> PAGE_SHIFT) -#define MAX_AREAS 6 - #define ORDER_MASK 0x3f #define ALLOC_MASK 0x40 #define SPECIAL_MASK 0x80 @@ -509,7 +507,7 @@ void page_alloc_init_area(u8 n, uintptr_t base_pfn, uintptr_t top_pfn) return; } #ifdef AREA_HIGH_PFN - __page_alloc_init_area(AREA_HIGH_NUMBER, AREA_HIGH_PFN), base_pfn, &top_pfn); + __page_alloc_init_area(AREA_HIGH_NUMBER, AREA_HIGH_PFN, base_pfn, &top_pfn); #endif __page_alloc_init_area(AREA_NORMAL_NUMBER, AREA_NORMAL_PFN, base_pfn, &top_pfn); #ifdef AREA_LOW_PFN
Fix the definitions of the memory areas. Bring the headers in line with the rest of the asm headers, by having the appropriate #ifdef _ASM$ARCH_ guarding the headers. Fixes: d74708246bd9 ("lib/asm: Add definitions of memory areas") Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com> Reviewed-by: Krish Sadhukhan <krish.sadhukhan@oracle.com> --- lib/asm-generic/memory_areas.h | 9 ++++----- lib/arm/asm/memory_areas.h | 11 +++-------- lib/arm64/asm/memory_areas.h | 11 +++-------- lib/powerpc/asm/memory_areas.h | 11 +++-------- lib/ppc64/asm/memory_areas.h | 11 +++-------- lib/s390x/asm/memory_areas.h | 13 ++++++------- lib/x86/asm/memory_areas.h | 27 ++++++++++++++++----------- lib/alloc_page.h | 3 +++ lib/alloc_page.c | 4 +--- 9 files changed, 42 insertions(+), 58 deletions(-)