From nobody Mon Sep 22 02:15: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=1757643199; cv=none; d=zohomail.com; s=zohoarc; b=Iv1V1wzo3k54d1N+mx95sElRsdN+LNuW0F2W8/kjBkp29pUNm5euoiw4GhyXKM39TL0kFjJnOAGdOKHZ1d0rAyBR9zFslJGrOBWBw5lJ1/b83/Nkcm93uoILNS4qdvPU+kVvLMoA2qSZT0rKxW0Y4PyUVxWRCp1CaHt4wXkt2p4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757643199; 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=QSqeJk1/nTfNexJS9hNqK2TkOR6oLFQ8iD91QwYPHDqs6sTfbQpIvQHZ5rEL8gQ1z8KCtQB9AQJk8MsgEOHxBBQlascJGMix0gyd6I6IYcwz/HXKsl3Jq6Hy5qiHzB3oDyjWKQy0XMbSUdzR+GYTkxlLkvJVs2B0YV+PDKMeRgs= 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 1757643199799678.212304351049; Thu, 11 Sep 2025 19:13:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uwtGy-0002Kv-Nv; Thu, 11 Sep 2025 22:12:24 -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 1uwtGx-0002KS-OT for qemu-devel@nongnu.org; Thu, 11 Sep 2025 22:12:23 -0400 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uwtGq-00055o-16 for qemu-devel@nongnu.org; Thu, 11 Sep 2025 22:12:23 -0400 Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-b49c1c130c9so990894a12.0 for ; Thu, 11 Sep 2025 19:12:15 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-25c3ad3349fsm32853205ad.104.2025.09.11.19.12.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Sep 2025 19:12:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757643134; x=1758247934; 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=nDl7+BQWyzN/cXAh7YDEStRNn3ZYcMlWzTAs43Gi7AzrXd/VBttrTKHu6DKOflKJY0 S0WJ9W9BWLEb6HDTgraL6WWz3STrdUoLaFYGooZD0OaE70wfukdfjn74KpP4CFQBiWPU ZrnrT14pLCCEgQGmMqu0bJn++Tqel2bJhmyXQmFfcHrLHknhflCD55PZhnHqPBeHfxz7 VXLfZRqwrRrHy41r04qlGbbLXgxtvKn8lXKccPZ1sz6aDpS4WGJzHgEZIewwJ6Rri2/u L22+ETomeeMMph5Ez9tPtdmIAFSs7pB2ParPpvtUDH4uovEQZGakw6HkKKXcGuR/Y7ug nKkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757643134; x=1758247934; 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=b3PjhIifirPox78t+d0svuAhpUdhPkHkU4tM76JKUprvQQ34ZNhKKC1Sfqh63xp5zk RUNPqroO1KfXhUC/W7ZbQ7Fu6AJUqsRhoVfFCcFdNxMg9+kPtaxknn8WRu91UT2ZRvac pS1fw+QIvEgV/NWfdnulbFDlxcoZ4vvQnsZn2OE+GW2xJkSqwwSmDV05Z1SaQKHqbXk6 ir72iZuTdPF4lEHfXS4HjHqbXpeRNufV3LHE653kfkLMC3ES9xcKH3c7XVJaH9NHpW1c HWqgMet31QvGQUQIxk4MjoZV94WcdqUczyDnELTvbVjDd+607/EnW/H4d6i1fmNUU5hY LThQ== X-Forwarded-Encrypted: i=1; AJvYcCVol3szs7tyyAgmFEvhfKw4sT3aCz1eJA3W6n/UyAqf7DL+6YUB01VhYIaT6L1izSeDh9q/kiAwcYac@nongnu.org X-Gm-Message-State: AOJu0YwTs6/hs/eBKAiDgHnjX6CGPj6RxBgsZ2HLEdRSmfWtBSEy/t/I /0U28qBmrJ+L0bXfLfqdg5uZ4CMsrTpgkIhkZK0pJvy7oXq03vmKuohB X-Gm-Gg: ASbGncsFbBZVCyPuz4T+CI8qM/39ta+A5LS70OI+mCY3or6Vtr6QsK0r3slsdZPBzKB KoxYELq9GvlJtXbgHx2mrCbWDWiojCAetmiypwnQtnWtyLw6F4HIQ2D7ABAsL1uP5HsWSBk10j3 fBvZRwpCEo5ARcmrxhJYxw1sQAeby7c6GjEcAK6xOFgSXjD1cSvhCGiSY6f8UD0zV6fWMmy+zrz UHFLH7gkPbw/bRFZDujPe8LTSq+Vz65wQvEt0cKI5TubV3T6dq5fUAeefKhiGLEd94mLhwHF7n/ /Auyt+qSHUQhBCfthiS2iNHXmowSxy0Yn+RirwUrEieqT5oWkjcITDHy4LQarW0+Y8bhTtDvIbg C3H4M/BuslZuFbZnb14Kz4ltbsLB5N4eAC1okqU55ug== X-Google-Smtp-Source: AGHT+IE+rYjmSR/VVbCN0aR+BJP0IiqXSo9nbYhYwLaiEHUXFKvOUP3Lt7vVuzFVoi32bUDCBMhcxQ== X-Received: by 2002:a17:903:2351:b0:24c:d6c6:c656 with SMTP id d9443c01a7336-25d24cac504mr16621855ad.4.1757643134162; Thu, 11 Sep 2025 19:12:14 -0700 (PDT) From: Wilfred Mallawa To: Alistair Francis Cc: Keith Busch , Klaus Jensen , Jesper Devantier , Stefan Hajnoczi , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kevin Wolf , Hanna Reitz , "Michael S . Tsirkin" , Marcel Apfelbaum , qemu-devel@nongnu.org, qemu-block@nongnu.org, Jonathan Cameron , Wilfred Mallawa , Jonathan Cameron Subject: [PATCH v7 1/5] spdm-socket: add seperate send/recv functions Date: Fri, 12 Sep 2025 12:11:48 +1000 Message-ID: <20250912021152.46556-2-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250912021152.46556-1-wilfred.opensource@gmail.com> References: <20250912021152.46556-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::52e; envelope-from=wilfred.opensource@gmail.com; helo=mail-pg1-x52e.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: 1757643201096116600 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 Mon Sep 22 02:15: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=1757643228; cv=none; d=zohomail.com; s=zohoarc; b=cVMpIk+AuavuqRpnodWXePSagCVYPddReAI9pEQpj4HUE4wUJCLVqSExd3ciAyuLwleD+mNoftpfcrSyxtMOupMCYfbqBF4+RzQE7KYRocOvGHFH7A6Ny9goUnThvy5gaYlEc8KjhQQA3EVEvVtBrxlOh33uMvG4XXh8Q2z+0sw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757643228; 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=GsI9tLbZn13h//cc7hEXy9QQkteGeB3W/s1U1ReZ4FvTj6umVeCCQcybC4vD3iLQcrN43Dp+AEeWisvMWTpQ0YwnRaFL8Myp3w9F73p3YAKPND/q8ovoV1Mz+naW5czUS6nqivMe2MDjun/bdecYXfb9U+NriADlPRmc79NC7FY= 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 1757643228601890.7092092769977; Thu, 11 Sep 2025 19:13:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uwtGy-0002Ke-8K; Thu, 11 Sep 2025 22:12:24 -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 1uwtGx-0002K9-Ca for qemu-devel@nongnu.org; Thu, 11 Sep 2025 22:12:23 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uwtGv-00056y-IT for qemu-devel@nongnu.org; Thu, 11 Sep 2025 22:12:22 -0400 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-25caef29325so9005965ad.2 for ; Thu, 11 Sep 2025 19:12:20 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-25c3ad3349fsm32853205ad.104.2025.09.11.19.12.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Sep 2025 19:12:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757643140; x=1758247940; 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=jrlzMsr1c2t8wXB++/C7fROIkOFlWkIAyk5CQKD0ZYOuJrvEla48DnJV67ffOvn5vL eXIhnTm2N4xrW+sLDscFDCevD9r5niiiDitBM3w1aglvhaoH8j3y24Tz6C3Y+i1pV9TK TxUj/cYWwCEux1yb5v2abBnpdoZiAfupVfW45KLMiM0DNYpdrivoZRwcAMFF2+kHd1Gi jn24sm/CcdpmG/EA6QIgNkZSqHHdJej53Zi8/1cwxkAfxPTDL9TtTXA3yPFIjnoo0OZR tGXjdRLCYCywcCP0PX4lkaHYl1nRvu0voMTmrjuZCKzzKhIeL6w8ygHjogcwXTIHn31T Mhxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757643140; x=1758247940; 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=JOly28XzF9LCVDnAyr+QaMmNhCGjwsoxzvOAkvuKqfxplj07tyQ5KG62f6Wjc2OPxo jm9cPS0qLYkVsIrY7ZToNPEO/xbyO4TiiUL8ZzaMKy7pF9xs1JbC4SvEXkXb/BCQ9hUv 6BiuOlDGtcTtO1tuAJ8+QJyYBZMRZdIpQtGA/5P0cK5uSyywPWUbadhJx9Miq6FW/lHD qlE5gjjpU6b4AB9m0wddPjBWFjy2QAcXXS065ks9/alq8+3eltMR6BpSfKW08FOyo0UC E7xNEliQSk5OBh068TKVXPsnsJ0e0ykSCC/y61hgrbaoBizABMjRCwpfJ6+kE0DBkpF2 OVEQ== X-Forwarded-Encrypted: i=1; AJvYcCX8gi7vDXum8Yu/4Ngt5bKE4BzrJfOmcIlOEq8SZfUJz+fRUVl+T5JTjoUn04VbU8O6i4OnEkFSZ2hl@nongnu.org X-Gm-Message-State: AOJu0YzEbyhBbXJC6z6UQ47nYS0sq/cZ6lKlRS1dFGDJQN5QiPFbNrEY jmAW5mXCsUogSLF+krH78wHRD5Lyh3B31O8Fsex6pQAvEnIgV7h0a5NI X-Gm-Gg: ASbGncvyww5jEK6OkzlImNbStHJEWGF7JmybJV8eoN7epZlqw+IW7KTp8me1jIKtCUK ccH9NeDkd8C4hxd4OGu6xSAGl5DXl2i4NsxX/DQzI3VgEpncSBv0f5J5RlQ+0dsHlEBm1AjTl34 utQX1uVjHUpv+1kBo17SPJRGBwSYwMJ2yWaGjavKXZJopPCIrXdX3RuzZmBRVF7WfOHusRjYl9L Iviu5atMnmBtZ1RdetU69bx4i7ZLCsX1rs2iZE5m+pjjaw1QDLOlkRNKPrpqyqzWTHN3JVoJWoi 6tvGoV3PiY37peMNr6q7PmcI7HedIX/VY0BcDi8V3NSs62Qikjxc1NXym/ovv4VzT29eUoznY1o ceT6FzTaG9p5FUW6p5xvFB7V9sNGA4SM= X-Google-Smtp-Source: AGHT+IEtbX15YzOAhFsDWtnsNyu2OMiWBMCeOT883cZ2c6sNpNoGtEGHYlol2NbETWTzUqKuoHG4fQ== X-Received: by 2002:a17:902:ce07:b0:24a:af68:72f0 with SMTP id d9443c01a7336-25d2647047cmr12913165ad.34.1757643139579; Thu, 11 Sep 2025 19:12:19 -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 v7 2/5] spdm: add spdm storage transport virtual header Date: Fri, 12 Sep 2025 12:11:49 +1000 Message-ID: <20250912021152.46556-3-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250912021152.46556-1-wilfred.opensource@gmail.com> References: <20250912021152.46556-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::630; envelope-from=wilfred.opensource@gmail.com; helo=mail-pl1-x630.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: 1757643229615116600 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 Mon Sep 22 02:15: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=1757643207; cv=none; d=zohomail.com; s=zohoarc; b=CIb1iiAMXIEJ/A/w+xfad8QfTW61UMKVlTzHz7YaXSqsC3PR/FYJ7Tad42mrhf2StYXyY9yzqboNYDyD/RD02hvMcSmOU7nBrQYnwFLkuJhIilYfWKA12v9QXpJO78iXxfEVeVa/uTkWeRaBkWORkcWNEuf3itRn+GWv8haM/8Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757643207; 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=9/Pln52C0lGoCXgIXqmA8V+qDmOgSd9AXk9xe5sK9Do=; b=PuEowuQ/wR/y5Vm1fG4OaMCcDJhcZJElK5vE7bRz7YEMGvjpDydbzHmMxLt2VE46Il8+X9mzcRtjSzjxRpksD7SppTuQ0Piw/Qb6GI59+xN4b9HjHjjzVpU4T5rdQu0HexSqtGJt2brYbuSOjkBKyUmqbs6KLB6ip+/ziBS5WUU= 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 1757643207882599.4526188111744; Thu, 11 Sep 2025 19:13:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uwtH8-0002Xl-6x; Thu, 11 Sep 2025 22:12:34 -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 1uwtH6-0002X8-J9 for qemu-devel@nongnu.org; Thu, 11 Sep 2025 22:12:32 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uwtH4-00057z-97 for qemu-devel@nongnu.org; Thu, 11 Sep 2025 22:12:32 -0400 Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-b52047b3f19so1004640a12.2 for ; Thu, 11 Sep 2025 19:12:29 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-25c3ad3349fsm32853205ad.104.2025.09.11.19.12.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Sep 2025 19:12:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757643146; x=1758247946; 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=9/Pln52C0lGoCXgIXqmA8V+qDmOgSd9AXk9xe5sK9Do=; b=Lbg70yYcL64uzOfYbcaXWckU9JRmOtcK+YnPP/WQIUi1WI6uokDRa+mVF14oXiFDat Xst0vStG0UZTQG/vUkHPUgE0XzU9nm7R0z5cFoiVBwa9oBt3D7a4wtN6SEwsn01fhfME Rjn2dhy7zTwD3sARk3PnJ8aVnged0wd7AT9UxWC/146VavJg6La7BNXp1cKFTvWWKgRn Si7yQff+1TyWmOinuGQGJeo4m7ozurjL32zyUsw+U2f4uy5Ytn52zfn8w08xhvWfnKDg /zeeldJW8AN4HGL4FPx6iRi4sVMAaFOkCv2PUMz2LwwiIX024hoUkGuTBU0XMTPN/pNo ra7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757643146; x=1758247946; 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=9/Pln52C0lGoCXgIXqmA8V+qDmOgSd9AXk9xe5sK9Do=; b=V6QX5qr0HwTcyXl2ostOcuTUhSEZkH1LXTxUg9LdOgEuI5CYPB9ubXoGH2V5aW88eS PS9tcQ9TFo7Mcs6Rfa6BStRtPmwemnjzK9QyXhMk30NaHkWog4I/cZ782jTxRzg5z41K BkSX4qUN31q2qgTvP9rMFNf3HpJaIRSM0X7rak0XYE4id6vA8ErtcUxiK2SIU6Cl8ZwQ KyYSHO4C6vBaP8pUe2slCieM0/ly672MVvxzrXPTvIHDpoQEY/QTS0SxtqMPhSn/9LG4 8ofR37mh438HisUJ2dd785fCZZNjXFSizjAnl6DL2+NWCraeXVtN0kpOrmgVl0wnQ7fc ECXg== X-Forwarded-Encrypted: i=1; AJvYcCWVAczNB7X7RKVmyp+05bi13oHFgLI1nUGtXaAk1HBRSrysTiZS9bKEXEEUGoS7tt72dj3YgtJa6Xk/@nongnu.org X-Gm-Message-State: AOJu0YwX4pF9rxZo1sSQzSyDeLOmqgpfuvKIKua8QnKq23Sy85yyilS1 0EmTmtYHBQYOCi4x47ZupF7zHPkScb0kvkmzfPHq0elxfn74sbeY59lp/qBuDA== X-Gm-Gg: ASbGnctyM/qC98MVI5AnHLvY7xp9eTtlXGY289ZZu4U7lNXdwwtUYHHORNeDzbJrSbL RHsoHPd5z+5fHuz3AMkIFMozE9r86FGPgjVm9ouFMs9HxIQQDDyHNXnLlmhe+3Ez7tEhcYvhltw 1r4v2hEdz/QdXjSD74iyYC0U5E7jKiGJgbQdVstqdlrqnUL1wsBotjCDSLcFtJ1a8mrKVAjga9i p2bx0VJIpXz6GjjYsZBepPAzgCrPgCfXft9MtPCCXxG5aG5Axxeg0FZ+CUh+07MquiVgXUEWJJk fEZsSWBsNGNBfxXKvqzQZkwDiFQE0cWTR7P6r3JGRgFoXTQTmCGdWZGGLwtHE0V39VIjlfkbvm6 wI6yEShZVa2LXmQJLp8VYzJQhdkYugDI= X-Google-Smtp-Source: AGHT+IEOKYTtssij30FpgFTcif8GAplXsf1N0bzSIjxtw3HF/x/HNyXkPhVwhO68HHAraNayF18V7A== X-Received: by 2002:a17:902:f64f:b0:250:999f:31c6 with SMTP id d9443c01a7336-25d26d4d96emr12595275ad.32.1757643145872; Thu, 11 Sep 2025 19:12:25 -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 , Jonathan Cameron , Klaus Jensen Subject: [PATCH v7 3/5] hw/nvme: add NVMe Admin Security SPDM support Date: Fri, 12 Sep 2025 12:11:50 +1000 Message-ID: <20250912021152.46556-4-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250912021152.46556-1-wilfred.opensource@gmail.com> References: <20250912021152.46556-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::531; envelope-from=wilfred.opensource@gmail.com; helo=mail-pg1-x531.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1757643209242116600 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 Mon Sep 22 02:15: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=1757643228; cv=none; d=zohomail.com; s=zohoarc; b=lqeHX4GvbBS2xdlZVZ/R/cFWt96cT/8FrNJA+fRSebuyVN7uS7oLTl/67zSCqVq89RoAsUZOjg2kzZTdRcqAV96fYnngDSR8fM4N4UGCEtDgJ5VFcLHV4hsZJyZEK3b6RE9DcDghbH/FKRLnz3PtPFGtbUnP9TV/9JyZ09aS1vY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757643228; 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=ha2CWcdF1yq5RZk6gyupQJN/1y58tYz1zUUImQK5k9yRC26FjZZCOUhg0TQB1vor7sUZh1ShcmfcbxoML4WEpKRUvHusVBIvh/GaJUPUIm/Wvc8augjhFiXExYgPnee9lCppPdnsWiZgSlY1aZXr7YGufhT4/OyWi5dhrCWb/tI= 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 1757643228369378.4872143613675; Thu, 11 Sep 2025 19:13:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uwtHC-0002bO-4C; Thu, 11 Sep 2025 22:12:38 -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 1uwtHA-0002Zq-1z for qemu-devel@nongnu.org; Thu, 11 Sep 2025 22:12:36 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uwtH7-00058X-FW for qemu-devel@nongnu.org; Thu, 11 Sep 2025 22:12:35 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-251ace3e7caso18283565ad.2 for ; Thu, 11 Sep 2025 19:12:33 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-25c3ad3349fsm32853205ad.104.2025.09.11.19.12.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Sep 2025 19:12:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757643152; x=1758247952; 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=DguLEdhC7Y6sQU+QdVbW8qCRVJTov8VIY0IzRtnvQSEmQNKgaZ1h3keggjEtlHMO7y ZaJ5GA6lWuyXs+LF0juwOLUdKuitBiTj06f+gCIkyLXR6FVNJyPTebEh4m/040VsU9Ba bYD240HGLkqeQcLbzs38asTBT/q6N2uO23tXCRB8yIByct8WwKNQfmhjToL+cA9GHog1 cSp51PeJT7AMtrdISeUcn9IE/bHm5d0xen+DAzKA/atWHp/cFczDX9RK8GTI8nXO1+nu KMYW2BmkyZCzLAM6d3jM6nsW+LISGWrp+zKmJKccUcSofgL/tj0ZLuSXk21juYJ6e0o3 bHYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757643152; x=1758247952; 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=Fh10cRmvZLhM9XsGUqPvs63Ec/27Wa0pZeKroh73pkWn4G2nT8h6w4TMGc5fgMANs0 u43jXLl8R9tBDcYEwelPjzWUb+kcyNc7vLVykxWrZwi2AmHcbGU3awVW3zq/re+MjTpb mmcq0x8WMMqgb/BVBle5mUZbqH2fdeIpnxyJ/rPPTCAugA6GCZM+O8Uut4CDtpaAyRs5 CBs6JGyJFAv4rHIOQt5ktUiaQBgiRG1Blnfq3VMH6AJ+AJXWfo5os98YNyCv116fuUn0 cA461V0+U2VUllzC30KrY86iuKIsAmx49khFnwlHgIPhGIsRBIfWOtxLg2/SAV2HUMAF MzHw== X-Forwarded-Encrypted: i=1; AJvYcCXi2YhcxiT4ZNn59kBcFHsbXTDvHY2BfIvftRpLbrbhnoZHCoMP4l9oay1YAoecnJv8EnmQooHKZfbo@nongnu.org X-Gm-Message-State: AOJu0YyaDX7nRHJJVoAYodIqJA9F922Wx879Id+WuPNSPYoyjmnNw0F0 /wsByFr5vsWpWIXwdr4hCFVmn1KBWFhpsFx80xpkyoxnYf/BEDyqmh/t X-Gm-Gg: ASbGncscJdwYIyXit1S0M1uh8NNqr6e9e7qplGvhDbyXXUdkitLcfWxcn7nFyQaO4oC gXqVc4OhBJU8c9Nbj3VLhFL6Cl8P4ia/gcssVxUHpAHQiHh3d4z6+vayj1JgturRKkrbjN//hoW +xH5Phtvb8SFPmbtar+2NtgwivOMf8MmgBkHkiAr30Mp/iuaVp/Se/DwjTZeZ5TaObjsKoKLM73 ixgnv3iUOOjDfad916pKVjsakaeVrgYZO8shQ5I5BVdPB1HHU+xRFCpUUUZnHFZdDMgRVjrwh2a XgppTJvmtC9zIldy/9PF7Frcmt62ARiDCgkThvpeo5sBjkE4psMuIesVC1Pbf1mJ1p0B09LosbV RxwiXv1Iy91mlNchzt018njHG22KSGxCRIJIKyw== X-Google-Smtp-Source: AGHT+IGdAoBZnz3y5oVldI7Mk0YGR2rkj7QUxivHCh0EjRD0ixSuQH1nVXv/GI68GhZk+vMPFMN+kw== X-Received: by 2002:a17:903:246:b0:24c:d6f7:2788 with SMTP id d9443c01a7336-25d2792963fmr17208155ad.57.1757643151734; Thu, 11 Sep 2025 19:12:31 -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 , Jonathan Cameron Subject: [PATCH v7 4/5] spdm: define SPDM transport enum types Date: Fri, 12 Sep 2025 12:11:51 +1000 Message-ID: <20250912021152.46556-5-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250912021152.46556-1-wilfred.opensource@gmail.com> References: <20250912021152.46556-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::635; envelope-from=wilfred.opensource@gmail.com; helo=mail-pl1-x635.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: 1757643229686116600 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 Mon Sep 22 02:15: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=1757643205; cv=none; d=zohomail.com; s=zohoarc; b=VK+u7Hi7WzQRlYtF9VFxgn+V1/PYfsZ6bKDETpPHAKTrMeGDexEi8Aoru9zzhsWu6VsUXWhoxBZY4rIoiunq7KHjl77HNRSHtJCQ75i2MSxoRrKhDOXtTz5mMTiqUcDHlhIZHdy//zbcvrgNBnvZ6gS2MqhtdDcaniVY08FTbQs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757643205; 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=7X1NXROzc/g77GSGWSORFJMpwrHccEZJKoS5nOctawY=; b=CPLNuWwd35G8+H2zLUWHqaQhDbzAIpraF9OqlxX4LN2Cr/46d06uZPZJaiUGQLRn1lWroZ6Wk+O+AXACImCVGPppM5eKsnhsh1qO+yJQatiIQC1nXWUO4qoiAHITATig2wHeVtXioj7prO8x4yBlzCGRIzxLv3n/lbffJmB7s8I= 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 1757643205770207.06175783201274; Thu, 11 Sep 2025 19:13:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uwtHe-0002zo-Pl; Thu, 11 Sep 2025 22:13:07 -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 1uwtHG-0002jo-HZ for qemu-devel@nongnu.org; Thu, 11 Sep 2025 22:12:48 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uwtHD-00059P-9O for qemu-devel@nongnu.org; Thu, 11 Sep 2025 22:12:41 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-24cb39fbd90so12453875ad.3 for ; Thu, 11 Sep 2025 19:12:38 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-25c3ad3349fsm32853205ad.104.2025.09.11.19.12.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Sep 2025 19:12:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757643158; x=1758247958; 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=7X1NXROzc/g77GSGWSORFJMpwrHccEZJKoS5nOctawY=; b=OxIVxmOAKYxKGQbXzOpy6u1EfW6sYHbvAaNGttzMZbIzH0oRYwExlue/E3Z5XvqxqC 1PXLy3XwICiZITcvBUauT8edhrE6Y1tA32khz7aAhjk9rIeI/gJqI+Gwrd1yscJeDIN6 9Tki9P6R+v/xugj3F1o5fHWCkLkzefoAX/27asQflWvtfO0qrS7lm8YwO7VSE1ZkDvLT REIEIfRlbBi70J7XgYtXAd0VsH2wHTwbu7xQSq+4UqMnkcjE+zzcu/8DjBeCoBD9zhqA j9W+QODZK1nqrvC7Za0ntSnurJSsVRosUcGlzjP+8et64dlBHeS4KmX5Rve89V2zk1he zPRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757643158; x=1758247958; 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=7X1NXROzc/g77GSGWSORFJMpwrHccEZJKoS5nOctawY=; b=s5gs6/z+MLwTiIXlZpzmabRvwiOTI0/Xw9HReW2uAnvMX1o8Q8NuWrawbPKy+P8Mxb yU2oEma8d00/UsJD+dZ8Lcqotxm5N9q/BiY92iWeWhiotRg026ebndW3Ctpe8YeE/fk/ Gh0qH16vjzG9BXjT2qtE/S2XknGacUebBUhe71pHUlg5HrJYygQcH/H+Sxz/ppouEFWu OcAMD/d4CoIvaIIbwc/SJ0k3YJv/exzKW3in4etFRQRUR56IDxedfR+PwzRtclsvcJg9 h4BBi7MLZUOAKKDpj1GpzzCSgamHS2NS138ryxgMxDWrubrvhmDULIKo9DtM4FqqqWFV cLjw== X-Forwarded-Encrypted: i=1; AJvYcCUXhmzsEbXE5JnQbjAQByghUFcHg9SK9M9LuBJikf0AI5nlC2n1zegO4C/qN7EQPUsLdgzSfZSnzvAk@nongnu.org X-Gm-Message-State: AOJu0YxlY0khhGVLf+2s17rxJVVQVCjBAI/fzPCboknjHpOUVxgAKB2X KNpBHxSwlfvZuTyeHxPNpHyTsLFYOhGWu8a0if921vXaZyPJDaP0W6og X-Gm-Gg: ASbGncupL7qnnZ97HM7lUqmIQXfamXyw+pqgXMu5d59v0nhjRrZGBIEhcnp5LFNLW1c E44fgAltFkrGalrWSMSN4kj55nuUoLFWK+EF+P4Kzztq/FOgvM/bBsOp86wJB7c/A84B030AlJV 6jOO2qLj+ATI6X3NCsW5Pg04Ra+CxF3pwJU/+zL0+KgallGNJyDoDGj+eK49cHCzADHVNJWsjH9 VlLes5nCQhcveaNAyJislWfS/0jXuzxm4pg+KJtmmfdmbB+m6n2RTp3bdK2VYCDs4wBOvpbOo9W EYEVzWUjSC6MBZqXjGSlaPChfJGastYtDWQEaTG2jZkcDrYAoUFgYRDz1oxM/wlPjZoyIEyqCCN N4i7MfKTLe4O+HOFzdGcOQN4OtH7Usd0= X-Google-Smtp-Source: AGHT+IGUtt0LUte+Nzwrqy+qzPqAjY7qxu7c99nuebal7JqTuzrgEPio04mXdV9wHLdcFy9vgItr6w== X-Received: by 2002:a17:902:cf06:b0:25c:19b4:7ae3 with SMTP id d9443c01a7336-25d2576ecc6mr15454975ad.24.1757643157657; Thu, 11 Sep 2025 19:12:37 -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 , Jonathan Cameron , Klaus Jensen Subject: [PATCH v7 5/5] hw/nvme: connect SPDM over NVMe Security Send/Recv Date: Fri, 12 Sep 2025 12:11:52 +1000 Message-ID: <20250912021152.46556-6-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250912021152.46556-1-wilfred.opensource@gmail.com> References: <20250912021152.46556-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::633; envelope-from=wilfred.opensource@gmail.com; helo=mail-pl1-x633.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: 1757643207512116600 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 | 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 ad52e8f569..7928e9b0a9 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,9 +9262,14 @@ static void nvme_exit(PCIDevice *pci_dev) g_free(n->cmb.buf); } =20 + /* Only one of the `spdm_socket`s below should have been setup */ + assert(!(pci_dev->doe_spdm.spdm_socket > 0 && n->spdm_socket >=3D 0)); if (pci_dev->doe_spdm.spdm_socket > 0) { spdm_socket_close(pci_dev->doe_spdm.spdm_socket, SPDM_SOCKET_TRANSPORT_TYPE_PCI_DOE); + } else if (n->spdm_socket >=3D 0) { + spdm_socket_close(pci_dev->doe_spdm.spdm_socket, + SPDM_SOCKET_TRANSPORT_TYPE_NVME); } =20 if (n->pmr.dev) { @@ -9307,6 +9324,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 +9401,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 +9414,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