Skip to content

Commit d732b5a

Browse files
davidhildenbrandxzpeter
davidhildenbrand
authored and
xzpeter
committed
memory: pass MemTxAttrs to memory_access_is_direct()
We want to pass another flag that will be stored in MemTxAttrs. So pass MemTxAttrs directly. Reviewed-by: Peter Xu <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Signed-off-by: David Hildenbrand <[email protected]> Link: https://lore.kernel.org/r/[email protected] [peterx: Fix MacOS builds] Signed-off-by: Peter Xu <[email protected]>
1 parent d4337aa commit d732b5a

File tree

6 files changed

+22
-20
lines changed

6 files changed

+22
-20
lines changed

‎hw/core/loader.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ ssize_t load_image_mr(const char *filename, MemoryRegion *mr)
144144
{
145145
ssize_t size;
146146

147-
if (!memory_access_is_direct(mr, false)) {
147+
if (!memory_access_is_direct(mr, false, MEMTXATTRS_UNSPECIFIED)) {
148148
/* Can only load an image into RAM or ROM */
149149
return -1;
150150
}

‎hw/display/apple-gfx.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@ static void apple_gfx_destroy_task(AppleGFXState *s, PGTask_t *task)
137137
MEMTXATTRS_UNSPECIFIED);
138138

139139
if (!ram_region || ram_region_length < length ||
140-
!memory_access_is_direct(ram_region, !read_only)) {
140+
!memory_access_is_direct(ram_region, !read_only,
141+
MEMTXATTRS_UNSPECIFIED)) {
141142
return NULL;
142143
}
143144

‎hw/remote/vfio-user-obj.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ static int vfu_object_mr_rw(MemoryRegion *mr, uint8_t *buf, hwaddr offset,
358358
int access_size;
359359
uint64_t val;
360360

361-
if (memory_access_is_direct(mr, is_write)) {
361+
if (memory_access_is_direct(mr, is_write, MEMTXATTRS_UNSPECIFIED)) {
362362
/**
363363
* Some devices expose a PCI expansion ROM, which could be buffer
364364
* based as compared to other regions which are primarily based on

‎include/exec/memory.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3012,7 +3012,8 @@ static inline bool memory_region_supports_direct_access(MemoryRegion *mr)
30123012
return !memory_region_is_ram_device(mr);
30133013
}
30143014

3015-
static inline bool memory_access_is_direct(MemoryRegion *mr, bool is_write)
3015+
static inline bool memory_access_is_direct(MemoryRegion *mr, bool is_write,
3016+
MemTxAttrs attrs)
30163017
{
30173018
if (!memory_region_supports_direct_access(mr)) {
30183019
return false;
@@ -3053,7 +3054,7 @@ MemTxResult address_space_read(AddressSpace *as, hwaddr addr,
30533054
fv = address_space_to_flatview(as);
30543055
l = len;
30553056
mr = flatview_translate(fv, addr, &addr1, &l, false, attrs);
3056-
if (len == l && memory_access_is_direct(mr, false)) {
3057+
if (len == l && memory_access_is_direct(mr, false, attrs)) {
30573058
ptr = qemu_map_ram_ptr(mr->ram_block, addr1);
30583059
memcpy(buf, ptr, len);
30593060
} else {

‎system/memory_ldst.c.inc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ static inline uint32_t glue(address_space_ldl_internal, SUFFIX)(ARG1_DECL,
3434

3535
RCU_READ_LOCK();
3636
mr = TRANSLATE(addr, &addr1, &l, false, attrs);
37-
if (l < 4 || !memory_access_is_direct(mr, false)) {
37+
if (l < 4 || !memory_access_is_direct(mr, false, attrs)) {
3838
release_lock |= prepare_mmio_access(mr);
3939

4040
/* I/O case */
@@ -103,7 +103,7 @@ static inline uint64_t glue(address_space_ldq_internal, SUFFIX)(ARG1_DECL,
103103

104104
RCU_READ_LOCK();
105105
mr = TRANSLATE(addr, &addr1, &l, false, attrs);
106-
if (l < 8 || !memory_access_is_direct(mr, false)) {
106+
if (l < 8 || !memory_access_is_direct(mr, false, attrs)) {
107107
release_lock |= prepare_mmio_access(mr);
108108

109109
/* I/O case */
@@ -170,7 +170,7 @@ uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL,
170170

171171
RCU_READ_LOCK();
172172
mr = TRANSLATE(addr, &addr1, &l, false, attrs);
173-
if (!memory_access_is_direct(mr, false)) {
173+
if (!memory_access_is_direct(mr, false, attrs)) {
174174
release_lock |= prepare_mmio_access(mr);
175175

176176
/* I/O case */
@@ -207,7 +207,7 @@ static inline uint16_t glue(address_space_lduw_internal, SUFFIX)(ARG1_DECL,
207207

208208
RCU_READ_LOCK();
209209
mr = TRANSLATE(addr, &addr1, &l, false, attrs);
210-
if (l < 2 || !memory_access_is_direct(mr, false)) {
210+
if (l < 2 || !memory_access_is_direct(mr, false, attrs)) {
211211
release_lock |= prepare_mmio_access(mr);
212212

213213
/* I/O case */
@@ -277,7 +277,7 @@ void glue(address_space_stl_notdirty, SUFFIX)(ARG1_DECL,
277277

278278
RCU_READ_LOCK();
279279
mr = TRANSLATE(addr, &addr1, &l, true, attrs);
280-
if (l < 4 || !memory_access_is_direct(mr, true)) {
280+
if (l < 4 || !memory_access_is_direct(mr, true, attrs)) {
281281
release_lock |= prepare_mmio_access(mr);
282282

283283
r = memory_region_dispatch_write(mr, addr1, val, MO_32, attrs);
@@ -314,7 +314,7 @@ static inline void glue(address_space_stl_internal, SUFFIX)(ARG1_DECL,
314314

315315
RCU_READ_LOCK();
316316
mr = TRANSLATE(addr, &addr1, &l, true, attrs);
317-
if (l < 4 || !memory_access_is_direct(mr, true)) {
317+
if (l < 4 || !memory_access_is_direct(mr, true, attrs)) {
318318
release_lock |= prepare_mmio_access(mr);
319319
r = memory_region_dispatch_write(mr, addr1, val,
320320
MO_32 | devend_memop(endian), attrs);
@@ -377,7 +377,7 @@ void glue(address_space_stb, SUFFIX)(ARG1_DECL,
377377

378378
RCU_READ_LOCK();
379379
mr = TRANSLATE(addr, &addr1, &l, true, attrs);
380-
if (!memory_access_is_direct(mr, true)) {
380+
if (!memory_access_is_direct(mr, true, attrs)) {
381381
release_lock |= prepare_mmio_access(mr);
382382
r = memory_region_dispatch_write(mr, addr1, val, MO_8, attrs);
383383
} else {
@@ -410,7 +410,7 @@ static inline void glue(address_space_stw_internal, SUFFIX)(ARG1_DECL,
410410

411411
RCU_READ_LOCK();
412412
mr = TRANSLATE(addr, &addr1, &l, true, attrs);
413-
if (l < 2 || !memory_access_is_direct(mr, true)) {
413+
if (l < 2 || !memory_access_is_direct(mr, true, attrs)) {
414414
release_lock |= prepare_mmio_access(mr);
415415
r = memory_region_dispatch_write(mr, addr1, val,
416416
MO_16 | devend_memop(endian), attrs);
@@ -474,7 +474,7 @@ static void glue(address_space_stq_internal, SUFFIX)(ARG1_DECL,
474474

475475
RCU_READ_LOCK();
476476
mr = TRANSLATE(addr, &addr1, &l, true, attrs);
477-
if (l < 8 || !memory_access_is_direct(mr, true)) {
477+
if (l < 8 || !memory_access_is_direct(mr, true, attrs)) {
478478
release_lock |= prepare_mmio_access(mr);
479479
r = memory_region_dispatch_write(mr, addr1, val,
480480
MO_64 | devend_memop(endian), attrs);

‎system/physmem.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ MemoryRegion *flatview_translate(FlatView *fv, hwaddr addr, hwaddr *xlat,
573573
is_write, true, &as, attrs);
574574
mr = section.mr;
575575

576-
if (xen_enabled() && memory_access_is_direct(mr, is_write)) {
576+
if (xen_enabled() && memory_access_is_direct(mr, is_write, attrs)) {
577577
hwaddr page = ((addr & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE) - addr;
578578
*plen = MIN(page, *plen);
579579
}
@@ -2869,7 +2869,7 @@ static MemTxResult flatview_write_continue_step(MemTxAttrs attrs,
28692869
return MEMTX_ACCESS_ERROR;
28702870
}
28712871

2872-
if (!memory_access_is_direct(mr, true)) {
2872+
if (!memory_access_is_direct(mr, true, attrs)) {
28732873
uint64_t val;
28742874
MemTxResult result;
28752875
bool release_lock = prepare_mmio_access(mr);
@@ -2965,7 +2965,7 @@ static MemTxResult flatview_read_continue_step(MemTxAttrs attrs, uint8_t *buf,
29652965
return MEMTX_ACCESS_ERROR;
29662966
}
29672967

2968-
if (!memory_access_is_direct(mr, false)) {
2968+
if (!memory_access_is_direct(mr, false, attrs)) {
29692969
/* I/O case */
29702970
uint64_t val;
29712971
MemTxResult result;
@@ -3274,7 +3274,7 @@ static bool flatview_access_valid(FlatView *fv, hwaddr addr, hwaddr len,
32743274
while (len > 0) {
32753275
l = len;
32763276
mr = flatview_translate(fv, addr, &xlat, &l, is_write, attrs);
3277-
if (!memory_access_is_direct(mr, is_write)) {
3277+
if (!memory_access_is_direct(mr, is_write, attrs)) {
32783278
l = memory_access_size(mr, l, addr);
32793279
if (!memory_region_access_valid(mr, xlat, l, is_write, attrs)) {
32803280
return false;
@@ -3354,7 +3354,7 @@ void *address_space_map(AddressSpace *as,
33543354
fv = address_space_to_flatview(as);
33553355
mr = flatview_translate(fv, addr, &xlat, &l, is_write, attrs);
33563356

3357-
if (!memory_access_is_direct(mr, is_write)) {
3357+
if (!memory_access_is_direct(mr, is_write, attrs)) {
33583358
size_t used = qatomic_read(&as->bounce_buffer_size);
33593359
for (;;) {
33603360
hwaddr alloc = MIN(as->max_bounce_buffer_size - used, l);
@@ -3487,7 +3487,7 @@ int64_t address_space_cache_init(MemoryRegionCache *cache,
34873487

34883488
mr = cache->mrs.mr;
34893489
memory_region_ref(mr);
3490-
if (memory_access_is_direct(mr, is_write)) {
3490+
if (memory_access_is_direct(mr, is_write, MEMTXATTRS_UNSPECIFIED)) {
34913491
/* We don't care about the memory attributes here as we're only
34923492
* doing this if we found actual RAM, which behaves the same
34933493
* regardless of attributes; so UNSPECIFIED is fine.

0 commit comments

Comments
 (0)