From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9CD09C433EF for ; Thu, 3 Mar 2022 10:05:31 +0000 (UTC) Received: from localhost ([::1]:40620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPiKw-0008Q9-Jc for qemu-devel@archiver.kernel.org; Thu, 03 Mar 2022 05:05:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPiJc-0007RL-IB for qemu-devel@nongnu.org; Thu, 03 Mar 2022 05:04:08 -0500 Received: from [2a00:1450:4864:20::42d] (port=33700 helo=mail-wr1-x42d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nPiJa-0007uq-Q4 for qemu-devel@nongnu.org; Thu, 03 Mar 2022 05:04:08 -0500 Received: by mail-wr1-x42d.google.com with SMTP id j17so7022816wrc.0 for ; Thu, 03 Mar 2022 02:04:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=OaHbLT7XMVucikN4A5l3lDVuaHDiOw/VMkIpfxGb2YU=; b=ett5gjIBQGtWHwdmE8ayN8//23QfVTu2HehpDDQ3Ezf8A9IzWQSXy/uxY4cJsvOo4L 9N5OhmO1ejtZ3YcIB6OAKZd05XPvLeIFy3OYXEKDekUYK4zEIpf68L0yr8E2JNgbZcDe cBQPrl0C+vH4t2KTReZoK2akrGOeysnzmBYtUVY9rV1xdMazeurO1cRlTzO3nlaxUfi6 OHXQIU5i51w/SZxBE8ve1g9J4rCcErOzVYGrjNv2IlkYpPvOM+MKtvXeKER0dM3MuyOo yRUYFG9LHtoVik0ZHCV++XnaQ8RSWyNLDESvgjF+4LGIe2rg3MCjfERL4/xgTtHyUU/i xA5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=OaHbLT7XMVucikN4A5l3lDVuaHDiOw/VMkIpfxGb2YU=; b=l8R7a9TFqXPonCHF9MyLHkpwR3q9R5P6o5lK/L7SbfFGw+AwJgFsxfvipNSHVE4OxF O/nnLl2OmvguQaNv0Obd/0615PctnYBB7yVdZCWCwFVgpgAQx2lnR7FsBOZ2nSJ5GMH0 E9CvrvV8YeZZqz+6OmiTIC4bweDRXCTWQhjkNbx8xadZg1SuByITHMoukKho2fLhIcG9 ICzb2eL5Q/NPS+daj6wvjQXUvvmZXJ2jESouwyCwulTc7U794k6OZTBpM3oHS7/BUhTa jrf+AHSv80fSj3t59Qube7ddEqM7u2oHrk2PpuXilCnZRZ9gZaLmDkQehthNCjzzvSwM jbcg== X-Gm-Message-State: AOAM533RmFtkFmgPub2NyvTiIrcO6e+uwc4AhEoUUVd18sWxTRK1dPby KuVyOwiCbNuk23X+hlZ7Nb3gsnlVuQskz96gPOE= X-Google-Smtp-Source: ABdhPJyTKXmE9VDFz3Q8v1qL/Be/GbCD20kUptqMSg6qrDufmGqTFbser1FkHMnb1wdAhJeq/D+Pl/djRBRfIw7KmNo= X-Received: by 2002:a5d:6d0c:0:b0:1ea:81fb:f323 with SMTP id e12-20020a5d6d0c000000b001ea81fbf323mr26559018wrq.187.1646301845383; Thu, 03 Mar 2022 02:04:05 -0800 (PST) MIME-Version: 1.0 References: <20220303095840.1318239-1-pizhenwei@bytedance.com> In-Reply-To: <20220303095840.1318239-1-pizhenwei@bytedance.com> From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Date: Thu, 3 Mar 2022 14:03:53 +0400 Message-ID: Subject: Re: [PATCH v2] qga: Introduce NVMe disk bus type To: zhenwei pi Content-Type: multipart/alternative; boundary="000000000000afeccd05d94d845b" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=marcandre.lureau@gmail.com; helo=mail-wr1-x42d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Roth , Markus Armbruster , QEMU Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --000000000000afeccd05d94d845b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Mar 3, 2022 at 2:01 PM zhenwei pi wrote: > Assigning a NVMe disk by VFIO or emulating a NVMe controller by QEMU, > a NVMe disk get exposed in guest side. Support NVMe disk bus type and > implement posix version. > > Test PCI passthrough case: > ~#virsh qemu-agent-command buster '{"execute":"guest-get-disks"}' | jq > ... > { > "name": "/dev/nvme0n1", > "dependencies": [], > "partition": false, > "address": { > "serial": "SAMSUNG MZQL23T8HCLS-00A07_S64HNE0N500076", > "bus-type": "nvme", > "bus": 0, > "unit": 0, > "pci-controller": { > "bus": 0, > "slot": 22, > "domain": 0, > "function": 0 > }, > "dev": "/dev/nvme0n1", > "target": 0 > } > ... > > Signed-off-by: zhenwei pi > Reviewed-by: Marc-Andr=C3=A9 Lureau > --- > qga/commands-posix.c | 5 ++++- > qga/qapi-schema.json | 3 ++- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/qga/commands-posix.c b/qga/commands-posix.c > index 75dbaab68e..4ec83bbfbc 100644 > --- a/qga/commands-posix.c > +++ b/qga/commands-posix.c > @@ -889,7 +889,8 @@ static bool build_guest_fsinfo_for_pci_dev(char const > *syspath, > if (driver && (g_str_equal(driver, "ata_piix") || > g_str_equal(driver, "sym53c8xx") || > g_str_equal(driver, "virtio-pci") || > - g_str_equal(driver, "ahci"))) { > + g_str_equal(driver, "ahci") || > + g_str_equal(driver, "nvme"))) { > break; > } > > @@ -984,6 +985,8 @@ static bool build_guest_fsinfo_for_pci_dev(char const > *syspath, > g_debug("no host for '%s' (driver '%s')", syspath, driver); > goto cleanup; > } > + } else if (strcmp(driver, "nvme") =3D=3D 0) { > + disk->bus_type =3D GUEST_DISK_BUS_TYPE_NVME; > } else { > g_debug("unknown driver '%s' (sysfs path '%s')", driver, syspath= ); > goto cleanup; > diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json > index 94e4aacdcc..8f73770210 100644 > --- a/qga/qapi-schema.json > +++ b/qga/qapi-schema.json > @@ -827,13 +827,14 @@ > # @mmc: Win multimedia card (MMC) bus type > # @virtual: Win virtual bus type > # @file-backed-virtual: Win file-backed bus type > +# @nvme: NVMe disks (since 6.3) > # > # Since: 2.2; 'Unknown' and all entries below since 2.4 > ## > { 'enum': 'GuestDiskBusType', > 'data': [ 'ide', 'fdc', 'scsi', 'virtio', 'xen', 'usb', 'uml', 'sata', > 'sd', 'unknown', 'ieee1394', 'ssa', 'fibre', 'raid', 'iscsi'= , > - 'sas', 'mmc', 'virtual', 'file-backed-virtual' ] } > + 'sas', 'mmc', 'virtual', 'file-backed-virtual', 'nvme' ] } > > > ## > -- > 2.20.1 > > --=20 Marc-Andr=C3=A9 Lureau --000000000000afeccd05d94d845b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Mar 3, 2022 at 2:01 PM zhenwe= i pi <pizhenwei@bytedance.com= > wrote:
= Assigning a NVMe disk by VFIO or emulating a NVMe controller by QEMU,
a NVMe disk get exposed in guest side. Support NVMe disk bus type and
implement posix version.

Test PCI passthrough case:
~#virsh qemu-agent-command buster '{"execute":"guest-get= -disks"}' | jq
=C2=A0 ...
=C2=A0 =C2=A0 {
=C2=A0 =C2=A0 =C2=A0 "name": "/dev/nvme0n1",
=C2=A0 =C2=A0 =C2=A0 "dependencies": [],
=C2=A0 =C2=A0 =C2=A0 "partition": false,
=C2=A0 =C2=A0 =C2=A0 "address": {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 "serial": "SAMSUNG MZQL23T8HCLS-= 00A07_S64HNE0N500076",
=C2=A0 =C2=A0 =C2=A0 =C2=A0 "bus-type": "nvme",
=C2=A0 =C2=A0 =C2=A0 =C2=A0 "bus": 0,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 "unit": 0,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 "pci-controller": {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "bus": 0,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "slot": 22,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "domain": 0,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "function": 0
=C2=A0 =C2=A0 =C2=A0 =C2=A0 },
=C2=A0 =C2=A0 =C2=A0 =C2=A0 "dev": "/dev/nvme0n1",
=C2=A0 =C2=A0 =C2=A0 =C2=A0 "target": 0
=C2=A0 =C2=A0 =C2=A0 }
=C2=A0 ...

Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>

Reviewed-by: Marc-Andr=C3=A9 Lureau <marcandre.lureau@redhat.com>
=C2=A0
---
=C2=A0qga/commands-posix.c | 5 ++++-
=C2=A0qga/qapi-schema.json | 3 ++-
=C2=A02 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 75dbaab68e..4ec83bbfbc 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -889,7 +889,8 @@ static bool build_guest_fsinfo_for_pci_dev(char const *= syspath,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (driver && (g_str_equal(driver= , "ata_piix") ||
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 g_str_equal(driver, "sym53c8xx") ||
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 g_str_equal(driver, "virtio-pci") ||
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0g_str_equal(driver, "ahci"))) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0g_str_equal(driver, "ahci") ||
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0g_str_equal(driver, "nvme"))) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0break;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}

@@ -984,6 +985,8 @@ static bool build_guest_fsinfo_for_pci_dev(char const *= syspath,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0g_debug("no host for &= #39;%s' (driver '%s')", syspath, driver);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto cleanup;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
+=C2=A0 =C2=A0 } else if (strcmp(driver, "nvme") =3D=3D 0) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 disk->bus_type =3D GUEST_DISK_BUS_TYPE_NVME= ;
=C2=A0 =C2=A0 =C2=A0} else {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0g_debug("unknown driver '%s'= (sysfs path '%s')", driver, syspath);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto cleanup;
diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json
index 94e4aacdcc..8f73770210 100644
--- a/qga/qapi-schema.json
+++ b/qga/qapi-schema.json
@@ -827,13 +827,14 @@
=C2=A0# @mmc: Win multimedia card (MMC) bus type
=C2=A0# @virtual: Win virtual bus type
=C2=A0# @file-backed-virtual: Win file-backed bus type
+# @nvme: NVMe disks (since 6.3)
=C2=A0#
=C2=A0# Since: 2.2; 'Unknown' and all entries below since 2.4
=C2=A0##
=C2=A0{ 'enum': 'GuestDiskBusType',
=C2=A0 =C2=A0'data': [ 'ide', 'fdc', 'scsi'= , 'virtio', 'xen', 'usb', 'uml', 'sata&= #39;,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0'sd', 'unknown&= #39;, 'ieee1394', 'ssa', 'fibre', 'raid', &= #39;iscsi',
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 'sas', 'mmc', &#= 39;virtual', 'file-backed-virtual' ] }
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 'sas', 'mmc', &#= 39;virtual', 'file-backed-virtual', 'nvme' ] }


=C2=A0##
--
2.20.1



--
Marc-Andr=C3=A9 Lureau
--000000000000afeccd05d94d845b--