From nobody Sat Sep 6 17:04:28 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1756955611; cv=none; d=zohomail.com; s=zohoarc; b=KaUmPWy7kq1RHoIFPGv5jLkWL3Pyj8nQzealRpKJDbvI2p2OIOb0CLdQ6Sz61SI9tgXFBTBqbNKpJl8yGgZW2R/+/f+Xz7phO/DM/kGut2DMenWRUd56Qt/jpIYTTf9RjoaF4JDjp6rNW4d/7Rwfswt91FKs+K7dNQnKKvIrUrE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756955611; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=UTN5PQBU5R23U2CzTrQavZPK3yp67RlOSwsKlo8g1u0=; b=oDPU78LVQfgxQmjp4cMIhQO1aamS/7x7gNvM3EnRdDjbCtMomfpmOIR9rpqhxCh9v9HxvAH2T8KOit8k3kTzUXZ9s1VFL3TOIPoXplTEi2u8TXP1ViHz5IyWsF9zEyNPssFuMTilO50WKP5PDd0j2E+HmcXl42ryctNGfPzj26g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1756955611487863.748282309499; Wed, 3 Sep 2025 20:13:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uu0Ow-00079l-3I; Wed, 03 Sep 2025 23:12:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uu0Ot-000795-IX; Wed, 03 Sep 2025 23:12:40 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uu0Or-0001BN-JM; Wed, 03 Sep 2025 23:12:39 -0400 Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-b4c29d2ea05so1221925a12.0; Wed, 03 Sep 2025 20:12:35 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2490375a9ccsm176497715ad.63.2025.09.03.20.12.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Sep 2025 20:12:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756955554; x=1757560354; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UTN5PQBU5R23U2CzTrQavZPK3yp67RlOSwsKlo8g1u0=; b=L3oyn8OGD6KT2/iXVqAy1yYEGVeZO7FTH4imOOKYzt6Qpl76UmpmplXvp6as9Mw9cI 8MnEJJ42VTxHaVEEbLCV22NbFUAIFSRlsWa632Y8T5bUg17v3koagZ+qadaAyUkgaoZ6 WHfGB1yYZMBDB8BgCp8700GyUdtMrw0kn+NYy8Bg88i5ImGRQ/qtfYp5GgHNaeUa8CeU i6y9Yx5oVVyNn48tk++RbJHT9yPg3Dn60ZZt2t5/G0Tzg4VlHsFUpO453BrpaRTzqjF1 O6gbHYrwZXzZz9ThQN8fhr2scP6yY6xNUDTaaJ/2/MhHWfBdzo9LL2wEWyWUUsGIcCmO Ja1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756955554; x=1757560354; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UTN5PQBU5R23U2CzTrQavZPK3yp67RlOSwsKlo8g1u0=; b=ofSdz3ylZNu1EaHmrWwmACgqX66SpuiwjDI0KrneiqAoC2dfXl4Y4HSF200tfZnF28 YO1fTArq0+xNWo37qHqengzRVVzlnhrIPUOTSHovq0mgxNFdHUpV5bBP3sL+AmmAOYne wlEwO18fhpvHa/l4ebsydfy89hBQlyi/hoI0yRzY473eM4g+tmSLwLln0uMED1C/N68k krP8C8v28hwMiqOmJtoHwKWnDSOL9ba7eLE3qq4U0hDa4CE65WXWegOOQaFW/bKX8gE/ jmmeMZH2z5gslnOx2i/LovPD+3jfFvNU4gvdNp3GqXTtGyyl2QEvX+yKzAilSgk3WeNB ziqQ== X-Forwarded-Encrypted: i=1; AJvYcCUWvYsRJ90px+uMQ8AwN5buwLYz2L86QTWNKfe+uQaeqX8/CP56zFko1KgnQ54yX8RNTB4lJSkMuMrV@nongnu.org, AJvYcCXU/CLlC0dIUJT+IAbZvgQMsOwQBYhgeQfo8l4nrq8n96J1ZbUyDan6oBUvh2ZhM1NOgDe6OKkTzQ7kJQ==@nongnu.org X-Gm-Message-State: AOJu0Yxl4Ju+auKrQZxynw+swz8ynsBKorOPr1rCv8KiUYIP7J4x1rDf gAE2vk7qp45wWVhG2FG0leh6ZDCIWj3aM5XtzNJOAqDsaRuHtlZ0T+wG X-Gm-Gg: ASbGncvISYyjnyF6Cwt/Xo2gzB3OEXc/xqeI4E+Bi4gHoWEVdW0asEXcoQnpwT9CC6N 8I8lRDaaCAB3IGtn5dH9cqdWu8TkUvHUeSW0WIRWZsFw9lIMzvVSbRL+V2V/1u3TuqChWlvZ6I/ QiE0znY3fc1vkizK/YDM6ZteGgZZguYfce6ZlT8Af3UI4NbtQbel6FwA8+I/MS6J5Ed7QNmyTti SR8exg/pBrnbPtwvr1ZIYdiAmtTW4bO2ZjXRbE1vAmbAlAzK9rNvQ7osNqRZvlhnZUie1E9KhmG vsNsx/TlIYRgGOgpHSETqwx8CSLcOEmqNUSAS92s1hLiz7qNe1qfwGtNB9bzazPWpniHrhqW0A7 017ORn1dINkT0CTQp9pc82CFpZD5ln3QOwr34 X-Google-Smtp-Source: AGHT+IETE5k7U1SNO7WXjKNLxjzQVwuLDo/FzYf5ucgV3Y+yjx3l2L7arA1A07enuytkgDD7LSb2xA== X-Received: by 2002:a17:902:f688:b0:248:aa0d:bb22 with SMTP id d9443c01a7336-249446d2aa2mr243338255ad.0.1756955554009; Wed, 03 Sep 2025 20:12:34 -0700 (PDT) From: Wilfred Mallawa To: Alistair Francis Cc: Keith Busch , Klaus Jensen , Jesper Devantier , Stefan Hajnoczi , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kevin Wolf , Hanna Reitz , "Michael S . Tsirkin" , Marcel Apfelbaum , qemu-devel@nongnu.org, qemu-block@nongnu.org, dlemoal@kernel.org, Jonathan Cameron , Wilfred Mallawa Subject: [PATCH v4 5/5] hw/nvme: connect SPDM over NVMe Security Send/Recv Date: Thu, 4 Sep 2025 13:10:59 +1000 Message-ID: <20250904031058.367667-7-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250904031058.367667-2-wilfred.opensource@gmail.com> References: <20250904031058.367667-2-wilfred.opensource@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::531; envelope-from=wilfred.opensource@gmail.com; helo=mail-pg1-x531.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1756955614567124100 Content-Type: text/plain; charset="utf-8" From: Wilfred Mallawa This patch extends the existing support we have for NVMe with only DoE to also add support to SPDM over the NVMe Security Send/Recv commands. With the new definition of the `spdm-trans` argument, users can specify `spdm_trans=3Dnvme` or `spdm_trans=3Ddoe`. This allows us to select the SPDM transport respectively. SPDM over the NVMe Security Send/Recv commands are defined in the DMTF DSP0286. Signed-off-by: Wilfred Mallawa --- docs/specs/spdm.rst | 10 +++++++-- hw/nvme/ctrl.c | 45 ++++++++++++++++++++++++++++--------- include/hw/pci/pci_device.h | 2 ++ 3 files changed, 44 insertions(+), 13 deletions(-) diff --git a/docs/specs/spdm.rst b/docs/specs/spdm.rst index f7de080ff0..dd6cfbbd68 100644 --- a/docs/specs/spdm.rst +++ b/docs/specs/spdm.rst @@ -98,7 +98,7 @@ Then you can add this to your QEMU command line: .. code-block:: shell =20 -drive file=3Dblknvme,if=3Dnone,id=3Dmynvme,format=3Draw \ - -device nvme,drive=3Dmynvme,serial=3Ddeadbeef,spdm_port=3D2323 + -device nvme,drive=3Dmynvme,serial=3Ddeadbeef,spdm_port=3D2323,spd= m_trans=3Ddoe =20 At which point QEMU will try to connect to the SPDM server. =20 @@ -113,7 +113,13 @@ of the default. So the entire QEMU command might look = like this -append "root=3D/dev/vda console=3DttyS0" \ -net none -nographic \ -drive file=3Dblknvme,if=3Dnone,id=3Dmynvme,format=3Draw \ - -device nvme,drive=3Dmynvme,serial=3Ddeadbeef,spdm_port=3D2323 + -device nvme,drive=3Dmynvme,serial=3Ddeadbeef,spdm_port=3D2323,spd= m_trans=3Ddoe + +The `spdm_trans` argument defines the underlying transport type that is em= ulated +by QEMU. For an PCIe NVMe controller, both "doe" and "nvme" are supported.= Where, +"doe" does SPDM transport over the PCIe extended capability Data Object Ex= change +(DOE), and "nvme" uses the NVMe Admin Security Send/Receive commands to +implement the SPDM transport. =20 .. _DMTF: https://www.dmtf.org/standards/SPDM diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index df72599bcc..e485e0584e 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -8948,19 +8948,31 @@ static bool nvme_init_pci(NvmeCtrl *n, PCIDevice *p= ci_dev, Error **errp) =20 pcie_cap_deverr_init(pci_dev); =20 - /* DOE Initialisation */ + /* SPDM Initialisation */ if (pci_dev->spdm_port) { - uint16_t doe_offset =3D n->params.sriov_max_vfs ? - PCI_CONFIG_SPACE_SIZE + PCI_ARI_SIZEOF - : PCI_CONFIG_SPACE_SIZE; + switch (pci_dev->spdm_trans) { + case SPDM_SOCKET_TRANSPORT_TYPE_PCI_DOE: + uint16_t doe_offset =3D n->params.sriov_max_vfs ? + PCI_CONFIG_SPACE_SIZE + PCI_ARI_SIZEOF + : PCI_CONFIG_SPACE_SIZE; =20 - pcie_doe_init(pci_dev, &pci_dev->doe_spdm, doe_offset, - doe_spdm_prot, true, 0); + pcie_doe_init(pci_dev, &pci_dev->doe_spdm, doe_offset, + doe_spdm_prot, true, 0); =20 - pci_dev->doe_spdm.spdm_socket =3D spdm_socket_connect(pci_dev->spd= m_port, - errp); + pci_dev->doe_spdm.spdm_socket =3D + spdm_socket_connect(pci_dev->spdm_port, errp); =20 - if (pci_dev->doe_spdm.spdm_socket < 0) { + if (pci_dev->doe_spdm.spdm_socket < 0) { + return false; + } + break; + case SPDM_SOCKET_TRANSPORT_TYPE_NVME: + n->spdm_socket =3D spdm_socket_connect(pci_dev->spdm_port, err= p); + if (n->spdm_socket < 0) { + return false; + } + break; + default: return false; } } @@ -9251,11 +9263,17 @@ static void nvme_exit(PCIDevice *pci_dev) g_free(n->cmb.buf); } =20 + /* Only one of the `spdm_socket` below would have been setup */ if (pci_dev->doe_spdm.spdm_socket > 0) { spdm_socket_close(pci_dev->doe_spdm.spdm_socket, SPDM_SOCKET_TRANSPORT_TYPE_PCI_DOE); } =20 + if (n->spdm_socket > 0) { + spdm_socket_close(pci_dev->doe_spdm.spdm_socket, + SPDM_SOCKET_TRANSPORT_TYPE_NVME); + } + if (n->pmr.dev) { host_memory_backend_set_mapped(n->pmr.dev, false); } @@ -9308,6 +9326,7 @@ static const Property nvme_props[] =3D { false), DEFINE_PROP_UINT16("mqes", NvmeCtrl, params.mqes, 0x7ff), DEFINE_PROP_UINT16("spdm_port", PCIDevice, spdm_port, 0), + DEFINE_PROP_SPDM_TRANS_NODEFAULT("spdm_trans", PCIDevice, spdm_trans), DEFINE_PROP_BOOL("ctratt.mem", NvmeCtrl, params.ctratt.mem, false), DEFINE_PROP_BOOL("atomic.dn", NvmeCtrl, params.atomic_dn, 0), DEFINE_PROP_UINT16("atomic.awun", NvmeCtrl, params.atomic_awun, 0), @@ -9383,7 +9402,9 @@ static void nvme_pci_write_config(PCIDevice *dev, uin= t32_t address, { uint16_t old_num_vfs =3D pcie_sriov_num_vfs(dev); =20 - if (pcie_find_capability(dev, PCI_EXT_CAP_ID_DOE)) { + /* DOE is only initialised if SPDM over DOE is used */ + if (pcie_find_capability(dev, PCI_EXT_CAP_ID_DOE) && + dev->spdm_trans =3D=3D SPDM_SOCKET_TRANSPORT_TYPE_PCI_DOE) { pcie_doe_write_config(&dev->doe_spdm, address, val, len); } pci_default_write_config(dev, address, val, len); @@ -9394,7 +9415,9 @@ static void nvme_pci_write_config(PCIDevice *dev, uin= t32_t address, static uint32_t nvme_pci_read_config(PCIDevice *dev, uint32_t address, int= len) { uint32_t val; - if (dev->spdm_port && pcie_find_capability(dev, PCI_EXT_CAP_ID_DOE)) { + + if (dev->spdm_port && pcie_find_capability(dev, PCI_EXT_CAP_ID_DOE) && + (dev->spdm_trans =3D=3D SPDM_SOCKET_TRANSPORT_TYPE_PCI_DOE)) { if (pcie_doe_read_config(&dev->doe_spdm, address, len, &val)) { return val; } diff --git a/include/hw/pci/pci_device.h b/include/hw/pci/pci_device.h index eee0338568..88ccea5011 100644 --- a/include/hw/pci/pci_device.h +++ b/include/hw/pci/pci_device.h @@ -4,6 +4,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pcie.h" #include "hw/pci/pcie_doe.h" +#include "system/spdm-socket.h" =20 #define TYPE_PCI_DEVICE "pci-device" typedef struct PCIDeviceClass PCIDeviceClass; @@ -166,6 +167,7 @@ struct PCIDevice { =20 /* SPDM */ uint16_t spdm_port; + SpdmTransportType spdm_trans; =20 /* DOE */ DOECap doe_spdm; --=20 2.51.0