From nobody Sun Sep 28 16:32:35 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=1757392479; cv=none; d=zohomail.com; s=zohoarc; b=glqDzJftAv4troFKBBjSInUDtYtAoIUVKMfhAg1fTC0UgnR/8Z7PaiPL9cX5ACPzdNPOfGY/So9LH8yGnzyFImTfsCiKNnXrlP5uNy+slkjOE4nkdXcoad1Ci9vFMJzLW9ASEWREnfo9ripukfHCzKZ7kOv1kgKID2QdeTY/edw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757392479; 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=i5g8XeO54kr+q7zWCREG86S9uAOS/RrMRa5OI3IBauo=; b=RI/HpLIvUFZfPmNFHyBhsFXOLRXeOyDGesNgj3Sy7yJ/2kdqV0RlJuwRB4WuJDagB5sV9jUC9cn1iklxqMkoWF+NK3TLk26rD3buGGnVRsbvrk18rJBU0AUooGADpPB23B1c+Xw0P9P9yyG2SGKNOtDmZjSNzWa8P7+93E3gp6s= 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 1757392479665396.7695277009432; Mon, 8 Sep 2025 21:34:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uvq3W-0006F7-Pi; Tue, 09 Sep 2025 00:34:10 -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 1uvq3U-0006EL-Ia; Tue, 09 Sep 2025 00:34:08 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uvq3R-0003DZ-8j; Tue, 09 Sep 2025 00:34:08 -0400 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-76e2ea933b7so4604280b3a.1; Mon, 08 Sep 2025 21:34:04 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-774661247cdsm606534b3a.33.2025.09.08.21.33.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Sep 2025 21:34:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757392442; x=1757997242; 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=i5g8XeO54kr+q7zWCREG86S9uAOS/RrMRa5OI3IBauo=; b=WjYJA2NqXwDJ8IBnKdlatzPqZJOlKQxmLVjJevn6HqrWc+8lQUWBv1YTDKBVVurQWy VRad4v8qW0X6bGK4Yujc1Rk1A96irUSU0FQm3H1YQ8nt/kjbSkwEkC+RzOYmWyL8ZXM/ LUfrMrJIeT9IxYIbKSci6/Pf+PVivfgQFGkEbRoql+GujtjmPQa5UdG2brE6onHR6Snv F/uVOSmX2+Rpna6Deb9EgcHafEs1eRqBKWBhgXow6Qq/7isJFOCOS7HybTG6kwefoD2G kXDQS5t1hVogHEbaKbvt5xhqtffdwMNvOMFJLRlo8VQjOQvRvzpL0CxS29rtAul6GBLa TFXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757392442; x=1757997242; 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=i5g8XeO54kr+q7zWCREG86S9uAOS/RrMRa5OI3IBauo=; b=Nf6jORs1TX/UZH5QoOdYhzEiOMSfs5ktjBzS1FmMxEdnKAuGrljOLs6+BYyosROBo0 RRqT4eDV7cY6SiYN+Tm4BbOhwa919R05GgrmHdBofy5vgsYvHuv9F02o70qc7hyseQZQ pvyX1/q5fvL3mXxlpE1U9Y5OdtATkltL3b+nxD9qDap71Xfrp5q5hFYCK5Hv9AvKbdkW WR6LOjSME+Vb8eFzNKcZE4+ME3EqxW2eL5SbTu/mebr7EHpOK0y8A84yGheYb9hQq1Wu NVrQETA0Z9DVWUSjAmpMbs0GE3HafdpWbrgWZessjm2+0SDXMfg4SmDkfz5peMx2qcda FyGQ== X-Forwarded-Encrypted: i=1; AJvYcCVv91VnxQssyRTwIHjjAC+vgDf1vRBOITBxxAzs25OEyBkHr01xsl5hbapX5urEHNcAtPoHNuDfd7CY@nongnu.org X-Gm-Message-State: AOJu0YzYSxNcazLj1E8S+0eJtk2egxmJvvv8lQ7yXLYrGQxUkQw3BVrj eWZpOU5ffktb5z7LAtp2jbWJMZrq9WF4K15dLa7OzeRvhsQZ7uNsLKrc X-Gm-Gg: ASbGncsFm3Vyi+6jnHF7yxm002VGZzMEuWN9mUKqtPD5H8exRqlcJFQnDRS6by18VLA WW4pTtZPmjAzIX5YbrgXrFIcAAaOA5j+7x6UJcpMREeQJuA/nUr+GmEpCRFmepQtM+ReU2EM0IH Q9h95EsXzLrLHkumlXbSL1UvoibJknsWCTv1RP/xClnfafAa0tHZECKshnILcbPcgGSy+ufD7BG Kv1kY2U4BxSI7kHvT4V6yY6owi1CY3wOCSnSKIAH//AXLgnzB+tqZNJaBoljQkFbIRtnYlRm82Q UqKB0gyHubxRpJAQq7SBNEnpSdNxo1RClnUfcd9VQ9lzQD+Ilb2bOEHZF3PXcMqDW8rjh9+mhvw gGvj75fGCZedPgCukjnk0eui/l0EMhG9pi1nHS46T5+RxWbXib/zl X-Google-Smtp-Source: AGHT+IF/1UhUxEc9qpZlyDWLVd1wC1YKqzxcd+gcvFkBcFXzCS1XOnOwmWCjzx6Jsu5C6DSGxJfGCA== X-Received: by 2002:a05:6a00:3e29:b0:736:5969:2b6f with SMTP id d2e1a72fcca58-7742e3b8783mr11811177b3a.6.1757392442399; Mon, 08 Sep 2025 21:34:02 -0700 (PDT) From: Wilfred Mallawa To: Alistair Francis , 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 Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, Jonathan Cameron , Wilfred Mallawa Subject: [PATCH v5 1/5] spdm-socket: add seperate send/recv functions Date: Tue, 9 Sep 2025 14:32:56 +1000 Message-ID: <20250909043259.93140-3-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250909043259.93140-2-wilfred.opensource@gmail.com> References: <20250909043259.93140-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::436; envelope-from=wilfred.opensource@gmail.com; helo=mail-pf1-x436.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: 1757392481437116600 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 Reviewed-by: Jonathan Cameron --- backends/spdm-socket.c | 55 ++++++++++++++++++++++++++++-------- include/system/spdm-socket.h | 32 +++++++++++++++++++++ 2 files changed, 76 insertions(+), 11 deletions(-) diff --git a/backends/spdm-socket.c b/backends/spdm-socket.c index 2c709c68c8..845ea87b72 100644 --- a/backends/spdm-socket.c +++ b/backends/spdm-socket.c @@ -184,28 +184,61 @@ 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, rsp, rsp_len); return rsp_len; } =20 diff --git a/include/system/spdm-socket.h b/include/system/spdm-socket.h index 5d8bd9aa4e..29aa04fd52 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 --=20 2.51.0 From nobody Sun Sep 28 16:32:35 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=1757392512; cv=none; d=zohomail.com; s=zohoarc; b=P5GcXZnzgeKdaP2C2cKmd6ZbqQlgsa76l7qIeAW0qv5QCIFOoxvNwSodz2hDmrcoefRfXeAFGzicNSBAmQKIS5CQwuozdw9HM9h2pJXRT6oPImkeNwJWeCDd8xUlVTcSgIxo+CSylCJkj+MyheEYlqyBTWgCyKSZO1SBZneOU9E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757392512; 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=7RCukcbGa6ijcHuk+daD95SFwDIqdnmVomZ8mMo0axk=; b=aIybBRVdRS4PFlrgpsQXdl7GtXbhaY+na83Zo39HQAeK0CzPD5ro/KVgnhc4vfwwzBYzwPWL5djORLqNW8EoXGWKmLHkR+hAbqhflq/6udhNHpIg5Y4hGG496QbQ+IR6FtbnHH+ZXAP5m94TjPr+YhS2O2lji7wYy9lT9jlqx9c= 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 1757392512447430.6342749160108; Mon, 8 Sep 2025 21:35:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uvq3h-0006HC-E2; Tue, 09 Sep 2025 00:34:22 -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 1uvq3d-0006GR-UJ; Tue, 09 Sep 2025 00:34:17 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uvq3X-0003Ee-3N; Tue, 09 Sep 2025 00:34:17 -0400 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-7741991159bso4543417b3a.0; Mon, 08 Sep 2025 21:34:10 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-774661247cdsm606534b3a.33.2025.09.08.21.34.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Sep 2025 21:34:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757392448; x=1757997248; 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=7RCukcbGa6ijcHuk+daD95SFwDIqdnmVomZ8mMo0axk=; b=BPACv1ddA5y6ZJpyq8na2sp0wEq1RQs8WkB5T0bQQkjHDTizaKkF9F4BfYACdWplJ1 1xbrlQl/Bh3EiOvLi/MoTR7jPC0W9INVGCnGayMOCgGswOudd/WFeasGkGl9RQg8odMf on2eAAAiZ1BzeFQE2FzsYrBbB57HALOTTJ+00+DXso6t70gT7r4sCKXGcaOpNJVTdAZV Tl3MEMEe1tBKCIayP/OERKi2fbR7NO59ycoFbqDQ7LIb16G6ZoXRizXOKilBnUT4A8wv HU6M+ben95BJuz9Rf/i6rb4qK4ODSEPBZM8AmdPsjgXKYRu0WY3vHswWhadEoTyliiK8 P3Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757392448; x=1757997248; 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=7RCukcbGa6ijcHuk+daD95SFwDIqdnmVomZ8mMo0axk=; b=uCzowRiP8sH2pX2CuEaojnPKm9eOQT9IFN+OWDFFeTFoutO8t8E4I6gtOA0tZsGLi/ S6xJaIPF1GeRuONqRntevVbe4eDyy8TfqjZbiNdVHbiYdi+eFoQdOqQgN5m7GwQnTT7W EbqNChjYdkWRg1BCXf8uZ5pE0U8csZHGJVed6b62FDqIm+39RBV252igopl1+2Mw0lgN 5L19jxizxQ5QL7Gg+54O4mXN2uEGE+W8o8Tttprc7nyHI/gemOGZJjiKFMc35HLcV3sb EQAqAzT7r6r3SLQwrt28nOIivowbNhriv41xutTdcMJD8IHVwAk5itD7F62/n88W8SgX aEoA== X-Forwarded-Encrypted: i=1; AJvYcCXRZEbCilcIECLF01R5XbENYvFMzjVPE/waKCBMhDfm2Vzw5zSE/4Y/t28MIgv40hdHZ+3P0DRElZ62@nongnu.org X-Gm-Message-State: AOJu0Yxpb04KRAVTt/tNginprfqwQDsv2On3Oufe9dTQVEt2Cdajr4jL rZPNCg6Sg6yDuDDBYUTIHgRejoYpAfcuWWVaq/6U8r6gGTGMQC/w+mha X-Gm-Gg: ASbGncuKQP9aHj8QQe5UwudohhXKm4AcYv15LojNdH7P1yerdxi9RRJQagd3NtaMfc+ rwFHfmgAEAXowvshGD4ahUWkCoAii4FLDJ/aztThnBzCWav8GrE2uJqZVqo+CwQoyMritxQKr3O Jz84TEq4iBkd5SAjRHKkupuQ9YWLB06mGyp5oDIbaCONsBrN81ec35SoGDFvQjCKI21s8+BTTJO WfavIzGVl1bmIfyYQbaU6PO6iDiZPNN8qlC80FfuL2XIeaFCQcFIzL9CLlP7ZulFUxTZyGVHuJC umVDdvdSBWUs+jmnUQ1+n4gctZQ4DkPbZj5O2C1X2mzAXRfXsLydX1W2t6/F+b3Z7B7NmwY/Hmx ZfgITstiWJrN42gzQ4/uZY8qkPETg1163VxKR+YPh9g== X-Google-Smtp-Source: AGHT+IE/mFdJf6KWeDFqKhSRKNLktZ5BvviL5gE6yDHp7B9PO945Fqqa7D3jJ90I/o01YsoH1u93kA== X-Received: by 2002:a05:6a20:4321:b0:24f:4c12:5fa5 with SMTP id adf61e73a8af0-25345578e96mr15885205637.42.1757392448255; Mon, 08 Sep 2025 21:34:08 -0700 (PDT) From: Wilfred Mallawa To: Alistair Francis , 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 Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, Jonathan Cameron , Wilfred Mallawa Subject: [PATCH v5 2/5] spdm: add spdm storage transport virtual header Date: Tue, 9 Sep 2025 14:32:57 +1000 Message-ID: <20250909043259.93140-4-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250909043259.93140-2-wilfred.opensource@gmail.com> References: <20250909043259.93140-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::42c; envelope-from=wilfred.opensource@gmail.com; helo=mail-pf1-x42c.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: 1757392513667124100 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 29aa04fd52..c5f9f3611c 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 Sun Sep 28 16:32:35 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=1757392534; cv=none; d=zohomail.com; s=zohoarc; b=OFrhV4QQvRJRYtnsrV7PK47QSO4wkWzPmJxewASiTcDKM+PjAoUy3Xll5gOlQ8LSYaBcAGERFcabwhoFPdzQr0P+64H7etrRCd3Jnd8SU/7kS2eLNwYS+Q2n+lTkhNSptFho26BF+6eA764PTx39YtvBgawHLSn7P/E1bvohBQE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757392534; 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=M01fkta1eJg+Tq+svkiBqT7oQzN8dljIIUY5Xwa7T5M=; b=KkVbdCFKaZgdrZ9k0X/VV32YZc0tKw+9lQqWTRStYFYrjY3n87TGpdVQghM4po1bpTlAIWY8B1lM3DNiQlZ+PxRtWv8UNLVgK7FlfJWi8BMk4A/b9RIEBq/ePALOjjj49jPJNW0+ElLGZvfTTJT5aeWSH2ndQ4WzXRqyNbAUYig= 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 175739253468198.81082769766499; Mon, 8 Sep 2025 21:35:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uvq3n-0006Ie-Ql; Tue, 09 Sep 2025 00:34: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 1uvq3l-0006I5-ES; Tue, 09 Sep 2025 00:34:26 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uvq3d-0003FM-RR; Tue, 09 Sep 2025 00:34:24 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-77287fb79d3so4141339b3a.1; Mon, 08 Sep 2025 21:34:15 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-774661247cdsm606534b3a.33.2025.09.08.21.34.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Sep 2025 21:34:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757392454; x=1757997254; 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=M01fkta1eJg+Tq+svkiBqT7oQzN8dljIIUY5Xwa7T5M=; b=bcgmarUOIUfvOy9SPlOVQhsCsKRtgfNCCHToGNdzXe2tMQGdqt4m59uxuD5ovHN2Oh NyEDHgSeo+Q4qDbCtr1BYDRhe8MIz8rkrBovQHkzC29PGgUihHl8w0YM9UhJ5bjPZ2hY JQxKNPpgD/76pkTrkuRIDdo2tXflFP1ZfPdKHbGmVHlgrUGrYjVQY+hmo+/u4vYcZkvu ODZj9wDWuvAInlpWBEzo9xP/DZAkuJzjvIwmy3ZNE5tEFD7ZJgf/RIBiOHf1o+lOeb9P HQgApcOqy6IAF1g2oCUcjLfZBJKYTw90MMq5G95pv4ewZzcDLrA+IJ/lUjeCXCg1oqdd P4RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757392454; x=1757997254; 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=M01fkta1eJg+Tq+svkiBqT7oQzN8dljIIUY5Xwa7T5M=; b=u904TVX9sojvoo/BneipxZ6Odn6hfip5Dfg4vSlK5eOpFYQ8wUdPlPKOq6LJeOWRme hanp5wqyxHcQP6aD8TIKzC6XEB59KmCdQs2sp9Vlqy+M1j5pm2O1ABuESEEJfKzEctOj PGSYRIu2mFdxcS63+Ej7fcBGFemlucXI/sDEao7mJuFBOmP1UvAKHvDTSN1GljnSK/wM RmTNGdMl4R68wKx8viwHQE2Auie9YMt9V3espIoM+9b1tiOqnhXhvx7mzcs+L7oqyr+b zPCn74JadA6LU5HU5lkeu7FPIJJKCYwxEsL8hrNH+uz40lMBLIJ2br27gjBaZiOGQmYR qT8A== X-Forwarded-Encrypted: i=1; AJvYcCVUwE4dcJa7HnZjoEVDUVnQfFD69ADW430GMMtKvB7un2GLYgKrxdBv9zMoLNgnLa5nBS41RU8hezOm@nongnu.org X-Gm-Message-State: AOJu0YzyrP5yDi7Pgq+MnUTzxVP1+WYPnSp7TPUyt6zfCDy2FQ+SO1HJ E9hbs66HS/c1aH0mIOckJ3YbXHnq5JiVrvn22LpwwTzAx16SMJnPNqEK X-Gm-Gg: ASbGncu3TSSm3ANNrX2SupYVImtMwvMB6txAM2T4tHwMHnHQ0AbYtzEGtJOyltQrzH9 Zg//qyDHmv2F3OAQXN0+Pzuu9wOP4cUq7JR6SBnRyx5Nms+Y32Du+DtjSMhsd7HcPzXztsr3zol BSx0tKtmTeAhGzjNP4ZhdyIIJavBZbP81tMfdsm4LWphoVjh6+Kk6iiqtKe9DjF+49BnBByomIX be5yQdkx5D4hU+1iAPb+vGAbnIQsHgtPo0KqYj9BY6lkxTBxlMX+bkKPTBIyhHtMafGiWabn+g/ Yt6cwugilnbGwNHvgr0NsKNZ5Lr05/IfDBOH9rZD5UVHswWrJPkcmjlWe9MhmKdbhrM8Ia+1e0z oF3nm2gw7Wr+8bSvRrDctqmOlhjeRlts= X-Google-Smtp-Source: AGHT+IEnNU+wQJjrfJwaWzYAC3W9Rmn9znz+q5+im3YnDD7KQNimGq6P2HntIxVoqdMk2rkurkuu4w== X-Received: by 2002:a05:6a21:6d9e:b0:253:2fae:5287 with SMTP id adf61e73a8af0-2533e18d170mr14072990637.26.1757392453938; Mon, 08 Sep 2025 21:34:13 -0700 (PDT) From: Wilfred Mallawa To: Alistair Francis , 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 Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, Jonathan Cameron , Wilfred Mallawa Subject: [PATCH v5 3/5] hw/nvme: add NVMe Admin Security SPDM support Date: Tue, 9 Sep 2025 14:32:58 +1000 Message-ID: <20250909043259.93140-5-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250909043259.93140-2-wilfred.opensource@gmail.com> References: <20250909043259.93140-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::432; envelope-from=wilfred.opensource@gmail.com; helo=mail-pf1-x432.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: 1757392536132116600 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 Reviewed-by: Stefan Hajnoczi Reviewed-by: Jonathan Cameron --- hw/nvme/ctrl.c | 212 ++++++++++++++++++++++++++++++++++- hw/nvme/nvme.h | 5 + include/block/nvme.h | 15 +++ include/system/spdm-socket.h | 2 + 4 files changed, 233 insertions(+), 1 deletion(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index f5ee6bf260..ad52e8f569 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,207 @@ 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); + uint16_t spsp =3D extract32(dw10, 8, 16); + 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(spsp); + 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, + &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 extract32(dw10, 24, 8); + + switch (secp) { + case NVME_SEC_PROT_DMTF_SPDM: + if (n->spdm_socket < 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 spsp =3D extract32(dw10, 8, 16); + 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(spsp), + .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, + &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, + &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 >=3D 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 < 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 +7592,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(); } @@ -8459,6 +8666,8 @@ static void nvme_init_state(NvmeCtrl *n) sctrl->vfn =3D cpu_to_le16(i + 1); } =20 + n->spdm_socket =3D -1; + cap->cntlid =3D cpu_to_le16(n->cntlid); cap->crt =3D NVME_CRT_VQ | NVME_CRT_VI; =20 @@ -8824,7 +9033,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; diff --git a/include/system/spdm-socket.h b/include/system/spdm-socket.h index c5f9f3611c..3d27cc366f 100644 --- a/include/system/spdm-socket.h +++ b/include/system/spdm-socket.h @@ -112,7 +112,9 @@ typedef struct { =20 #define SPDM_SOCKET_TRANSPORT_TYPE_MCTP 0x01 #define SPDM_SOCKET_TRANSPORT_TYPE_PCI_DOE 0x02 +#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 Sun Sep 28 16:32:35 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=1757392561; cv=none; d=zohomail.com; s=zohoarc; b=KyN9GRyrVfqPHKfGz9f/3G+N8o9r5mJF897NDijktssC3axQJ8UlFLIyghFRoflGuJm3/yc2nT9gdlBBmjzfYBBwAVTCK6qeUlVvYmTGn/wnZyd34731MMOOM8J62TPDFVsfJkLEW+zc8IoJHxj/UXu4bUioH9X2C7meXxNjB08= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757392561; 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=WzDwa5raG8Sm10+4ENnYqbcNfW3OS0HNvh0la9YBPno=; b=Gicf7zG6RWamAttN5cxDxJYYoVVwNfak2I8M1odJfuJzuSXoJeK3FDse2auCNI3NQ+6ifyi+w/9xaYIII7GwgF5YafeI994lH7VPC5bqNBFqwqu8pMWz0Wvc3FifEdQTf1eoJOxW1qtM6JPboHoELb1mFrmOUrNfLTWtumB6Rkk= 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 1757392561136489.9574657380863; Mon, 8 Sep 2025 21:36:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uvq3p-0006JR-2Q; Tue, 09 Sep 2025 00:34:29 -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 1uvq3n-0006IY-Fx; Tue, 09 Sep 2025 00:34:27 -0400 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uvq3k-0003GI-Io; Tue, 09 Sep 2025 00:34:27 -0400 Received: by mail-pg1-x52b.google.com with SMTP id 41be03b00d2f7-b4c72885c8bso4232149a12.0; Mon, 08 Sep 2025 21:34:22 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-774661247cdsm606534b3a.33.2025.09.08.21.34.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Sep 2025 21:34:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757392460; x=1757997260; 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=WzDwa5raG8Sm10+4ENnYqbcNfW3OS0HNvh0la9YBPno=; b=M8ciZTl3UwF9C8XaGsDXQZfiRCVBv3rcCJ3OfluOwe9/ZWkwWBovTJNpCe9xh1QLX1 tM/VNZaBv337W5Pjo7gj0rAP3QC0BhWOA7952g3Hvmqc4TRcHk9Ijrz/Rieb7CMZFgpN zBtXs3qZIMZ+EqNk4JitM1RSezGOWGSWL2mNfWwozrRq70RcOrkt3qs+UbAe5xTa2n/X hMc695CqHxjXp+uRdOpLB39JIWCIeriJXb7wYLogK6zgNFKcUacRqyC1yIG3UW+F2Bj9 g5hLVTrhmVFiDt2OxpydkQU2p/iG8pCDBwAZIj4X3ihwKBD7hztPCl9ZPSjZ6asGDb4k D/VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757392460; x=1757997260; 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=WzDwa5raG8Sm10+4ENnYqbcNfW3OS0HNvh0la9YBPno=; b=Z2Dd1ad2YiOetNryKAGhWx86tl8BGEKXwFYIk5b5Y2IB8YDnhDE9470gryNSL126ln puheklu3NBI3q5Elb6qGxymvOR2uEs94IQpc49Jb6CUiPGNzTx8f0Rt98U9MTNdTADjZ 3JkesvN1VbBe0AtCujJwOLrBq8NxuSnWz7vcqFiDN/IUzlBQjgCMc89/lDogWTYlB3RI 97EP7v8D4bVky4KsjejM/Pb2o9nR6eadKvrfWvVR6u7ICNVM7wbA2ivYJ8kfXAStVGqf xh2NQ+TSYWt25LGiXgWFFkJ4leaf30pbGyvzjuemWfkSqgToz0ZvhAT/mYHw7U/siXnk JIEg== X-Forwarded-Encrypted: i=1; AJvYcCXDdNesXtTIzWincctT44cqmD441c017M7c2FmDCC7vpVzu9c98PEB7/7e12lu2iL4CS+POEWsDqFvd@nongnu.org X-Gm-Message-State: AOJu0YwL6INpoDpvgnlCPKBRZrbW6/0wak6Eff2sZRxGqaDAZY88NVv4 J4UUy5RV5W6KzdhyUsx09W6kjNXvOLiuCS0CqzXElZGeThJ6zQi5Y/PW X-Gm-Gg: ASbGncssHyIbJPwv6DM6Yp8xklZveBgUhx39mr8ohs98lylbUyGIPer80tyuYSbnMpS jNQXVvW7is/LnHqo2eiMXvQ61rJf8JevzEfNJNAIRBnQn6tm7JJevAlJIWJZixK7mK5BfcPHN0F xNlOTbzTDX85yBEZMqXwBVL1WCklA4gDg4YYhpNr9fK9dJhEPTVjMeNJz9ud4pMP7NnJdfrnxhi FOy/ycx3aXBRkFAdZkWBcTVlxqsbIbzKMKJMxWFquVXAulg0jfB0hCqv3xbLXQSYrx3mYVg9f8X bOiwu4w1sBJyNPK7j9gJaDyLw/7B4jno2wmNL0x1kwJm4ky3AjpUM1jm/43AQFf91cclUw/mD0h HcwkMSm5ne5PuD7NKvR1lhwxlNr+dgNxszsdreQ== X-Google-Smtp-Source: AGHT+IHFSBwyK2utun2TNC4gGtAzdCXBgUG0lg2FqmBo8o2awc7edJTWsyKuaOKzLXOGjvs6Jgvwog== X-Received: by 2002:a17:903:46cb:b0:24d:f9f:de8f with SMTP id d9443c01a7336-2516fbdcc8amr155936605ad.17.1757392460026; Mon, 08 Sep 2025 21:34:20 -0700 (PDT) From: Wilfred Mallawa To: Alistair Francis , 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 Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, Jonathan Cameron , Wilfred Mallawa Subject: [PATCH v5 4/5] spdm: define SPDM transport enum types Date: Tue, 9 Sep 2025 14:32:59 +1000 Message-ID: <20250909043259.93140-6-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250909043259.93140-2-wilfred.opensource@gmail.com> References: <20250909043259.93140-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::52b; envelope-from=wilfred.opensource@gmail.com; helo=mail-pg1-x52b.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: 1757392562249124100 Content-Type: text/plain; charset="utf-8" From: Wilfred Mallawa SPDM maybe used over different transports. This patch specifies the trasnport 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 transportenum for internal use. Signed-off-by: Wilfred Mallawa Reviewed-by: Jonathan Cameron --- backends/spdm-socket.c | 23 +++++++++++++++++++++++ include/system/spdm-socket.h | 19 +++++++++++++++---- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/backends/spdm-socket.c b/backends/spdm-socket.c index 845ea87b72..2321ab72d5 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) @@ -247,3 +250,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 3d27cc366f..6edbf5185b 100644 --- a/include/system/spdm-socket.h +++ b/include/system/spdm-socket.h @@ -110,11 +110,22 @@ 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_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) + #endif --=20 2.51.0 From nobody Sun Sep 28 16:32:35 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=1757392541; cv=none; d=zohomail.com; s=zohoarc; b=Pgj+8Jbt3+NakZBNKpd/GiITUX+28OfIqnBsF1I1fK2LyJsYt9dsgTXYz7S4cBREEBN2CJ8nG0o2/FSnOGldjzvh536ABnm6E2dUwRy3mgfBCayjg8rZ+56TXyzp1lhLXcxjuXpTWetqa2Jc/8kIZ5A40gtvDCUTNKB1FWUrpkE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757392541; 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=vaeExwVGOVV/kW0JCGTlDJdwyrSQrvISoe6gs6Lc/zE=; b=m3zNDq8wzQKuo7UK1AC4LfP3BR/84/SdUWsKZbnulx2eiXmpVfHnd4uPSvdmaoBRs416TrBGsiViGmtkHM0AN6KC4lX/iQEXPh5ZoVk822KFTwNPSWpZZLHQ44gdLSAuSvIqHMurS+dr9NDGnRQ167b1+iW/R3/SvTimaRQP88g= 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 1757392541639138.80402868938518; Mon, 8 Sep 2025 21:35:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uvq3v-0006L9-5S; Tue, 09 Sep 2025 00:34:35 -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 1uvq3u-0006Kr-1j; Tue, 09 Sep 2025 00:34:34 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uvq3o-0003HK-R4; Tue, 09 Sep 2025 00:34:33 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-7725147ec88so2182809b3a.0; Mon, 08 Sep 2025 21:34:27 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-774661247cdsm606534b3a.33.2025.09.08.21.34.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Sep 2025 21:34:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757392466; x=1757997266; 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=vaeExwVGOVV/kW0JCGTlDJdwyrSQrvISoe6gs6Lc/zE=; b=i7dVJs8s2Mi4AWXLNmB2NRk7NA/UYM+8McDoiTpOkYol9sH/PSGEhsz80yw/9dXUB8 bh+EtcUOmaEo8D+nuueflK0DRQON7EVvedtrVhhcHFfFhWiXZZkHB822YtzPlZysgrBh 9d4rMb2uwBBBG/4JDdE+ffdHxkPdkc1Vk0AgErXlKS/Y4q/wBpOwCXlWjsJHOp3qRfz7 EdDd8Lx58OgftojZSLf9JWw7cCgIRhUigarvNQ0ffaEppykuUKFsha6cBSTHVWA5bMVy be0VZbBYJMghKbBSpSiKRh9JVqOSuTepOUmVQzW3Ru7AdKRNICA2DYYJdNsA1+Vycn27 IxMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757392466; x=1757997266; 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=vaeExwVGOVV/kW0JCGTlDJdwyrSQrvISoe6gs6Lc/zE=; b=bTwL5O/7joG96RS+95CaKyxc1RT2rdgjtNQUHoZmdYYTDLWZFoKxkEeMA9srs2rcej vDwA8VI2zCrZwfKNi3wN8VL0sDzkjzV9Hifk2cYhpSaZAqVBovS+DBM17c+wKoTWM5O7 Aez1LGFa4oRhyqNBzMDAjfaP03569iIC1b2ID9C1rpA2/fGNF/vCy9JjeqW66oGgIzEF mu0Z2EPIN4c1n9lwzOhtpfD0n+Lt8U2DZKrfG/SuVTyUxGwkmHUhOkw4kiL0+3+MDHjz 8MqwpslQEGCyZ+eZ2FL9giGcoGC5s59jNCLcgpzBdUAYMOlZvtCjOOWVIUvGWdkorE3f AIEg== X-Forwarded-Encrypted: i=1; AJvYcCUBwIg/DgM5tQ2O3u59FYhXMWjSc5S0Vl6Bp/fEH4naDtkQC21afpm5LRvWcOlJySR0JsEEsqxRSPgq@nongnu.org X-Gm-Message-State: AOJu0YwzYEHgoVSBUKfS1GDKAIuRxuAp7uUOcDEJQFk98hDyT5+m0iKQ 4HKxUKqdDYC0WeH7zvUFYSp0rnAeEd5BZNVT0BUy0qQENxjAlKiJhZCs X-Gm-Gg: ASbGncsni2MLSmFg0fxnvGMeF46Nq2zk5jVT418EJtdjjF0czBVwDJLWOetfZEfzi/2 VLHAl6gKM2HwRa3vokx/wxfz9LYlATJ8VBbLz7jiNOmn6ta8W+spNsu2bmhb50pSMXLf0g4qiKT XdFJ4tWh61R8mksikq4HPaFuUQ0BXdITZKICJS///h3a34KHhlKvAlcOP5FNVS3OZVYSCbkvTeM 8NeoWFPb633WJUhPdseKfH/5CSHcilY9chLPXlIE8ICnLMwkENYDFpztW3MZsIJB0jSpYcCzdEP My8oCtbPBqrwtvGPZtqwn7le72QIrhZ5bf86zJUHMS3WO7Yph2638zY432atVHWo/1b6JKHUvxH ImxwQa6TZSpjBbHwsy3XHlrwr/3j4ueHuIPHSV8ej8Q== X-Google-Smtp-Source: AGHT+IGQKbb6IwSj0dYPTn1TVe874Hwz76JC3Ma1lp67i+jYd+oBBS8Bqt+7fQGS3Mr2o1yUmFwSBQ== X-Received: by 2002:a05:6a00:2188:b0:772:2bcc:d2d7 with SMTP id d2e1a72fcca58-7741bebeab3mr17700719b3a.2.1757392465810; Mon, 08 Sep 2025 21:34:25 -0700 (PDT) From: Wilfred Mallawa To: Alistair Francis , 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 Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, Jonathan Cameron , Wilfred Mallawa Subject: [PATCH v5 5/5] hw/nvme: connect SPDM over NVMe Security Send/Recv Date: Tue, 9 Sep 2025 14:33:00 +1000 Message-ID: <20250909043259.93140-7-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250909043259.93140-2-wilfred.opensource@gmail.com> References: <20250909043259.93140-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::432; envelope-from=wilfred.opensource@gmail.com; helo=mail-pf1-x432.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: 1757392541894116600 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 Reviewed-by: Jonathan Cameron --- docs/specs/spdm.rst | 10 ++++++-- hw/nvme/ctrl.c | 46 ++++++++++++++++++++++++++++--------- include/hw/pci/pci_device.h | 2 ++ 3 files changed, 45 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 ad52e8f569..8a610f57f2 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -8947,19 +8947,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; } } @@ -9250,11 +9262,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 >=3D 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); } @@ -9307,6 +9325,8 @@ 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("spdm_trans", PCIDevice, spdm_trans, + SPDM_SOCKET_TRANSPORT_TYPE_PCI_DOE), 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), @@ -9382,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); @@ -9393,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