From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Maxim Levitsky <mlevitsk@redhat.com>,
qemu-devel@nongnu.org,
Alex Williamson <alex.williamson@redhat.com>,
Eric Auger <eric.auger@redhat.com>
Cc: "Fam Zheng" <fam@euphon.net>, "Kevin Wolf" <kwolf@redhat.com>,
qemu-block@nongnu.org, "Michal Prívozník" <mprivozn@redhat.com>,
qemu-stable@nongnu.org, "Max Reitz" <mreitz@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>
Subject: Re: [PATCH] block/nvme: Fix VFIO_MAP_DMA failed: No space left on device
Date: Thu, 17 Jun 2021 17:48:46 +0200 [thread overview]
Message-ID: <48bfbc56-f2c0-daf2-5e1e-7df17192ca0c@redhat.com> (raw)
In-Reply-To: <4b6b6f1b7a97d4b7fd2008fd31c6c2121ba053fb.camel@redhat.com>
On 6/17/21 2:40 PM, Maxim Levitsky wrote:
> On Mon, 2021-06-14 at 18:03 +0200, Philippe Mathieu-Daudé wrote:
>> On 6/11/21 1:46 PM, Philippe Mathieu-Daudé wrote:
>>> When the NVMe block driver was introduced (see commit bdd6a90a9e5,
>>> January 2018), Linux VFIO_IOMMU_MAP_DMA ioctl was only returning
>>> -ENOMEM in case of error. The driver was correctly handling the
>>> error path to recycle its volatile IOVA mappings.
>>>
>>> To fix CVE-2019-3882, Linux commit 492855939bdb ("vfio/type1: Limit
>>> DMA mappings per container", April 2019) added the -ENOSPC error to
>>> signal the user exhausted the DMA mappings available for a container.
>>
>> Hmm this commit has been added before v5.1-rc4.
>>
>> So while this fixes the behavior of v5.1-rc4+ kernels,
>> older kernels using this fix will have the same problem...
>
>
> Hi!
>
> I wonder why not to check for both -ENOMEM and -ENOSPC
> and recycle the mappings in both cases?
>
> I think that would work on both old and new kernels.
>
> What do you think?
Yes, worst case we retry one more time for nothing.
Alex suggested to use VFIO_IOMMU_GET_INFO to get the limit
with VFIO_IOMMU_TYPE1_INFO_DMA_AVAIL, and if not available
the driver should use a reasonable value to limit itself.
I'll try to get it quick, otherwise fall back to your "dual
errno" case.
Thanks both for the ideas,
Phil.
>>> diff --git a/block/nvme.c b/block/nvme.c
>>> index 2b5421e7aa6..12f9dd5cce3 100644
>>> --- a/block/nvme.c
>>> +++ b/block/nvme.c
>>> @@ -1030,7 +1030,7 @@ try_map:
>>> r = qemu_vfio_dma_map(s->vfio,
>>> qiov->iov[i].iov_base,
>>> len, true, &iova);
>>> - if (r == -ENOMEM && retry) {
>>> + if (r == -ENOSPC && retry) {
>>> retry = false;
>>> trace_nvme_dma_flush_queue_wait(s);
>>> if (s->dma_map_count) {
>>>
prev parent reply other threads:[~2021-06-17 17:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-11 11:46 [PATCH] block/nvme: Fix VFIO_MAP_DMA failed: No space left on device Philippe Mathieu-Daudé
2021-06-14 15:25 ` Michal Prívozník
2021-06-14 16:03 ` Philippe Mathieu-Daudé
2021-06-14 17:58 ` Michal Prívozník
2021-06-17 12:40 ` Maxim Levitsky
2021-06-17 15:48 ` Philippe Mathieu-Daudé [this message]
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=48bfbc56-f2c0-daf2-5e1e-7df17192ca0c@redhat.com \
--to=philmd@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=eric.auger@redhat.com \
--cc=fam@euphon.net \
--cc=kwolf@redhat.com \
--cc=mlevitsk@redhat.com \
--cc=mprivozn@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.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).