From nobody Sun Sep 28 17:03:46 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=1757570584; cv=none; d=zohomail.com; s=zohoarc; b=NB0tBbx4kMT7IlIzkCeIYe8UEVKFiqsLFfsoShAbDaQ0R5GYsqWqJ4PrGj93+qYOGKyhmlYlc5XOzDd4gEMpfU2rv7lXc5u7IYQVCBkrpIZZnv/c5DJPVa3SLl/4/9a3Ogq/pc6q8/7XKYBXm3IXrrI7P4dkR2KekbJezArOcco= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757570584; 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=Y3Ue5pghwP4uwx+oHlIvFn46LDHxEJsAXYRGOuLoMuY=; b=m5AR7iasVspZeY/N9z1TK1s4jGL8I8kY48dyML73C9no1OkChS2SfEaTPUn/hT8b1RQKIDYB5twciO5g+TqYuejHalFiEYEtDV7tt6AAeeqEk5YwNWLgPkT++UA4QahyzONcfdJ4dD/XjBwPqZ5+noannPSMDJy6oIOap7DYOio= 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 1757570584087544.2259150551267; Wed, 10 Sep 2025 23:03:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uwaNT-00019h-20; Thu, 11 Sep 2025 02:01:51 -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 1uwaNS-00019R-0a for qemu-devel@nongnu.org; Thu, 11 Sep 2025 02:01:50 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uwaNQ-0000ZR-4q for qemu-devel@nongnu.org; Thu, 11 Sep 2025 02:01:49 -0400 Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-7725de6b57dso435343b3a.0 for ; Wed, 10 Sep 2025 23:01:47 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-77607c54a71sm795381b3a.102.2025.09.10.23.01.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Sep 2025 23:01:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757570507; x=1758175307; 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=Y3Ue5pghwP4uwx+oHlIvFn46LDHxEJsAXYRGOuLoMuY=; b=Cx9vB2DKFBu2x7N5mQKUu/F5Zd2pbcBomf8PbzdUavXTmT4UBduCwu4CDLQ55TSNVR b/NcsSSA41tXFzuZ0sPxBKUiQkjTHKfrZvvH2wm0YMaICoeBIe/RcbQ2z/NvKQmOaB6c IHcDkpaDa5mziXfFq7sdba1rjRiMpm0ZtYeQ2tHGDv+Sq2MQ/2wp0DGLF0nqhYLp0nuu 2K0V6H2WC88M2cVQjMdtXZqjZHRwSyrs79SHr7o20Jw1jcnHXoszQMt9XMJP6Xsvtzft xYXmqDfg0CQljcZaX3QhucWHf1MSLIqgECR6STbilsnsRtJCLhO/cBKtrA4COg84Zad2 yMoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757570507; x=1758175307; 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=Y3Ue5pghwP4uwx+oHlIvFn46LDHxEJsAXYRGOuLoMuY=; b=RG0W8VyBAd4FGIWcxNSV/gKFJIHvk8+ey9bRAHkEQYR5VjTUg3Ug3TcMP9XnR2goOZ T7uOmQbgaWFW18rsQ9Yfp+P0bWsTv2pwbMcFOzGdO9I2F3NIXniensSXdtY6yx9cxlm9 CPzNzw+krasqAa0D3h4dCEletyqvWxZt0x5SBCenG6ziKYaTsr4D3jv2rxgSC/y3KShP X5nfbIkPQ0QkgPoNVkHLrgPC3UsiNZnsQmkAl7cCH+qyyLFx9KXpwR5LPe+UaGlRVR+z uSC3RwiHNaGQqBP06UQGGZRCuqeJUnYtc+HWCLivMZRVRPuPD6/GW/ULH9DNZKcNvH8f wcYA== X-Forwarded-Encrypted: i=1; AJvYcCXfx2qtO4hjTZgzUbIxuqjomOnKGumoTaxj89xhzLtrnJcyUbNlBwOT9YLvN0yP1D0TkWD0MzwIT/vQ@nongnu.org X-Gm-Message-State: AOJu0Yyg6sKvJGgbBuTbsZgQID51u2dTsd9zQrk6eY9cbxqHS4Xk0VcL yFJvjAUG8BLvlve0mgGuuLu4pettOPib3DWRrbfbUpWjlgIVUWLMaDfX X-Gm-Gg: ASbGncsxSQ6ROM9KnUC04u9FVXudHP6UQeasFmj2Wf9e/lY0YpUEKqSodA4ZeSyL7XH 4E9yXPsrmr1/ryb/LOCFOEM/66416aZicyaKU8mg0/IBqSnJDjml2xDcwz7VaBNw6L3qjbriI9S 5VhcSxmU4pSWSCKwT8QB9FPV3KGNRD9IHY7RMLTVfnbYhC5iFo5oNG4teMhJ4VerFF/ZE4nMGEI nfKXVe5AHW8eYYLqDs52k0fZ6dKRhWa/2DvEsMrNtRnjulJbaj9YOPPAvxnj2MvrTBQfgAGtN9J wFwLN/ihLouKyaVWmiovwzfDLqT/OkPemadaL6s/8BpsnlQtFGC3Y5qQ8AjyEbWnfb8jzDKfbdY Y3bConOShFSTtwzJ8foqzZ0krU/c/XVU4GKAtY3VhiQ== X-Google-Smtp-Source: AGHT+IGp2w21sBmIdKdqdvKCQEnxbla7TE0HvfpiIH4z+t/wVnd3Xms1kkXHiNoTm0lsFqwjsiQ7YQ== X-Received: by 2002:a05:6a00:464f:b0:76e:7ae5:ec92 with SMTP id d2e1a72fcca58-7742df08f8emr19844550b3a.28.1757570506222; Wed, 10 Sep 2025 23:01:46 -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 v6 1/5] spdm-socket: add seperate send/recv functions Date: Thu, 11 Sep 2025 16:00:27 +1000 Message-ID: <20250911060031.124683-2-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250911060031.124683-1-wilfred.opensource@gmail.com> References: <20250911060031.124683-1-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::42f; envelope-from=wilfred.opensource@gmail.com; helo=mail-pf1-x42f.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: 1757570586662116600 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 | 56 ++++++++++++++++++++++++++++-------- include/system/spdm-socket.h | 32 +++++++++++++++++++++ 2 files changed, 76 insertions(+), 12 deletions(-) diff --git a/backends/spdm-socket.c b/backends/spdm-socket.c index 2c709c68c8..ab74a02d9c 100644 --- a/backends/spdm-socket.c +++ b/backends/spdm-socket.c @@ -184,29 +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); - - return rsp_len; + return spdm_socket_receive(socket, transport_type, rsp, rsp_len); } =20 void spdm_socket_close(const int socket, uint32_t transport_type) 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 17:03:46 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=1757570545; cv=none; d=zohomail.com; s=zohoarc; b=lMXgHlesJICZylgMyRJir/k+z8WiLioRll5UjN+33o1TTYdvaTQ4Uud7UUJBb+1O+iTbUm/jdTxnXelI9pftuqBYgOEfl2QMtysJCm0q5aenbIxVIETDVuXrt0z1/seYbO/rBVig4RYf1jRgoIx43eWNXWGAGpCHPnyaFNflxnE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757570545; 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=oRpME3fEReq6A+HV+JEVsuZoSxZ+EergPyPzTNo/lsw=; b=nxyBebfR/K/qpB6zG++IidBFkeQd0GZcF+/pQPxhtEA8XKC+luLVsxYKlv7n3cGKJREHHXpa7AaZ6RAcbxIeEqcNahDqMrNRNYzK/jpwuupBsGzq2nhN92UJB7gvSMlvxIciIwVeTBsHOI2rZnMPuPQrwimnI+F8Q9wMZKpKOeE= 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 1757570545353344.52532484930316; Wed, 10 Sep 2025 23:02:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uwaNZ-0001Bw-Pt; Thu, 11 Sep 2025 02:01:57 -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 1uwaNX-0001Ar-Nq for qemu-devel@nongnu.org; Thu, 11 Sep 2025 02:01:55 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uwaNV-0000a7-LV for qemu-devel@nongnu.org; Thu, 11 Sep 2025 02:01:55 -0400 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-7725de6b57dso435505b3a.0 for ; Wed, 10 Sep 2025 23:01:53 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-77607c54a71sm795381b3a.102.2025.09.10.23.01.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Sep 2025 23:01:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757570512; x=1758175312; 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=oRpME3fEReq6A+HV+JEVsuZoSxZ+EergPyPzTNo/lsw=; b=MJ/EDMcIH0LPimadQR05lu2q/4pYljE+JMxcJ/TLsyYtRvbYf7cOE/sPEsiA93TYGH i7N4gOpbQiXTmCo5f0f0c59OyIH67b550TB2GZBOS9J5xDzQbQBu4Vq8hZpSpnWPUG6o YsnojIp2dtpc747VCe43k0+Mm34dxwmAflvTABa/v3y3Telmmk/JeQvqf2srF8LNjaik gtlIkRrhHlam3l3EIxAKXWJrgu80YLdql5x1ntP9mSe9coodev5YAwimq7BdpTqEVv4c M6J2yHTvSUljars8uKz33uTSZIcyT2pU4AV7LcmZ5n3BGt5iUPyWA+JIVezXySVk3aI8 Zquw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757570512; x=1758175312; 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=oRpME3fEReq6A+HV+JEVsuZoSxZ+EergPyPzTNo/lsw=; b=MVTyFSMbtoenRYUeZ16h8+kvynpySwsw5bdrqkcCDR+9jq3ptpLmdP9PKLnSpE5ImF 7R5MoBXCScCsM/GxKWhpAcYmtUnktvjhYqvjaTO10fyAF3Wc92QbiemEn45ApR0vRTWL z3f0hmO87Ga1wW6gGv/TJ9qZkDrgEXUbTZt1865zs5iThnZ6WbqgwB0+HNFmNT9IDYG6 W8dpgY2ou6mTirGO6SIPgb63E13VRiVJkt+JXyJwVvu9o5FhX4hVIqpzi4qLiMTo8SmJ AKU2bvPZcPkTzwOhKpF48O6d8QAqBpIdCnba7RAmFYomM3e9pLkX2fuYwc0UP4UgRsdU loiQ== X-Forwarded-Encrypted: i=1; AJvYcCV0mID0A6IRKsdimO7DFcwIgfFmjB9J6OTd+5+1tGdKYFYVAfRy9g9lPihsG+5dylbUO305cqIxw0uc@nongnu.org X-Gm-Message-State: AOJu0YynZKHHj8vFyd6WVWedt25sD7xb8o21Y1VHpdh6E+ZdQnzkOjVW fBGE0Zx85Cdz5FEQ8vcuGAwQ5jsK80KDYjmYpZKu4vug8aecMxXeRMGT X-Gm-Gg: ASbGncuPbf9n2jVp7B2Te5VttAgxhRhu50YXbqZIqHUADvQo64SW1iEZe33ufI/r8Xc CTrD4z5uzyO432PBDrZquebD0DKkj3hzNxoBwUe0HuAPs22h6SXQRrQVlDjhkMmc44DdokskfQb Zqh1W6wFgG0AUseMmGntpQ2qjBJ7boOHB729SIzEtrUeP/edYZ9iGAFyr/833yVm8f/JVavnpVL 5yroiH7mM6GF6nDfTMMCJnqcqNo3mEShcjh+SPeclHOVp6V+/T64DRxvShF1Mf51jLbWBtPDRkQ 8kPhNqvlicNHgtS8snQA8JkecXHsiKnctceLBZiv0v89UQcwhMVcGGTSJ+wTyiUBz3jtqmWiES/ BJxzJiUt21avs7oZnUXmmeXLRigw703I= X-Google-Smtp-Source: AGHT+IFQKXPYbSJGr+MYQtaNagRLgtGREumXIm3/Ryh0XibIxls9djF5wLF4LQgJj/anX8qA3jp5FA== X-Received: by 2002:a05:6a20:914c:b0:246:9192:2778 with SMTP id adf61e73a8af0-2534557a7b3mr25569206637.45.1757570512098; Wed, 10 Sep 2025 23:01:52 -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 v6 2/5] spdm: add spdm storage transport virtual header Date: Thu, 11 Sep 2025 16:00:28 +1000 Message-ID: <20250911060031.124683-3-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250911060031.124683-1-wilfred.opensource@gmail.com> References: <20250911060031.124683-1-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::42b; envelope-from=wilfred.opensource@gmail.com; helo=mail-pf1-x42b.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: 1757570547873116600 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..80cd7021c1 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 17:03:46 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=1757570586; cv=none; d=zohomail.com; s=zohoarc; b=ngVJjOeZWr+HqQ6rzDzA1u+fXPb7qGls8vh3/ToUqoknrjT2WGgaD3PJl9NjlzOt7GKtuaEs6QEBuTNAAQiITjZTJvVKnUI6GDPQpgTBjSaZUC2arTtzZtRbXG9XUoK2PUL5XW2m2G1Vvtc3kInXk5W34n1I46PEGjl0aVMZPz8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757570586; 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=2ckIfNbLRICGKZlDZ9lIT2naej4PEPqvIAN7kUTeUXU=; b=Ad5a1McGSzd8zsAbJKgPLThj1vafDc/VRmpg1iQEGHGtuiO4rrjaGIzG9YYElFQIQICWoM8x/bXfHWy5dflPZGJAMoVaUxLstw1g5TgLDWYqSNDbexS0HwIdnOPfexzcbxjGml42dEZbZ6I4J52IuPglDw3Yz3ITW1+yEtSuj4A= 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 1757570586181389.16568083981076; Wed, 10 Sep 2025 23:03:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uwaNg-0001DX-G6; Thu, 11 Sep 2025 02:02:04 -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 1uwaNe-0001DD-GC; Thu, 11 Sep 2025 02:02:02 -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 1uwaNb-0000al-Sr; Thu, 11 Sep 2025 02:02:02 -0400 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-76e2ea933b7so326404b3a.1; Wed, 10 Sep 2025 23:01:59 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-77607c54a71sm795381b3a.102.2025.09.10.23.01.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Sep 2025 23:01:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757570518; x=1758175318; 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=2ckIfNbLRICGKZlDZ9lIT2naej4PEPqvIAN7kUTeUXU=; b=EZpfohafrbuoVGG8CW3LrEjlelbSrA8LVtbni4MQHSMlc2a0A2IBVKrBQCLcpY+BQR vGguzPEOp2RdkkIIx+YmKuCH1GvR4T2zx92TtmRiaMDs8kTp/Ku7wMtk4CgMmOnmQaj2 XJ2bzcndQwY4v1ahKaDH222zsuT3FjSusHZSIqaiUrQI16btwD/HUAixd0UEJFMv5oxG AjejeBCArI0ajOCwZg3iNv4Y4SL5+X0ox6ClMOp+ccOD8gaShysFsXkD8PyGWBT01Y+d CIjpzTJe1SdaFVEYCts2IL2cTImxS7yY3FUpD+7vUPD1LbVU2zH80/rcwPbN2fzd5hXs 5k8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757570518; x=1758175318; 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=2ckIfNbLRICGKZlDZ9lIT2naej4PEPqvIAN7kUTeUXU=; b=oXMef2icUjrgL7waQrsFWou2nXVDKQCuy/1bFVft4UqYSj1xluNzL0K9mwwyNndw4U BsJndyK7Mgsc5HEiv1PoijEVKrZKnejLHslE5wwKbh8p9cifrI8sqsJTINDhI5iPqFP9 T22s0KVNiyjSsGsBl9RnMSNRfvJRfQTZW7dKMqklsi3ydvlLFsLyGd73lyUYUoumR55U EIrqvUcksCNJ1/HA+1XHObdVLVX9izn259WHyDcEc6hmgvLwH3nAkiMhnnnKsP/QOmeo 0h0jCnB9yYDRQf4rq9R0Mq+Bo6Urw5Nccu+caJFuC3dX1rKZosGeS7PQs0l2PeEi7QVo 7VMw== X-Forwarded-Encrypted: i=1; AJvYcCVnlWwPJ3wQLB9q2aIGGlk1u+gq/ABNwTaAf1E1i2Agj5R31EMSk94kD+xz5R51Z3P3WX6BEV5VAV7Dbw==@nongnu.org, AJvYcCWkIKUb0l69/TzDv5TL2OjANjAMsQCcc6WDJTUVvkY/jExa5gQT14AGpnEaotc+Fd25FI85LPgbhuDz@nongnu.org X-Gm-Message-State: AOJu0YxOMeHLuS8h96gxbVe3riotBpsY56VfWpsA/vuXKDqNxei8l/7K ewJmJjvjBBo1Hy7bC1H75kyPQeCdwIpgNkl7gExnXLuQJ5c13g8FjGIJ X-Gm-Gg: ASbGncty5tATvN+r/PIreAdEN9fSqrKpOUzAoD0a9PxlrXSY/i+Fa62h/WwJHkKFcMR VTXawBIBhUO5rVy4yM6ozZqrqieQjRR+UppDTcxYCcRYt//UUwmfTlFXsUbdWwudH6UcCS5kTI4 T1Sw+Ra00C+wzu40uyeWTtBUJK+sOPiDkLNJAwNLjow4QILK/lONV6+rCquXyM+LmkRzGLz2Lmc PkP7MtDhe5V/oC9U1KBQvQMpb+UnL2ZMQFgNpH5ISyof16FKLq/DZPzjXxeJa9u+MssnyPNiKrB xOyy/iP+glxV3r1DYDw6wxBcxC9MHVxDiHz8r/W5g+xO05eStDvapu5o9FFyNywkD4gFrlWUi+L A/EqidokGwQLyy4PFe4HsWig79JbutIr+tEX1m2vtfRyWVb6VKKn0 X-Google-Smtp-Source: AGHT+IH+A2sAnSyqyKHUNKtJUPfMaxNBCxCg/ky9pemf/hi3xO41Wbxj1cfLouoVhgUzf3AKZTAf1Q== X-Received: by 2002:a05:6a00:cce:b0:776:26f:4d20 with SMTP id d2e1a72fcca58-77602fcf88fmr2391746b3a.1.1757570518072; Wed, 10 Sep 2025 23:01:58 -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 v6 3/5] hw/nvme: add NVMe Admin Security SPDM support Date: Thu, 11 Sep 2025 16:00:29 +1000 Message-ID: <20250911060031.124683-4-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250911060031.124683-1-wilfred.opensource@gmail.com> References: <20250911060031.124683-1-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: 1757570588384116600 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 Reviewed-by: Klaus Jensen --- 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 80cd7021c1..f0c8b64d1b 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 17:03:46 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=1757570576; cv=none; d=zohomail.com; s=zohoarc; b=dJYrrrSbW7U0KS/TRbKriDXJBnIl6EyIsbjQ3nu1OZ6atM8Gvx6E7cGxgZM5yv6mkLT+kho6nWLnZXY8DgBZvOvR0lUNUR0YnnFeKphAueQ1MqsV7q+z0U0WsVSyk1VtqLsZuV4wmRFMuDVz1SZTYbPv7xa2v38oX8zcwZPcAcY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757570576; 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=WELA+m2bPvDObkEGkJ7spvguGqQJeJhqpe8T4T8datk=; b=Re8a2T9zwzPEi5YlJW6IsY97limTYFT1P/ON0LHCawI3icGKsjVhqoJ5gyEd9fmdno/vH8fTmYTJxl69XvI5vRxUDmIYmfLvt3OKUWsGchKca6Shm+oW5GU9C11JlEGG8w43F/uY3GfuMGnhKE939uy99XFoPGFqHANPlej5IyU= 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 1757570576095565.6628490592412; Wed, 10 Sep 2025 23:02:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uwaNn-0001Fn-P2; Thu, 11 Sep 2025 02:02:11 -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 1uwaNl-0001FF-T5; Thu, 11 Sep 2025 02:02:09 -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 1uwaNk-0000bN-5P; Thu, 11 Sep 2025 02:02:09 -0400 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-76e4fc419a9so294415b3a.0; Wed, 10 Sep 2025 23:02:07 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-77607c54a71sm795381b3a.102.2025.09.10.23.01.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Sep 2025 23:02:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757570526; x=1758175326; 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=WELA+m2bPvDObkEGkJ7spvguGqQJeJhqpe8T4T8datk=; b=BQ05M6zT4YRtfNEiQEaWw7Ql60PQ8/kZYMqEqiL1F2muAPcP3SCEhL/SLQOK/vC44D qatUEKR5q+LcnEaoGnEbv21aHkifls79HHdAVznZgfxpIveeskD0kj4JDBIJxx0UepsJ UsdGskzmC0a5lxBW2IzXwB67pvhoSH5kPiLTEh4xXncR1jrHqGj11EKKw/q+ysjZCkNN P43Y9UnFh7Erkr8OTu3GS9xYRg9VHo/EGkUeI2jwyo07L6llHR3UKGDvp7Djj5rTajz6 QRqydSOoOflR9O9psa6shHQkY2q6/HY8MsRcB8y7x1Nja5LXa+6arp2X6r5EpIJIoEq9 IBNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757570526; x=1758175326; 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=WELA+m2bPvDObkEGkJ7spvguGqQJeJhqpe8T4T8datk=; b=ehZJ6e0yMcaCHFo8oFY61VbD01LYkktHh6anyE0Rshrfqfm/1RRj/Cmb8tB7wkwAbq dWYgSyO+9w+4d7JmC9anc6OBsxQvN6+r/whKnLuJwHT1pt+KGHYdXAZfiGqKDkGIsFX3 TNeIbR2K5uDmuSliL+skgh7J0YedOSZbjwx91FQh4CxEJf9GGpoTb8g427a9m+i0vM1Q 7OA7CFDe/ZfkN4txKTtIwWHQFcE4RB8A4XgTFQHBfOq/FQ/BtIIaIalu9bPWKkklEiDB aLz9GlnoRg6tlbw6mduEZ06qile8jmBo79mvvinL3yQyUvAKZ9sCg2rR/1nPnB5UvlD3 tRsQ== X-Forwarded-Encrypted: i=1; AJvYcCU+3GVW27JLnbsegAAy1JMQ1VF215quf1Tw8OCZF52p5+wndRROsEiDg4wbMP2E/KF3JCkdNwdaYxyK@nongnu.org, AJvYcCVE1Td1aTTe238u2mq+XibHS2gLole/F1POsxovXPHuHUQZ4k4lqkMhU0jdy7+KuiwkujaVhN9KF3kEkw==@nongnu.org X-Gm-Message-State: AOJu0Yya9JBKwaDjCLeekGky/8Hzi0WrFD5AlUgM8t8HkxSRprZVnoyr Me88Ljs/6ElYR5UlI5TFIEP/APTxwUldICWk9oFY3rqe9ESo9ZyWPtKm X-Gm-Gg: ASbGncvteCc21FHJz6NGCpesfdqTS9CDqZJ7IFGiLc5CPbFSanVUtmiK98WypnM7T0s rXVrFRRc+mipQ7GRPvWVKQ2S5VbajO7IULwFRfpIGOJl2G2+Je2bFH8Ur9CupjRnVKbPLFZqxcy L3V04GbVri7WkTx9cL3b3iy1ak22KE5/obJ4/mAAOuoK8Kq4ToTXdrAx3H7K/9rop/Bznn1CHM+ ryUUwIZ/0wurPTiifQqLvQ/Nd+4P/GoHmqz+1XDY4BxRaFezNgHAr/AXW0Agrvhp3A8s7j5W6B5 Z4gLU5NL2JoddGmKDcS3tH3k87U0tbQj1CD7s6WeF7ZDA2vLZpew3uPfWPcycs7baTIjJsAIJtd cgY0WEyw15hiW/vUERFl/C4IjBVuq3wH6KNKeWuj/JQ== X-Google-Smtp-Source: AGHT+IFSBxf/vyjQTQwrXj+GLTupYyC0bSw2SrzqwHQ4EFsvXO5e/pbQPrIPnx41umyHUwNCxAaa2w== X-Received: by 2002:a05:6a00:3694:b0:775:fadc:25f1 with SMTP id d2e1a72fcca58-775fadc2dfamr4232695b3a.12.1757570526503; Wed, 10 Sep 2025 23:02:06 -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 v6 4/5] spdm: define SPDM transport enum types Date: Thu, 11 Sep 2025 16:00:30 +1000 Message-ID: <20250911060031.124683-5-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250911060031.124683-1-wilfred.opensource@gmail.com> References: <20250911060031.124683-1-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: 1757570577955116600 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 ab74a02d9c..6d8f02d3b9 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) @@ -246,3 +249,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 f0c8b64d1b..9d0b85f8cc 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 17:03:46 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=1757570604; cv=none; d=zohomail.com; s=zohoarc; b=CFfwEpNhY7ztNqfT8KE9jzq0eWh4vA84MjwItCFnX9EcElWuVzteP6uMocQ9LiNb29ULOYdbGjphFkpFakE/v+pcmLhNOnJ/sOYEYfzfGxZrAaW4v0DmoV6LcrI4uaVR8aNQFD/P2/yHLcJA5Eooyput5xpO6F/WHDfqhTf4rVM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757570604; 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=GdC3nvafAzNHaUljJ+HTo3g+rlPelEIsbEjpQ/CG1p0=; b=khBi6BtINE7LlwCIRF8vY226h1wt4xPgvYB+UEGtWdsM8JUehLkD+9nN9v70sWZE6LYRsvgTVaZYTnPQj0pT888zD6OzWxf09WC+aWYHqEIT84CjAZtrfunEs25KcYFCP/fDlEW6auVOC2X6oBAUI9c+uKYmoZr+XU+Az0ZnT0Y= 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 1757570604166304.1341916945411; Wed, 10 Sep 2025 23:03:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uwaNu-0001Tz-Fp; Thu, 11 Sep 2025 02:02:18 -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 1uwaNt-0001PL-4X for qemu-devel@nongnu.org; Thu, 11 Sep 2025 02:02:17 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uwaNp-0000bp-Uo for qemu-devel@nongnu.org; Thu, 11 Sep 2025 02:02:16 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-772301f8a4cso499002b3a.3 for ; Wed, 10 Sep 2025 23:02:13 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-77607c54a71sm795381b3a.102.2025.09.10.23.02.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Sep 2025 23:02:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757570532; x=1758175332; 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=GdC3nvafAzNHaUljJ+HTo3g+rlPelEIsbEjpQ/CG1p0=; b=c2qQRJ1qVPWFCGVDxZBYXZzgQKZAb6+zA8IM9jSxqH3lr20h8dD/DwdI0+WKoIYTZq 7s6bgyAlrDlT8S8WfAAg8+UUe/g2bbMZQAtPi9U3eq7/kaLy4Hd78h6ctUGFA5hXMTj1 14FTcnjbfcy3l/c5TiXlD2NaiJW64miO71OWvG/8S+4d6rxk3zcwT5RyaPl5CiYq0sW8 Qhc5Wn3YealU4P2b1wf9I1HTDlrOeQaDhf0epDpwsp+/fSM0jiGF4etHLb/sdG00/Y3j fg8m9WFzq2CaqDvWDiI6jH5O/RZpFP4MeQMrwfIJBdt0+aF/CitBA1qiZce6QcOC5f5A uIyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757570532; x=1758175332; 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=GdC3nvafAzNHaUljJ+HTo3g+rlPelEIsbEjpQ/CG1p0=; b=jOq6I87MIQmpMW6GseMOMrBfs0472ORkT7H102x6Gz4BgjnLU6fahJesVc86tzzsDk 4kG0elmkv1UtXrmQzR2d/GTG/GpY+DwGazbvB9MzW5sLI4aLYGPVLG4QPwFqDgKpXAKy 94xKFO7xyI6rZXwB4sqHMk+s7ceGZknrNkljxnKVN7Z7m+py1niUUXRuW5AaetPDNlrO 3OO7CNF1vXH+MxXBdA0ORDkpwy3VPITKRb96HLFb9sNnJz+45JicYvOaFuO06t2AaNRn Hq3B765I4NsYYzolO5g84JNFlNHGuaqVdSNFh5/dK5cf3p/7eiPuTeYzUjaIxOiVNz++ m+Kw== X-Forwarded-Encrypted: i=1; AJvYcCV0x+rPmifxdYQ/U0a3w9uU2Z/sKeIvsc5x2MUpqGDlNdLPP3zvsW1epYi7C6cHd0Gx16yUNfZe0vMo@nongnu.org X-Gm-Message-State: AOJu0Yy1crOga4O7//ep8hCOiCLpD0yk6UF4zXKOdO/xwMSoHUuehyvk rYtoGYtx+hcASz9Sbd6Wa/21S2IbIwen3PEPJAT7ARdP4KjGi9nEyEhR X-Gm-Gg: ASbGncvpmiv8VklFBqS9kWtwv7UXjF17umsLKOofwlikE8ThqgXH7cyMejYYgOpGT0z XodXyvgBGSgeLW21cDL159rxxcA1YNH7yKOMbHSGDGfAXTFDAGcaDc39opyV5Kvhy8VrEBFFwkb FXR253WUePM7gff7VqYch32DvzeSSc9qBDgFgG+P8xo5rU2hULN/DFaIYCmTHwUBGDW26L3CtAL pquvhs5/BJ2WSeY5kGCNVy+uevAgvCUJI6QrkPCjlrIxP6jIxf987NNArYtVJX7t5uPdqzeYocb 6RSty/LF3x2OkRs6cm3X2etrK1jDweQS1KPAbLsBV2FQDWIU6d00mVLOqtjdpzt0pR29oaBtFIu 2UZIWSRq6PaPC2R/oF0ba++ZH/Kf6wjxaLOK/kB9ogQ== X-Google-Smtp-Source: AGHT+IFvRF4XwTEO6UaU6QZpr4uMmqK5PXidAFq8PpYJp71YaKawvrCuVYurwAKWxUnFCt7cNcbSlg== X-Received: by 2002:a05:6a00:1810:b0:772:8436:df3 with SMTP id d2e1a72fcca58-7742df03360mr25765218b3a.24.1757570532025; Wed, 10 Sep 2025 23:02: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 v6 5/5] hw/nvme: connect SPDM over NVMe Security Send/Recv Date: Thu, 11 Sep 2025 16:00:31 +1000 Message-ID: <20250911060031.124683-6-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250911060031.124683-1-wilfred.opensource@gmail.com> References: <20250911060031.124683-1-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::42e; envelope-from=wilfred.opensource@gmail.com; helo=mail-pf1-x42e.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=unavailable 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: 1757570607257116601 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 Reviewed-by: Klaus Jensen --- 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