include/exec/exec-all.h | 2 +- accel/tcg/cputlb.c | 4 ++-- target/arm/mte_helper.c | 4 ++-- target/arm/ptw.c | 2 +- target/arm/sve_helper.c | 2 +- target/arm/translate-a64.c | 2 +- target/i386/tcg/sysemu/excp_helper.c | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-)
Change to match the recent change to probe_access_flags.
All existing callers updated to supply 0, so no change in behaviour.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/exec-all.h | 2 +-
accel/tcg/cputlb.c | 4 ++--
target/arm/mte_helper.c | 4 ++--
target/arm/ptw.c | 2 +-
target/arm/sve_helper.c | 2 +-
target/arm/translate-a64.c | 2 +-
target/i386/tcg/sysemu/excp_helper.c | 4 ++--
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 165b050872..b631832e17 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -475,7 +475,7 @@ int probe_access_flags(CPUArchState *env, target_ulong addr, int size,
* and must be consumed or copied immediately, before any further
* access or changes to TLB @mmu_idx.
*/
-int probe_access_full(CPUArchState *env, target_ulong addr,
+int probe_access_full(CPUArchState *env, target_ulong addr, int size,
MMUAccessType access_type, int mmu_idx,
bool nonfault, void **phost,
CPUTLBEntryFull **pfull, uintptr_t retaddr);
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index fc27e34457..008ae7a66d 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -1589,12 +1589,12 @@ static int probe_access_internal(CPUArchState *env, target_ulong addr,
return flags;
}
-int probe_access_full(CPUArchState *env, target_ulong addr,
+int probe_access_full(CPUArchState *env, target_ulong addr, int size,
MMUAccessType access_type, int mmu_idx,
bool nonfault, void **phost, CPUTLBEntryFull **pfull,
uintptr_t retaddr)
{
- int flags = probe_access_internal(env, addr, 0, access_type, mmu_idx,
+ int flags = probe_access_internal(env, addr, size, access_type, mmu_idx,
nonfault, phost, pfull, retaddr);
/* Handle clean RAM pages. */
diff --git a/target/arm/mte_helper.c b/target/arm/mte_helper.c
index 98bcf59c22..fee3c7eb96 100644
--- a/target/arm/mte_helper.c
+++ b/target/arm/mte_helper.c
@@ -118,7 +118,7 @@ static uint8_t *allocation_tag_mem(CPUARMState *env, int ptr_mmu_idx,
* valid. Indicate to probe_access_flags no-fault, then assert that
* we received a valid page.
*/
- flags = probe_access_full(env, ptr, ptr_access, ptr_mmu_idx,
+ flags = probe_access_full(env, ptr, 0, ptr_access, ptr_mmu_idx,
ra == 0, &host, &full, ra);
assert(!(flags & TLB_INVALID_MASK));
@@ -154,7 +154,7 @@ static uint8_t *allocation_tag_mem(CPUARMState *env, int ptr_mmu_idx,
*/
in_page = -(ptr | TARGET_PAGE_MASK);
if (unlikely(ptr_size > in_page)) {
- flags |= probe_access_full(env, ptr + in_page, ptr_access,
+ flags |= probe_access_full(env, ptr + in_page, 0, ptr_access,
ptr_mmu_idx, ra == 0, &host, &full, ra);
assert(!(flags & TLB_INVALID_MASK));
}
diff --git a/target/arm/ptw.c b/target/arm/ptw.c
index 1ecefb2027..d92cdc9733 100644
--- a/target/arm/ptw.c
+++ b/target/arm/ptw.c
@@ -258,7 +258,7 @@ static bool S1_ptw_translate(CPUARMState *env, S1Translate *ptw,
int flags;
env->tlb_fi = fi;
- flags = probe_access_full(env, addr, MMU_DATA_LOAD,
+ flags = probe_access_full(env, addr, 0, MMU_DATA_LOAD,
arm_to_core_mmu_idx(s2_mmu_idx),
true, &ptw->out_host, &full, 0);
env->tlb_fi = NULL;
diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c
index 51909c44ac..9a8951afa4 100644
--- a/target/arm/sve_helper.c
+++ b/target/arm/sve_helper.c
@@ -5356,7 +5356,7 @@ bool sve_probe_page(SVEHostPage *info, bool nofault, CPUARMState *env,
&info->host, retaddr);
#else
CPUTLBEntryFull *full;
- flags = probe_access_full(env, addr, access_type, mmu_idx, nofault,
+ flags = probe_access_full(env, addr, 0, access_type, mmu_idx, nofault,
&info->host, &full, retaddr);
#endif
info->flags = flags;
diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
index da9f877476..67e9c4ee79 100644
--- a/target/arm/translate-a64.c
+++ b/target/arm/translate-a64.c
@@ -14651,7 +14651,7 @@ static bool is_guarded_page(CPUARMState *env, DisasContext *s)
* that the TLB entry must be present and valid, and thus this
* access will never raise an exception.
*/
- flags = probe_access_full(env, addr, MMU_INST_FETCH, mmu_idx,
+ flags = probe_access_full(env, addr, 0, MMU_INST_FETCH, mmu_idx,
false, &host, &full, 0);
assert(!(flags & TLB_INVALID_MASK));
diff --git a/target/i386/tcg/sysemu/excp_helper.c b/target/i386/tcg/sysemu/excp_helper.c
index 55bd1194d3..e87f90dbe3 100644
--- a/target/i386/tcg/sysemu/excp_helper.c
+++ b/target/i386/tcg/sysemu/excp_helper.c
@@ -64,7 +64,7 @@ static bool ptw_translate(PTETranslate *inout, hwaddr addr)
int flags;
inout->gaddr = addr;
- flags = probe_access_full(inout->env, addr, MMU_DATA_STORE,
+ flags = probe_access_full(inout->env, addr, 0, MMU_DATA_STORE,
inout->ptw_idx, true, &inout->haddr, &full, 0);
if (unlikely(flags & TLB_INVALID_MASK)) {
@@ -428,7 +428,7 @@ do_check_protect_pse36:
CPUTLBEntryFull *full;
int flags, nested_page_size;
- flags = probe_access_full(env, paddr, access_type,
+ flags = probe_access_full(env, paddr, 0, access_type,
MMU_NESTED_IDX, true,
&pte_trans.haddr, &full, 0);
if (unlikely(flags & TLB_INVALID_MASK)) {
--
2.34.1
On 2/23/23 21:45, Richard Henderson wrote:
> Change to match the recent change to probe_access_flags.
> All existing callers updated to supply 0, so no change in behaviour.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
> include/exec/exec-all.h | 2 +-
> accel/tcg/cputlb.c | 4 ++--
> target/arm/mte_helper.c | 4 ++--
> target/arm/ptw.c | 2 +-
> target/arm/sve_helper.c | 2 +-
> target/arm/translate-a64.c | 2 +-
> target/i386/tcg/sysemu/excp_helper.c | 4 ++--
> 7 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
> index 165b050872..b631832e17 100644
> --- a/include/exec/exec-all.h
> +++ b/include/exec/exec-all.h
> @@ -475,7 +475,7 @@ int probe_access_flags(CPUArchState *env, target_ulong addr, int size,
> * and must be consumed or copied immediately, before any further
> * access or changes to TLB @mmu_idx.
> */
> -int probe_access_full(CPUArchState *env, target_ulong addr,
> +int probe_access_full(CPUArchState *env, target_ulong addr, int size,
> MMUAccessType access_type, int mmu_idx,
> bool nonfault, void **phost,
> CPUTLBEntryFull **pfull, uintptr_t retaddr);
> diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
> index fc27e34457..008ae7a66d 100644
> --- a/accel/tcg/cputlb.c
> +++ b/accel/tcg/cputlb.c
> @@ -1589,12 +1589,12 @@ static int probe_access_internal(CPUArchState *env, target_ulong addr,
> return flags;
> }
>
> -int probe_access_full(CPUArchState *env, target_ulong addr,
> +int probe_access_full(CPUArchState *env, target_ulong addr, int size,
> MMUAccessType access_type, int mmu_idx,
> bool nonfault, void **phost, CPUTLBEntryFull **pfull,
> uintptr_t retaddr)
> {
> - int flags = probe_access_internal(env, addr, 0, access_type, mmu_idx,
> + int flags = probe_access_internal(env, addr, size, access_type, mmu_idx,
> nonfault, phost, pfull, retaddr);
>
> /* Handle clean RAM pages. */
> diff --git a/target/arm/mte_helper.c b/target/arm/mte_helper.c
> index 98bcf59c22..fee3c7eb96 100644
> --- a/target/arm/mte_helper.c
> +++ b/target/arm/mte_helper.c
> @@ -118,7 +118,7 @@ static uint8_t *allocation_tag_mem(CPUARMState *env, int ptr_mmu_idx,
> * valid. Indicate to probe_access_flags no-fault, then assert that
> * we received a valid page.
> */
> - flags = probe_access_full(env, ptr, ptr_access, ptr_mmu_idx,
> + flags = probe_access_full(env, ptr, 0, ptr_access, ptr_mmu_idx,
> ra == 0, &host, &full, ra);
> assert(!(flags & TLB_INVALID_MASK));
>
> @@ -154,7 +154,7 @@ static uint8_t *allocation_tag_mem(CPUARMState *env, int ptr_mmu_idx,
> */
> in_page = -(ptr | TARGET_PAGE_MASK);
> if (unlikely(ptr_size > in_page)) {
> - flags |= probe_access_full(env, ptr + in_page, ptr_access,
> + flags |= probe_access_full(env, ptr + in_page, 0, ptr_access,
> ptr_mmu_idx, ra == 0, &host, &full, ra);
> assert(!(flags & TLB_INVALID_MASK));
> }
> diff --git a/target/arm/ptw.c b/target/arm/ptw.c
> index 1ecefb2027..d92cdc9733 100644
> --- a/target/arm/ptw.c
> +++ b/target/arm/ptw.c
> @@ -258,7 +258,7 @@ static bool S1_ptw_translate(CPUARMState *env, S1Translate *ptw,
> int flags;
>
> env->tlb_fi = fi;
> - flags = probe_access_full(env, addr, MMU_DATA_LOAD,
> + flags = probe_access_full(env, addr, 0, MMU_DATA_LOAD,
> arm_to_core_mmu_idx(s2_mmu_idx),
> true, &ptw->out_host, &full, 0);
> env->tlb_fi = NULL;
> diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c
> index 51909c44ac..9a8951afa4 100644
> --- a/target/arm/sve_helper.c
> +++ b/target/arm/sve_helper.c
> @@ -5356,7 +5356,7 @@ bool sve_probe_page(SVEHostPage *info, bool nofault, CPUARMState *env,
> &info->host, retaddr);
> #else
> CPUTLBEntryFull *full;
> - flags = probe_access_full(env, addr, access_type, mmu_idx, nofault,
> + flags = probe_access_full(env, addr, 0, access_type, mmu_idx, nofault,
> &info->host, &full, retaddr);
> #endif
> info->flags = flags;
> diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
> index da9f877476..67e9c4ee79 100644
> --- a/target/arm/translate-a64.c
> +++ b/target/arm/translate-a64.c
> @@ -14651,7 +14651,7 @@ static bool is_guarded_page(CPUARMState *env, DisasContext *s)
> * that the TLB entry must be present and valid, and thus this
> * access will never raise an exception.
> */
> - flags = probe_access_full(env, addr, MMU_INST_FETCH, mmu_idx,
> + flags = probe_access_full(env, addr, 0, MMU_INST_FETCH, mmu_idx,
> false, &host, &full, 0);
> assert(!(flags & TLB_INVALID_MASK));
>
> diff --git a/target/i386/tcg/sysemu/excp_helper.c b/target/i386/tcg/sysemu/excp_helper.c
> index 55bd1194d3..e87f90dbe3 100644
> --- a/target/i386/tcg/sysemu/excp_helper.c
> +++ b/target/i386/tcg/sysemu/excp_helper.c
> @@ -64,7 +64,7 @@ static bool ptw_translate(PTETranslate *inout, hwaddr addr)
> int flags;
>
> inout->gaddr = addr;
> - flags = probe_access_full(inout->env, addr, MMU_DATA_STORE,
> + flags = probe_access_full(inout->env, addr, 0, MMU_DATA_STORE,
> inout->ptw_idx, true, &inout->haddr, &full, 0);
>
> if (unlikely(flags & TLB_INVALID_MASK)) {
> @@ -428,7 +428,7 @@ do_check_protect_pse36:
> CPUTLBEntryFull *full;
> int flags, nested_page_size;
>
> - flags = probe_access_full(env, paddr, access_type,
> + flags = probe_access_full(env, paddr, 0, access_type,
> MMU_NESTED_IDX, true,
> &pte_trans.haddr, &full, 0);
> if (unlikely(flags & TLB_INVALID_MASK)) {
On 24/2/23 01:45, Richard Henderson wrote: > Change to match the recent change to probe_access_flags. > All existing callers updated to supply 0, so no change in behaviour. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > include/exec/exec-all.h | 2 +- > accel/tcg/cputlb.c | 4 ++-- > target/arm/mte_helper.c | 4 ++-- > target/arm/ptw.c | 2 +- > target/arm/sve_helper.c | 2 +- > target/arm/translate-a64.c | 2 +- > target/i386/tcg/sysemu/excp_helper.c | 4 ++-- > 7 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h > index 165b050872..b631832e17 100644 > --- a/include/exec/exec-all.h > +++ b/include/exec/exec-all.h > @@ -475,7 +475,7 @@ int probe_access_flags(CPUArchState *env, target_ulong addr, int size, > * and must be consumed or copied immediately, before any further > * access or changes to TLB @mmu_idx. > */ > -int probe_access_full(CPUArchState *env, target_ulong addr, > +int probe_access_full(CPUArchState *env, target_ulong addr, int size, > MMUAccessType access_type, int mmu_idx, > bool nonfault, void **phost, > CPUTLBEntryFull **pfull, uintptr_t retaddr); Why is 'size' signed? (similar in probe_access_flags). Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On 2/23/23 20:57, Philippe Mathieu-Daudé wrote: > On 24/2/23 01:45, Richard Henderson wrote: >> Change to match the recent change to probe_access_flags. >> All existing callers updated to supply 0, so no change in behaviour. >> >> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> >> --- >> include/exec/exec-all.h | 2 +- >> accel/tcg/cputlb.c | 4 ++-- >> target/arm/mte_helper.c | 4 ++-- >> target/arm/ptw.c | 2 +- >> target/arm/sve_helper.c | 2 +- >> target/arm/translate-a64.c | 2 +- >> target/i386/tcg/sysemu/excp_helper.c | 4 ++-- >> 7 files changed, 10 insertions(+), 10 deletions(-) >> >> diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h >> index 165b050872..b631832e17 100644 >> --- a/include/exec/exec-all.h >> +++ b/include/exec/exec-all.h >> @@ -475,7 +475,7 @@ int probe_access_flags(CPUArchState *env, target_ulong addr, int size, >> * and must be consumed or copied immediately, before any further >> * access or changes to TLB @mmu_idx. >> */ >> -int probe_access_full(CPUArchState *env, target_ulong addr, >> +int probe_access_full(CPUArchState *env, target_ulong addr, int size, >> MMUAccessType access_type, int mmu_idx, >> bool nonfault, void **phost, >> CPUTLBEntryFull **pfull, uintptr_t retaddr); > > Why is 'size' signed? (similar in probe_access_flags). Not sure. But all of the other interfaces exposed are signed too. r~
© 2016 - 2024 Red Hat, Inc.