From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: Alexander Bulekov <alxndr@bu.edu>, qemu-devel@nongnu.org
Cc: "Stefan Hajnoczi" <stefanha@redhat.com>,
"Mauro Matteo Cascella" <mcascell@redhat.com>,
"Peter Xu" <peterx@redhat.com>,
"Jason Wang" <jasowang@redhat.com>,
"David Hildenbrand" <david@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Laurent Vivier" <lvivier@redhat.com>,
"Bandan Das" <bsd@redhat.com>,
"Edgar E . Iglesias" <edgar.iglesias@gmail.com>,
"Darren Kenny" <darren.kenny@oracle.com>,
"Bin Meng" <bin.meng@windriver.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Jon Maloy" <jmaloy@redhat.com>, "Siqi Chen" <coc.cyqh@gmail.com>
Subject: Re: [PATCH v7 1/6] memory: prevent dma-reentracy issues
Date: Mon, 13 Mar 2023 09:45:39 +0100 [thread overview]
Message-ID: <bb13d933-0de9-9537-8e3e-dc91c24eb177@linaro.org> (raw)
In-Reply-To: <20230313082417.827484-2-alxndr@bu.edu>
Hi Alex,
Sorry for the late review, *sigh*.
On 13/3/23 09:24, Alexander Bulekov wrote:
> Add a flag to the DeviceState, when a device is engaged in PIO/MMIO/DMA.
> This flag is set/checked prior to calling a device's MemoryRegion
> handlers, and set when device code initiates DMA. The purpose of this
> flag is to prevent two types of DMA-based reentrancy issues:
>
> 1.) mmio -> dma -> mmio case
> 2.) bh -> dma write -> mmio case
>
> These issues have led to problems such as stack-exhaustion and
> use-after-frees.
>
> Summary of the problem from Peter Maydell:
> https://lore.kernel.org/qemu-devel/CAFEAcA_23vc7hE3iaM-JVA6W38LK4hJoWae5KcknhPRD5fPBZA@mail.gmail.com
>
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/62
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/540
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/541
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/556
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/557
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/827
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1282
>
> Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
> Acked-by: Peter Xu <peterx@redhat.com>
> ---
> include/hw/qdev-core.h | 7 +++++++
> softmmu/memory.c | 17 +++++++++++++++++
> softmmu/trace-events | 1 +
> 3 files changed, 25 insertions(+)
>
> diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
> index bd50ad5ee1..7623703943 100644
> --- a/include/hw/qdev-core.h
> +++ b/include/hw/qdev-core.h
> @@ -162,6 +162,10 @@ struct NamedClockList {
> QLIST_ENTRY(NamedClockList) node;
> };
>
> +typedef struct {
> + bool engaged_in_io;
Do you plan to add more fields?
> +} MemReentrancyGuard;
> +
> /**
> * DeviceState:
> * @realized: Indicates whether the device has been fully constructed.
> @@ -194,6 +198,9 @@ struct DeviceState {
> int alias_required_for_version;
> ResettableState reset;
> GSList *unplug_blockers;
> +
> + /* Is the device currently in mmio/pio/dma? Used to prevent re-entrancy */
> + MemReentrancyGuard mem_reentrancy_guard;
At this point I'm not sure anymore this is a device or MR property.
> };
>
> struct DeviceListener {
> diff --git a/softmmu/memory.c b/softmmu/memory.c
> index 4699ba55ec..57bf18a257 100644
> --- a/softmmu/memory.c
> +++ b/softmmu/memory.c
> @@ -533,6 +533,7 @@ static MemTxResult access_with_adjusted_size(hwaddr addr,
> uint64_t access_mask;
> unsigned access_size;
> unsigned i;
> + DeviceState *dev = NULL;
> MemTxResult r = MEMTX_OK;
>
> if (!access_size_min) {
> @@ -542,6 +543,19 @@ static MemTxResult access_with_adjusted_size(hwaddr addr,
> access_size_max = 4;
> }
>
> + /* Do not allow more than one simultanous access to a device's IO Regions */
Typo "simultaneous".
1/ access_with_adjusted_size() is complex enough and we are having hard
time getting it right. I'd prefer we don't intermix size adjustment
and re-entrancy check in the same function. This check could belong
to the callers.
2/ I'm not keen on calling QOM object_dynamic_cast() in this hot path;
and mixing QDev API within MR one. At least, can we cache this value
once in memory_region_do_init() since we have access to @owner?
> + if (mr->owner &&
> + !mr->ram_device && !mr->ram && !mr->rom_device && !mr->readonly) {
> + dev = (DeviceState *) object_dynamic_cast(mr->owner, TYPE_DEVICE);
> + if (dev) {
> + if (dev->mem_reentrancy_guard.engaged_in_io) {
> + trace_memory_region_reentrant_io(get_cpu_index(), mr, addr, size);
> + return MEMTX_ERROR;
MEMTX_ERROR is device-specific, I'm not sure it is right to return it
from this generic path. Maybe you meant MEMTX_ACCESS_ERROR?
> + }
> + dev->mem_reentrancy_guard.engaged_in_io = true;
> + }
> + }
> +
> /* FIXME: support unaligned access? */
> access_size = MAX(MIN(size, access_size_max), access_size_min);
> access_mask = MAKE_64BIT_MASK(0, access_size * 8);
> @@ -556,6 +570,9 @@ static MemTxResult access_with_adjusted_size(hwaddr addr,
> access_mask, attrs);
> }
> }
> + if (dev) {
> + dev->mem_reentrancy_guard.engaged_in_io = false;
> + }
> return r;
> }
next prev parent reply other threads:[~2023-03-13 8:46 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-13 8:24 [PATCH v7 0/6] memory: prevent dma-reentracy issues Alexander Bulekov
2023-03-13 8:24 ` [PATCH v7 1/6] " Alexander Bulekov
2023-03-13 8:45 ` Philippe Mathieu-Daudé [this message]
2023-03-13 9:15 ` Alexander Bulekov
2023-03-13 9:16 ` Alexander Bulekov
2023-03-13 10:06 ` Philippe Mathieu-Daudé
2023-03-13 8:24 ` [PATCH v7 2/6] async: Add an optional reentrancy guard to the BH API Alexander Bulekov
2023-03-13 8:24 ` [PATCH v7 3/6] checkpatch: add qemu_bh_new/aio_bh_new checks Alexander Bulekov
2023-03-13 8:24 ` [PATCH v7 4/6] hw: replace most qemu_bh_new calls with qemu_bh_new_guarded Alexander Bulekov
2023-03-13 8:36 ` Thomas Huth
2023-03-13 8:24 ` [PATCH v7 5/6] memory: Allow disabling re-entrancy checking per-MR Alexander Bulekov
2023-03-13 8:36 ` Thomas Huth
2023-03-13 12:21 ` Darren Kenny
2023-03-13 8:24 ` [PATCH v7 6/6] lsi53c895a: disable reentrancy detection for script RAM Alexander Bulekov
2023-03-13 8:38 ` Thomas Huth
2023-03-13 12:23 ` Darren Kenny
2023-04-21 11:30 ` Michael Tokarev
2023-03-13 14:02 ` [PATCH v7 0/6] memory: prevent dma-reentracy issues Thomas Huth
2023-03-13 14:52 ` Alexander Bulekov
2023-03-13 15:41 ` Philippe Mathieu-Daudé
2023-03-13 16:08 ` Peter Maydell
2023-03-13 17:20 ` Alexander Bulekov
2023-03-13 16:18 ` Thomas Huth
2023-03-13 20:39 ` 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=bb13d933-0de9-9537-8e3e-dc91c24eb177@linaro.org \
--to=philmd@linaro.org \
--cc=alxndr@bu.edu \
--cc=berrange@redhat.com \
--cc=bin.meng@windriver.com \
--cc=bsd@redhat.com \
--cc=coc.cyqh@gmail.com \
--cc=darren.kenny@oracle.com \
--cc=david@redhat.com \
--cc=edgar.iglesias@gmail.com \
--cc=eduardo@habkost.net \
--cc=jasowang@redhat.com \
--cc=jmaloy@redhat.com \
--cc=kraxel@redhat.com \
--cc=lvivier@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mcascell@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=thuth@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).