SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

accel/tcg: Make page_alloc_target_data allocation constant

Browse Source 
Use a constant target data allocation size for all pages.
This will be necessary to reduce overhead of page tracking.
Since TARGET_PAGE_DATA_SIZE is now required, we can use this
to omit data tracking for targets that don't require it.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-09-17 14:25:12 +02:00
parent 7ed9e721cc
commit 50d4c8c1d4
5 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
accel/tcg/translate-all.c
View File

@ -2271,6 +2271,7 @@ void page_set_flags(target_ulong start, target_ulong end, int flags)
void page_reset_target_data(target_ulong start, target_ulong end) void page_reset_target_data(target_ulong start, target_ulong end)
{ {
#ifdef TARGET_PAGE_DATA_SIZE
target_ulong addr, len; target_ulong addr, len;
/* /*
@ -2293,15 +2294,17 @@ void page_reset_target_data(target_ulong start, target_ulong end)
g_free(p->target_data); g_free(p->target_data);
p->target_data = NULL; p->target_data = NULL;
} }
#endif
} }
#ifdef TARGET_PAGE_DATA_SIZE
void *page_get_target_data(target_ulong address) void *page_get_target_data(target_ulong address)
{ {
PageDesc *p = page_find(address >> TARGET_PAGE_BITS); PageDesc *p = page_find(address >> TARGET_PAGE_BITS);
return p ? p->target_data : NULL; return p ? p->target_data : NULL;
} }
void *page_alloc_target_data(target_ulong address, size_t size) void *page_alloc_target_data(target_ulong address)
{ {
PageDesc *p = page_find(address >> TARGET_PAGE_BITS); PageDesc *p = page_find(address >> TARGET_PAGE_BITS);
void *ret = NULL; void *ret = NULL;
@ -2309,11 +2312,12 @@ void *page_alloc_target_data(target_ulong address, size_t size)
if (p->flags & PAGE_VALID) { if (p->flags & PAGE_VALID) {
ret = p->target_data; ret = p->target_data;
if (!ret) { if (!ret) {
p->target_data = ret = g_malloc0(size); p->target_data = ret = g_malloc0(TARGET_PAGE_DATA_SIZE);
} }
} }
return ret; return ret;
} }
#endif /* TARGET_PAGE_DATA_SIZE */
int page_check_range(target_ulong start, target_ulong len, int flags) int page_check_range(target_ulong start, target_ulong len, int flags)
{ {

9
include/exec/cpu-all.h
View File

@ -281,19 +281,18 @@ void page_reset_target_data(target_ulong start, target_ulong end);
int page_check_range(target_ulong start, target_ulong len, int flags); int page_check_range(target_ulong start, target_ulong len, int flags);
/** /**
* page_alloc_target_data(address, size) * page_alloc_target_data(address)
* @address: guest virtual address * @address: guest virtual address
* @size: size of data to allocate
* *
* Allocate @size bytes of out-of-band data to associate with the * Allocate TARGET_PAGE_DATA_SIZE bytes of out-of-band data to associate
* guest page at @address. If the page is not mapped, NULL will * with the guest page at @address. If the page is not mapped, NULL will
* be returned. If there is existing data associated with @address, * be returned. If there is existing data associated with @address,
* no new memory will be allocated. * no new memory will be allocated.
* *
* The memory will be freed when the guest page is deallocated, * The memory will be freed when the guest page is deallocated,
* e.g. with the munmap system call. * e.g. with the munmap system call.
*/ */
void *page_alloc_target_data(target_ulong address, size_t size); void *page_alloc_target_data(target_ulong address);
/** /**
* page_get_target_data(address) * page_get_target_data(address)

8
target/arm/cpu.h
View File

@ -3410,6 +3410,14 @@ extern const uint64_t pred_esz_masks[5];
#define PAGE_MTE PAGE_TARGET_2 #define PAGE_MTE PAGE_TARGET_2
#define PAGE_TARGET_STICKY PAGE_MTE #define PAGE_TARGET_STICKY PAGE_MTE
/* We associate one allocation tag per 16 bytes, the minimum. */
#define LOG2_TAG_GRANULE 4
#define TAG_GRANULE (1 << LOG2_TAG_GRANULE)
#ifdef CONFIG_USER_ONLY
#define TARGET_PAGE_DATA_SIZE (TARGET_PAGE_SIZE >> (LOG2_TAG_GRANULE + 1))
#endif
#ifdef TARGET_TAGGED_ADDRESSES #ifdef TARGET_TAGGED_ADDRESSES
/** /**
* cpu_untagged_addr: * cpu_untagged_addr:

4
target/arm/internals.h
View File

@ -1164,10 +1164,6 @@ void arm_log_exception(CPUState *cs);
*/ */
#define GMID_EL1_BS 6 #define GMID_EL1_BS 6
/* We associate one allocation tag per 16 bytes, the minimum. */
#define LOG2_TAG_GRANULE 4
#define TAG_GRANULE (1 << LOG2_TAG_GRANULE)
/* /*
* SVE predicates are 1/8 the size of SVE vectors, and cannot use * SVE predicates are 1/8 the size of SVE vectors, and cannot use
* the same simd_desc() encoding due to restrictions on size. * the same simd_desc() encoding due to restrictions on size.

3
target/arm/mte_helper.c
View File

@ -96,8 +96,7 @@ static uint8_t *allocation_tag_mem(CPUARMState *env, int ptr_mmu_idx,
tags = page_get_target_data(clean_ptr); tags = page_get_target_data(clean_ptr);
if (tags == NULL) { if (tags == NULL) {
size_t alloc_size = TARGET_PAGE_SIZE >> (LOG2_TAG_GRANULE + 1); tags = page_alloc_target_data(clean_ptr);
tags = page_alloc_target_data(clean_ptr, alloc_size);
assert(tags != NULL); assert(tags != NULL);
} }