From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Peter Xu" <peterx@redhat.com>, "Bibo Mao" <maobibo@loongson.cn>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [RFC PATCH 08/12] exec/memory_ldst_cached: Check address alignment if requested
Date: Thu, 20 May 2021 13:09:15 +0200 [thread overview]
Message-ID: <20210520110919.2483190-9-philmd@redhat.com> (raw)
In-Reply-To: <20210520110919.2483190-1-philmd@redhat.com>
If the caller requires strict alignment, check the address
satisfies it before doing the transaction. Otherwise return
a MEMTX_UNALIGNED_ERROR.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/exec/memory_ldst_cached.h.inc | 42 +++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/include/exec/memory_ldst_cached.h.inc b/include/exec/memory_ldst_cached.h.inc
index 515beb48f47..311a9759a22 100644
--- a/include/exec/memory_ldst_cached.h.inc
+++ b/include/exec/memory_ldst_cached.h.inc
@@ -31,6 +31,13 @@ static inline uint16_t ADDRESS_SPACE_LD_CACHED(uw)(MemoryRegionCache *cache,
assert(addr < cache->len && 2 <= cache->len - addr);
fuzz_dma_read_cb(cache->xlat + addr, 2, cache->mrs.mr);
if (likely(cache->ptr)) {
+ if (attrs.aligned && unlikely(!QEMU_PTR_IS_ALIGNED(cache->ptr,
+ sizeof(uint16_t)))) {
+ if (result) {
+ *result = MEMTX_UNALIGNED_ERROR;
+ }
+ return (uint16_t)-1; /* XXX */
+ }
if (result) {
*result = MEMTX_OK;
}
@@ -47,6 +54,13 @@ static inline uint32_t ADDRESS_SPACE_LD_CACHED(l)(MemoryRegionCache *cache,
assert(addr < cache->len && 4 <= cache->len - addr);
fuzz_dma_read_cb(cache->xlat + addr, 4, cache->mrs.mr);
if (likely(cache->ptr)) {
+ if (attrs.aligned && unlikely(!QEMU_PTR_IS_ALIGNED(cache->ptr,
+ sizeof(uint32_t)))) {
+ if (result) {
+ *result = MEMTX_UNALIGNED_ERROR;
+ }
+ return (uint32_t)-1; /* XXX */
+ }
if (result) {
*result = MEMTX_OK;
}
@@ -63,6 +77,13 @@ static inline uint64_t ADDRESS_SPACE_LD_CACHED(q)(MemoryRegionCache *cache,
assert(addr < cache->len && 8 <= cache->len - addr);
fuzz_dma_read_cb(cache->xlat + addr, 8, cache->mrs.mr);
if (likely(cache->ptr)) {
+ if (attrs.aligned && unlikely(!QEMU_PTR_IS_ALIGNED(cache->ptr,
+ sizeof(uint64_t)))) {
+ if (result) {
+ *result = MEMTX_UNALIGNED_ERROR;
+ }
+ return (uint64_t)-1; /* XXX */
+ }
if (result) {
*result = MEMTX_OK;
}
@@ -89,6 +110,13 @@ static inline void ADDRESS_SPACE_ST_CACHED(w)(MemoryRegionCache *cache,
{
assert(addr < cache->len && 2 <= cache->len - addr);
if (likely(cache->ptr)) {
+ if (attrs.aligned && unlikely(!QEMU_PTR_IS_ALIGNED(cache->ptr,
+ sizeof(uint16_t)))) {
+ if (result) {
+ *result = MEMTX_UNALIGNED_ERROR;
+ }
+ return;
+ }
if (result) {
*result = MEMTX_OK;
}
@@ -104,6 +132,13 @@ static inline void ADDRESS_SPACE_ST_CACHED(l)(MemoryRegionCache *cache,
{
assert(addr < cache->len && 4 <= cache->len - addr);
if (likely(cache->ptr)) {
+ if (attrs.aligned && unlikely(!QEMU_PTR_IS_ALIGNED(cache->ptr,
+ sizeof(uint32_t)))) {
+ if (result) {
+ *result = MEMTX_UNALIGNED_ERROR;
+ }
+ return;
+ }
if (result) {
*result = MEMTX_OK;
}
@@ -119,6 +154,13 @@ static inline void ADDRESS_SPACE_ST_CACHED(q)(MemoryRegionCache *cache,
{
assert(addr < cache->len && 8 <= cache->len - addr);
if (likely(cache->ptr)) {
+ if (attrs.aligned && unlikely(!QEMU_PTR_IS_ALIGNED(cache->ptr,
+ sizeof(uint64_t)))) {
+ if (result) {
+ *result = MEMTX_UNALIGNED_ERROR;
+ }
+ return;
+ }
if (result) {
*result = MEMTX_OK;
}
--
2.26.3
next prev parent reply other threads:[~2021-05-20 11:14 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-20 11:09 [RFC PATCH 00/12] exec/memory: Experimental API to catch unaligned accesses Philippe Mathieu-Daudé
2021-05-20 11:09 ` [RFC PATCH 01/12] exec/memory_ldst: Use correct type sizes Philippe Mathieu-Daudé
2021-05-20 11:09 ` [RFC PATCH 02/12] exec/memattrs: Add attribute/error for address alignment Philippe Mathieu-Daudé
2021-06-02 12:39 ` Stefan Hajnoczi
2021-05-20 11:09 ` [RFC PATCH 03/12] exec/memory_ldst: Return MEMTX_UNALIGNED_ERROR for unaligned addresses Philippe Mathieu-Daudé
2021-05-20 11:09 ` [RFC PATCH 04/12] exec/memory_ldst_cached: Sort declarations Philippe Mathieu-Daudé
2021-05-20 11:09 ` [RFC PATCH 05/12] exec/memory_ldst_cached: Use correct type size Philippe Mathieu-Daudé
2021-05-20 11:09 ` [RFC PATCH 06/12] exec/memory_ldst_cached: Set MemTxResult on success Philippe Mathieu-Daudé
2021-05-20 11:09 ` [RFC PATCH 07/12] exec/memory_ldst_cached: Document aligned addresses are expected Philippe Mathieu-Daudé
2021-05-20 11:09 ` Philippe Mathieu-Daudé [this message]
2021-05-20 11:09 ` [RFC PATCH 09/12] hw/virtio: Use correct type sizes Philippe Mathieu-Daudé
2021-05-20 11:09 ` [RFC PATCH 10/12] hw/virtio: Extract virtio_lduw_phys_cached_with_attrs() Philippe Mathieu-Daudé
2021-05-20 11:09 ` [RFC PATCH 11/12] hw/virtio: Have vring_avail_flags() return a boolean value Philippe Mathieu-Daudé
2021-05-20 11:09 ` [RFC PATCH 12/12] hw/virtio: Display error if vring flag field is not aligned Philippe Mathieu-Daudé
2021-06-02 12:44 ` Stefan Hajnoczi
2021-06-01 3:32 ` [RFC PATCH 00/12] exec/memory: Experimental API to catch unaligned accesses Philippe Mathieu-Daudé
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=20210520110919.2483190-9-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=maobibo@loongson.cn \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=stefanha@redhat.com \
/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).