From: David Gibson <david@gibson.dropbear.id.au>
To: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>,
qemu-ppc@nongnu.org, qemu-arm@nongnu.org, kvm@vger.kernel.org
Subject: Re: [PATCH v3 08/10] Convert address_space_rw to use MemoryAccessType
Date: Thu, 21 Jul 2016 11:47:18 +1000 [thread overview]
Message-ID: <20160721014718.GB12087@voom.fritz.box> (raw)
In-Reply-To: <1468990980-4598-9-git-send-email-andrew.smirnov@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 5544 bytes --]
On Tue, Jul 19, 2016 at 10:02:58PM -0700, Andrey Smirnov wrote:
> Convert address_space_rw() to use MemoryAccessType following the
> conversion of cpu_memory_rw_debug().
>
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> exec.c | 14 +++++++++-----
> include/exec/memory.h | 7 +++++--
> kvm-all.c | 8 +++++---
> scripts/coverity-model.c | 9 +++++++--
> 4 files changed, 26 insertions(+), 12 deletions(-)
>
> diff --git a/exec.c b/exec.c
> index 995ff60..5557cc9 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -2726,12 +2726,16 @@ MemTxResult address_space_read_full(AddressSpace *as, hwaddr addr,
> }
>
> MemTxResult address_space_rw(AddressSpace *as, hwaddr addr, MemTxAttrs attrs,
> - uint8_t *buf, int len, bool is_write)
> + uint8_t *buf, int len,
> + MemoryAccessType access_type)
> {
> - if (is_write) {
> + switch (access_type) {
> + case MEM_DATA_STORE:
> return address_space_write(as, addr, attrs, buf, len);
> - } else {
> + case MEM_DATA_LOAD:
> return address_space_read(as, addr, attrs, buf, len);
> + default:
> + abort();
> }
> }
>
> @@ -2739,7 +2743,7 @@ void cpu_physical_memory_rw(hwaddr addr, uint8_t *buf,
> int len, int is_write)
> {
> address_space_rw(&address_space_memory, addr, MEMTXATTRS_UNSPECIFIED,
> - buf, len, is_write);
> + buf, len, is_write ? MEM_DATA_STORE : MEM_DATA_LOAD);
> }
>
> enum write_rom_type {
> @@ -3651,7 +3655,7 @@ int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr,
> } else {
> address_space_rw(cpu->cpu_ases[asidx].as, phys_addr,
> MEMTXATTRS_UNSPECIFIED,
> - buf, l, 0);
> + buf, l, access_type);
> }
> len -= l;
> buf += l;
> diff --git a/include/exec/memory.h b/include/exec/memory.h
> index 7851ca9..da56c0e 100644
> --- a/include/exec/memory.h
> +++ b/include/exec/memory.h
> @@ -22,6 +22,7 @@
> #define DIRTY_MEMORY_NUM 3 /* num of dirty bits */
>
> #include "exec/cpu-common.h"
> +#include "qom/cpu.h"
> #ifndef CONFIG_USER_ONLY
> #include "exec/hwaddr.h"
> #endif
> @@ -1284,11 +1285,13 @@ void address_space_destroy(AddressSpace *as);
> * @addr: address within that address space
> * @attrs: memory transaction attributes
> * @buf: buffer with the data transferred
> - * @is_write: indicates the transfer direction
> + * @access_type: indicates the transfer direction (only valid values
> + * are MEM_DATA_LOAD for data reads and MEM_DATA_STORE for data
> + * writes)
> */
> MemTxResult address_space_rw(AddressSpace *as, hwaddr addr,
> MemTxAttrs attrs, uint8_t *buf,
> - int len, bool is_write);
> + int len, MemoryAccessType access_type);
>
> /**
> * address_space_write: write to address space.
> diff --git a/kvm-all.c b/kvm-all.c
> index a88f917..ed45a95 100644
> --- a/kvm-all.c
> +++ b/kvm-all.c
> @@ -1767,11 +1767,12 @@ static void kvm_handle_io(uint16_t port, MemTxAttrs attrs, void *data, int direc
> {
> int i;
> uint8_t *ptr = data;
> + MemoryAccessType access_type =
> + (direction == KVM_EXIT_IO_OUT) ? MEM_DATA_STORE : MEM_DATA_LOAD;
>
> for (i = 0; i < count; i++) {
> address_space_rw(&address_space_io, port, attrs,
> - ptr, size,
> - direction == KVM_EXIT_IO_OUT);
> + ptr, size, access_type);
> ptr += size;
> }
> }
> @@ -1947,7 +1948,8 @@ int kvm_cpu_exec(CPUState *cpu)
> run->mmio.phys_addr, attrs,
> run->mmio.data,
> run->mmio.len,
> - run->mmio.is_write);
> + run->mmio.is_write ?
> + MEM_DATA_STORE : MEM_DATA_LOAD);
> ret = 0;
> break;
> case KVM_EXIT_IRQ_WINDOW_OPEN:
> diff --git a/scripts/coverity-model.c b/scripts/coverity-model.c
> index ee5bf9d..c5603b5 100644
> --- a/scripts/coverity-model.c
> +++ b/scripts/coverity-model.c
> @@ -68,13 +68,18 @@ static void __bufread(uint8_t *buf, ssize_t len)
> }
>
> MemTxResult address_space_rw(AddressSpace *as, hwaddr addr, MemTxAttrs attrs,
> - uint8_t *buf, int len, bool is_write)
> + uint8_t *buf, int len,
> + MemoryAccessType access_type)
> {
> MemTxResult result;
>
> // TODO: investigate impact of treating reads as producing
> // tainted data, with __coverity_tainted_data_argument__(buf).
> - if (is_write) __bufread(buf, len); else __bufwrite(buf, len);
> + if (access_type == MEM_DATA_STORE) {
> + __bufread(buf, len);
> + } else {
> + __bufwrite(buf, len);
> + }
>
> return result;
> }
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2016-07-21 1:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-20 5:02 [PATCH v3 00/10] Support non-direct memory writes in cpu_memory_rw_debug Andrey Smirnov
2016-07-20 5:02 ` [PATCH v3 01/10] Avoid needless calls to address_space_rw() Andrey Smirnov
2016-07-20 5:02 ` [PATCH v3 02/10] Change signature of address_space_read() to avoid casting Andrey Smirnov
2016-07-20 5:02 ` [PATCH v3 03/10] Change signature of address_space_write() " Andrey Smirnov
2016-07-20 5:02 ` [PATCH v3 04/10] address_space_write_continue: Distill common code Andrey Smirnov
2016-07-20 5:02 ` [PATCH v3 05/10] Rename MMUAccessType to MemoryAccessType Andrey Smirnov
2016-07-20 9:34 ` David Gibson
2016-07-20 5:02 ` [PATCH v3 06/10] Change signature of cpu_memory_rw_debug() to avoid casting Andrey Smirnov
2016-07-20 5:02 ` [PATCH v3 07/10] Convert cpu_memory_rw_debug to use MemoryAccessType Andrey Smirnov
2016-07-20 9:45 ` David Gibson
2016-07-20 5:02 ` [PATCH v3 08/10] Convert address_space_rw " Andrey Smirnov
2016-07-21 1:47 ` David Gibson [this message]
2016-07-20 5:02 ` [PATCH v3 09/10] gdbstub: Convert target_memory_rw_debug " Andrey Smirnov
2016-07-21 1:48 ` David Gibson
2016-07-20 5:03 ` [PATCH v3 10/10] exec: Use address_space_rw to handle reads and wirtes Andrey Smirnov
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=20160721014718.GB12087@voom.fritz.box \
--to=david@gibson.dropbear.id.au \
--cc=andrew.smirnov@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).