From: Peter Maydell <peter.maydell@linaro.org>
To: David Woodhouse <dwmw2@infradead.org>
Cc: qemu-devel@nongnu.org, "Stefan Hajnoczi" <stefanha@redhat.com>,
"Kevin Wolf" <kwolf@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Anthony Perard" <anthony.perard@citrix.com>,
"Paul Durrant" <paul@xen.org>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Jason Wang" <jasowang@redhat.com>,
"Marcelo Tosatti" <mtosatti@redhat.com>,
qemu-block@nongnu.org, xen-devel@lists.xenproject.org,
kvm@vger.kernel.org
Subject: Re: [PULL 06/15] hw/xen: automatically assign device index to block devices
Date: Thu, 9 Nov 2023 14:33:06 +0000 [thread overview]
Message-ID: <CAFEAcA8McSqwXyAg1+9_DOjy5PU==FRja_gjkdXAAqjr7QtLQA@mail.gmail.com> (raw)
In-Reply-To: <20231107092149.404842-7-dwmw2@infradead.org>
On Tue, 7 Nov 2023 at 09:24, David Woodhouse <dwmw2@infradead.org> wrote:
>
> From: David Woodhouse <dwmw@amazon.co.uk>
>
> There's no need to force the user to assign a vdev. We can automatically
> assign one, starting at xvda and searching until we find the first disk
> name that's unused.
>
> This means we can now allow '-drive if=xen,file=xxx' to work without an
> explicit separate -driver argument, just like if=virtio.
>
> Rip out the legacy handling from the xenpv machine, which was scribbling
> over any disks configured by the toolstack, and didn't work with anything
> but raw images.
Hi; Coverity points out an issue in this code (CID 1523906):
> +/*
> + * Find a free device name in the xvda → xvdfan range and set it in
> + * blockdev->props.vdev. Our definition of "free" is that there must
> + * be no other disk or partition with the same disk number.
> + *
> + * You are technically permitted to have all of hda, hda1, sda, sda1,
> + * xvda and xvda1 as *separate* PV block devices with separate backing
> + * stores. That doesn't make it a good idea. This code will skip xvda
> + * if *any* of those "conflicting" devices already exists.
> + *
> + * The limit of xvdfan (disk 4095) is fairly arbitrary just to avoid a
> + * stupidly sized bitmap, but Linux as of v6.6 doesn't support anything
> + * higher than that anyway.
> + */
> +static bool xen_block_find_free_vdev(XenBlockDevice *blockdev, Error **errp)
> +{
> + XenBus *xenbus = XEN_BUS(qdev_get_parent_bus(DEVICE(blockdev)));
> + unsigned long used_devs[BITS_TO_LONGS(MAX_AUTO_VDEV)];
> + XenBlockVdev *vdev = &blockdev->props.vdev;
> + char fe_path[XENSTORE_ABS_PATH_MAX + 1];
> + char **existing_frontends;
> + unsigned int nr_existing = 0;
> + unsigned int vdev_nr;
> + int i, disk = 0;
> +
> + snprintf(fe_path, sizeof(fe_path), "/local/domain/%u/device/vbd",
> + blockdev->xendev.frontend_id);
> +
> + existing_frontends = qemu_xen_xs_directory(xenbus->xsh, XBT_NULL, fe_path,
> + &nr_existing);
> + if (!existing_frontends && errno != ENOENT) {
Here we check whether existing_frontends is NULL, implying it
might be NULL (and the && in the condition means we might not
take this error-exit path even if it is NULL)...
> + error_setg_errno(errp, errno, "cannot read %s", fe_path);
> + return false;
> + }
> +
> + memset(used_devs, 0, sizeof(used_devs));
> + for (i = 0; i < nr_existing; i++) {
> + if (qemu_strtoui(existing_frontends[i], NULL, 10, &vdev_nr)) {
...but here we deref existing_frontends, implying it can't be NULL.
> + free(existing_frontends[i]);
> + continue;
> + }
> +
> + free(existing_frontends[i]);
> +
> + disk = vdev_to_diskno(vdev_nr);
> + if (disk < 0 || disk >= MAX_AUTO_VDEV) {
> + continue;
> + }
> +
> + set_bit(disk, used_devs);
> + }
> + free(existing_frontends);
thanks
-- PMM
next prev parent reply other threads:[~2023-11-09 14:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-07 9:21 [PULL 00/15] xenfv.for-upstream queue David Woodhouse
2023-11-07 9:21 ` [PULL 01/15] i386/xen: Ignore VCPU_SSHOTTMR_future flag in set_singleshot_timer() David Woodhouse
2023-11-07 9:21 ` [PULL 02/15] hw/xen: Clean up event channel 'type_val' handling to use union David Woodhouse
2023-11-07 9:21 ` [PULL 03/15] include: update Xen public headers to Xen 4.17.2 release David Woodhouse
2023-11-07 9:21 ` [PULL 04/15] i386/xen: advertise XEN_HVM_CPUID_UPCALL_VECTOR in CPUID David Woodhouse
2023-11-07 9:21 ` [PULL 05/15] hw/xen: populate store frontend nodes with XenStore PFN/port David Woodhouse
2023-11-07 9:21 ` [PULL 06/15] hw/xen: automatically assign device index to block devices David Woodhouse
2023-11-09 14:33 ` Peter Maydell [this message]
2023-11-09 14:55 ` David Woodhouse
2023-11-07 9:21 ` [PULL 07/15] hw/xen: add get_frontend_path() method to XenDeviceClass David Woodhouse
2023-11-07 9:21 ` [PULL 08/15] hw/xen: do not repeatedly try to create a failing backend device David Woodhouse
2023-11-07 9:21 ` [PULL 09/15] hw/xen: update Xen console to XenDevice model David Woodhouse
2023-11-07 9:21 ` [PULL 10/15] hw/xen: add support for Xen primary console in emulated mode David Woodhouse
2023-11-07 9:21 ` [PULL 11/15] hw/xen: only remove peers of PCI NICs on unplug David Woodhouse
2023-11-07 9:21 ` [PULL 12/15] hw/xen: update Xen PV NIC to XenDevice model David Woodhouse
2023-11-07 9:21 ` [PULL 13/15] hw/i386/pc: support '-nic' for xen-net-device David Woodhouse
2023-11-07 9:21 ` [PULL 14/15] xen-platform: unplug AHCI disks David Woodhouse
2023-11-07 9:21 ` [PULL 15/15] docs: update Xen-on-KVM documentation David Woodhouse
2023-11-07 13:40 ` [PULL 00/15] xenfv.for-upstream queue Stefan Hajnoczi
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='CAFEAcA8McSqwXyAg1+9_DOjy5PU==FRja_gjkdXAAqjr7QtLQA@mail.gmail.com' \
--to=peter.maydell@linaro.org \
--cc=anthony.perard@citrix.com \
--cc=dwmw2@infradead.org \
--cc=eduardo@habkost.net \
--cc=hreitz@redhat.com \
--cc=jasowang@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=kwolf@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=mtosatti@redhat.com \
--cc=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=sstabellini@kernel.org \
--cc=stefanha@redhat.com \
--cc=xen-devel@lists.xenproject.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).