From nobody Sat Nov 15 03:17:56 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=1756187322; cv=none; d=zohomail.com; s=zohoarc; b=ICIuEoMsILB2wiWrh2eMZtNZj59aL0ssRcry/mKK5/GrTWpkCXMVb27n8/u6zR92r0F3+2FT03YIKFJr0eMdCQPdTSScS+5+RpAtFnA2Gn2RL8K2sYuQ/AlObXwLzKx8MGgcc36+dyiKWR0eGi1vsoi+wsOIa78fdwWDMdaib/A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756187322; 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=5UiXR8FRiYli5OCixlKdlXRa1V5eOOYhqgAqd+KK4XI=; b=C/Q+wM/xPFOcdMhMRxT+aY7sQg8qhynpx3bzy2RTDpQz0d2VNiDem0XmuxI7LJqOXrIcQYuPgZSSRYO6RqOf5X9/N3eHlR89om1j8LbHzLb3hwizn2iBPeSbUXZTWpd6NDosuk3azrB1LtCdWoMOoTu6+apFoxY6nkRmXT/J/KY= 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 1756187322279928.5241731842486; Mon, 25 Aug 2025 22:48:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uqmWk-0000dR-Na; Tue, 26 Aug 2025 01:47:26 -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 1uqmWW-0000Xv-2F; Tue, 26 Aug 2025 01:47:16 -0400 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uqmWP-0007FC-9N; Tue, 26 Aug 2025 01:47:09 -0400 Received: by mail-pj1-x1029.google.com with SMTP id 98e67ed59e1d1-32597b88f0dso1632262a91.3; Mon, 25 Aug 2025 22:47:00 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-770401afdaesm9032365b3a.53.2025.08.25.22.46.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Aug 2025 22:46:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756187218; x=1756792018; 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=5UiXR8FRiYli5OCixlKdlXRa1V5eOOYhqgAqd+KK4XI=; b=h8eTiQK+7vQtQizQOB/UDio6NOCpT98MtKofjr17rYiV7YzAZjfqV4nfaAAOrURvl1 y8hRZIhtsLIciecTlEMHpBRXZrOZmPpFAESvalsqb8RrwdrV81x2xeg6xSfKLllO+yX7 ZITIrZo6Z9VCiuESP9wQEjwUkP5haSzfn1uOUT0inl+SM6nd5m4oBAkBgx6xNYxX+iOz lsUqfV3l7dK7toIWKRNQ8qSWqpjgKmytdZgpW7dnW78PwDYpz5NhHi1iUph72oDqsyPs nFcN0T8sGt0aKtQRdfl3+bRLbLIdHECFnEaHrfRYfw5gnTZV6c3gHA8hAxMbGRsPwFsf yyiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756187218; x=1756792018; 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=5UiXR8FRiYli5OCixlKdlXRa1V5eOOYhqgAqd+KK4XI=; b=ehZZXqyqlE9/d9elXdnjIUGlLSN6RNZ+xyN0sRdfEa1p8GcTJhkTmwX9rk0uGHXKUI yHpQ3/XD+JHwnNYvScKcsu6KRYuWF0PWhLdGr+tyuLDZFXVT4WSYVustA+Z6BF5xKZW8 cvp3QFR18RNLhFtv5UfFzic/bsJ8H2QmpZG98FblYIofuKVwzkLFnITE8XYom3QEmfmW QUaKwCJTmz0Xm2qbCCa2kSlDu0kdzrIkyJ4jYOHy6bMy71Gkb7caLcK97Iy/1NCw7PAU k+M2JdsN4DrCpsx2He5n9YPMU7XxSKVjmzx3gsp21ry1fYqVBwPPWPkhPUmvYgO/tY+d sPog== X-Forwarded-Encrypted: i=1; AJvYcCX/eQdOFqyfDOXUf+LwMirhiQeF0qNgbxGuVBFJaLR9q7yrLyPNPweo7Zm11aXct8BBIqeptprHGJ12BA==@nongnu.org, AJvYcCXxUh0qn/5Wlms53973xA1Ib5aKggopA43GUq42OBnnB+UEtB4ngw+k1EhjEGBGVadaWqglI0iQ/cDa@nongnu.org X-Gm-Message-State: AOJu0Yzedw8wzKw2XXCyT/UQZI0ZgmleeYQ8dUf66U/bwQTuDlG2LDGT vC8FA9Vrod5CoHqZwJ8lw2vA3kE/gZET+eYqJ4vMtdDn1qZontUSQLNv X-Gm-Gg: ASbGnct6AlRLdHgUpGb70gWYShtCBxpohEP4CMrMWpmWEZeoQoggkZR9pkfXC3nl8dx 5k2JNKf06W2PiDYjxU8Wyub33KeU+ZaH2+PWUcAGkUM1mX6UTkw9/l4z4ne2GL5Gp2vMM9OVlB2 orQR9j7e13NyMc9UrGNMlynZyvFtgmOJtJPBgz+GIrlkiOQ29vnxrG9/vBdB2tYhgSoOcV/ut9T g82yc7qqi1a4IbDcav0uDwGJMFupom/mNcT4o79Ys+wLvmV13isM7c8jaq+JhU6hdyJtMIcXNIE nOrfHfyEfzKWqS35yQs6Yj2yZARP53Y1EkUcXVMI/Lff2Nw3nxVYLtcnd/y9FqWnwOq1OWWLcYR yKgNtle9a6+5Br7siACteLKDDGQ== X-Google-Smtp-Source: AGHT+IFm8LKJYLDYMjukzBQleQAgmizZXli5ewkl3EvcQEi8qj9rdpRFLVaAQ1AQ1MwZIiIPoZrPiQ== X-Received: by 2002:a17:90b:53c8:b0:323:7e82:fcd with SMTP id 98e67ed59e1d1-32517b2bba5mr19935421a91.37.1756187217897; Mon, 25 Aug 2025 22:46:57 -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, Wilfred Mallawa Subject: [PATCH 1/4] spdm-socket: add seperate send/recv functions Date: Tue, 26 Aug 2025 15:46:27 +1000 Message-ID: <20250826054630.222052-2-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250826054630.222052-1-wilfred.opensource@gmail.com> References: <20250826054630.222052-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::1029; envelope-from=wilfred.opensource@gmail.com; helo=mail-pj1-x1029.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: 1756187324535124100 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. Signed-off-by: Wilfred Mallawa --- backends/spdm-socket.c | 27 ++++++++++++++++++++++++--- include/system/spdm-socket.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/backends/spdm-socket.c b/backends/spdm-socket.c index 2c709c68c8..bab1b512c8 100644 --- a/backends/spdm-socket.c +++ b/backends/spdm-socket.c @@ -184,6 +184,29 @@ int spdm_socket_connect(uint16_t port, Error **errp) return client_socket; } =20 +uint32_t spdm_socket_receive(const int socket, uint32_t transport_type, + void *rsp, uint32_t rsp_len) +{ + uint32_t command; + bool result; + + result =3D receive_platform_data(socket, transport_type, &command, + (uint8_t *)rsp, &rsp_len); + + if (!result || command =3D=3D 0) { + return 0; + } + + 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) @@ -200,12 +223,10 @@ uint32_t spdm_socket_rsp(const int socket, uint32_t t= ransport_type, =20 result =3D receive_platform_data(socket, transport_type, &command, (uint8_t *)rsp, &rsp_len); - if (!result) { + if (!result || command =3D=3D 0) { return 0; } =20 - assert(command !=3D 0); - return rsp_len; } =20 diff --git a/include/system/spdm-socket.h b/include/system/spdm-socket.h index 5d8bd9aa4e..2b7d03f82d 100644 --- a/include/system/spdm-socket.h +++ b/include/system/spdm-socket.h @@ -50,6 +50,35 @@ uint32_t spdm_socket_rsp(const int socket, uint32_t tran= sport_type, void *req, uint32_t req_len, void *rsp, uint32_t rsp_len); =20 +/** + * spdm_socket_rsp: Receive a message from an SPDM server + * @socket: socket returned from spdm_socket_connect() + * @transport_type: SPDM_SOCKET_TRANSPORT_TYPE_* macro + * @rsp: response buffer + * @rsp_len: response buffer length + * + * Receives a message from the SPDM server and returns the number of bytes + * received or 0 on failure. This can be used to receive a message from th= e SPDM + * server without sending anything first. + */ +uint32_t spdm_socket_receive(const int socket, uint32_t transport_type, + void *rsp, uint32_t rsp_len); + +/** + * spdm_socket_rsp: Sends a message to an SPDM server + * @socket: socket returned from spdm_socket_connect() + * @socket_cmd: socket command type (normal/if_recv/if_send etc...) + * @transport_type: SPDM_SOCKET_TRANSPORT_TYPE_* macro + * @req: request buffer + * @req_len: request buffer length + * + * Sends platform data to a SPDM server on socket, returns true on success. + * The response from the server must then be fetched by using + * spdm_socket_receive(). + */ +bool spdm_socket_send(const int socket, uint32_t socket_cmd, + uint32_t transport_type, void *req, uint32_t req_len= ); + /** * spdm_socket_close: send a shutdown command to the server * @socket: socket returned from spdm_socket_connect() @@ -60,6 +89,9 @@ uint32_t spdm_socket_rsp(const int socket, uint32_t trans= port_type, void spdm_socket_close(const int socket, uint32_t transport_type); =20 #define SPDM_SOCKET_COMMAND_NORMAL 0x0001 +#define SPDM_SOCKET_STORAGE_CMD_IF_SEND 0x0002 +#define SPDM_SOCKET_STORAGE_CMD_IF_RECV 0x0003 +#define SOCKET_SPDM_STORAGE_ACK_STATUS 0x0004 #define SPDM_SOCKET_COMMAND_OOB_ENCAP_KEY_UPDATE 0x8001 #define SPDM_SOCKET_COMMAND_CONTINUE 0xFFFD #define SPDM_SOCKET_COMMAND_SHUTDOWN 0xFFFE @@ -68,7 +100,10 @@ void spdm_socket_close(const int socket, uint32_t trans= port_type); =20 #define SPDM_SOCKET_TRANSPORT_TYPE_MCTP 0x01 #define SPDM_SOCKET_TRANSPORT_TYPE_PCI_DOE 0x02 +#define SPDM_SOCKET_TRANSPORT_TYPE_SCSI 0x03 +#define SPDM_SOCKET_TRANSPORT_TYPE_NVME 0x04 =20 #define SPDM_SOCKET_MAX_MESSAGE_BUFFER_SIZE 0x1200 +#define SPDM_SOCKET_MAX_MSG_STATUS_LEN 0x02 =20 #endif --=20 2.51.0 From nobody Sat Nov 15 03:17:56 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=1756187343; cv=none; d=zohomail.com; s=zohoarc; b=F9wPJMW4Hw0VOUWdHZwV7EleGWoJOigTjkjPUDianH6Vm4Iu4vqWWGjBn+x6rwc2GYC8oUj2ZQVkTP8v8oOmw36SzFAGlY2dur8XzEklFYrjIwcNGE6KbpL2scTZ9tI/vCWrCZ8T0V0CF/pqN82VLR0k8iSw46yheLeoggxlKwU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756187343; 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=jC5ltyVIy9yJ20gk6j9B/6jrs48ECuEt3pZwln7qQJg=; b=jg74IPCIeLZdxnUFl3K8sarFm13U6PNyOzPFVf6MflH0RZRP+q9f/ZxbFKQ0/GlqbTbV52tQwo+rvLZ78SC80W3PfhNZX9eByxzw2l8UkBmfGnJuFDkvBhJRs9maS3Xrcv/I/5vpeQV2Jt9hWrjQCKWDndcOcshkXN9Zo+zOxIo= 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 1756187343543212.09788542755655; Mon, 25 Aug 2025 22:49:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uqmWo-0000fx-13; Tue, 26 Aug 2025 01:47:31 -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 1uqmWa-0000ZY-52; Tue, 26 Aug 2025 01:47:18 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uqmWU-0007Fv-70; Tue, 26 Aug 2025 01:47:13 -0400 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-7704f3c46ceso1882920b3a.2; Mon, 25 Aug 2025 22:47:06 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-770401afdaesm9032365b3a.53.2025.08.25.22.46.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Aug 2025 22:47:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756187224; x=1756792024; 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=jC5ltyVIy9yJ20gk6j9B/6jrs48ECuEt3pZwln7qQJg=; b=QQVYcc3nnN4ihzWZ1YgMZ9zfttDjU2GcM0RmmTiSvnvJPBgi9aQRW1IaBuebpZY9ND i3Z6L3dAIwFzJiTCn3Qm4RRtkDf6Uu6BCMyQRksqEvbnUuiIwFwxgUKwDyjfCiASJedc 2T0bik2h7+/YP+E1ZyW1XXWxAKvLVSDfmWgdFw60iMj4YOvzUMWevE2jukVItrySD9CU QVYWLsiBo4WiKSYPSPyfsUbRI0alm6WBh3LhR+isqrXUsHrbDZDr+mZ73AiQ9YoGCkih n/dYRWlgBHXgwN7Dk1zDeIk14GhHua90pmR9AGSvqWCPt38eniyhcG6Y5oIirX3uBh4/ +I+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756187224; x=1756792024; 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=jC5ltyVIy9yJ20gk6j9B/6jrs48ECuEt3pZwln7qQJg=; b=Tqid3s4Z0oXvqMW+bvW8OMeL6HddkAu3uREHkxoQhDYGUUpdbTjMju47o/TCXOnAq3 p/Y7l+bFgoEvoMHjP9u0cmmTU5iUx3HbPJ+0WK1jfM21DJZqv40wpdpBnV3is6fl1eGC 4fh5v9hfKIXx3IKEYWamkxAVATIzi0fPRC6JQ6c0qohjMJL3aUjue0iy3F3LIX0EUwxN qJTQxO5X0Sfvsx77ndVEzjbi+pgbYFsADc8Ovht0KhXR1fJOBfojEPQQMh3St2sop0ls 5jRKvbf0cIfaKhjsBcz9EhD8vyNHU5Ijgj2x+sKRyXw5W02wtxIdiYIEJ5WtSH5ddEy+ IQSw== X-Forwarded-Encrypted: i=1; AJvYcCWdWq3MWoIts2sOoFiltIHZfB5ZdhtnM1C+unODu5LMF1E8tL43+kZ8/GyrFzF0RKptTqed+NIeeXIZ@nongnu.org, AJvYcCXvABk+9Tn1yJ2RSzXUExJyw9Z5LXXxDhI3AjqNeno7X9hAkSv/PqAXINuvba+0/FT3bH1/we6GSzL1uQ==@nongnu.org X-Gm-Message-State: AOJu0Yw2086H+gJDriyGEPgmn8WSFZ4d0XlXmpu5Pc50TVAJHlpOW+Ii gynWtENDznIpkvsfjOj/rHwlZQWU24ULwO4ho/7MYYrhAMB09/rwZL3W X-Gm-Gg: ASbGnctSNnnQUU4RlXa8XrTHjrRBKXEMI2D1220iHpQa/hGBFuHHIflH191QAxPEoud vshtSQ54wSYpS3wr6h9m/bfJsvri+8rdzH+SvXoCF9PhEbMAzVY0AJDjgDHO2rG4MSGFG0odOZq 4XoFDQy0ft3WjRJbZKj+Kf43KkH8/TifcEEHl7WoFMIV6yh6Xi7qDAubtozWAzrIeKbyUopJCBy zToW0J4HTRc00tsTf6mKOr4KP1YnHeX7La7RE3NiiweCAo0fqswDpVSG4/gutp2FdS5OhuOXhbu uBF/xLhom4X32Yhmkf4cJpNfgObHz4eNpJvmaRyKW81kQkXQRICtzMQ2gk4JXqcC0898VHusjDl czx+s+m11XR18iij5jy0zuCgbzQ== X-Google-Smtp-Source: AGHT+IEBhaHreBhD+w0v8PyJrJLq2knv7d9i4viw06enYmEUgd39gF68jPw6PZsfpEV0w5bMlBWK2Q== X-Received: by 2002:a05:6a00:bd92:b0:76e:7aee:35f1 with SMTP id d2e1a72fcca58-7702fc09f00mr17043840b3a.29.1756187224004; Mon, 25 Aug 2025 22:47:04 -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, Wilfred Mallawa Subject: [PATCH 2/4] spdm: add spdm storage transport virtual header Date: Tue, 26 Aug 2025 15:46:28 +1000 Message-ID: <20250826054630.222052-3-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250826054630.222052-1-wilfred.opensource@gmail.com> References: <20250826054630.222052-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::435; envelope-from=wilfred.opensource@gmail.com; helo=mail-pf1-x435.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: 1756187346189124100 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 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/system/spdm-socket.h b/include/system/spdm-socket.h index 2b7d03f82d..2469424cce 100644 --- a/include/system/spdm-socket.h +++ b/include/system/spdm-socket.h @@ -88,6 +88,17 @@ 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 QEMU_PACKED { + uint8_t security_protocol; + uint16_t security_protocol_specific; + uint32_t length; +} StorageSpdmTransportHeader; + #define SPDM_SOCKET_COMMAND_NORMAL 0x0001 #define SPDM_SOCKET_STORAGE_CMD_IF_SEND 0x0002 #define SPDM_SOCKET_STORAGE_CMD_IF_RECV 0x0003 --=20 2.51.0 From nobody Sat Nov 15 03:17:56 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=1756187342; cv=none; d=zohomail.com; s=zohoarc; b=XAxJjLffPY5cbKS3QNMeloz9XLkhq995QmsRYZ887SMu31x8UusMyEVA6g+BIp0q9xStLy/rta3GS/rYPkpLqZ0cmaNaxIOZ1orXI+Fk49B/VeaVaHaaNHMhDEkOx3IralzsBQ3Dc2oUPXr5/zUX2rNmc2bAzT4IBLBd15XhdBM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756187342; 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=9BjzK5ZkTCKLDWpara3x77Oouy5dA+HljQA8qiCuWPI=; b=L98tgmI4/OCxyVJETK5a/K0En6vvxG0dy9MHaqTTXnQw5Qlav6IaW9M+Bff6kblg3SlXZbRXo1xqaD7AmkFkSzOBiZX5jsZQOaGOIB0sVAFH82yN1t/bV/ixoWvB73fuaCUA88e8ByA75DUL2MyTPMYRx8+XOpmy8HZThVcFFrU= 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 1756187342768417.5200246304813; Mon, 25 Aug 2025 22:49:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uqmWo-0000fw-6H; Tue, 26 Aug 2025 01:47:30 -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 1uqmWf-0000c7-4E; Tue, 26 Aug 2025 01:47:23 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uqmWY-0007GY-V0; Tue, 26 Aug 2025 01:47:20 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-771f3f89952so610803b3a.0; Mon, 25 Aug 2025 22:47:13 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-770401afdaesm9032365b3a.53.2025.08.25.22.47.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Aug 2025 22:47:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756187230; x=1756792030; 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=9BjzK5ZkTCKLDWpara3x77Oouy5dA+HljQA8qiCuWPI=; b=I+Pzxg5jrOCp9Mbpy5YLoC3Ij6QU9pMF7uoDblmrCYC033xaAE+v60IRta88KeAh3B UJDoPket4DmvtXb7iGteUCN4I9KStRsE8HBqEiALoMLRbzEN6204ixRSUCFNPPY1Onwg lig7ZSGesUeEjoc4FPhh7oudrUdMBz7dnlpBq3VtsAfy+F7/Wzv+kulGLnEyXwkNi0dc yqcrdLuaaBkq2mjA+wW3dAohzCZfvzdoIE2JFXbc90z6/VJj0okPfAjbBMhtzbRXSvZY xq4BKxw1lPW6EqsXOWKXH3IYo9JlNuvaktLnWQNClVDh7/qHCszwJF+YOgq07t1Db/7N C03g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756187230; x=1756792030; 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=9BjzK5ZkTCKLDWpara3x77Oouy5dA+HljQA8qiCuWPI=; b=J7FXSDy4fjYeQaiYuCbLVr1RS4T8xCS374ZhdhPbtnxQA7eMCivYJLt/OtSIlFl3he 6KDpk07i1Wc6mH7L92VGM+PngOlNuvURrBwH0TMdXoG2reh9FXJUBMLITXX95UQ0Y1kU syefrNCrCXZnRKIoAUG6jQsdJLDVhygm1Rkkq4UF1VGnXKO2BZmOd17C2SMlKRQLJgv6 XnEHeM7FrssYTfe+9JGobfVxrV23KZcONDQMoZKj9DQM6BF3R3+B26QbzsbY+gFhzbxG tmCVVhVqPLXsP019bSggImIgi+SjYDRokEauKe7BrRaTB8ap0RC/k3Tm/bLSRxcIEW+X L+GA== X-Forwarded-Encrypted: i=1; AJvYcCUmsAvDvot6AvnAWhp0vQU6eGD7WPqv2QUErMVtL0CdoeoozH4CZcOhQNnU6k7CT7GKU0DnTQcePS8esw==@nongnu.org, AJvYcCXIWdYIrilbTlEoP3nsLEGrs9kSgyM+SHVBkTm6XDNkADeKmjsLdBwu+vpDBpSK0D4f8X1SsWIUvpDr@nongnu.org X-Gm-Message-State: AOJu0YwPhuPVbwDdUqtwc1NJblehiUGum0aOWAVJi9YEqJlHpNJ191mc 5GrZLLwbaFow4wUjh4ppVOK+zg/si3R1jt8dRomflYXuTwtWkeibM2+z X-Gm-Gg: ASbGncsmYLgfqcJORblbV7Tj652Zt0eiav4YLOPUtsTxaUQ2gYj3aHkdUlBtpNUPWpx Lgp9mIExCUF8B9Ya9LSdy0dGybmkrRRCfBPAU8LUtElsLRXvt/2xxltlrkHXlka2S8CYYq9kMtm XWTyHmTp4D/rcWLUxznEeVWMEKqRuHFtWR5so/WcbM7x+4qrJlNn6qkPRzckqeW20cINtemUy13 3QftvQ1pXg4GkXJEcbxsBk6GfhA5L4Ecez3/SPE85kJffFyYcRvBkTQSh8OyvspyVxOAxqYQkAW i2o8kVHYRhVhvXXIunmFedwOlWA8a0StjcpAnrijplsuq298BNhf+CF/YduW2UGQEOxGr16ti8A f27B/r8V/ME4PRXIASbxH3243XgY+88Bg66qp X-Google-Smtp-Source: AGHT+IFdThN6dFmBweKlCpabGlr2Ear6ZaZNmXxMNLuiW4Ripm6pAn9yMLKB1of1wFK5EPxQ8Rp4cA== X-Received: by 2002:aa7:9e06:0:b0:746:195b:bf1c with SMTP id d2e1a72fcca58-771fc293053mr253765b3a.10.1756187230204; Mon, 25 Aug 2025 22:47:10 -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, Wilfred Mallawa Subject: [PATCH 3/4] hw/nvme: add NVMe Admin Security SPDM support Date: Tue, 26 Aug 2025 15:46:29 +1000 Message-ID: <20250826054630.222052-4-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250826054630.222052-1-wilfred.opensource@gmail.com> References: <20250826054630.222052-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::430; envelope-from=wilfred.opensource@gmail.com; helo=mail-pf1-x430.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: 1756187344574124100 Content-Type: text/plain; charset="utf-8" From: Wilfred Mallawa Adds the NVMe Admin Security Send/Receive command support with support for DMTFs SPDM. The transport binding for SPDM is defined in the DMTF DSP0286. Signed-off-by: Wilfred Mallawa --- hw/nvme/ctrl.c | 202 ++++++++++++++++++++++++++++++++++++++++++- hw/nvme/nvme.h | 5 ++ include/block/nvme.h | 15 ++++ 3 files changed, 221 insertions(+), 1 deletion(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index f5ee6bf260..442144642d 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,199 @@ 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}; + uint8_t *sec_buf; + 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; + uint16_t ret; + uint8_t secp =3D (dw10 >> 24) & 0xFF; + uint8_t spsp1 =3D (dw10 >> 16) & 0xFF; + uint8_t spsp0 =3D (dw10 >> 8) & 0xFF; + bool spdm_res; + + transport_transfer_len +=3D sizeof(hdr); + if (transport_transfer_len > SPDM_SOCKET_MAX_MESSAGE_BUFFER_SIZE) { + return NVME_NO_COMPLETE | NVME_DNR; + } + + /* Generate the NVMe transport header */ + hdr.security_protocol =3D secp; + hdr.security_protocol_specific =3D cpu_to_le16((spsp1 << 8) | spsp0); + hdr.length =3D cpu_to_le32(transfer_len); + + sec_buf =3D g_malloc0(transport_transfer_len); + if (!sec_buf) { + return NVME_NO_COMPLETE | NVME_DNR; + } + + /* Attach the transport header */ + memcpy(sec_buf, &hdr, sizeof(hdr)); + ret =3D nvme_h2c(n, sec_buf + sizeof(hdr), transfer_len, req); + if (ret) { + return NVME_NO_COMPLETE | NVME_DNR; + } + + spdm_res =3D spdm_socket_send(n->spdm_socket, SPDM_SOCKET_STORAGE_CMD_= IF_SEND, + SPDM_SOCKET_TRANSPORT_TYPE_NVME, sec_buf, + transport_transfer_len); + if (!spdm_res) { + g_free(sec_buf); + return NVME_NO_COMPLETE | NVME_DNR; + } + + /* The responder shall ack with message status */ + recvd =3D spdm_socket_receive(n->spdm_socket, SPDM_SOCKET_TRANSPORT_TY= PE_NVME, + (uint8_t *)&nvme_cmd_status, + SPDM_SOCKET_MAX_MSG_STATUS_LEN); + + nvme_cmd_status =3D cpu_to_be16(nvme_cmd_status); + + if (recvd < SPDM_SOCKET_MAX_MSG_STATUS_LEN) { + g_free(sec_buf); + return NVME_NO_COMPLETE | NVME_DNR; + } + + g_free(sec_buf); + return nvme_cmd_status; +} + +/* From host to controller */ +static uint16_t nvme_security_send(NvmeCtrl *n, NvmeRequest *req) +{ + uint32_t dw10 =3D le32_to_cpu(req->cmd.cdw10); + uint8_t secp =3D (dw10 >> 24) & 0xff; + + switch (secp) { + case NVME_SEC_PROT_DMTF_SPDM: + return nvme_sec_prot_spdm_send(n, req); + default: + /* Unsupported Security Protocol Type */ + return NVME_INVALID_FIELD | NVME_DNR; + } + + return NVME_INVALID_FIELD | NVME_DNR; +} + +static uint16_t nvme_sec_prot_spdm_receive(NvmeCtrl *n, NvmeRequest *req) +{ + StorageSpdmTransportHeader hdr =3D {0}; + uint8_t *rsp_spdm_buf; + 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; + uint16_t ret; + uint8_t secp =3D (dw10 >> 24) & 0xFF; + uint8_t spsp1 =3D (dw10 >> 16) & 0xFF; + uint8_t spsp0 =3D (dw10 >> 8) & 0xFF; + + if (!alloc_len) { + return NVME_INVALID_FIELD | NVME_DNR; + } + + /* Generate the NVMe transport header */ + hdr.security_protocol =3D secp; + hdr.security_protocol_specific =3D cpu_to_le16((spsp1 << 8) | spsp0); + hdr.length =3D cpu_to_le32(alloc_len); + + /* Forward if_recv to the SPDM Server with SPSP0 */ + spdm_res =3D spdm_socket_send(n->spdm_socket, SPDM_SOCKET_STORAGE_CMD_= IF_RECV, + SPDM_SOCKET_TRANSPORT_TYPE_NVME, + (uint8_t *)&hdr, sizeof(hdr)); + if (!spdm_res) { + return NVME_NO_COMPLETE | NVME_DNR; + } + + /* The responder shall ack with message status */ + recvd =3D spdm_socket_receive(n->spdm_socket, SPDM_SOCKET_TRANSPORT_TY= PE_NVME, + (uint8_t *)&nvme_cmd_status, + SPDM_SOCKET_MAX_MSG_STATUS_LEN); + + nvme_cmd_status =3D cpu_to_be16(nvme_cmd_status); + + + if (recvd < SPDM_SOCKET_MAX_MSG_STATUS_LEN) { + return NVME_NO_COMPLETE | NVME_DNR; + } + + /* An error here implies the prior if_recv from requester was spurious= */ + if (nvme_cmd_status !=3D NVME_SUCCESS) { + return nvme_cmd_status; + } + + /* Clear to start receiving data from the server */ + rsp_spdm_buf =3D g_malloc0(alloc_len); + if (!rsp_spdm_buf) { + return NVME_NO_COMPLETE | NVME_DNR; + } + + recvd =3D spdm_socket_receive(n->spdm_socket, + SPDM_SOCKET_TRANSPORT_TYPE_NVME, + rsp_spdm_buf, alloc_len); + if (!recvd) { + g_free(rsp_spdm_buf); + return NVME_NO_COMPLETE | NVME_DNR; + } + + ret =3D nvme_c2h(n, rsp_spdm_buf, MIN(recvd, alloc_len), req); + g_free(rsp_spdm_buf); + + if (ret) { + return NVME_NO_COMPLETE | NVME_DNR; + } + + return NVME_SUCCESS; +} + +static uint16_t nvme_get_sec_prot_info(NvmeCtrl *n, NvmeRequest *req) +{ + uint32_t alloc_len =3D le32_to_cpu(req->cmd.cdw11); + uint8_t resp[10] =3D {0}; + + if (alloc_len < 10) { + return NVME_INVALID_FIELD | NVME_DNR; + } + + /* Support Security Protol List Length */ + resp[6] =3D 0; /* MSB */ + resp[7] =3D 2; /* LSB */ + /* Support Security Protocol List */ + resp[8] =3D SFSC_SECURITY_PROT_INFO; + resp[9] =3D NVME_SEC_PROT_DMTF_SPDM; + + 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 (dw10 >> 8) & 0xFFFF; + uint8_t secp =3D (dw10 >> 24) & 0xFF; + + 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 */ + default: + return NVME_INVALID_FIELD | NVME_DNR; + } + case NVME_SEC_PROT_DMTF_SPDM: + return nvme_sec_prot_spdm_receive(n, req); + default: + return NVME_INVALID_FIELD | NVME_DNR; + } +} + static uint16_t nvme_directive_send(NvmeCtrl *n, NvmeRequest *req) { return NVME_INVALID_FIELD | NVME_DNR; @@ -7389,6 +7584,10 @@ static uint16_t nvme_admin_cmd(NvmeCtrl *n, NvmeRequ= est *req) return nvme_directive_send(n, req); case NVME_ADM_CMD_DIRECTIVE_RECV: return nvme_directive_receive(n, req); + case NVME_ADM_CMD_SECURITY_SEND: + return nvme_security_send(n, req); + case NVME_ADM_CMD_SECURITY_RECV: + return nvme_security_receive(n, req); default: g_assert_not_reached(); } @@ -8824,7 +9023,8 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pc= i_dev) id->mdts =3D n->params.mdts; id->ver =3D cpu_to_le32(NVME_SPEC_VER); =20 - oacs =3D NVME_OACS_NMS | NVME_OACS_FORMAT | NVME_OACS_DIRECTIVES; + oacs =3D NVME_OACS_NMS | NVME_OACS_FORMAT | NVME_OACS_DIRECTIVES | + NVME_OACS_SECURITY; =20 if (n->params.dbcs) { oacs |=3D NVME_OACS_DBCS; diff --git a/hw/nvme/nvme.h b/hw/nvme/nvme.h index b5c9378ea4..67ed562e00 100644 --- a/hw/nvme/nvme.h +++ b/hw/nvme/nvme.h @@ -461,6 +461,8 @@ static inline const char *nvme_adm_opc_str(uint8_t opc) case NVME_ADM_CMD_DIRECTIVE_RECV: return "NVME_ADM_CMD_DIRECTIVE_REC= V"; case NVME_ADM_CMD_DBBUF_CONFIG: return "NVME_ADM_CMD_DBBUF_CONFIG"; case NVME_ADM_CMD_FORMAT_NVM: return "NVME_ADM_CMD_FORMAT_NVM"; + case NVME_ADM_CMD_SECURITY_SEND: return "NVME_ADM_CMD_SECURITY_SEND= "; + case NVME_ADM_CMD_SECURITY_RECV: return "NVME_ADM_CMD_SECURITY_RECV= "; default: return "NVME_ADM_CMD_UNKNOWN"; } } @@ -648,6 +650,9 @@ typedef struct NvmeCtrl { } next_pri_ctrl_cap; /* These override pri_ctrl_cap after reset */ uint32_t dn; /* Disable Normal */ NvmeAtomic atomic; + + /* Socket mapping to SPDM over NVMe Security In/Out commands */ + int spdm_socket; } NvmeCtrl; =20 typedef enum NvmeResetType { diff --git a/include/block/nvme.h b/include/block/nvme.h index 358e516e38..9fa2ecaf28 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -1779,6 +1779,21 @@ enum NvmeDirectiveOperations { NVME_DIRECTIVE_RETURN_PARAMS =3D 0x1, }; =20 +typedef enum SfscSecurityProtocol { + SFSC_SECURITY_PROT_INFO =3D 0x00, +} SfscSecurityProtocol; + +typedef enum NvmeSecurityProtocols { + NVME_SEC_PROT_DMTF_SPDM =3D 0xE8, +} NvmeSecurityProtocols; + +typedef enum SpdmOperationCodes { + SPDM_STORAGE_DISCOVERY =3D 0x1, /* Mandatory */ + SPDM_STORAGE_PENDING_INFO =3D 0x2, /* Optional */ + SPDM_STORAGE_MSG =3D 0x5, /* Mandatory */ + SPDM_STORAGE_SEC_MSG =3D 0x6, /* Optional */ +} SpdmOperationCodes; + typedef struct QEMU_PACKED NvmeFdpConfsHdr { uint16_t num_confs; uint8_t version; --=20 2.51.0 From nobody Sat Nov 15 03:17:56 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=1756187323; cv=none; d=zohomail.com; s=zohoarc; b=FX/iz7I+LOSv1NiOjD/nDQBl2cNBvGmutuAhEgqE6o9vWsZbjpBTrWjs/azKuz3jTZZEM4Xgk+xuxOceNoHuF5IIS+BRsn/nVUUfbrRKOibB2vSwV4EGhOM+BN0cMA4IVcR9l9a8yU3CaS2J6xO5BYUSAFKTwaaSAQC/NpFByRA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756187323; 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=1nsEJMdFt1tNRfqfp3bEJq0v/9zje2N3ec0X3FuUg8Q=; b=HAWsxOCHtl6/v7Sj8bDVQQhXOOzMmNFTyzkBD8IY0++ffCPzGUqP74dr2XqTByzAogPeEAsLVy8zavgBt7bIlrnjxJd9t+NLmVEBmtlLKoLAuTDlgxrPDDcO10ZPn0e4oD32NiRJ+KkiEjgE2hioDEKoIEfVNUaVRotyyt3IcWI= 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 1756187323662649.3851228023451; Mon, 25 Aug 2025 22:48:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uqmWr-0000iP-25; Tue, 26 Aug 2025 01:47:33 -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 1uqmWo-0000hp-Ls; Tue, 26 Aug 2025 01:47:30 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uqmWh-0007HC-Nr; Tue, 26 Aug 2025 01:47:30 -0400 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-2468e7c7b30so27661265ad.0; Mon, 25 Aug 2025 22:47:20 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-770401afdaesm9032365b3a.53.2025.08.25.22.47.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Aug 2025 22:47:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756187237; x=1756792037; 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=1nsEJMdFt1tNRfqfp3bEJq0v/9zje2N3ec0X3FuUg8Q=; b=fPOPkokBsG/zrJXil2F0seZPEd1rpisns2fBLmgNIx/Lq1f9NFeTWqGto+qhIGyor9 fopFmNF5ruqXjdd+CTiS3UJHd5Oj7wjdMmQjRt1Xwq1Vmcsel4ul2W5lDQ0qndfXYqUC wYleRjrCZpMN8FLlHxJTUXgt0bzOTidS3cITPOudimIOVmpa6vdmvPhdYy6JltMomdC5 86larE/mDjQtxF5bPQdXgCfYQcnpaLBYhnjyms/PxGFVV30lv3eml820YRjLjLnLruW2 KmwNvKomn5IHkj4rHQXISCeCQcoOzOJbwzV7wU/6WZKOwG7LTDf77QG2T6gSP6Eb9HbW e2Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756187237; x=1756792037; 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=1nsEJMdFt1tNRfqfp3bEJq0v/9zje2N3ec0X3FuUg8Q=; b=qYeUdFPcAaOpgZtR8JEHkKRw5vSFvYd4xCe0vk1bfHAncfp+oriqMUKF4oXrew5Pcs zX5X+g1vvswnMJBHzSzF8o0KN43F0mZmMsJrbEU/4XHluwBEK1HBbWcwPBydPzTXNULd Pk0qlAV9n61Mh8Oq5TEzW2va9NgmagJ3lAfCZJp705R+BUw1LEDVlzO4EdpHHBN1N2Gk +ctL+diPBnw3DJ5NeX9WzsYdGmUngFEoJaGaxIwwECmNUKEyEHhJfHZFceUh8yXc+OXc zBgwt6FkDFy4SRCrqzsiQZ+MoK1HeXE6sqtfuoit0OBHmifGb7r2LLFW/ilelvPdeD1b qwKA== X-Forwarded-Encrypted: i=1; AJvYcCVFqNhNOtTRwTrpUttPgaMkZ+lN1rDEV4BjJ+7cR1lQXLSSPokM036hW+sBWpbVXqvouHaDcsdJ1n3rBg==@nongnu.org, AJvYcCXEzFFpcKkQmY//uG9v0/JSndtGDqZ9Ggo7kNsEDdZD8iugLXPqtqflwmv1xN1uyUSLR3tcRRoCX9yG@nongnu.org X-Gm-Message-State: AOJu0Yw5laVcrWFFZUtwVKyKqIUqxicUo1HE3u3FMVOkVuvt3FklneRn uLv0g0SUI9U60VDhlWPX9FFyL6+e1VCX7d97+zGB5TluXJsksQ9IQqS7 X-Gm-Gg: ASbGncuzyc4GZzJHEgCUxPLQN7OMI0OxUSYZ1iaaNy9pL9FsZwt3M1cVO4TOnkqqtmo o86/WP59I2LVxC1t/5QuD1V1QoOyBzU1zQ/7nFdkx1uD9dFQ9HUVhmtP/dtsQRiDb5Wbj0xdmcj 0vrpbo73sJUX/SMnSU9zAlH5f4zhworRwdtpkGPABbj3ebwHg7cYAQ8q/3xJ0t1pYcCslhyYp2e BVGQ/xG5zePpObHK0hOsmqh0NP+ltzlQm3B0hD7yGKWFx5tun6HAdgdyXfXrTQTEtVLUcQtBfxp 0Aq1TGipyMjXL3Icndr0Qoxu9FT1JBRH2tiw/e2Rn0Z+QG38B7+NROt3zwK8MshU9DBosZ8l60M BREOK8eDTOeQp0jG5XfgmY+5pmw== X-Google-Smtp-Source: AGHT+IFz5fHUIc3smiudz3ULlyoWrSKkEwLWXH2oY1dzzbE8O9f40TRvT0prr88zOT2wH29ir+w6XA== X-Received: by 2002:a17:902:f707:b0:246:2733:940d with SMTP id d9443c01a7336-2462ee542abmr195030645ad.15.1756187236589; Mon, 25 Aug 2025 22:47:16 -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, Wilfred Mallawa Subject: [PATCH 4/4] hw/nvme: connect SPDM over NVMe Security Send/Recv Date: Tue, 26 Aug 2025 15:46:30 +1000 Message-ID: <20250826054630.222052-5-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250826054630.222052-1-wilfred.opensource@gmail.com> References: <20250826054630.222052-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::629; envelope-from=wilfred.opensource@gmail.com; helo=mail-pl1-x629.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: 1756187325719116600 Content-Type: text/plain; charset="utf-8" From: Wilfred Mallawa This patch extends the existing support we have for NVMe with only DoE to also add support to SPDM over the NVMe Security Send/Recv commands. With the new definition of the `spdm-trans` argument, users can specify `spdm_trans=3Dnvme` or `spdm_trans=3Ddoe`. This allows us to select the SPDM transport respectively. SPDM over the NVMe Security Send/Recv commands are defined in the DMTF DSP0286. Signed-off-by: Wilfred Mallawa --- docs/specs/spdm.rst | 10 ++++-- hw/nvme/ctrl.c | 62 ++++++++++++++++++++++++++++++------- include/hw/pci/pci_device.h | 1 + 3 files changed, 60 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 442144642d..61feb9b35a 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -8849,6 +8849,23 @@ static DOEProtocol doe_spdm_prot[] =3D { { } }; =20 +static inline uint32_t nvme_get_spdm_trans_type(PCIDevice *pci_dev) +{ + if (!pci_dev) { + return false; + } + + if (!strcmp(pci_dev->spdm_trans, "nvme")) { + return SPDM_SOCKET_TRANSPORT_TYPE_NVME; + } + + if (!strcmp(pci_dev->spdm_trans, "doe")) { + return SPDM_SOCKET_TRANSPORT_TYPE_PCI_DOE; + } + + return 0; +} + static bool nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp) { ERRP_GUARD(); @@ -8937,19 +8954,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 (nvme_get_spdm_trans_type(pci_dev)) { + 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; } } @@ -9240,11 +9269,17 @@ static void nvme_exit(PCIDevice *pci_dev) g_free(n->cmb.buf); } =20 + /* Only one of the `spdm_socket` below would have been setup */ if (pci_dev->doe_spdm.spdm_socket > 0) { spdm_socket_close(pci_dev->doe_spdm.spdm_socket, SPDM_SOCKET_TRANSPORT_TYPE_PCI_DOE); } =20 + if (n->spdm_socket > 0) { + spdm_socket_close(pci_dev->doe_spdm.spdm_socket, + SPDM_SOCKET_TRANSPORT_TYPE_NVME); + } + if (n->pmr.dev) { host_memory_backend_set_mapped(n->pmr.dev, false); } @@ -9297,6 +9332,7 @@ static const Property nvme_props[] =3D { false), DEFINE_PROP_UINT16("mqes", NvmeCtrl, params.mqes, 0x7ff), DEFINE_PROP_UINT16("spdm_port", PCIDevice, spdm_port, 0), + DEFINE_PROP_STRING("spdm_trans", PCIDevice, spdm_trans), DEFINE_PROP_BOOL("ctratt.mem", NvmeCtrl, params.ctratt.mem, false), DEFINE_PROP_BOOL("atomic.dn", NvmeCtrl, params.atomic_dn, 0), DEFINE_PROP_UINT16("atomic.awun", NvmeCtrl, params.atomic_awun, 0), @@ -9372,7 +9408,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) && + nvme_get_spdm_trans_type(dev) =3D=3D SPDM_SOCKET_TRANSPORT_TYPE_PC= I_DOE) { pcie_doe_write_config(&dev->doe_spdm, address, val, len); } pci_default_write_config(dev, address, val, len); @@ -9383,7 +9421,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) && + (nvme_get_spdm_trans_type(dev) =3D=3D SPDM_SOCKET_TRANSPORT_TYPE_P= CI_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..c98dc24001 100644 --- a/include/hw/pci/pci_device.h +++ b/include/hw/pci/pci_device.h @@ -166,6 +166,7 @@ struct PCIDevice { =20 /* SPDM */ uint16_t spdm_port; + char *spdm_trans; =20 /* DOE */ DOECap doe_spdm; --=20 2.51.0