diff mbox series

[v4,12/12] exec: Fix overlap of PAGE_ANON and PAGE_TARGET_1

Message ID 20210406174031.64299-13-richard.henderson@linaro.org
State Superseded
Headers show
Series target/arm mte fixes | expand

Commit Message

Richard Henderson April 6, 2021, 5:40 p.m. UTC
Unfortuately, the elements of PAGE_* were not in numerical
order and so PAGE_ANON was added to an "unused" bit.
As an arbitrary choice, move PAGE_TARGET_{1,2} together.

Cc: Laurent Vivier <laurent@vivier.eu>
Fixes: 26bab757d41b ("linux-user: Introduce PAGE_ANON")
Buglink: https://bugs.launchpad.net/bugs/1922617
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---
 include/exec/cpu-all.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.25.1

Comments

Laurent Vivier April 6, 2021, 6:21 p.m. UTC | #1
Le 06/04/2021 à 19:40, Richard Henderson a écrit :
> Unfortuately, the elements of PAGE_* were not in numerical

> order and so PAGE_ANON was added to an "unused" bit.

> As an arbitrary choice, move PAGE_TARGET_{1,2} together.

> 

> Cc: Laurent Vivier <laurent@vivier.eu>

> Fixes: 26bab757d41b ("linux-user: Introduce PAGE_ANON")

> Buglink: https://bugs.launchpad.net/bugs/1922617

> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

> ---

>  include/exec/cpu-all.h | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)

> 

> diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h

> index d76b0b9e02..32cfb634c6 100644

> --- a/include/exec/cpu-all.h

> +++ b/include/exec/cpu-all.h

> @@ -268,8 +268,8 @@ extern intptr_t qemu_host_page_mask;

>  #define PAGE_RESERVED  0x0100

>  #endif

>  /* Target-specific bits that will be used via page_get_flags().  */

> -#define PAGE_TARGET_1  0x0080

> -#define PAGE_TARGET_2  0x0200

> +#define PAGE_TARGET_1  0x0200

> +#define PAGE_TARGET_2  0x0400

>  

>  #if defined(CONFIG_USER_ONLY)

>  void page_dump(FILE *f);

> 


Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Laurent Vivier April 6, 2021, 7:36 p.m. UTC | #2
Le 06/04/2021 à 19:40, Richard Henderson a écrit :
> Unfortuately, the elements of PAGE_* were not in numerical

> order and so PAGE_ANON was added to an "unused" bit.

> As an arbitrary choice, move PAGE_TARGET_{1,2} together.

> 

> Cc: Laurent Vivier <laurent@vivier.eu>

> Fixes: 26bab757d41b ("linux-user: Introduce PAGE_ANON")

> Buglink: https://bugs.launchpad.net/bugs/1922617

> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

> ---

>  include/exec/cpu-all.h | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)

> 

> diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h

> index d76b0b9e02..32cfb634c6 100644

> --- a/include/exec/cpu-all.h

> +++ b/include/exec/cpu-all.h

> @@ -268,8 +268,8 @@ extern intptr_t qemu_host_page_mask;

>  #define PAGE_RESERVED  0x0100

>  #endif

>  /* Target-specific bits that will be used via page_get_flags().  */

> -#define PAGE_TARGET_1  0x0080

> -#define PAGE_TARGET_2  0x0200

> +#define PAGE_TARGET_1  0x0200

> +#define PAGE_TARGET_2  0x0400

>  

>  #if defined(CONFIG_USER_ONLY)

>  void page_dump(FILE *f);

> 


Tested-by: Laurent Vivier <laurent@vivier.eu>
Alex Bennée April 7, 2021, 5:16 p.m. UTC | #3
Richard Henderson <richard.henderson@linaro.org> writes:

> Unfortuately, the elements of PAGE_* were not in numerical

> order and so PAGE_ANON was added to an "unused" bit.

> As an arbitrary choice, move PAGE_TARGET_{1,2} together.

>

> Cc: Laurent Vivier <laurent@vivier.eu>

> Fixes: 26bab757d41b ("linux-user: Introduce PAGE_ANON")

> Buglink: https://bugs.launchpad.net/bugs/1922617

> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Reviewed-by: Alex Bennée <alex.bennee@linaro.org>


-- 
Alex Bennée
Nathan Chancellor April 7, 2021, 9:33 p.m. UTC | #4
On Tue, Apr 06, 2021 at 10:40:31AM -0700, Richard Henderson wrote:
> Unfortuately, the elements of PAGE_* were not in numerical

> order and so PAGE_ANON was added to an "unused" bit.

> As an arbitrary choice, move PAGE_TARGET_{1,2} together.

> 

> Cc: Laurent Vivier <laurent@vivier.eu>

> Fixes: 26bab757d41b ("linux-user: Introduce PAGE_ANON")

> Buglink: https://bugs.launchpad.net/bugs/1922617

> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Tested-by: Nathan Chancellor <nathan@kernel.org>


> ---

>  include/exec/cpu-all.h | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)

> 

> diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h

> index d76b0b9e02..32cfb634c6 100644

> --- a/include/exec/cpu-all.h

> +++ b/include/exec/cpu-all.h

> @@ -268,8 +268,8 @@ extern intptr_t qemu_host_page_mask;

>  #define PAGE_RESERVED  0x0100

>  #endif

>  /* Target-specific bits that will be used via page_get_flags().  */

> -#define PAGE_TARGET_1  0x0080

> -#define PAGE_TARGET_2  0x0200

> +#define PAGE_TARGET_1  0x0200

> +#define PAGE_TARGET_2  0x0400

>  

>  #if defined(CONFIG_USER_ONLY)

>  void page_dump(FILE *f);

> -- 

> 2.25.1

> 

>
diff mbox series

Patch

diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index d76b0b9e02..32cfb634c6 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -268,8 +268,8 @@  extern intptr_t qemu_host_page_mask;
 #define PAGE_RESERVED  0x0100
 #endif
 /* Target-specific bits that will be used via page_get_flags().  */
-#define PAGE_TARGET_1  0x0080
-#define PAGE_TARGET_2  0x0200
+#define PAGE_TARGET_1  0x0200
+#define PAGE_TARGET_2  0x0400
 
 #if defined(CONFIG_USER_ONLY)
 void page_dump(FILE *f);