From nobody Sun Sep 28 15:29:09 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=1756366043; cv=none; d=zohomail.com; s=zohoarc; b=QFEIPxOftQ+xHpzYe1YEgTtn4kwIz0+v1YdSbexfU/Iwjw+6+S/5KHnbQnWL6Dkq95bOVNI1EHPj+Xzd3cGVz3mZtFILAweo78oUy4D7n0EgLqgPnxAFUY+RjY1ZxKFu2SmjpR7oF7ewrCGZotAjPNn4FwDIdSORTAGvOAoIJLo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756366043; 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=Hx/u7xHbKmLTY1IHjfIIex1/JZb4cVE/Py1ceyF+AvvryJcAbKtVZzDLP7Us+g5CVTf2g7qe27LYKn3DNk+siN5CfOmMc8zDW30+2aLWTdjp0MJKb49m4cx3ETSzJHsdPjhBJILK0s/Ohc8nFkx8OV/65CPGqWyrNp2QiIA8/qY= 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 175636604346870.2508538277774; Thu, 28 Aug 2025 00:27:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1urX1l-0004T2-Lk; Thu, 28 Aug 2025 03:26: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 1urX1M-0004GU-Nt; Thu, 28 Aug 2025 03:26:11 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1urX1H-0005Mm-LQ; Thu, 28 Aug 2025 03:26:08 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-246151aefaaso14169815ad.1; Thu, 28 Aug 2025 00:26:02 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-24884a629fcsm51009775ad.19.2025.08.28.00.25.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Aug 2025 00:26:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756365961; x=1756970761; 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=k21dXQYdRkKwUuT+EnmLGb3KoEDAa6pkfDeshRRdxHC0F/yKZ/dy3vegR0o3GQt7+2 9M4KKVCwFDRR/VHRWAGhbzsQ7O5NcxtVUNKyX3E6dI7/OpDZb603H3VIu9cy9NyOQ8Gd oeuoJw0RdPNhE4EW4K5L1/i/jjnQWKIipUr6WRjfNdEgAjBtI5MdI9o0Pr9LVdkPYQVU rgU+muX4ijbA51aiVa0jzviHVSte25JwzwzbdXiZKdIk4v9JFH7e87M3vWZWEX9cKZ39 BkIJkoo14FrmkZSEJ0stJks4M5QfvG0yI1P1RwEy+UdmvpalyZOyfBIa0CokscDSPU1z S4BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756365961; x=1756970761; 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=ncIPOP3jLJMaLK9somrm1WuFv52FpEM1LJpXu3cy6axrdQXF/5R5GTIt6IWQJSpHqp IwtQjrlaJFUnhEizhOAl6kXZ1zO5Ic66sWtqyR+NX3kCgySQtcpIQY822ArDQCKh2KcW 0ZnnedhhibcgOfH7X71g5r/rnK2+NopnNH6FaU+NWfjYrjLMPLs4apct9qyQbGxUtplk eKrMuE8FbUZEBEfM156Q8gkVXuAWQOFvNt8pDpAQmnnkkFEFbq4Qbo2wbDR+KcqBy0x9 rWIuWd4j5THjeSZX/kVZ+D2lyaglZ7xtU3n+z/X7vLLqWyKa8OnbKbn/HmtFOAm1LvUz cWcw== X-Forwarded-Encrypted: i=1; AJvYcCUeakmmkezw6mOiPwpxjOMB7QY5RZQPel1OEdgtkkS9zA7+f+Z5d0IgX22b0Whe57OMIy9dT+m6Q/h7Fg==@nongnu.org, AJvYcCV3KU9Wu+NBvRVRX+NCc5p6tpIIxkXHv7UWqij6dNdI1Pugtk04cGG61f3J4PMRmCA07JYuSLQSW90s@nongnu.org X-Gm-Message-State: AOJu0YwbpHNvywmshN84nK3cDQem+FCDhyb78+Kl+7ZmtpDp3WxpHpOZ gv6NkT3bfwdCck18wpuubjNGgvProf8ARXIxVkxIJvZx5OIyZwPDapzM X-Gm-Gg: ASbGncuTfYORnGjwNN133f5Fqfbri/tzHntw4NwVn83LhfTSAkzYy7zqLNAyGMAUIMy n2vihvh3fvinUg5csLvKLiqLipyF2n85T9v0a1olkIo5cmmHqNlJkD0exCx6tRuivz68YsRiSYW r7WvEvTvOKHJY8M+bysKUH/QVuU3RbIxgN4ei1Nb4Y6hPLEo1/7Y5TRYvSkxBMnr6fFZZnVg1Az vp7vM7p8I7AxwZQetxietBInRRZSG2aqrRF4z4Lg3i89mwPbd2jeANnCAMZRhmmpNm2oFDq+HFu Lok7rSZ4QynlTN9nTJBhh9Jp9vw7bnqQ7kRGmpxgXJo5mXRujVOvGgtmruJmunyNk40okIKTCK/ cA3wfBF4npev3vBi+zeGD5lx7Py9fauxtxtAr X-Google-Smtp-Source: AGHT+IEaiU6QgRcG8htPDvaxwJq7c3fZMpgwcWvJeNKCz/xC/tgpHeBjnRoR5czn+mauKhxLWSiG4Q== X-Received: by 2002:a17:902:e5cc:b0:246:d5b3:6310 with SMTP id d9443c01a7336-2487539f6b8mr91260575ad.23.1756365961394; Thu, 28 Aug 2025 00:26:01 -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, Jonathan Cameron , Wilfred Mallawa Subject: [PATCH v2 1/5] spdm-socket: add seperate send/recv functions Date: Thu, 28 Aug 2025 17:25:29 +1000 Message-ID: <20250828072532.425592-3-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250828072532.425592-2-wilfred.opensource@gmail.com> References: <20250828072532.425592-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::634; envelope-from=wilfred.opensource@gmail.com; helo=mail-pl1-x634.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: 1756366046625124100 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 Sun Sep 28 15:29:09 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=1756366062; cv=none; d=zohomail.com; s=zohoarc; b=CCn+IYV5LN2z90Ks3dtSvFkmnUFM17ukKN/0uNultmuEGSS6Zoc5ha9lkLuuuKsaizGMvA1YylmKOZ4rlZQ/HLl6+/8qKuAa2+JJmesrky2xX/ZIR6J4ZkbNs2S3coB5t5jBS0wOmVBo6EDyi9U9O8vriEyT+LaQMOuSFogR66E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756366062; 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=akg6u9oiv0QFKl0WCK/hRaXYAtF7tG+kvfp/TDCdEyFtBopG99vNmemzfi7LWKCA65qIrhFookB09DqgreXQkh0s7rYSD6SJmU8N9bBrVPy1n4OgSgJw/RzLk4giXhqniiEZi6LvdnZVaYSjlGhAbj3u4aeY75OXY6XOGTZ1q2E= 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 1756366062590134.08078120694574; Thu, 28 Aug 2025 00:27:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1urX1n-0004Tk-Co; Thu, 28 Aug 2025 03:26:37 -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 1urX1P-0004H6-Pc; Thu, 28 Aug 2025 03:26:13 -0400 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1urX1N-0005NM-Pd; Thu, 28 Aug 2025 03:26:11 -0400 Received: by mail-pg1-x533.google.com with SMTP id 41be03b00d2f7-b49cf1d4f6fso505777a12.3; Thu, 28 Aug 2025 00:26:08 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-24884a629fcsm51009775ad.19.2025.08.28.00.26.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Aug 2025 00:26:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756365967; x=1756970767; 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=Ijh5FLHNNwLJxAUuM4oIW9MU0qZWrKgnUkeKkro/zQa69flahtLAFmh2yl+OUb6o8G 3xvNTC1+mB7BbDb7vfFgc/gGM81CE1sLgBgvNJsFF6QOddu/eerjLwyCqSltQX7nziow TAcufzYTFbhrRq1Idj39IUdE/Bg4Dk/TJlw6t+Sh3zTntrppJOIDpXKclEMvDAGh+Wc4 skwAbza8FJPqSGleOyh/sXYyEiBYgSPXzVvO4SF66WM5aK6BnGaCAgIlAdf6fiYvYeUq hF+zv6OeYiWm0JTt5Ib0nBO5Up6coDgh2Oq2zm2tuthdENaipKEp0fDKUElzBtPoQnjZ 4BxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756365967; x=1756970767; 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=ii+XGZihfqTnMfTucLBCgiaLOmSb+tWMjAAtBlBoOT4W1ybNgbAmExZ/tMQyxhvLUP TG5AGynpR7mMoVSJcqqy0IAQItNzEcmjYMHUQOW04l+O4YJESZlpFZnPqAbxL9B6nwTg w8Q4tH4qt5Nh5rC/Gc1lqauTfFk76DXmWaygovgNVKLJFQn7Dn6ZMKScZpttWKtbs83s YPJNAUfNRJfMDLE2dVGHLy09ggZUKLxBiSDr3rF64nl/4f34HR4XTtYqccOPHzb8N305 MQ65aZdDtlpFv0hdhDUOxoyPr3BUdGUe6X7RWjZG9xGYqIVTTuNJJTuBZftvWh3Iux4Y tA/A== X-Forwarded-Encrypted: i=1; AJvYcCUlCH+U3CWxyg8u8wFwfVzxqva1rlyjPDUHvSFJcJzYRiHHRp//t9wUHe7CpXZT/fVamYTC7o0Cb+ceFQ==@nongnu.org, AJvYcCUwQvUXMl5NKv3mrSqjRr2i6LGkhE1MM1QhSkLr9uAuaAEuWMSIQAkrVmKshjPjXjAIE/13nS82e3Pa@nongnu.org X-Gm-Message-State: AOJu0YzsiHoX3h7t/uP7D4EI1XA1c0Y5ZacdKbGG5mqiLMiTGWJf5gbf JAxNK101YD6HrsRgfQajrjQQZsCYI+2txD5ck4LIPscXhN6R8cXevgkA X-Gm-Gg: ASbGnctVR+Yc/VW49TdtrOogfg4EiHkdRdD0yVtpVpe2eHjxVSqXbOQDK/G8+xhz0o9 exxjZx1L+81v9JvC5J1P/140hV/HjfczCO+lZcTmoaCvfwif/381pAWnveozo+AlW5Z0TJAtjHB TMQNWgc4fK1w/CrWC4QVz9RgQ1ec89yXyzdBrT1iPulZmLqXJiII1dmejvfqxcxMcL8/6C/MrU6 RoilUJGq8kbuG4V2QaQfpgoaAyCWLnb2xwnIH83rZqdKQ2HYAGzigULz1adKmkn6phaptP0fYs7 5/X4lSXuNQIFEwnBhM6HJpUG7FMcTMmCBcHr2np91DPTW78iG4Iwx9gm9y8cu9yUFbQALEGLc/Z 5m7MFtx2ARN8s4ZKjqje7dLZKi6CzSbpcNtOwLJdoFH0u0oY= X-Google-Smtp-Source: AGHT+IHBYzMaGkOIL1ZjpUwqP29SLBrEi72rPjKWtHFnO0b0N9aYCtkoSbG6yWqlCKxdx0ngb7Dwqg== X-Received: by 2002:a17:902:f70c:b0:246:a165:87c7 with SMTP id d9443c01a7336-246a1658a38mr223930275ad.42.1756365967215; Thu, 28 Aug 2025 00:26: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, Jonathan Cameron , Wilfred Mallawa Subject: [PATCH v2 2/5] spdm: add spdm storage transport virtual header Date: Thu, 28 Aug 2025 17:25:30 +1000 Message-ID: <20250828072532.425592-4-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250828072532.425592-2-wilfred.opensource@gmail.com> References: <20250828072532.425592-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::533; envelope-from=wilfred.opensource@gmail.com; helo=mail-pg1-x533.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: 1756366064221124100 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 Sun Sep 28 15:29:09 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=1756366052; cv=none; d=zohomail.com; s=zohoarc; b=W0m8Ey+YBhSAAG0HbQW4Oslw4+ECTGBztdjSlgM/c+yEsTiHqcRSahHKAj6JzFalmm66YOEmiJejXiNyAcew9spe1mkm0QYV6tqcAGMLq3w0f/MsalEaEACW4a3rVK1vNJo65Djm05aJIdGtoN9roZuqsuoFgA6oBUg2YnbKajg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756366052; 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=Ck5yLgXToT01vA3KvejNunoGtn7Gx8kvaulugBPMFTw=; b=WXPvVHWPb2DibuFDGjaz/+dYU9qMap5rwcOqMKtHDYN0+DrzT6Y1aq81IKLbIORPcp9b+Czkyzxd+WYTcqr45J7mNbpcouIEIclbgoffSxmQ2AA/n+WozNnWV8kBE0KpMZ9kfm0mCMr4aL9ccNP/NmPIxvIJ9ltJxcVNeyFD9cc= 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 1756366052226341.0646508983807; Thu, 28 Aug 2025 00:27:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1urX24-0004ad-Ur; Thu, 28 Aug 2025 03:26:53 -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 1urX1a-0004Pu-NX; Thu, 28 Aug 2025 03:26:24 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1urX1T-0005O8-2h; Thu, 28 Aug 2025 03:26:22 -0400 Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-b4717543ed9so480540a12.3; Thu, 28 Aug 2025 00:26:14 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-24884a629fcsm51009775ad.19.2025.08.28.00.26.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Aug 2025 00:26:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756365973; x=1756970773; 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=Ck5yLgXToT01vA3KvejNunoGtn7Gx8kvaulugBPMFTw=; b=gP5+3WSy7d0DJo5vnmRD2A4Hb3uKpo7kREVTrr4+If3H289xuSr42zGkVUBVFlVLVS nQDiyd3Zc7NeqFqQXgyZm7FUjUWHUrE+rxU3ujQg+ilP4z8aT5jA0QFOxfgTNY9GCuAH 3dXz1TZdObBttP1JXPwTraQwC2fJuo2Bob09qIpCWKVPmmz7vN72GmtrmsPeKFaF9c+s lZT7dUS6dUCKld0SCD5tlY8X1W8i7m32TrZJJ37EnMvNpcIptE4DA1C/QO+5tuDVr1H1 EgXN1+d/cXnNGkvEMk1gKdnWetFHKK8O8dwC6XFVK4WO2KF572RD1W/tjmHSj0609RMs UUNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756365973; x=1756970773; 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=Ck5yLgXToT01vA3KvejNunoGtn7Gx8kvaulugBPMFTw=; b=My+ofMlHEgkAl+MTohyCY0rs+mQYafaoyeoI7NuqYlkaLECHzSSTY9NRVzQg/bHEV3 84gSEIFZRAPt4zSvvC3ceHrXymP/6/a0ZWCom4Dz6/4V+bVmVkwvGXgb/g/wmOyamXB4 OSvi8/oWUZ2yBJsBPRSqAAV1DG0eJ0XXTQRVHBWgATdVx5UyCafRIz00OpAZtmpYx/0Q dOBh2zUkkdNYQpbAKyFj6eP/6MlhYLV7aAhSW57qasdG9l3s7jNoUQbNZqqoRF8at66b /xKbb+x0gtt44kl3V3Pt+Tf6BeTOmQu+BsvQJeMj90wua+ZJzbT21EyudXyVzqih+2rP EA0A== X-Forwarded-Encrypted: i=1; AJvYcCVAgEfSLYbNIKGvmI3kdTxV+0xKjLZK7JeCVKE2g012kiVW949Sa97SJd+H6VfMUqiyj5KmypRgdYZ4dg==@nongnu.org, AJvYcCVacs8W3f3NzK0ArJMvOubSeD5eOR8wZ3egm4uCmr1XqIA4kzVCF9Jc4ta+OhuObQRWCkc/JISnY+zM@nongnu.org X-Gm-Message-State: AOJu0Ywn5vW4ua+A6lct2wUOW0lIbR4zKJnSE1Go0yMeSY6jAg2Iboq7 li7Kq/kRV0SdkQDeTh6gDOQ62crXXRcZZrmdna/RNaQyXdQTm/ChgIBw X-Gm-Gg: ASbGncsg/WhKIWuHXRyeWQ71fYn4hBTG7mzpBE20I4RSZzON0+CeRt05eV98DhxBa6b OFsZh9HRY8J2Ss0glu1VMAZu8dvi0ufQ24yfNeDfP/kmcGqDO49RsJns821q3j03fFFNJn+SYyT 95WyR+asqcuknMitZobQPr1z7DCfCQ4WVbjMPa7mf+VqczH6+uUB0DZbwO2aaKzFtzc92nabsSq jdq5i9MK8E41JYJtvEJWSeRx27Z7nlE6hvCcfzUItjXQgYzoPJInY8NPSGaD0fjU1TA3FkJQbl0 CVd41Cz2VZUqOkQHnGz05N0rHT11hAAgqfZjLnw1625KhsIsoUFxl7ZiQWDF0k1lEcqz5wde1Bh pWeiGbJI+lE33O0CgsgL/ZpQ2Kgxj/7EmuMwk X-Google-Smtp-Source: AGHT+IHv7tEcljRVwXoap6gNVxVu+QaeyQsykN4WcgygoLFIC5lcNkCGphbP44VruiRHe3TbFQX8hg== X-Received: by 2002:a17:903:2f44:b0:242:fba2:b8e4 with SMTP id d9443c01a7336-2462efaf1demr308733595ad.56.1756365972994; Thu, 28 Aug 2025 00:26:12 -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, Jonathan Cameron , Wilfred Mallawa Subject: [PATCH v2 3/5] hw/nvme: add NVMe Admin Security SPDM support Date: Thu, 28 Aug 2025 17:25:31 +1000 Message-ID: <20250828072532.425592-5-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250828072532.425592-2-wilfred.opensource@gmail.com> References: <20250828072532.425592-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::534; envelope-from=wilfred.opensource@gmail.com; helo=mail-pg1-x534.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: 1756366054344124100 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 | 197 ++++++++++++++++++++++++++++++++++++++++++- hw/nvme/nvme.h | 5 ++ include/block/nvme.h | 15 ++++ 3 files changed, 216 insertions(+), 1 deletion(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index f5ee6bf260..9358c9e540 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,194 @@ 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; + + transport_transfer_len +=3D sizeof(hdr); + if (transport_transfer_len > SPDM_SOCKET_MAX_MESSAGE_BUFFER_SIZE) { + return NVME_NO_COMPLETE | NVME_DNR; + } + + /* 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_malloc0(transport_transfer_len); + if (!sec_buf) { + return NVME_NO_COMPLETE | NVME_DNR; + } + + /* 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 NVME_NO_COMPLETE | NVME_DNR; + } + + 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_NO_COMPLETE | 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 cpu_to_be16(nvme_cmd_status); + + if (recvd < SPDM_SOCKET_MAX_MSG_STATUS_LEN) { + return NVME_NO_COMPLETE | 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: + 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_NO_COMPLETE | 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 cpu_to_be16(nvme_cmd_status); + + if (recvd < SPDM_SOCKET_MAX_MSG_STATUS_LEN) { + return NVME_NO_COMPLETE | NVME_DNR; + } + + /* 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_malloc0(alloc_len); + if (!rsp_spdm_buf) { + return NVME_NO_COMPLETE | NVME_DNR; + } + + recvd =3D spdm_socket_receive(n->spdm_socket, + SPDM_SOCKET_TRANSPORT_TYPE_NVME, + rsp_spdm_buf, alloc_len); + if (!recvd) { + return NVME_NO_COMPLETE | NVME_DNR; + } + + ret =3D nvme_c2h(n, rsp_spdm_buf, MIN(recvd, alloc_len), req); + + if (ret) { + return NVME_NO_COMPLETE | NVME_DNR; + } + + 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 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: + 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 +7579,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 +9018,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 Sun Sep 28 15:29:09 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=1756366049; cv=none; d=zohomail.com; s=zohoarc; b=MoMOwB1blmg+Apk785RyqYY8fcQI1/Xur5MfSaEOy2eMTyf6vPkmIHUb40wtRB0E8oGubJSzROPfGV9Qc1tmuad8r66PMmWqCIotawJQNNIg5q/e3nzN2ZmjsbPNH/slY9xqw7L44CvFwHspIocOwQox63yzoWqTenNthrpT30Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756366049; 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=bIwa9VEUNpCf9SlyyZNHcZ66bG/fPOsoSgecU8EqY6roH+QdMOXP5Dgf95wlyI5gtxNNA3dpZF3flGiFVFEn34hli+LGMxSEhhWmz2uGbw3rrOYbEjUim14YZwdMOXdFAMt4IqcuxJEi3kbAOw0cjX2HWIvWxu8vRGLzV6jPI7c= 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 1756366049803153.6873468917329; Thu, 28 Aug 2025 00:27:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1urX26-0004e2-VL; Thu, 28 Aug 2025 03:26:55 -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 1urX1c-0004QZ-Qm; Thu, 28 Aug 2025 03:26:27 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1urX1Y-0005OW-Po; Thu, 28 Aug 2025 03:26:24 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-2460757107bso6141665ad.2; Thu, 28 Aug 2025 00:26:20 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-24884a629fcsm51009775ad.19.2025.08.28.00.26.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Aug 2025 00:26:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756365979; x=1756970779; 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=Aw51a69AcHWlzYv4cfrG/qT2fM5hVBplJodW3yO3m/mc+JrXUtS1eWzmZRA1qFLeab KV0XcZTeQOgB5nxgm1Q80bjeRULtcE2Ehp3ZDGXshXqV8NJhHh6M5usSmJBjHwZO7m+y 0oQE4dyOxVnK6FO0ka/qDTc2UKFiz747hs4T0iX52GjQKJSJWN/scb/56R8q5eWIUgAf F9akJ3zK5ankyAEErt1jWrzpMQXrKS+EXcsDpYoCHZAUhaVmBCYQ6HPvQ/KUtjIyd/ll IPNY5ys/0n6TPiHfKAIfI6BoDbBFGUG18RZPLPnyxCc0ZsG4zze/NAOFI+A9am9r2uFr ClMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756365979; x=1756970779; 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=lB7svPLlPmkAOKgTxP/2b5dCxAngmg3nW+8gLUTNvgFaC57yFZN9goGQq+IXvomEN9 72goZmixEXtljMcAaiJHb0B7a0QhzGBtRLpldMEn3ThyFTegPUOtpXia1OWFFjuYlzma pUyrVktienVeQgUeBQgaq56Ml4yVMqiD3dU8o8DfijaKpmuhrd/EcdhUm0G/K4AWlQ5h 9dCMf9w0csN8mH8QAjyGSgLv6pkcpog7SV2eO+SuMxOhTKuhrG6MlEmu4ZOScv6CVNqr H6nFXbGfYy2yjoUfma476/wK+YeLL9sf/wodC8GdgJK4hWESnFQB7W2MRVrFaUY1nTpZ fozA== X-Forwarded-Encrypted: i=1; AJvYcCWsPJH2cG4ZjKhFOVTCRa2bZ/N5DuuPiX+m5Ipdeb39S98238IypvLyt7aoVBo9RzMrqd+34c1j3wC2hQ==@nongnu.org, AJvYcCXFzoiEDduX1LOAh1E0geaYXGKRza9jtP0WHXnifnAB9dY5Tk68F+LxHprtoF9ptTZolstCqYIHEeGD@nongnu.org X-Gm-Message-State: AOJu0YzQv1AzWGxAjJ8fNcxCTxKo8hLw9VsmKRPb1MvrqGfoQM+mTjE8 rlLpy2LriY5J4LCjhwvqCCUxJB1RPGIMzByJy+hjUmYFSP83kLAlfVdQ X-Gm-Gg: ASbGncufENbhOZn55tOEvrXizmmeLLNNmykh0kxXsaZzfEIQSkLJnHuwSQWfEXZ2fW9 kE/zEXnoGwmA1f3gab2W6/TwOjZsYPnN5eyBE8CFxnJjCLRSwpWdcWzibEseNVSgyuXzQoF7zQL Q8NZ2UZMU6IOvrWKEigUE6DC6kwf22fIj4e3c1YSzeW16K5eyio0A9f/vvrE9ePKL2FXc1+92TS o2XyCVvpqSNhU14AyKkHV5O/ha23V9z6X/dybxd+fjbQurVu2sf6rj4BJaaPsdFwZz3UhACiXC9 zBbBuvttcYpck8g6DzzpuVLCRl+nWhd2+0xt8Igq7bWDmjvUBcH8UUbQ5q7c8m0GCikyjc3+7VA OZNewP6H7gYzFUDNO+8fRIcK2Qg== X-Google-Smtp-Source: AGHT+IGxSHqw+FbOa+3w0I51+hhI3jQTmm91AWUdluW5U2ZbLl5zA91oWqpRV3uX7ZaMxe/vTLAYdQ== X-Received: by 2002:a17:903:2281:b0:246:571:4b24 with SMTP id d9443c01a7336-2462ef6392emr260710255ad.61.1756365978824; Thu, 28 Aug 2025 00:26:18 -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, Jonathan Cameron , Wilfred Mallawa Subject: [PATCH v2 4/5] spdm: define SPDM transport enum types Date: Thu, 28 Aug 2025 17:25:32 +1000 Message-ID: <20250828072532.425592-6-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250828072532.425592-2-wilfred.opensource@gmail.com> References: <20250828072532.425592-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::636; envelope-from=wilfred.opensource@gmail.com; helo=mail-pl1-x636.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: 1756366052312124100 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 Sun Sep 28 15:29:09 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=1756366061; cv=none; d=zohomail.com; s=zohoarc; b=IW1bGiXUJJbTWTkCBhVkbDwwdH0BN4UDKvP5O8/O8v61CJnLvahwRLvWvGLVCe23Oynvvo5WTtoD91yri9N08RxvA1EWKD5yyJ44i1uYR3DQvykM+B5CsNWQK9Ofn2OStra1keXJefydq24TxSTCM6zFIhx1KkLvvdcwn0kB1Y0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756366061; 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=rVc3ZDMgKX2lqgZgsOWCoFWzd0mHTx09FG8yv2UWhzY=; b=aLbWF9bwKhBiVf8f4wkgcAlQLSfWh3+uTB9j9JTHlZ84HhQaYNPlktybyEV/Cck++46sBt6fl0/BJMo5mNSDL/sFxZ6kEzFzC9/5hgnRmVYdjfrcSqoQTZxUcBw9iKgUJwvgWL8f12S/u5sqiagdp4O/+f4NKqTC6temX6JEvzg= 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 1756366061358337.0521905631307; Thu, 28 Aug 2025 00:27:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1urX1x-0004XP-PN; Thu, 28 Aug 2025 03:26:45 -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 1urX1i-0004T7-JU; Thu, 28 Aug 2025 03:26:31 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1urX1e-0005PF-JT; Thu, 28 Aug 2025 03:26:29 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-248e3ef1641so1290445ad.3; Thu, 28 Aug 2025 00:26:25 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-24884a629fcsm51009775ad.19.2025.08.28.00.26.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Aug 2025 00:26:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756365985; x=1756970785; 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=rVc3ZDMgKX2lqgZgsOWCoFWzd0mHTx09FG8yv2UWhzY=; b=Tt8ZlVlyUCTvHclsZiOHst24rX0rRWx6PT+zQfJRgSkQFWvQ+LEaQoc0BdBjMsYinI VnZMOheC3qHFxkN2UfCTUsHryI4TD/pTdmx5fgY2OIk146sHbA/o971S4bCHEjaGRyMY m3cRU9SJ2+4mEUHMDbJqRwKKZdUkONJ7o9Aog9vT4QRv5c7bAZ6lq5XyV/UtAw2Uxalg yCPrv6Ch1j16bxAmu5k5gkp8HIPWFutv5p2SHHAywdZ13kEfvrCdaSCpWJUgiTN75dv0 Iuqxq7zniTkXBS4a0n7t1iJpFZtnp829OXwjwC1+MPuqBtOBXWaeIV7aBkGpevLbnZym dPoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756365985; x=1756970785; 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=rVc3ZDMgKX2lqgZgsOWCoFWzd0mHTx09FG8yv2UWhzY=; b=pqi2U6ylrMXy9j96nTopJD2DA4yXFTaO2cXxUah4O23SsYOSP5I6Ze29r4bg4uPbTX 0R7MXg42CPfmGth6QAjMuF37OXBUcILvMVDeuVDT6mO6eY5MQlkeH3dkbEWyUx6P2eS5 iOOat2v1mjS3yvKDYAgcUgEtWyOYKyPgLNapDyJ/whXODYNEPw6sqWfqavCljQrgSMR9 gN/rcCcS9pH2ng5EwzhIwg6JC3fvvQYD1jkdUlIVHP4K6QkHg+Zg9AzFZT580B7eFS2D XvuoQLQrV1E+hv6rF6vV4EYdUNuhwFhQ28ibn7uEXPOvMP/0EemL5WENKLP1ytyuurA2 knsQ== X-Forwarded-Encrypted: i=1; AJvYcCUZTymvAVqYq9LMfN3cg7/1IZY3N3rWCOl4HfkmMD5Hz2Q4TYUqTLkoMOEk5dXjQFk84jXAvLQsW3xi@nongnu.org, AJvYcCXvReQ3+qSGQ8GJda+Mod/B1s5u0TunwQ1sssHmG3lvEb2jekepSXFxg3Vr+p/5hDyYP2ZbBaShNcGXQg==@nongnu.org X-Gm-Message-State: AOJu0Yzwx3jiU1hMBQpAuxb9qMuoOkmpB7sqxp8kgLkyD/1hNKFj2vY7 BtIotq+qUswPYOBIEZ4EGHJ3+6M3Ot54u7ANytNCOeuB0c/spvz1Qjyc X-Gm-Gg: ASbGncvCBTq61odcJRfYUHQMjdRTxDM/hIY74DX/Jela1g3fLkXquzKID4ejIfuw/RG 8She7WpnXLRSTc5ExWRRrmw5fOM6Y8FCC1cU1Crc/a3j6L5QgBQHfnl6Y+Z0P7rVwW1FP94OzAi ooXeqGOeJcoN076ycdzRyf6GIeb05Kn/ShV/pq91OK81kuJpT4e488SD86VuaZ+fZ9yrGRWG8Ru AuuoZhxo6Uj6zom3GLkSjhqx2A4yfOHINHcCiNOAX0gejYC+X6sFNK2XB9Imufa8mbIh3Bullr3 TQh4PoFUBbRM+x9YoHCq5XU3X6sFqETZuBX4nk9jzs1KSaFHAjOFFxByQxxD7Rn0fLpRltr5dcY C+p5d/OtepaAKwq2GC2/ehmgyAIwKwJOurYmv X-Google-Smtp-Source: AGHT+IH2xSp3bvAWurtxpJuguxYbJ5Swhjwn8WQp6JHft+eIg///HbPRYJeIC6SqU7lFuHBlk5T7yA== X-Received: by 2002:a17:902:db0e:b0:246:edc9:3a80 with SMTP id d9443c01a7336-246edc93d95mr178979595ad.5.1756365984717; Thu, 28 Aug 2025 00:26:24 -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, Jonathan Cameron , Wilfred Mallawa Subject: [PATCH v2 5/5] hw/nvme: connect SPDM over NVMe Security Send/Recv Date: Thu, 28 Aug 2025 17:25:33 +1000 Message-ID: <20250828072532.425592-7-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250828072532.425592-2-wilfred.opensource@gmail.com> References: <20250828072532.425592-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::634; envelope-from=wilfred.opensource@gmail.com; helo=mail-pl1-x634.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: 1756366062270124100 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 9358c9e540..3ddaea6cd5 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -8932,19 +8932,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; } } @@ -9235,11 +9247,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); } @@ -9292,6 +9310,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), @@ -9367,7 +9386,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); @@ -9378,7 +9399,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