Re: [PATCH 03/33] accel/tcg: Restrict tlb_protect/unprotect_code() to TCG

[Chao Liu <chao.liu.zevorn@gmail.com>]

On Wed, Jul 01, 2026 at 12:00:30AM +0800, Philippe Mathieu-Daudé wrote:
> Both tlb_protect() and tlb_unprotect_code() are only used
> within accel/tcg/. Avoid exposing them to the whole code base,
> declare them in a new "system-page-protection.h" local header.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Reviewed-by: Chao Liu <chao.liu.zevorn@gmail.com>

> ---
>  accel/tcg/system-page-protection.h | 17 +++++++++++++++++
>  include/exec/cputlb.h              |  8 ++------
>  accel/tcg/cputlb.c                 |  3 ++-
>  accel/tcg/tb-maint.c               |  1 +
>  4 files changed, 22 insertions(+), 7 deletions(-)
>  create mode 100644 accel/tcg/system-page-protection.h
> 
> diff --git a/accel/tcg/system-page-protection.h b/accel/tcg/system-page-protection.h
> new file mode 100644
> index 00000000000..52896c6d24a
> --- /dev/null
> +++ b/accel/tcg/system-page-protection.h
> @@ -0,0 +1,17 @@
> +/*
> + * QEMU page protection (system emulation)
> + *
> + *  Copyright (c) 2003 Fabrice Bellard
> + *
> + * SPDX-License-Identifier: LGPL-2.1-or-later
> + */
> +#ifndef SYSTEM_PAGE_PROTECTION_H
> +#define SYSTEM_PAGE_PROTECTION_H
> +
> +#include "system/ram_addr.h"
> +
> +void tlb_protect_code(ram_addr_t ram_addr);
> +void tlb_unprotect_code(ram_addr_t ram_addr);
> +
> +#endif
> +
> diff --git a/include/exec/cputlb.h b/include/exec/cputlb.h
> index 3a9603a6965..f7f7020382d 100644
> --- a/include/exec/cputlb.h
> +++ b/include/exec/cputlb.h
> @@ -24,14 +24,10 @@
>  #include "exec/hwaddr.h"
>  #include "exec/memattrs.h"
>  #include "exec/vaddr.h"
> -#include "system/ram_addr.h"
> -
> -#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY)
> -void tlb_protect_code(ram_addr_t ram_addr);
> -void tlb_unprotect_code(ram_addr_t ram_addr);
> -#endif
>  
>  #ifndef CONFIG_USER_ONLY
> +#include "system/ram_addr.h"
> +
>  void tlb_reset_dirty(CPUState *cpu, uintptr_t start, uintptr_t length);
>  void tlb_reset_dirty_range_all(ram_addr_t start, ram_addr_t length);
>  #endif
> diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
> index 6e66f3c6e93..7f7c208ba12 100644
> --- a/accel/tcg/cputlb.c
> +++ b/accel/tcg/cputlb.c
> @@ -1,5 +1,5 @@
>  /*
> - *  Common CPU TLB handling
> + *  Common CPU TLB handling (system emulation)
>   *
>   *  Copyright (c) 2003 Fabrice Bellard
>   *
> @@ -47,6 +47,7 @@
>  #include "tb-hash.h"
>  #include "tlb-bounds.h"
>  #include "internal-common.h"
> +#include "system-page-protection.h"
>  #ifdef CONFIG_PLUGIN
>  #include "qemu/plugin-memory.h"
>  #endif
> diff --git a/accel/tcg/tb-maint.c b/accel/tcg/tb-maint.c
> index c33dbf65e7f..4313864d2c5 100644
> --- a/accel/tcg/tb-maint.c
> +++ b/accel/tcg/tb-maint.c
> @@ -38,6 +38,7 @@
>  #include "user/page-protection.h"
>  #define runstate_is_running()  true
>  #else
> +#include "system-page-protection.h"
>  #include "system/runstate.h"
>  #endif
>  #include "trace.h"
> -- 
> 2.53.0
>