From nobody Sat Sep 6 14:37:08 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=1756955603; cv=none; d=zohomail.com; s=zohoarc; b=bzll+NH+c3zYxlSBtL6aOO52Q3JWHXw1FhM3CFil9oilL8N8HUGgSTC3BMAiokTJEp4XmC0SJSHQuqou74gZFWt6+a28ZZT3Wth7YbjnDaOhJBi3QlkhRhVItr7X5yTXDraS2lcwBtCF5IDZL4hrK8vohFNAd/yXbVpDqs+I1cI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756955603; 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=RjacYaLKOhLtcN2plgF+C3NWVsLcWnhBIR1v/WVcDRc=; b=GEzgWn+IA0sXq3mpAuGP+4T6am4ruYdHCK33D5GCs0g7efwE1TNZttsRdi75dogyyNPZrafnPahBjBGNTxXs3VsagSfpW5HnUVq6KOBxePbjnN1BLmUiuwkRMEO1Q/SSIrVPtgRpoKkZdXlRLtDv8vhOFA8lwAnj+ho9vfCXRw8= 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 1756955603112329.31393781882423; Wed, 3 Sep 2025 20:13:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uu0OU-0006zQ-0U; Wed, 03 Sep 2025 23:12:14 -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 1uu0OR-0006yS-OM; Wed, 03 Sep 2025 23:12:11 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uu0OP-00013i-VD; Wed, 03 Sep 2025 23:12:11 -0400 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-76e4f2e4c40so495731b3a.2; Wed, 03 Sep 2025 20:12:09 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2490375a9ccsm176497715ad.63.2025.09.03.20.12.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Sep 2025 20:12:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756955528; x=1757560328; 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=RjacYaLKOhLtcN2plgF+C3NWVsLcWnhBIR1v/WVcDRc=; b=XxeD9HgAAMDuEYO7HUDt6mC0Yp77N70ofgjBBPl1QU3vudWUYUsyberakWevWkoYfP KIHcahz7uYgaXDzcIXrmS9pECBbEzphDxWqdBGj/Qb2YY2cACxFTaCjLIY7gX02nWeX9 DRTX00HWjFVSLVYOaxEtqxcobbuQSaZ02XGqhW4LyKrSIoKT9R2nDqIzgz9kmpYH4mL4 vHlCXWWLEu3xphvZttjNWsAAVTW5VLRdA6dluq8rugwGuWnWYBqA8MCuyxcF0e+9WtpF gwBjZ2d9jIR+sFX8fYvWLqAYIJkPgN3TLy3cWO2ln7EznTkgNrtzUTe3cLB+AUJ1lfYg Nn5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756955528; x=1757560328; 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=RjacYaLKOhLtcN2plgF+C3NWVsLcWnhBIR1v/WVcDRc=; b=GAmqK4W33uWiq5Z+Mv8/6x+Yo0XIWlMFF2WGA9JpjfNIn/IeFrlw3pZi2kb4mmOyVx 2P8tyUl3ocZ/SO1CdgDuJ8vvAx6XL1W/9Eit59R2lZpN21iJbgs5VDRbSRSWhRGyJLtG RthS1Q/Qtmlqm6DD+lbvz7HttIgrp2GgX9pjLjLnTK5NCKZdET8rV17VSann4XSsWieV 4N14tdgYDsJjDT/KS6lpUzYaWFQvamJX57NpPVnBUqr3JkZ9i7Uj8jgjPgKcVeftjCRh b5vRwSARVhSpfgiXJPEbMgoNooLbAcHKT9l9O4PYPmxTk/SxxgmHuFzrdiOdUWx1wTyI enkQ== X-Forwarded-Encrypted: i=1; AJvYcCVFK2nI/N2L2N1696F2CcXV3Jb9sICgmvWASRXKFoSMddzQ355MripB6zFrgAxULdqLIowYZlM/G5oX@nongnu.org, AJvYcCXzh69M2UBy1HV1LtOcA7AEK76raFY1HBn2ZL0ojJ1S+cTNResEmEFp3x0UFx8L0rnm8BvfBJAtNWpO5A==@nongnu.org X-Gm-Message-State: AOJu0YzlQaOSmKXBQotQNAci+PzNSivXE5mNCBx6whHCEeTqruUDyEmL VTaUujj6F2fu5VFJIUyBCowqHmX0dbdq5V8EZ+q3MOMhvpkmw/7ayMzi X-Gm-Gg: ASbGncvk/WJrWu67LFTLsdcO/gm7px659An4OOAz75TRdT06LXhmTvXnJZLkJWIYzn1 BFtzUyAfNapEElXx4+bFueQ7s9qcawd/JQ8XjQOazc2EoRhKzTFXHh5zDtNIDOFsGuU6090qy/x JJNbdVb6e2pbCUtY6MEWa6XWp2pg5XWz3PjHlR66zSdGy8prZpH4fu/qVSeAYd2vuvVW2S5D4oj cTIMLxxSdzU/ZiHucNTaiP2DfU+CXMVrC0oWuTRBw+jy4zVObCFTvlYTiA+0zJq9aDJRMndFtBU /JTfLN2D2SUPAGvl10Ou2vhFT3AlqfNESQg8WYXbx6uvopDcdvHUXmCX7FOOq8b73g3kBvLoLWi fAnAfV0XmUNGYMxb2Z5tVHZw7bBF7oF5GWFGR X-Google-Smtp-Source: AGHT+IG+qr2xTwpMaS2kmWJDNH9C31Hpn3BQgNm3bmBmDP+jxfR75hRHTxndz/SWJlWLYjn2VVCg1g== X-Received: by 2002:a17:903:3847:b0:248:e3fb:4dc8 with SMTP id d9443c01a7336-24944aa2905mr250624175ad.39.1756955527760; Wed, 03 Sep 2025 20:12:07 -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 1/5] spdm-socket: add seperate send/recv functions Date: Thu, 4 Sep 2025 13:10:55 +1000 Message-ID: <20250904031058.367667-3-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::42d; envelope-from=wilfred.opensource@gmail.com; helo=mail-pf1-x42d.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: 1756955604906124100 Content-Type: text/plain; charset="utf-8" From: Wilfred Mallawa This is to support uni-directional transports such as SPDM over Storage. As specified by the DMTF DSP0286. Also update spdm_socket_rsp() to use the new send()/receive() functions. For the case of spdm_socket_receive(), this allows us to do error checking in one place with the addition of spdm_socket_command_valid(). Signed-off-by: Wilfred Mallawa --- backends/spdm-socket.c | 56 +++++++++++++++++++++++++++++------- include/system/spdm-socket.h | 35 ++++++++++++++++++++++ 2 files changed, 80 insertions(+), 11 deletions(-) diff --git a/backends/spdm-socket.c b/backends/spdm-socket.c index 2c709c68c8..3d264814df 100644 --- a/backends/spdm-socket.c +++ b/backends/spdm-socket.c @@ -184,28 +184,62 @@ int spdm_socket_connect(uint16_t port, Error **errp) return client_socket; } =20 -uint32_t spdm_socket_rsp(const int socket, uint32_t transport_type, - void *req, uint32_t req_len, - void *rsp, uint32_t rsp_len) +static bool spdm_socket_command_valid(uint32_t command) +{ + switch (command) { + case SPDM_SOCKET_COMMAND_NORMAL: + case SPDM_SOCKET_STORAGE_CMD_IF_SEND: + case SPDM_SOCKET_STORAGE_CMD_IF_RECV: + case SOCKET_SPDM_STORAGE_ACK_STATUS: + case SPDM_SOCKET_COMMAND_OOB_ENCAP_KEY_UPDATE: + case SPDM_SOCKET_COMMAND_CONTINUE: + case SPDM_SOCKET_COMMAND_SHUTDOWN: + case SPDM_SOCKET_COMMAND_UNKOWN: + case SPDM_SOCKET_COMMAND_TEST: + return true; + default: + return false; + } +} + +uint32_t spdm_socket_receive(const int socket, uint32_t transport_type, + void *rsp, uint32_t rsp_len) { uint32_t command; bool result; =20 - result =3D send_platform_data(socket, transport_type, - SPDM_SOCKET_COMMAND_NORMAL, - req, req_len); - if (!result) { + result =3D receive_platform_data(socket, transport_type, &command, + (uint8_t *)rsp, &rsp_len); + + /* we may have received some data, but check if the command is valid */ + if (!result || !spdm_socket_command_valid(command)) { return 0; } =20 - result =3D receive_platform_data(socket, transport_type, &command, - (uint8_t *)rsp, &rsp_len); + return rsp_len; +} + +bool spdm_socket_send(const int socket, uint32_t socket_cmd, + uint32_t transport_type, void *req, uint32_t req_len) +{ + return send_platform_data(socket, transport_type, + socket_cmd, req, req_len); +} + +uint32_t spdm_socket_rsp(const int socket, uint32_t transport_type, + void *req, uint32_t req_len, + void *rsp, uint32_t rsp_len) +{ + bool result; + + result =3D spdm_socket_send(socket, SPDM_SOCKET_COMMAND_NORMAL, + transport_type, req, req_len); if (!result) { return 0; } =20 - assert(command !=3D 0); - + rsp_len =3D spdm_socket_receive(socket, transport_type, (uint8_t *)rsp, + rsp_len); return rsp_len; } =20 diff --git a/include/system/spdm-socket.h b/include/system/spdm-socket.h index 5d8bd9aa4e..2b7d03f82d 100644 --- a/include/system/spdm-socket.h +++ b/include/system/spdm-socket.h @@ -50,6 +50,35 @@ uint32_t spdm_socket_rsp(const int socket, uint32_t tran= sport_type, void *req, uint32_t req_len, void *rsp, uint32_t rsp_len); =20 +/** + * spdm_socket_rsp: Receive a message from an SPDM server + * @socket: socket returned from spdm_socket_connect() + * @transport_type: SPDM_SOCKET_TRANSPORT_TYPE_* macro + * @rsp: response buffer + * @rsp_len: response buffer length + * + * Receives a message from the SPDM server and returns the number of bytes + * received or 0 on failure. This can be used to receive a message from th= e SPDM + * server without sending anything first. + */ +uint32_t spdm_socket_receive(const int socket, uint32_t transport_type, + void *rsp, uint32_t rsp_len); + +/** + * spdm_socket_rsp: Sends a message to an SPDM server + * @socket: socket returned from spdm_socket_connect() + * @socket_cmd: socket command type (normal/if_recv/if_send etc...) + * @transport_type: SPDM_SOCKET_TRANSPORT_TYPE_* macro + * @req: request buffer + * @req_len: request buffer length + * + * Sends platform data to a SPDM server on socket, returns true on success. + * The response from the server must then be fetched by using + * spdm_socket_receive(). + */ +bool spdm_socket_send(const int socket, uint32_t socket_cmd, + uint32_t transport_type, void *req, uint32_t req_len= ); + /** * spdm_socket_close: send a shutdown command to the server * @socket: socket returned from spdm_socket_connect() @@ -60,6 +89,9 @@ uint32_t spdm_socket_rsp(const int socket, uint32_t trans= port_type, void spdm_socket_close(const int socket, uint32_t transport_type); =20 #define SPDM_SOCKET_COMMAND_NORMAL 0x0001 +#define SPDM_SOCKET_STORAGE_CMD_IF_SEND 0x0002 +#define SPDM_SOCKET_STORAGE_CMD_IF_RECV 0x0003 +#define SOCKET_SPDM_STORAGE_ACK_STATUS 0x0004 #define SPDM_SOCKET_COMMAND_OOB_ENCAP_KEY_UPDATE 0x8001 #define SPDM_SOCKET_COMMAND_CONTINUE 0xFFFD #define SPDM_SOCKET_COMMAND_SHUTDOWN 0xFFFE @@ -68,7 +100,10 @@ void spdm_socket_close(const int socket, uint32_t trans= port_type); =20 #define SPDM_SOCKET_TRANSPORT_TYPE_MCTP 0x01 #define SPDM_SOCKET_TRANSPORT_TYPE_PCI_DOE 0x02 +#define SPDM_SOCKET_TRANSPORT_TYPE_SCSI 0x03 +#define SPDM_SOCKET_TRANSPORT_TYPE_NVME 0x04 =20 #define SPDM_SOCKET_MAX_MESSAGE_BUFFER_SIZE 0x1200 +#define SPDM_SOCKET_MAX_MSG_STATUS_LEN 0x02 =20 #endif --=20 2.51.0 From nobody Sat Sep 6 14:37:08 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=1756955603; cv=none; d=zohomail.com; s=zohoarc; b=beWz7c05qtQ+GQtZpmWKynsYCp9ywrLf/bKrUPGPDn3Nb5BeU3QdseaGV5vrkD6QKCkO5l95ZinMvMo0RgJZy79ILHygQCLhwTOlsTL6FE9GF8X6b258F57vWzO2l82TDIhqcr8/0BDJCYA5jrdlEvqbi1VE1G+AJd1nq6UZALo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756955603; 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=jNY4ncpuDcOsXQxB2Rg/MklRq+L9/xqLJrUQZb5aHUA=; b=nRe0nS5d+giNDja++eBrPC4wIlAXY76gbbuEc298sswJJ3qmrgpJgG0+8UVHmnu7qEvLGF3zOmgNceKLacPsUYVl2v/kkJ5RRcUL9e2BvNoULHRWh7cc9SDUNJHNLOPMScZKLgGXhDciaxg21rkLyd5Bpoe5a+nDGWDvdj5IJeQ= 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 1756955603212391.2966377300039; Wed, 3 Sep 2025 20:13:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uu0Oa-00072z-2h; Wed, 03 Sep 2025 23:12:20 -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 1uu0OY-00071o-O9; Wed, 03 Sep 2025 23:12:18 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uu0OW-00015e-Lo; Wed, 03 Sep 2025 23:12:18 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-2445806e03cso8276245ad.1; Wed, 03 Sep 2025 20:12:15 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2490375a9ccsm176497715ad.63.2025.09.03.20.12.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Sep 2025 20:12:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756955535; x=1757560335; 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=jNY4ncpuDcOsXQxB2Rg/MklRq+L9/xqLJrUQZb5aHUA=; b=LHXGb9FM1MrlUbG2KTSOIcP3mTw4xnfSFXGpJuHPMJZ5Kr16AZ9VqW8ff86lZ2Eb20 /L5DBo+ekayWClctrRn3kj6406w7Cug7dThjWFSo7dlFUZdHWjS7OVRbdILfuWtS8FtW ImzrK7ZMCpoaZeBPX/YoFBJn4fn6Znceqg6KjkSOBe+wMoUkqRlNJyn4UgJY9RoY1NiE rXFJKaPlBBLzH5nnC9IU5GV21FoTb35g+iXAjGP2bueygC3Fge2QW1+Tp3z2ImHki8xf 1I5FidodaUL6ssgDXXjzQi5yUXr0pBM56HMuLIxG8+0RrcelnfVSP+RPvR+SG9+Yp7yM 3AVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756955535; x=1757560335; 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=jNY4ncpuDcOsXQxB2Rg/MklRq+L9/xqLJrUQZb5aHUA=; b=a+0NMLgGYfLAqzk+VI4+cr/KLmfEDeX2gdp2LdznKxg/F1BG2870h8p9MdiqXFDwSB +5eorYBKJUMBNoY2CZWStqvFaLFtJ8TWsStPRbtfNusX8qwJrHauRbYlkda71fOr0z1W pm3pe81zCGTPF/WRMI7ccUMDFrKopze4JrJBzvSUbL6OZums6+eIEt4XGft+oHw21t5n fWi1U3sMssO8EpHxaXXGJ8YCsysnUMBr5QQF73jAz+X8nrMal0rfcRKJknQiY/g628Sp S+iVcOtO/BA7lNHpXQ/hm0dhZGNGpaCQNY+Ba0nHMNRM+iwPFVAb2FsxhnTC3T/dOo3L 0vVQ== X-Forwarded-Encrypted: i=1; AJvYcCVAQNNZs5YKADHyPQMIYP9VdAm3SEp+ZilAT+lci9gJjETgqFmW0fn05+QKv9rSLQSds/jMaaFP5oFyuw==@nongnu.org, AJvYcCWamoi9DXacEPsS6dxAoDCOcZwCbVsdQZW0tDnvaZ/OFIWWcPIjjy6k+HAxYpgDVY0gG/UWPncD9kKh@nongnu.org X-Gm-Message-State: AOJu0Ywzhi4kXl2cxY8WWp/Dqa2YvtR/2vy7HTlIhtlxg7oEAK9Bb3S+ 3VYec8MYML7IJFegpczxJHCAOH+gepjxMyzrcXJSoUsGxUS4Cq5r2mi+ X-Gm-Gg: ASbGnctEn8jW7VC2lXUVtRVqWcAcJo+5Ny79QKF5WU7rs2t0+euPKdiCBtqph5D1y6o TvQZWJaWTZ8AujFknNonlvSxum32LSJLbJOEiaHMShLERHfj0fZDzfSCEEO0GXS9/ZRNZI7af42 jsfzcQao8Cs9zCoPRXsT6F65VdrEnAA6Af2AK4HDBstSnslmgZf9MmSq05G2tXG7yVXGmXYZuL9 zIaw0klCzXYwu0iJBMoPDNw2ZqOj7lqnRt79k+OBNpIc10zEe4EITH0aMjh0gkIvz+6UVsCAwAQ eGCBrzkar+z+uTALDEmIu6H0gZyCW0JAB0qhudmWmBcfNfvi/SM6X8Q0RQjH/+f/KM6KcNgQOHj wjnvdKVIl6IxNvKo3Ug9a/LXJiw== X-Google-Smtp-Source: AGHT+IG99vRIbhhGBX7dK8cjCy/FbB76ssG6mstpMmJlA5HJIHUQu6Iq/cqCJnfvHzwSQ9KcGLKWjQ== X-Received: by 2002:a17:902:f787:b0:24b:1f34:a64c with SMTP id d9443c01a7336-24b1f34a8famr83675475ad.10.1756955534467; Wed, 03 Sep 2025 20:12:14 -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 2/5] spdm: add spdm storage transport virtual header Date: Thu, 4 Sep 2025 13:10:56 +1000 Message-ID: <20250904031058.367667-4-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::62e; envelope-from=wilfred.opensource@gmail.com; helo=mail-pl1-x62e.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: 1756955604605116600 Content-Type: text/plain; charset="utf-8" From: Wilfred Mallawa This header contains the transport encoding for an SPDM message that uses the SPDM over Storage transport as defined by the DMTF DSP0286. Signed-off-by: Wilfred Mallawa --- include/system/spdm-socket.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/system/spdm-socket.h b/include/system/spdm-socket.h index 2b7d03f82d..6c2cb7b926 100644 --- a/include/system/spdm-socket.h +++ b/include/system/spdm-socket.h @@ -88,6 +88,18 @@ bool spdm_socket_send(const int socket, uint32_t socket_= cmd, */ void spdm_socket_close(const int socket, uint32_t transport_type); =20 +/** + * Defines the transport encoding for SPDM, this information shall be pass= ed + * down to the SPDM server, when conforming to the SPDM over Storage stand= ard + * as defined by DSP0286. + */ +typedef struct { + uint8_t security_protocol; /* Must be 0xE8 for SPDM Comma= nds */ + uint16_t security_protocol_specific; /* Bit[7:2] SPDM Operation + Bit[0:1] Connection ID */ + uint32_t length; /* Length of the SPDM Message*/ +} QEMU_PACKED StorageSpdmTransportHeader; + #define SPDM_SOCKET_COMMAND_NORMAL 0x0001 #define SPDM_SOCKET_STORAGE_CMD_IF_SEND 0x0002 #define SPDM_SOCKET_STORAGE_CMD_IF_RECV 0x0003 --=20 2.51.0 From nobody Sat Sep 6 14:37:08 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=1756955613; cv=none; d=zohomail.com; s=zohoarc; b=QNbRGBlQ4FXAeY0YbEutH8RVUVZbgApOEEMZcAGsZwuSupgrqJA9AO/bHmGgSNO0dzF0dOCkFUS6+2AqspFEFOZns6ciH6Mxxoe6TPdDfJfTDsxYTR81LlFf8ZGrbUbCoC1vlY1eW+kp7neSHhSSRs9pxF0X+sa15ooZDmPxobs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756955613; 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=kEpXSPNDBxCP+cYZ2PtOxfL9NOWp/d6+QbppZ9CHuVk=; b=OPQWyVG8SmfNMYSLgRiGA4GuTh+pD+H9qiQcnbqAoQK9j30tR7uOchRfeOPE/Z84d+Y0ZSHenp5GQ3bRc4MUK9HFYPZ6UC7SNn+Qx9MR5KXWa1AFsV58cTmwCzpdKOAp7jU4PacC94/qQr7PS0ert4vIjkTzVi908aprGZhY3fM= 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 1756955613054231.6446328938357; Wed, 3 Sep 2025 20:13:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uu0Oh-00075f-9K; Wed, 03 Sep 2025 23:12:27 -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 1uu0Of-00074u-2q; Wed, 03 Sep 2025 23:12:25 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uu0Oc-00017A-UV; Wed, 03 Sep 2025 23:12:24 -0400 Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-b47475cf8ecso320581a12.0; Wed, 03 Sep 2025 20:12:22 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2490375a9ccsm176497715ad.63.2025.09.03.20.12.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Sep 2025 20:12:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756955541; x=1757560341; 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=kEpXSPNDBxCP+cYZ2PtOxfL9NOWp/d6+QbppZ9CHuVk=; b=GVF/omIm2b7NwXMjoWv5ASzGGQ8KNeRkJ2wHzcfKgYRiQh+IoIdhv/AUCChNII2WxC /v0a4SkeyiI8OaHwPVLffRGWnAlFGLQWmBeRxWLQiRtWBvioa+Cc8NtJ/43vpewqMTvK tQ5sBcaLfL4Drr3MpjtiBPIluI+PgMc5NmedLLQ0q9uVz2y5bNshlcGp7kFHI1EfOf76 WLr8/Z6Vy3AD77oycB5SaSn5r73DrzCa2TxlRBeXeQGtdEVIaRoKgNyaGBsRSfgmGtmZ BClpILaooI5TfZmtMCaTTjHbhGbZmbzb66sVnaRvRwqcvsx5bms8filHQ9zjFpq7mh/B pz4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756955541; x=1757560341; 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=kEpXSPNDBxCP+cYZ2PtOxfL9NOWp/d6+QbppZ9CHuVk=; b=QMgBxrz0Jzf8fIjX1orAXJTvMtvTpW2HD10oK8kZiF9DWaqecz6uGwxM/STTBm20co N0r4DOm+kI4RVni9ylunpfT18ewbb51WEEt0EZpuBnyFr0Saj6Rfzc4X3TMHP/d3lL7p Nf+UwKCzx8BJuHBjLSRIxOtKlc7qeXx4GwySIfxX3Lwja+VXJd1T16/4Fa8e78vqRkZn 8n5ScgQhOps8oyHMVK6Gb0dN3TEhACM7OYL53Y8XKKI1a+ePK3yQoeYHo6vPK6e1Ldw3 PqRYckNDSfe01DSmo2f9cqTdFAa6zHtvMC/aJSLA5DVC6jc5k98+MS8HzlZNeZQdihZp WEtA== X-Forwarded-Encrypted: i=1; AJvYcCU9OS8fDh0dXqDBREtJ1xa5kevblnR+GAp49XoDwlxWZfe5tVCr0qXYaC6UQl19xCPRyEHsp890ERVc@nongnu.org, AJvYcCXVlRh4JAfC3EfxKRxVMTH5kqDrEZKGnBgvdR/GKnpAYxf3igxKt/OmlvS36it3tePgPgX3CXbGTYT8Vw==@nongnu.org X-Gm-Message-State: AOJu0Yy+8Vrs81aPlMtkUOAvC0OgIu3BjDkeWkFZqFVDQBomZ1vLaPeS D8N3o7RYotLNmAeZFJT1hV+eHzPq96S3rHqbPjA5otnPIzDEaHCmIwqy X-Gm-Gg: ASbGncv5L32u7UW6xGx3fhW5wB49d0G0/ZNMf0QLxKj3rCD01HVF8CTZgjKb0jc/DPZ tg5gSzbYUomS0eppQWLJ9olgNR+PShgeisiJ7q4ltN+GUlW+NVZdEtJDcOnXWBiKCCO31IuZcPt 0W8YANmjvX/vs1jwAbVZVtYoBTQspjIr3b0/xWSSLg5+FPyKNiy5UOnc6VnmpXDECMThxyyfdzt AY6fKTWYmjfGOUWmbNEfxzFWQ9Z37XexpuSs+lhUXlurSrTloldVY4VFJXEqskw1iMuiq82LgMr +BaKtCUZuc3dX4i0/dE9mqSdLBSTPKXN7AAEwm8mmz413pZenV6JE1VzTcos2P03gSAjwcR/w4c KsotUCncWfnLHZc7v1R7Jblxd5hnp7mf7Km3sK6aVcBXIzzw= X-Google-Smtp-Source: AGHT+IF8HMWx7YA1EZNmhYoY9AVjqYpWuvgEzbCnaFaXEt2fC1t4Ao1sgjUegBjCFZ5TO0LDt3DKGQ== X-Received: by 2002:a17:902:f68a:b0:24c:bc02:78b5 with SMTP id d9443c01a7336-24cbc029261mr26492325ad.20.1756955540851; Wed, 03 Sep 2025 20:12:20 -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 3/5] hw/nvme: add NVMe Admin Security SPDM support Date: Thu, 4 Sep 2025 13:10:57 +1000 Message-ID: <20250904031058.367667-5-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::52f; envelope-from=wilfred.opensource@gmail.com; helo=mail-pg1-x52f.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: 1756955614607124100 Content-Type: text/plain; charset="utf-8" From: Wilfred Mallawa Adds the NVMe Admin Security Send/Receive command support with support for DMTFs SPDM. The transport binding for SPDM is defined in the DMTF DSP0286. Signed-off-by: Wilfred Mallawa --- hw/nvme/ctrl.c | 213 ++++++++++++++++++++++++++++++++++++++++++- hw/nvme/nvme.h | 5 + include/block/nvme.h | 15 +++ 3 files changed, 232 insertions(+), 1 deletion(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index f5ee6bf260..df72599bcc 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -282,6 +282,8 @@ static const uint32_t nvme_cse_acs_default[256] =3D { [NVME_ADM_CMD_FORMAT_NVM] =3D NVME_CMD_EFF_CSUPP | NVME_CMD_EFF_= LBCC, [NVME_ADM_CMD_DIRECTIVE_RECV] =3D NVME_CMD_EFF_CSUPP, [NVME_ADM_CMD_DIRECTIVE_SEND] =3D NVME_CMD_EFF_CSUPP, + [NVME_ADM_CMD_SECURITY_SEND] =3D NVME_CMD_EFF_CSUPP, + [NVME_ADM_CMD_SECURITY_RECV] =3D NVME_CMD_EFF_CSUPP, }; =20 static const uint32_t nvme_cse_iocs_nvm_default[256] =3D { @@ -7282,6 +7284,210 @@ static uint16_t nvme_dbbuf_config(NvmeCtrl *n, cons= t NvmeRequest *req) return NVME_SUCCESS; } =20 +static uint16_t nvme_sec_prot_spdm_send(NvmeCtrl *n, NvmeRequest *req) +{ + StorageSpdmTransportHeader hdr =3D {0}; + g_autofree uint8_t *sec_buf =3D NULL; + uint32_t transfer_len =3D le32_to_cpu(req->cmd.cdw11); + uint32_t transport_transfer_len =3D transfer_len; + uint32_t dw10 =3D le32_to_cpu(req->cmd.cdw10); + uint32_t recvd; + uint16_t nvme_cmd_status, ret; + uint8_t secp =3D extract32(dw10, 24, 8); + uint8_t spsp1 =3D extract32(dw10, 16, 8); + uint8_t spsp0 =3D extract32(dw10, 8, 8); + bool spdm_res; + + if (transport_transfer_len > UINT32_MAX - sizeof(hdr)) { + return NVME_INVALID_FIELD | NVME_DNR; + } + + transport_transfer_len +=3D sizeof(hdr); + if (transport_transfer_len > SPDM_SOCKET_MAX_MESSAGE_BUFFER_SIZE) { + return NVME_INVALID_FIELD | NVME_DNR; + } + + ret =3D nvme_check_mdts(n, transport_transfer_len); + if (ret !=3D NVME_SUCCESS) { + return ret; + } + + /* Generate the NVMe transport header */ + hdr.security_protocol =3D secp; + hdr.security_protocol_specific =3D cpu_to_le16((spsp1 << 8) | spsp0); + hdr.length =3D cpu_to_le32(transfer_len); + + sec_buf =3D g_try_malloc0(transport_transfer_len); + if (!sec_buf) { + return NVME_INTERNAL_DEV_ERROR; + } + + /* Attach the transport header */ + memcpy(sec_buf, &hdr, sizeof(hdr)); + ret =3D nvme_h2c(n, sec_buf + sizeof(hdr), transfer_len, req); + if (ret) { + return ret; + } + + spdm_res =3D spdm_socket_send(n->spdm_socket, SPDM_SOCKET_STORAGE_CMD_= IF_SEND, + SPDM_SOCKET_TRANSPORT_TYPE_NVME, sec_buf, + transport_transfer_len); + if (!spdm_res) { + return NVME_DATA_TRAS_ERROR | NVME_DNR; + } + + /* The responder shall ack with message status */ + recvd =3D spdm_socket_receive(n->spdm_socket, SPDM_SOCKET_TRANSPORT_TY= PE_NVME, + (uint8_t *)&nvme_cmd_status, + SPDM_SOCKET_MAX_MSG_STATUS_LEN); + + nvme_cmd_status =3D be16_to_cpu(nvme_cmd_status); + + if (recvd < SPDM_SOCKET_MAX_MSG_STATUS_LEN) { + return NVME_DATA_TRAS_ERROR | NVME_DNR; + } + + return nvme_cmd_status; +} + +/* From host to controller */ +static uint16_t nvme_security_send(NvmeCtrl *n, NvmeRequest *req) +{ + uint32_t dw10 =3D le32_to_cpu(req->cmd.cdw10); + uint8_t secp =3D (dw10 >> 24) & 0xff; + + switch (secp) { + case NVME_SEC_PROT_DMTF_SPDM: + if (n->spdm_socket <=3D 0) { + return NVME_INVALID_FIELD | NVME_DNR; + } + return nvme_sec_prot_spdm_send(n, req); + default: + /* Unsupported Security Protocol Type */ + return NVME_INVALID_FIELD | NVME_DNR; + } + + return NVME_INVALID_FIELD | NVME_DNR; +} + +static uint16_t nvme_sec_prot_spdm_receive(NvmeCtrl *n, NvmeRequest *req) +{ + StorageSpdmTransportHeader hdr; + g_autofree uint8_t *rsp_spdm_buf =3D NULL; + uint32_t dw10 =3D le32_to_cpu(req->cmd.cdw10); + uint32_t alloc_len =3D le32_to_cpu(req->cmd.cdw11); + uint32_t recvd, spdm_res; + uint16_t nvme_cmd_status, ret; + uint8_t secp =3D extract32(dw10, 24, 8); + uint8_t spsp1 =3D extract32(dw10, 16, 8); + uint8_t spsp0 =3D extract32(dw10, 8, 8); + + if (!alloc_len) { + return NVME_INVALID_FIELD | NVME_DNR; + } + + /* Generate the NVMe transport header */ + hdr =3D (StorageSpdmTransportHeader) { + .security_protocol =3D secp, + .security_protocol_specific =3D cpu_to_le16((spsp1 << 8) | spsp0), + .length =3D cpu_to_le32(alloc_len), + }; + + /* Forward if_recv to the SPDM Server with SPSP0 */ + spdm_res =3D spdm_socket_send(n->spdm_socket, SPDM_SOCKET_STORAGE_CMD_= IF_RECV, + SPDM_SOCKET_TRANSPORT_TYPE_NVME, + (uint8_t *)&hdr, sizeof(hdr)); + if (!spdm_res) { + return NVME_DATA_TRAS_ERROR | NVME_DNR; + } + + /* The responder shall ack with message status */ + recvd =3D spdm_socket_receive(n->spdm_socket, SPDM_SOCKET_TRANSPORT_TY= PE_NVME, + (uint8_t *)&nvme_cmd_status, + SPDM_SOCKET_MAX_MSG_STATUS_LEN); + if (recvd < SPDM_SOCKET_MAX_MSG_STATUS_LEN) { + return NVME_DATA_TRAS_ERROR | NVME_DNR; + } + + nvme_cmd_status =3D be16_to_cpu(nvme_cmd_status); + /* An error here implies the prior if_recv from requester was spurious= */ + if (nvme_cmd_status !=3D NVME_SUCCESS) { + return nvme_cmd_status; + } + + /* Clear to start receiving data from the server */ + rsp_spdm_buf =3D g_try_malloc0(alloc_len); + if (!rsp_spdm_buf) { + return NVME_INTERNAL_DEV_ERROR; + } + + recvd =3D spdm_socket_receive(n->spdm_socket, + SPDM_SOCKET_TRANSPORT_TYPE_NVME, + rsp_spdm_buf, alloc_len); + if (!recvd) { + return NVME_DATA_TRAS_ERROR | NVME_DNR; + } + + ret =3D nvme_c2h(n, rsp_spdm_buf, MIN(recvd, alloc_len), req); + if (ret) { + return ret; + } + + return NVME_SUCCESS; +} + +static uint16_t nvme_get_sec_prot_info(NvmeCtrl *n, NvmeRequest *req) +{ + uint32_t alloc_len =3D le32_to_cpu(req->cmd.cdw11); + uint8_t resp[10] =3D { + /* Support Security Protol List Length */ + [6] =3D 0, /* MSB */ + [7] =3D 2, /* LSB */ + /* Support Security Protocol List */ + [8] =3D SFSC_SECURITY_PROT_INFO, + [9] =3D 0, + }; + + if (n->spdm_socket > 0) { + resp[9] =3D NVME_SEC_PROT_DMTF_SPDM; + } + + if (alloc_len < 10) { + return NVME_INVALID_FIELD | NVME_DNR; + } + + return nvme_c2h(n, resp, sizeof(resp), req); +} + +/* From controller to host */ +static uint16_t nvme_security_receive(NvmeCtrl *n, NvmeRequest *req) +{ + uint32_t dw10 =3D le32_to_cpu(req->cmd.cdw10); + uint16_t spsp =3D extract32(dw10, 8, 16); + uint8_t secp =3D extract32(dw10, 24, 8); + + switch (secp) { + case SFSC_SECURITY_PROT_INFO: + switch (spsp) { + case 0: + /* Supported security protocol list */ + return nvme_get_sec_prot_info(n, req); + case 1: + /* Certificate data */ + /* fallthrough */ + default: + return NVME_INVALID_FIELD | NVME_DNR; + } + case NVME_SEC_PROT_DMTF_SPDM: + if (n->spdm_socket <=3D 0) { + return NVME_INVALID_FIELD | NVME_DNR; + } + return nvme_sec_prot_spdm_receive(n, req); + default: + return NVME_INVALID_FIELD | NVME_DNR; + } +} + static uint16_t nvme_directive_send(NvmeCtrl *n, NvmeRequest *req) { return NVME_INVALID_FIELD | NVME_DNR; @@ -7389,6 +7595,10 @@ static uint16_t nvme_admin_cmd(NvmeCtrl *n, NvmeRequ= est *req) return nvme_directive_send(n, req); case NVME_ADM_CMD_DIRECTIVE_RECV: return nvme_directive_receive(n, req); + case NVME_ADM_CMD_SECURITY_SEND: + return nvme_security_send(n, req); + case NVME_ADM_CMD_SECURITY_RECV: + return nvme_security_receive(n, req); default: g_assert_not_reached(); } @@ -8824,7 +9034,8 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pc= i_dev) id->mdts =3D n->params.mdts; id->ver =3D cpu_to_le32(NVME_SPEC_VER); =20 - oacs =3D NVME_OACS_NMS | NVME_OACS_FORMAT | NVME_OACS_DIRECTIVES; + oacs =3D NVME_OACS_NMS | NVME_OACS_FORMAT | NVME_OACS_DIRECTIVES | + NVME_OACS_SECURITY; =20 if (n->params.dbcs) { oacs |=3D NVME_OACS_DBCS; diff --git a/hw/nvme/nvme.h b/hw/nvme/nvme.h index b5c9378ea4..67ed562e00 100644 --- a/hw/nvme/nvme.h +++ b/hw/nvme/nvme.h @@ -461,6 +461,8 @@ static inline const char *nvme_adm_opc_str(uint8_t opc) case NVME_ADM_CMD_DIRECTIVE_RECV: return "NVME_ADM_CMD_DIRECTIVE_REC= V"; case NVME_ADM_CMD_DBBUF_CONFIG: return "NVME_ADM_CMD_DBBUF_CONFIG"; case NVME_ADM_CMD_FORMAT_NVM: return "NVME_ADM_CMD_FORMAT_NVM"; + case NVME_ADM_CMD_SECURITY_SEND: return "NVME_ADM_CMD_SECURITY_SEND= "; + case NVME_ADM_CMD_SECURITY_RECV: return "NVME_ADM_CMD_SECURITY_RECV= "; default: return "NVME_ADM_CMD_UNKNOWN"; } } @@ -648,6 +650,9 @@ typedef struct NvmeCtrl { } next_pri_ctrl_cap; /* These override pri_ctrl_cap after reset */ uint32_t dn; /* Disable Normal */ NvmeAtomic atomic; + + /* Socket mapping to SPDM over NVMe Security In/Out commands */ + int spdm_socket; } NvmeCtrl; =20 typedef enum NvmeResetType { diff --git a/include/block/nvme.h b/include/block/nvme.h index 358e516e38..9fa2ecaf28 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -1779,6 +1779,21 @@ enum NvmeDirectiveOperations { NVME_DIRECTIVE_RETURN_PARAMS =3D 0x1, }; =20 +typedef enum SfscSecurityProtocol { + SFSC_SECURITY_PROT_INFO =3D 0x00, +} SfscSecurityProtocol; + +typedef enum NvmeSecurityProtocols { + NVME_SEC_PROT_DMTF_SPDM =3D 0xE8, +} NvmeSecurityProtocols; + +typedef enum SpdmOperationCodes { + SPDM_STORAGE_DISCOVERY =3D 0x1, /* Mandatory */ + SPDM_STORAGE_PENDING_INFO =3D 0x2, /* Optional */ + SPDM_STORAGE_MSG =3D 0x5, /* Mandatory */ + SPDM_STORAGE_SEC_MSG =3D 0x6, /* Optional */ +} SpdmOperationCodes; + typedef struct QEMU_PACKED NvmeFdpConfsHdr { uint16_t num_confs; uint8_t version; --=20 2.51.0 From nobody Sat Sep 6 14:37:08 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=1756955617; cv=none; d=zohomail.com; s=zohoarc; b=TU++XRFNFzMReTfOIGQ/HTUQq0BCW8OLZL3G+ed9Gb+qwOF1+MjUulNfpu/rvv8JI0DxsnoZiaGgVQDod+yN0t33mkducTXkjumVppRHd+OhXP6Nh2nbmYedVMP9yMeCMW9YFP4N9Z11vtSmi2UDHFa5gVOaj+CKrC96mq9RWEc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756955617; 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=u/kmaiKLLPI0PyePeUcLux7CKbpjWHsslnSzk4jw9sA=; b=MqID0fYj3CLRwYziz2gvuvX6vWoA0exjek/WP4JIlNG64dhxkQL7PUDSYIeUjSXbYsBaPzPihuvTJFTMNBYr6KLopQK5r+xYPPQ1swHbarQ2bpc0FOZ4fEOxcNQ+gwvOVmM5BQna/H2n0J7z6VszwDloS8lkan+vSeKTBOS0eE4= 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 1756955617986382.26662714074894; Wed, 3 Sep 2025 20:13:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uu0Om-00077R-J4; Wed, 03 Sep 2025 23:12:32 -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 1uu0Ok-00076d-W9; Wed, 03 Sep 2025 23:12:31 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uu0Oj-00019Q-FN; Wed, 03 Sep 2025 23:12:30 -0400 Received: by mail-pg1-x536.google.com with SMTP id 41be03b00d2f7-b4c72e4f1b6so368631a12.1; Wed, 03 Sep 2025 20:12:28 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2490375a9ccsm176497715ad.63.2025.09.03.20.12.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Sep 2025 20:12:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756955547; x=1757560347; 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=u/kmaiKLLPI0PyePeUcLux7CKbpjWHsslnSzk4jw9sA=; b=cK2fe54koGoP5ecb2TE2+mYPk7rYF/RCs5AAubUzP6eXNRI0sD7oqnkPP+urkk+hOw PTNXRZbpAUBg/7JAFHAYlE9JK3CpfeGHPoZ/EY/1aKfuPjwID3/50KNp5PoXy9g7qeqs g7tJY35C4UBCnf6VOFBExRAAU09KpmLUs6MYaZ1zS1ZLyFqntzc4r0wLZI4lfmdojtj1 u7WD//JWoMibreRzAt9cioU3EvGpH5g9bn3JyFACduz0DF1cJsLc7L2TLrZormWB57kL qSue7Np/WpJBQOarri6jwz9k8XgajAHyheC7DhliowQxdQr143KtGM6t8SvbsWK4rDeN i9Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756955547; x=1757560347; 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=u/kmaiKLLPI0PyePeUcLux7CKbpjWHsslnSzk4jw9sA=; b=p4PNMSS8SchWhF1hERg4FhExOftNe+HX/dESZvLjWkMaC2EGUBnE3wa3a9vvom/+aT d11uFSxtx7K8PbJkg/OZnG4RAVAmTdMxdKByN7PzdHSWmCYnGxVL1PzHqwWNmfDkKVEz WfCpdC85kuBrBEW69/Tx9GaR1JEldyEGvddebeVhhaJikgfj07HCdDD+1Bh9/kOziRZ+ sy5PJq3AcQuemDsnNqW07IS2wzhubTqoypVgUINK3HvTChpQfbBPcuQ4Ojui5gEa7Aqp G/ryHtIlaf1z4cAUV9YXc4hsZDNoBBNdj47RBZti/TRqKRBYksCbDwVOWp7PP+acV2aP 9N8A== X-Forwarded-Encrypted: i=1; AJvYcCUQS6n7vKGuPO0/gsQHzgQ6mpGAAuwzCHYWnvCgs3l0Y9E0LEONs+I3RyrShvFHhKs5uzfYrKw2WDAi@nongnu.org, AJvYcCVtdfAQKG8rLob35POdGw26E+bjZM5NJwOMGo/tHc5elembC+/+JmUuaUD4lNeIBP/AV7JdtoRYFsziVg==@nongnu.org X-Gm-Message-State: AOJu0YyJhL/SI7wf0oyOrWVeyc0XitSzi23QTtTUr22NrTHHtt++o8L/ Z6TSpUHqCbshaftuNfRrU3oqjZ2UMjnLvEOP1fchluoV8DiyDeG2kZ2f X-Gm-Gg: ASbGnctkHsPy5nDPLP3soaGyMpRU9VtMcwg3GlxoRTFU0s+JMKz0HbVlcAwneUbH/+/ T+k3XYpleavjrBzxe9OQOnJEMweSK+P/mWg8FLA0ykmiNfbPN7+gSVKneuUxuXXWN6R7S0a7rMX jkLisKO6k6fqPiTLRmTvYBr5ZFPmL7ciKCgxitzuq75jJjqp6RUzHRIutbNlMEDp6i1sTHmHlut O4xe9/PXK0XWliRXm1XXVzZMj0Jq53px7snEiFxKNK3fjFHRXGqM+YUTWdEM1c9mcxJtQW75Ykx hKqvJFlJHemJVVrlkjM3tZNJPR/jBc3TPI5MasSaAkBptCcUJq5/sLN3hgmSpyCyBQiutJ0Vxr3 AT8nJybtptXPTdzFn9QJNnfhNv/xgg0AjHV7s X-Google-Smtp-Source: AGHT+IHPiKh2xbPG2vaJ1UUowgGaASX5EGlpd+FM5EGZnNK5xJQjJ29hinKWG9SSbcHBgTjDdT4RNA== X-Received: by 2002:a17:902:ecc3:b0:24b:eef:643c with SMTP id d9443c01a7336-24b0eef6874mr128839735ad.5.1756955547477; Wed, 03 Sep 2025 20:12:27 -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 4/5] spdm: define SPDM transport enum types Date: Thu, 4 Sep 2025 13:10:58 +1000 Message-ID: <20250904031058.367667-6-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::536; envelope-from=wilfred.opensource@gmail.com; helo=mail-pg1-x536.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: 1756955620712124100 Content-Type: text/plain; charset="utf-8" From: Wilfred Mallawa SPDM maybe used over different transports, such as PCIe Data Object Exchange (DoE) or Storage amongst others. This patch specifies such types as an enum with a qdev property definition such that a user input transport type (string) can be mapped directly into the respective SPDM transport enum for internal use. Signed-off-by: Wilfred Mallawa --- backends/spdm-socket.c | 23 +++++++++++++++++++++++ include/system/spdm-socket.h | 23 ++++++++++++++++++----- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/backends/spdm-socket.c b/backends/spdm-socket.c index 3d264814df..6943246372 100644 --- a/backends/spdm-socket.c +++ b/backends/spdm-socket.c @@ -13,6 +13,9 @@ #include "qemu/osdep.h" #include "system/spdm-socket.h" #include "qapi/error.h" +#include "hw/qdev-properties.h" +#include "hw/qdev-properties-system.h" +#include "hw/core/qdev-prop-internal.h" =20 static bool read_bytes(const int socket, uint8_t *buffer, size_t number_of_bytes) @@ -248,3 +251,23 @@ void spdm_socket_close(const int socket, uint32_t tran= sport_type) send_platform_data(socket, transport_type, SPDM_SOCKET_COMMAND_SHUTDOWN, NULL, 0); } + +const QEnumLookup SpdmTransport_lookup =3D { + .array =3D (const char *const[]) { + [SPDM_SOCKET_TRANSPORT_TYPE_UNSPEC] =3D "unspecified", + [SPDM_SOCKET_TRANSPORT_TYPE_MCTP] =3D "mctp", + [SPDM_SOCKET_TRANSPORT_TYPE_PCI_DOE] =3D "doe", + [SPDM_SOCKET_TRANSPORT_TYPE_SCSI] =3D "scsi", + [SPDM_SOCKET_TRANSPORT_TYPE_NVME] =3D "nvme", + }, + .size =3D SPDM_SOCKET_TRANSPORT_TYPE_MAX +}; + +const PropertyInfo qdev_prop_spdm_trans =3D { + .type =3D "SpdmTransportType", + .description =3D "Spdm Transport, doe/nvme/mctp/scsi/unspecified", + .enum_table =3D &SpdmTransport_lookup, + .get =3D qdev_propinfo_get_enum, + .set =3D qdev_propinfo_set_enum, + .set_default_value =3D qdev_propinfo_set_default_value_enum, +}; diff --git a/include/system/spdm-socket.h b/include/system/spdm-socket.h index 6c2cb7b926..8fb5f7cf40 100644 --- a/include/system/spdm-socket.h +++ b/include/system/spdm-socket.h @@ -110,12 +110,25 @@ typedef struct { #define SPDM_SOCKET_COMMAND_UNKOWN 0xFFFF #define SPDM_SOCKET_COMMAND_TEST 0xDEAD =20 -#define SPDM_SOCKET_TRANSPORT_TYPE_MCTP 0x01 -#define SPDM_SOCKET_TRANSPORT_TYPE_PCI_DOE 0x02 -#define SPDM_SOCKET_TRANSPORT_TYPE_SCSI 0x03 -#define SPDM_SOCKET_TRANSPORT_TYPE_NVME 0x04 - #define SPDM_SOCKET_MAX_MESSAGE_BUFFER_SIZE 0x1200 #define SPDM_SOCKET_MAX_MSG_STATUS_LEN 0x02 =20 +typedef enum SpdmTransportType { + SPDM_SOCKET_TRANSPORT_TYPE_UNSPEC =3D 0, + SPDM_SOCKET_TRANSPORT_TYPE_MCTP, + SPDM_SOCKET_TRANSPORT_TYPE_PCI_DOE, + SPDM_SOCKET_TRANSPORT_TYPE_SCSI, + SPDM_SOCKET_TRANSPORT_TYPE_NVME, + SPDM_SOCKET_TRANSPORT_TYPE_MAX, +} SpdmTransportType; + +extern const PropertyInfo qdev_prop_spdm_trans; + +#define DEFINE_PROP_SPDM_TRANS(_name, _state, _field, _default) \ + DEFINE_PROP_UNSIGNED(_name, _state, _field, _default, \ + qdev_prop_spdm_trans, SpdmTransportType) +#define DEFINE_PROP_SPDM_TRANS_NODEFAULT(_name, _state, _field) \ + DEFINE_PROP_SPDM_TRANS(_name, _state, _field, \ + SPDM_SOCKET_TRANSPORT_TYPE_UNSPEC) + #endif --=20 2.51.0 From nobody Sat Sep 6 14:37:08 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