From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id E38E21FF167 for ; Wed, 31 Jul 2024 17:30:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 76CC718E63; Wed, 31 Jul 2024 17:30:38 +0200 (CEST) Message-ID: <187ff423-af18-4f7a-9582-6ea99d651c6b@proxmox.com> Date: Wed, 31 Jul 2024 17:30:33 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta To: Proxmox VE development discussion , Aaron Lauterer References: <20240731131658.1719688-1-a.lauterer@proxmox.com> <20240731134033.1733932-1-a.lauterer@proxmox.com> Content-Language: en-GB, de-AT From: Thomas Lamprecht Autocrypt: addr=t.lamprecht@proxmox.com; keydata= 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 DrEx In-Reply-To: <20240731134033.1733932-1-a.lauterer@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL -0.052 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [drive.pm, qemuserver.pm] Subject: Re: [pve-devel] [WIP qemu-server 1/3] fix #2255: add support for nvme emulation X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Am 31/07/2024 um 15:40 schrieb Aaron Lauterer: > From: Oguz Bektas > > now we can add nvme drives; > > nvme0: local-lvm:vm-103-disk-0,size=32G > > or > > qm set VMID --nvme0 local-lvm:32 > > max number is 8 for now, as most real hardware has 1-3 nvme slots and > can have a few more with pcie. most cases won't go over 8, if there's an > actual usecase at some point this can always be increased without > breaking anything (although the same isn't valid for decreasing it). > > Signed-off-by: Oguz Bektas A S-o-b from you hear would be good to have, you can also describe the changes done on top of original patch like: Signed-off-by: Oguz Bektas [ AL: rebased, ... ] Signed-off-by: Aaron Lauterer > --- > PVE/QemuServer.pm | 23 ++++++++++++++++++++--- > PVE/QemuServer/Drive.pm | 21 +++++++++++++++++++++ > 2 files changed, 41 insertions(+), 3 deletions(-) > > diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm > index b26da50..7d8d75b 100644 > --- a/PVE/QemuServer.pm > +++ b/PVE/QemuServer.pm > @@ -437,7 +437,7 @@ EODESC > optional => 1, > type => 'string', format => 'pve-qm-bootdisk', > description => "Enable booting from specified disk. Deprecated: Use 'boot: order=foo;bar' instead.", > - pattern => '(ide|sata|scsi|virtio)\d+', > + pattern => '(ide|sata|scsi|virtio|nvme)\d+', > }, > smp => { > optional => 1, > @@ -1433,7 +1433,10 @@ sub print_drivedevice_full { > $device .= ",product=$product"; > } > } > - > + } elsif ($drive->{interface} eq 'nvme') { > + my $path = $drive->{file}; ^- this variable seems to be unused? > + $drive->{serial} //= "$drive->{interface}$drive->{index}"; # serial is mandatory for nvme > + $device = "nvme,drive=drive-$drive->{interface}$drive->{index},id=$drive->{interface}$drive->{index}"; > } elsif ($drive->{interface} eq 'ide' || $drive->{interface} eq 'sata') { > my $maxdev = ($drive->{interface} eq 'sata') ? $PVE::QemuServer::Drive::MAX_SATA_DISKS : 2; > my $controller = int($drive->{index} / $maxdev); > @@ -2396,7 +2399,7 @@ sub parse_vm_config { > } else { > $key = 'ide2' if $key eq 'cdrom'; > my $fmt = $confdesc->{$key}->{format}; > - if ($fmt && $fmt =~ /^pve-qm-(?:ide|scsi|virtio|sata)$/) { > + if ($fmt && $fmt =~ /^pve-qm-(?:ide|scsi|virtio|sata|nvme)$/) { > my $v = parse_drive($key, $value); > if (my $volid = filename_to_volume_id($vmid, $v->{file}, $v->{media})) { > $v->{file} = $volid; > @@ -4289,6 +4292,17 @@ sub vm_deviceplug { > warn $@ if $@; > die $err; > } > + } elsif ($deviceid =~ m/^(nvme)(\d+)$/) { > + > + qemu_driveadd($storecfg, $vmid, $device); > + > + my $devicefull = print_drivedevice_full($storecfg, $conf, $vmid, $device, $arch, $machine_type); Would prefer having a word separator: my $device_full = ... > + eval { qemu_deviceadd($vmid, $devicefull); }; > + if (my $err = $@) { > + eval { qemu_drivedel($vmid, $deviceid); }; > + warn $@ if $@; > + die $err; > + } > } elsif ($deviceid =~ m/^(net)(\d+)$/) { > return if !qemu_netdevadd($vmid, $conf, $arch, $device, $deviceid); > > @@ -4361,6 +4375,9 @@ sub vm_deviceunplug { > > qemu_iothread_del($vmid, "virtioscsi$device->{index}", $device) > if $conf->{scsihw} && ($conf->{scsihw} eq 'virtio-scsi-single'); > + } elsif ($deviceid =~ m/^(nvme)(\d+)$/) { > + qemu_devicedel($vmid, $deviceid); > + qemu_drivedel($vmid, $deviceid); > } elsif ($deviceid =~ m/^(net)(\d+)$/) { > qemu_devicedel($vmid, $deviceid); > qemu_devicedelverify($vmid, $deviceid); > diff --git a/PVE/QemuServer/Drive.pm b/PVE/QemuServer/Drive.pm > index 6e98c09..f05ad26 100644 > --- a/PVE/QemuServer/Drive.pm > +++ b/PVE/QemuServer/Drive.pm > @@ -33,6 +33,7 @@ PVE::JSONSchema::register_standard_option('pve-qm-image-format', { > > my $MAX_IDE_DISKS = 4; > my $MAX_SCSI_DISKS = 31; > +my $MAX_NVME_DISKS = 8; > my $MAX_VIRTIO_DISKS = 16; > our $MAX_SATA_DISKS = 6; > our $MAX_UNUSED_DISKS = 256; > @@ -315,6 +316,20 @@ my $scsidesc = { > }; > PVE::JSONSchema::register_standard_option("pve-qm-scsi", $scsidesc); > > +my $nvme_fmt = { > + %drivedesc_base, > + %ssd_fmt, > + %wwn_fmt, > +}; > + > +my $nvmedesc = { The existing `foodesc` use is ugly, not sure how much I'd care about style compat here though, so IMO it would be slightly nicer to use: my $nvme_desc = ... > + optional => 1, > + type => 'string', format => $nvme_fmt, > + description => "Use volume as NVME disk (n is 0 to " . ($MAX_NVME_DISKS -1) . ").", > +}; > + > +PVE::JSONSchema::register_standard_option("pve-qm-nvme", $nvmedesc); > + > my $sata_fmt = { > %drivedesc_base, > %ssd_fmt, > @@ -515,6 +530,11 @@ for (my $i = 0; $i < $MAX_SCSI_DISKS; $i++) { > $drivedesc_hash_with_alloc->{"scsi$i"} = $desc_with_alloc->('scsi', $scsidesc); > } > > +for (my $i = 0; $i < $MAX_NVME_DISKS; $i++) { > + $drivedesc_hash->{"nvme$i"} = $nvmedesc; > +} > + > + > for (my $i = 0; $i < $MAX_VIRTIO_DISKS; $i++) { > $drivedesc_hash->{"virtio$i"} = $virtiodesc; > $drivedesc_hash_with_alloc->{"virtio$i"} = $desc_with_alloc->('virtio', $virtiodesc); > @@ -541,6 +561,7 @@ sub valid_drive_names { > (map { "scsi$_" } (0 .. ($MAX_SCSI_DISKS - 1))), > (map { "virtio$_" } (0 .. ($MAX_VIRTIO_DISKS - 1))), > (map { "sata$_" } (0 .. ($MAX_SATA_DISKS - 1))), > + (map { "nvme$_" } (0 .. ($MAX_NVME_DISKS - 1))), > 'efidisk0', > 'tpmstate0'); > } _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel