From: Avi Kivity <avi@redhat.com> To: Anthony Liguori <anthony@codemonkey.ws>, Gerhard Wiesinger <lists@wiesinger.com> Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [PATCH 1/2] memory: abstract cracking of write access ops into a function Date: Thu, 11 Aug 2011 10:40:25 +0300 [thread overview] Message-ID: <1313048426-17273-2-git-send-email-avi@redhat.com> (raw) In-Reply-To: <1313048426-17273-1-git-send-email-avi@redhat.com> The memory API automatically cracks large reads and writes into smaller ones when needed. Factor out this mechanism, which is now duplicated between memory reads and memory writes, into a function. Signed-off-by: Avi Kivity <avi@redhat.com> --- memory.c | 109 ++++++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 68 insertions(+), 41 deletions(-) diff --git a/memory.c b/memory.c index beff98c..3c18e70 100644 --- a/memory.c +++ b/memory.c @@ -226,6 +226,65 @@ static void flatview_simplify(FlatView *view) } } +static void memory_region_read_accessor(void *opaque, + target_phys_addr_t addr, + uint64_t *value, + unsigned size, + unsigned shift, + uint64_t mask) +{ + MemoryRegion *mr = opaque; + uint64_t tmp; + + tmp = mr->ops->read(mr->opaque, addr, size); + *value |= (tmp & mask) << shift; +} + +static void memory_region_write_accessor(void *opaque, + target_phys_addr_t addr, + uint64_t *value, + unsigned size, + unsigned shift, + uint64_t mask) +{ + MemoryRegion *mr = opaque; + uint64_t tmp; + + tmp = (*value >> shift) & mask; + mr->ops->write(mr->opaque, addr, tmp, size); +} + +static void access_with_adjusted_size(target_phys_addr_t addr, + uint64_t *value, + unsigned size, + unsigned access_size_min, + unsigned access_size_max, + void (*access)(void *opaque, + target_phys_addr_t addr, + uint64_t *value, + unsigned size, + unsigned shift, + uint64_t mask), + void *opaque) +{ + uint64_t access_mask; + unsigned access_size; + unsigned i; + + if (!access_size_min) { + access_size_min = 1; + } + if (!access_size_max) { + access_size_max = 4; + } + access_size = MAX(MIN(size, access_size_max), access_size_min); + access_mask = -1ULL >> (64 - access_size * 8); + for (i = 0; i < size; i += access_size) { + /* FIXME: big-endian support */ + access(opaque, addr + i, value, access_size, i * 8, access_mask); + } +} + static void memory_region_prepare_ram_addr(MemoryRegion *mr); static void as_memory_range_add(AddressSpace *as, FlatRange *fr) @@ -744,10 +803,7 @@ static uint32_t memory_region_read_thunk_n(void *_mr, unsigned size) { MemoryRegion *mr = _mr; - unsigned access_size, access_size_min, access_size_max; - uint64_t access_mask; - uint32_t data = 0, tmp; - unsigned i; + uint64_t data = 0; if (!memory_region_access_valid(mr, addr, size)) { return -1U; /* FIXME: better signalling */ @@ -758,23 +814,10 @@ static uint32_t memory_region_read_thunk_n(void *_mr, } /* FIXME: support unaligned access */ - - access_size_min = mr->ops->impl.min_access_size; - if (!access_size_min) { - access_size_min = 1; - } - access_size_max = mr->ops->impl.max_access_size; - if (!access_size_max) { - access_size_max = 4; - } - access_size = MAX(MIN(size, access_size_max), access_size_min); - access_mask = -1ULL >> (64 - access_size * 8); - addr += mr->offset; - for (i = 0; i < size; i += access_size) { - /* FIXME: big-endian support */ - tmp = mr->ops->read(mr->opaque, addr + i, access_size); - data |= (tmp & access_mask) << (i * 8); - } + access_with_adjusted_size(addr + mr->offset, &data, size, + mr->ops->impl.min_access_size, + mr->ops->impl.max_access_size, + memory_region_read_accessor, mr); return data; } @@ -785,9 +828,6 @@ static void memory_region_write_thunk_n(void *_mr, uint64_t data) { MemoryRegion *mr = _mr; - unsigned access_size, access_size_min, access_size_max; - uint64_t access_mask; - unsigned i; if (!memory_region_access_valid(mr, addr, size)) { return; /* FIXME: better signalling */ @@ -799,23 +839,10 @@ static void memory_region_write_thunk_n(void *_mr, } /* FIXME: support unaligned access */ - - access_size_min = mr->ops->impl.min_access_size; - if (!access_size_min) { - access_size_min = 1; - } - access_size_max = mr->ops->impl.max_access_size; - if (!access_size_max) { - access_size_max = 4; - } - access_size = MAX(MIN(size, access_size_max), access_size_min); - access_mask = -1ULL >> (64 - access_size * 8); - addr += mr->offset; - for (i = 0; i < size; i += access_size) { - /* FIXME: big-endian support */ - mr->ops->write(mr->opaque, addr + i, (data >> (i * 8)) & access_mask, - access_size); - } + access_with_adjusted_size(addr + mr->offset, &data, size, + mr->ops->impl.min_access_size, + mr->ops->impl.max_access_size, + memory_region_write_accessor, mr); } static uint32_t memory_region_read_thunk_b(void *mr, target_phys_addr_t addr) -- 1.7.5.3
WARNING: multiple messages have this Message-ID (diff)
From: Avi Kivity <avi@redhat.com> To: Anthony Liguori <anthony@codemonkey.ws>, Gerhard Wiesinger <lists@wiesinger.com> Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 1/2] memory: abstract cracking of write access ops into a function Date: Thu, 11 Aug 2011 10:40:25 +0300 [thread overview] Message-ID: <1313048426-17273-2-git-send-email-avi@redhat.com> (raw) In-Reply-To: <1313048426-17273-1-git-send-email-avi@redhat.com> The memory API automatically cracks large reads and writes into smaller ones when needed. Factor out this mechanism, which is now duplicated between memory reads and memory writes, into a function. Signed-off-by: Avi Kivity <avi@redhat.com> --- memory.c | 109 ++++++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 68 insertions(+), 41 deletions(-) diff --git a/memory.c b/memory.c index beff98c..3c18e70 100644 --- a/memory.c +++ b/memory.c @@ -226,6 +226,65 @@ static void flatview_simplify(FlatView *view) } } +static void memory_region_read_accessor(void *opaque, + target_phys_addr_t addr, + uint64_t *value, + unsigned size, + unsigned shift, + uint64_t mask) +{ + MemoryRegion *mr = opaque; + uint64_t tmp; + + tmp = mr->ops->read(mr->opaque, addr, size); + *value |= (tmp & mask) << shift; +} + +static void memory_region_write_accessor(void *opaque, + target_phys_addr_t addr, + uint64_t *value, + unsigned size, + unsigned shift, + uint64_t mask) +{ + MemoryRegion *mr = opaque; + uint64_t tmp; + + tmp = (*value >> shift) & mask; + mr->ops->write(mr->opaque, addr, tmp, size); +} + +static void access_with_adjusted_size(target_phys_addr_t addr, + uint64_t *value, + unsigned size, + unsigned access_size_min, + unsigned access_size_max, + void (*access)(void *opaque, + target_phys_addr_t addr, + uint64_t *value, + unsigned size, + unsigned shift, + uint64_t mask), + void *opaque) +{ + uint64_t access_mask; + unsigned access_size; + unsigned i; + + if (!access_size_min) { + access_size_min = 1; + } + if (!access_size_max) { + access_size_max = 4; + } + access_size = MAX(MIN(size, access_size_max), access_size_min); + access_mask = -1ULL >> (64 - access_size * 8); + for (i = 0; i < size; i += access_size) { + /* FIXME: big-endian support */ + access(opaque, addr + i, value, access_size, i * 8, access_mask); + } +} + static void memory_region_prepare_ram_addr(MemoryRegion *mr); static void as_memory_range_add(AddressSpace *as, FlatRange *fr) @@ -744,10 +803,7 @@ static uint32_t memory_region_read_thunk_n(void *_mr, unsigned size) { MemoryRegion *mr = _mr; - unsigned access_size, access_size_min, access_size_max; - uint64_t access_mask; - uint32_t data = 0, tmp; - unsigned i; + uint64_t data = 0; if (!memory_region_access_valid(mr, addr, size)) { return -1U; /* FIXME: better signalling */ @@ -758,23 +814,10 @@ static uint32_t memory_region_read_thunk_n(void *_mr, } /* FIXME: support unaligned access */ - - access_size_min = mr->ops->impl.min_access_size; - if (!access_size_min) { - access_size_min = 1; - } - access_size_max = mr->ops->impl.max_access_size; - if (!access_size_max) { - access_size_max = 4; - } - access_size = MAX(MIN(size, access_size_max), access_size_min); - access_mask = -1ULL >> (64 - access_size * 8); - addr += mr->offset; - for (i = 0; i < size; i += access_size) { - /* FIXME: big-endian support */ - tmp = mr->ops->read(mr->opaque, addr + i, access_size); - data |= (tmp & access_mask) << (i * 8); - } + access_with_adjusted_size(addr + mr->offset, &data, size, + mr->ops->impl.min_access_size, + mr->ops->impl.max_access_size, + memory_region_read_accessor, mr); return data; } @@ -785,9 +828,6 @@ static void memory_region_write_thunk_n(void *_mr, uint64_t data) { MemoryRegion *mr = _mr; - unsigned access_size, access_size_min, access_size_max; - uint64_t access_mask; - unsigned i; if (!memory_region_access_valid(mr, addr, size)) { return; /* FIXME: better signalling */ @@ -799,23 +839,10 @@ static void memory_region_write_thunk_n(void *_mr, } /* FIXME: support unaligned access */ - - access_size_min = mr->ops->impl.min_access_size; - if (!access_size_min) { - access_size_min = 1; - } - access_size_max = mr->ops->impl.max_access_size; - if (!access_size_max) { - access_size_max = 4; - } - access_size = MAX(MIN(size, access_size_max), access_size_min); - access_mask = -1ULL >> (64 - access_size * 8); - addr += mr->offset; - for (i = 0; i < size; i += access_size) { - /* FIXME: big-endian support */ - mr->ops->write(mr->opaque, addr + i, (data >> (i * 8)) & access_mask, - access_size); - } + access_with_adjusted_size(addr + mr->offset, &data, size, + mr->ops->impl.min_access_size, + mr->ops->impl.max_access_size, + memory_region_write_accessor, mr); } static uint32_t memory_region_read_thunk_b(void *mr, target_phys_addr_t addr) -- 1.7.5.3
next prev parent reply other threads:[~2011-08-11 7:40 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-08-11 7:40 [PATCH 0/2] Fix wide ioport access cracking Avi Kivity 2011-08-11 7:40 ` [Qemu-devel] " Avi Kivity 2011-08-11 7:40 ` Avi Kivity [this message] 2011-08-11 7:40 ` [Qemu-devel] [PATCH 1/2] memory: abstract cracking of write access ops into a function Avi Kivity 2011-08-11 7:40 ` [PATCH 2/2] memory: crack wide ioport accesses into smaller ones when needed Avi Kivity 2011-08-11 7:40 ` [Qemu-devel] " Avi Kivity 2011-08-11 8:25 ` [PATCH 0/2] Fix wide ioport access cracking Gerhard Wiesinger 2011-08-11 8:25 ` [Qemu-devel] " Gerhard Wiesinger 2011-08-11 8:27 ` Avi Kivity 2011-08-11 8:27 ` [Qemu-devel] " Avi Kivity 2011-08-11 8:29 ` Avi Kivity 2011-08-11 8:29 ` Avi Kivity 2011-08-11 9:01 ` Gerhard Wiesinger 2011-08-11 9:01 ` [Qemu-devel] " Gerhard Wiesinger 2011-08-11 9:44 ` Avi Kivity 2011-08-11 16:08 ` Gerhard Wiesinger 2011-08-11 16:20 ` Avi Kivity 2011-08-11 16:22 ` Avi Kivity 2011-08-11 19:01 ` Gerhard Wiesinger 2011-08-22 10:46 ` Avi Kivity 2011-08-11 16:11 ` Gerhard Wiesinger 2011-08-11 16:15 ` Avi Kivity 2011-08-22 14:42 ` Anthony Liguori
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1313048426-17273-2-git-send-email-avi@redhat.com \ --to=avi@redhat.com \ --cc=anthony@codemonkey.ws \ --cc=kvm@vger.kernel.org \ --cc=lists@wiesinger.com \ --cc=qemu-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.