From nobody Tue Dec 16 13:27:26 2025 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 09CC51A262A for ; Tue, 2 Dec 2025 01:35:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764639314; cv=none; b=qNxeumoA8DLIM8zOUkakNOXrWseaHsCiAm99xR+YkSGq3xDGNx7xEU0kfrlhEsTYT44q3ByUfYL38kuk1ykP0EJIA1FZEmK/HtSDOyWbmm/e91DEFuYdlLcAsh/e1yIhAXgZ9OjGzHWUMCLzRFASIjy4nIAofBE2k0UArFhpofU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764639314; c=relaxed/simple; bh=hz26PoRu8wHYwcbPcNok7LEN/UGSvwxHbi/hTcXSdHQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z7mf7mQH/ck/0kHtpSH8wniXu0eFLX88MJ5yG8C21KSECen+O8rc3Ba7ohKsMWw7mqBGb+Rcmm5AI4J+5IzMloA2BHDeGqVKzZw1Ofkg6Gjr+dN8bzrTczpeOshUJf1b/Pz8RF00oWa5uKcmcTKdwydY2jFCWJeN3PjRHsKNGDg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HoupdSjY; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HoupdSjY" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-29ba9249e9dso55044525ad.3 for ; Mon, 01 Dec 2025 17:35:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764639311; x=1765244111; darn=vger.kernel.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=kJvJhfPbnFYn3z6Y3dZFBcvJzRxMfFMy2X3buPGIRvg=; b=HoupdSjY34A/0OGSK+LDiB+6uAdnqhnhI4PwoGBZgTss1LecFTun8Zb7XoUqt0Ltpn VPEPqt+3BS6SG2FwUko0H26XZRWQXSdiaTPgpLX4sDkx6CZkFI4os5shlYa2PRtpQH64 b5biBtE1x0k4W660KH16aC9LD3xnlpgoVhGyxcSZPtaDiz8wT63ADdXIIPbW4R6PZ0Ty l46QnvbZc5zwIF/mRpBBRHGEDAWddkevuyv5ihTgAmu9WQC4G2EXnzAjRsgB7IkSsojP KlX6b0rmRlgslWXn1hulNhVkn+mRvuDJGIm6gnCMDoImq0jqr1Qtvkj+LJpSc+X1V55g c0NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764639311; x=1765244111; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=kJvJhfPbnFYn3z6Y3dZFBcvJzRxMfFMy2X3buPGIRvg=; b=SY9pFKktWDXXqzyhDJvgck9J12fyRdl+nmupx3SQ15phUKqU8E6phXLHECOlTCV7GR IaByWolti7TWCcIx3FMLqIumxZdvbpSK5gmd8RQaiAfJlZ24smgNG5twW2+7SR2XuiWm zCt8h5CooMYQyjTKLM1y5PFpU9P/eMJCFcNb4mAfmB9J2P07rpma6X2B23Y4kNyAI+0l SFivJgh/FfDqbG2cgzCmLPaH92xLyZq7WZd4xw1zLTNKPpEk3PsVXWsYWuRhJJrxhKJ+ lUC+oINqlvgenpFYqzTB5B00aMf85FYXST6gJ9gzqwDXQgvf1bWildvMy9OcCBqISbSY atJg== X-Forwarded-Encrypted: i=1; AJvYcCVLGtsX+l6u3Smpauo4rnJAUeuV/Opkb51O0pN7hEXEBhozYRAcYGFFNRo5AqmO+dy8sNQkQfnd8HidBA0=@vger.kernel.org X-Gm-Message-State: AOJu0YzbYs7/9usxO8QOy2myxfWKffM9uksyz0kfXWATkgT8Ob8Hc8R9 Vv6krsWT6yQlT0Au7Vk9eVfZOPi9IyUSveyQRUrZZbCiV82oQlYP9t3Lh0FsrA== X-Gm-Gg: ASbGncsQ7dUni3Roen7hqO1FW50hlnXWtKX9BoKHbcEUt4Z4MSLITxz57TEQCfHDUwt IBYhJQRVXFyu/yEVW9rmNyXHXKn1tvrcwyS0IlenkiepUB7wZxgcJmCCATM3hoLUk0jQYeptxRf ar+7ovfLGUZKa6XidzaxPXBohdYByh8SAWgnWw+okrlVcb0Ytz98yqcP8cSfs4yHX7u+Vwtjyth D/ez+MOvQHnrqrnRctP9h/iJRA+bjA4Kw6Qj6hoC0fly6TsApQ2Befed46fXO+qJD+qIFLE6Ec3 tcSU81592TOCUr9fWczgf147olnmuUHMYvF1UU2appNqYDnuEjXhupEbmIyC3EAdCHxvRpx9dQq /B3fbhc0dnyh9VGn8aLTw4b5kR1w9Tv+T1Ba2RsFDA7A7OQYJwfXJFBr17yyYDin2IG6pDwaO1B D3jaZw7sVXWLXEomDLc6RYfnltQBXUxZnKWqpGno71uRDMlADpoim2GEB38E/T2kyGASCxNe8lO ck4qYWJx21IpO9NGJc= X-Google-Smtp-Source: AGHT+IH83tJaSf6G3Voz30gvV9am+rP5Je0+3DRGMgD/fBbFGdbiYM3LHkSvkNZ0vjcndHQPHyhM1A== X-Received: by 2002:a17:903:37cd:b0:29a:2d0:c1b5 with SMTP id d9443c01a7336-29b6c4fc395mr396760085ad.22.1764639311213; Mon, 01 Dec 2025 17:35:11 -0800 (PST) Received: from toolbx.alistair23.me (2403-580b-97e8-0-82ce-f179-8a79-69f4.ip6.aussiebb.net. [2403:580b:97e8:0:82ce:f179:8a79:69f4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29bceb54563sm132378575ad.89.2025.12.01.17.35.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 17:35:10 -0800 (PST) From: alistair23@gmail.com X-Google-Original-From: alistair.francis@wdc.com To: chuck.lever@oracle.com, hare@kernel.org, kernel-tls-handshake@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-nvme@lists.infradead.org, linux-nfs@vger.kernel.org Cc: kbusch@kernel.org, axboe@kernel.dk, hch@lst.de, sagi@grimberg.me, kch@nvidia.com, hare@suse.de, alistair23@gmail.com, Alistair Francis Subject: [PATCH v6 1/5] net/handshake: Store the key serial number on completion Date: Tue, 2 Dec 2025 11:34:25 +1000 Message-ID: <20251202013429.1199659-2-alistair.francis@wdc.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251202013429.1199659-1-alistair.francis@wdc.com> References: <20251202013429.1199659-1-alistair.francis@wdc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Alistair Francis Allow userspace to include a key serial number when completing a handshake with the HANDSHAKE_CMD_DONE command. We then store this serial number and will provide it back to userspace in the future. This allows userspace to save data to the keyring and then restore that data later. This will be used to support the TLS KeyUpdate operation, as now userspace can resume information about a established session. Signed-off-by: Alistair Francis Reviewed-by: Hannes Reincke Reviewed-by: Chuck Lever Reviewed-by: Sagi Grimberg --- v6: - Add the "ta_" and "th_" prefixs v5: - Change name to "handshake session ID" v4: - No change v3: - No change v2: - Change "key-serial" to "session-id" Documentation/netlink/specs/handshake.yaml | 4 ++++ Documentation/networking/tls-handshake.rst | 1 + drivers/nvme/host/tcp.c | 3 ++- drivers/nvme/target/tcp.c | 3 ++- include/net/handshake.h | 5 ++++- include/uapi/linux/handshake.h | 1 + net/handshake/genl.c | 5 +++-- net/handshake/tlshd.c | 15 +++++++++++++-- net/sunrpc/svcsock.c | 4 +++- net/sunrpc/xprtsock.c | 4 +++- 10 files changed, 36 insertions(+), 9 deletions(-) diff --git a/Documentation/netlink/specs/handshake.yaml b/Documentation/net= link/specs/handshake.yaml index 95c3fade7a8d..a273bc74d26f 100644 --- a/Documentation/netlink/specs/handshake.yaml +++ b/Documentation/netlink/specs/handshake.yaml @@ -87,6 +87,9 @@ attribute-sets: name: remote-auth type: u32 multi-attr: true + - + name: session-id + type: u32 =20 operations: list: @@ -123,6 +126,7 @@ operations: - status - sockfd - remote-auth + - session-id =20 mcast-groups: list: diff --git a/Documentation/networking/tls-handshake.rst b/Documentation/net= working/tls-handshake.rst index 6f5ea1646a47..c58b3c8b16c1 100644 --- a/Documentation/networking/tls-handshake.rst +++ b/Documentation/networking/tls-handshake.rst @@ -60,6 +60,7 @@ fills in a structure that contains the parameters of the = request: key_serial_t ta_my_privkey; unsigned int ta_num_peerids; key_serial_t ta_my_peerids[5]; + key_serial_t ta_handshake_session_id; }; =20 The @ta_sock field references an open and connected socket. The consumer diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 9058ea64b89c..024d02248831 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -1694,7 +1694,8 @@ static void nvme_tcp_set_queue_io_cpu(struct nvme_tcp= _queue *queue) qid, queue->io_cpu); } =20 -static void nvme_tcp_tls_done(void *data, int status, key_serial_t pskid) +static void nvme_tcp_tls_done(void *data, int status, key_serial_t pskid, + key_serial_t handshake_session_id) { struct nvme_tcp_queue *queue =3D data; struct nvme_tcp_ctrl *ctrl =3D queue->ctrl; diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index 470bf37e5a63..7f8516892359 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -1780,7 +1780,8 @@ static int nvmet_tcp_tls_key_lookup(struct nvmet_tcp_= queue *queue, } =20 static void nvmet_tcp_tls_handshake_done(void *data, int status, - key_serial_t peerid) + key_serial_t peerid, + key_serial_t handshake_session_id) { struct nvmet_tcp_queue *queue =3D data; =20 diff --git a/include/net/handshake.h b/include/net/handshake.h index 8ebd4f9ed26e..d9b2411d5523 100644 --- a/include/net/handshake.h +++ b/include/net/handshake.h @@ -15,10 +15,12 @@ enum { TLS_NO_PEERID =3D 0, TLS_NO_CERT =3D 0, TLS_NO_PRIVKEY =3D 0, + TLS_NO_SESSION_ID =3D 0, }; =20 typedef void (*tls_done_func_t)(void *data, int status, - key_serial_t peerid); + key_serial_t peerid, + key_serial_t handshake_session_id); =20 struct tls_handshake_args { struct socket *ta_sock; @@ -31,6 +33,7 @@ struct tls_handshake_args { key_serial_t ta_my_privkey; unsigned int ta_num_peerids; key_serial_t ta_my_peerids[5]; + key_serial_t ta_handshake_session_id; }; =20 int tls_client_hello_anon(const struct tls_handshake_args *args, gfp_t fla= gs); diff --git a/include/uapi/linux/handshake.h b/include/uapi/linux/handshake.h index 662e7de46c54..b68ffbaa5f31 100644 --- a/include/uapi/linux/handshake.h +++ b/include/uapi/linux/handshake.h @@ -55,6 +55,7 @@ enum { HANDSHAKE_A_DONE_STATUS =3D 1, HANDSHAKE_A_DONE_SOCKFD, HANDSHAKE_A_DONE_REMOTE_AUTH, + HANDSHAKE_A_DONE_SESSION_ID, =20 __HANDSHAKE_A_DONE_MAX, HANDSHAKE_A_DONE_MAX =3D (__HANDSHAKE_A_DONE_MAX - 1) diff --git a/net/handshake/genl.c b/net/handshake/genl.c index f55d14d7b726..6cdce7e5dbc0 100644 --- a/net/handshake/genl.c +++ b/net/handshake/genl.c @@ -16,10 +16,11 @@ static const struct nla_policy handshake_accept_nl_poli= cy[HANDSHAKE_A_ACCEPT_HAN }; =20 /* HANDSHAKE_CMD_DONE - do */ -static const struct nla_policy handshake_done_nl_policy[HANDSHAKE_A_DONE_R= EMOTE_AUTH + 1] =3D { +static const struct nla_policy handshake_done_nl_policy[HANDSHAKE_A_DONE_S= ESSION_ID + 1] =3D { [HANDSHAKE_A_DONE_STATUS] =3D { .type =3D NLA_U32, }, [HANDSHAKE_A_DONE_SOCKFD] =3D { .type =3D NLA_S32, }, [HANDSHAKE_A_DONE_REMOTE_AUTH] =3D { .type =3D NLA_U32, }, + [HANDSHAKE_A_DONE_SESSION_ID] =3D { .type =3D NLA_U32, }, }; =20 /* Ops table for handshake */ @@ -35,7 +36,7 @@ static const struct genl_split_ops handshake_nl_ops[] =3D= { .cmd =3D HANDSHAKE_CMD_DONE, .doit =3D handshake_nl_done_doit, .policy =3D handshake_done_nl_policy, - .maxattr =3D HANDSHAKE_A_DONE_REMOTE_AUTH, + .maxattr =3D HANDSHAKE_A_DONE_SESSION_ID, .flags =3D GENL_CMD_CAP_DO, }, }; diff --git a/net/handshake/tlshd.c b/net/handshake/tlshd.c index 8f9532a15f43..e72f45bdc226 100644 --- a/net/handshake/tlshd.c +++ b/net/handshake/tlshd.c @@ -26,7 +26,8 @@ =20 struct tls_handshake_req { void (*th_consumer_done)(void *data, int status, - key_serial_t peerid); + key_serial_t peerid, + key_serial_t handshake_session_id); void *th_consumer_data; =20 int th_type; @@ -39,6 +40,8 @@ struct tls_handshake_req { =20 unsigned int th_num_peerids; key_serial_t th_peerid[5]; + + key_serial_t th_handshake_session_id; }; =20 static struct tls_handshake_req * @@ -55,6 +58,7 @@ tls_handshake_req_init(struct handshake_req *req, treq->th_num_peerids =3D 0; treq->th_certificate =3D TLS_NO_CERT; treq->th_privkey =3D TLS_NO_PRIVKEY; + treq->th_handshake_session_id =3D TLS_NO_SESSION_ID; return treq; } =20 @@ -83,6 +87,13 @@ static void tls_handshake_remote_peerids(struct tls_hand= shake_req *treq, if (i >=3D treq->th_num_peerids) break; } + + nla_for_each_attr(nla, head, len, rem) { + if (nla_type(nla) =3D=3D HANDSHAKE_A_DONE_SESSION_ID) { + treq->th_handshake_session_id =3D nla_get_u32(nla); + break; + } + } } =20 /** @@ -105,7 +116,7 @@ static void tls_handshake_done(struct handshake_req *re= q, set_bit(HANDSHAKE_F_REQ_SESSION, &req->hr_flags); =20 treq->th_consumer_done(treq->th_consumer_data, -status, - treq->th_peerid[0]); + treq->th_peerid[0], treq->th_handshake_session_id); } =20 #if IS_ENABLED(CONFIG_KEYS) diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 7b90abc5cf0e..2401b4c757f6 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -444,13 +444,15 @@ static void svc_tcp_kill_temp_xprt(struct svc_xprt *x= prt) * @data: address of xprt to wake * @status: status of handshake * @peerid: serial number of key containing the remote peer's identity + * @handshake_session_id: serial number of the userspace session ID * * If a security policy is specified as an export option, we don't * have a specific export here to check. So we set a "TLS session * is present" flag on the xprt and let an upper layer enforce local * security policy. */ -static void svc_tcp_handshake_done(void *data, int status, key_serial_t pe= erid) +static void svc_tcp_handshake_done(void *data, int status, key_serial_t pe= erid, + key_serial_t handshake_session_id) { struct svc_xprt *xprt =3D data; struct svc_sock *svsk =3D container_of(xprt, struct svc_sock, sk_xprt); diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 3aa987e7f072..5c6e7543f293 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -2589,9 +2589,11 @@ static int xs_tcp_tls_finish_connecting(struct rpc_x= prt *lower_xprt, * @data: address of xprt to wake * @status: status of handshake * @peerid: serial number of key containing the remote's identity + * @handshake_session_id: serial number of the userspace session ID * */ -static void xs_tls_handshake_done(void *data, int status, key_serial_t pee= rid) +static void xs_tls_handshake_done(void *data, int status, key_serial_t pee= rid, + key_serial_t handshake_session_id) { struct rpc_xprt *lower_xprt =3D data; struct sock_xprt *lower_transport =3D --=20 2.51.1 From nobody Tue Dec 16 13:27:26 2025 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E89B221F1C for ; Tue, 2 Dec 2025 01:35:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764639319; cv=none; b=js1hKVeVw0MzXGKGH3K9IeT6OxMRbFsk5DuNr+q5a69JmWDiSKzFl6mseYBAup3wKC0XAcUEzBEdpSQ4en8x7eo/ylw/JbSwO7AYBJTVZGJb8fCmDh5n/pGpnaBXEsfFeqLPcRlnCrjAI6TmthbAqStgjap5oWAV6EgUkf9wn4k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764639319; c=relaxed/simple; bh=vxpkGccNVOzZnxnGt+XxGTh2tk/X17iKXQnOD/cPnrU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JyUE9Ulb33hDqIRqLmqzIcGoXl/LD/SeDeWqQH3Bw2VDJX+u4ok9khDYCUMQnVrjPEap7QU1Qg5y3ZDVSOVX/Wz+nlkqoectW5yFW+VIr4Q31rLmx0GzsW2mrC2v8uLqWFk6lNNziui497oMDPLvzERCeFWEfrqsh4/nT9PsulQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=c2rEX/vB; arc=none smtp.client-ip=209.85.215.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="c2rEX/vB" Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-bbf2c3eccc9so2319117a12.0 for ; Mon, 01 Dec 2025 17:35:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764639317; x=1765244117; darn=vger.kernel.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=czIyAwG2XcUYBMND32our9jihcE3M72DjVQfcH7wVb4=; b=c2rEX/vB0yOkHxxHbXx/PQluwv8O5A6DKW+Tzr4JM7ySrR5wuOWafV+VFh//D5AzEb SNm6r5Zy38jGGqXsqvxh/ByS+bFnZX3HXUl3RB/LER2Ybwc8ds7JI9x7brveA46+dDBv cOBmDCErqF9704Xx6PkYkk8U0qTmS3SClttUujfLmnSr4e+PlH8V/GfwKzDNwC3/JB4M rCxlVswlq0cSUblTQMxrlaelaXGH9aK/Z9oHy1PXKjK2IziPlG2kEsX/5ldkPMAwRUgX E72bV88i3bbYlOyVXDIED+hBggFm1zSLL7CxYpqU7FneUuYq1StucDqqXXiOcDJVINnm 9wgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764639317; x=1765244117; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=czIyAwG2XcUYBMND32our9jihcE3M72DjVQfcH7wVb4=; b=i6GBkVBH7UJmO8kwQX3txm+wcks6655e+bLxlLYk+9wGsffeXwl1mS1FObKcNruD+7 w6dcmjoM2af00a+bmnHNo6GPmQIO9mAq4QH4DNn3rbyBa1Yx4sy4B4jT96I4IIYBfiRG srAe6kaKnXJpEh9zFVFWCa/bgZ7VE6lkfDLfubFZmCLj6EGjLVMEGF46PFfVDFsvRL/q v0v5jwRVk0GNhSV/2QmSRStDmrhLR28R26c/NfL5yzWdKDxcGWslhXj/nOQ+n7MbDjnQ 6cQ6w7MVHlDz/vO0J66qtCrK8zKxAzbt5t0R5anfPLqIHtDnCMtG+UzzSgzpkxsuCoyC pOCw== X-Forwarded-Encrypted: i=1; AJvYcCUFWT7bJ5XUTCZKbmw6JafLTaHtWPxW93bMakvBba8FpD3hoEbJpLLtl6yXjzrLlm3V9+sdFKELH7BvyEE=@vger.kernel.org X-Gm-Message-State: AOJu0YyNWzglSp8vDDkzvhSjuumnS0tr+HndYjLOrCM7UEIpPAUZ67eq e5kzthCX+zfgUuSIrx1asnNtVojl2/ZSWi+d/5snwrpZ4Jge4KLefJ/f X-Gm-Gg: ASbGnctJCDFGlaWyyS99pA6D7o3UY749PwTQdwMtT8yIfG7uruzHEXezintfQFxsa01 r91ym402Ng5cY283gf1eoSG7GFbL03j26e8MYkFWpWMamIvQF/4CQwPiWiDOj7nWl6ua4J/tmt2 DQZ2BpmxoxY99/eWcFBRCOsR+H0LSPZRffXwl9sERt5JfZWWE3zsZoUaO9XpaXvdMZ5LjURSr/3 qh/eaL22nrpIdBU7m52CKmRWD2F306/anxSlFj5cEqjEE3Xxj5Q9dWpoGPy57SA65UJitEYC16z BWeSSV8Qud7XxaLKcQqtRt6y5Li3ueb9Rdn83AnayK57CrD6U2DFWOXOujAQl9sDkFFKAActTFT 4jIEbcSyMgB73DtP3JpFmat9gZdyL+vWfEVojw5LQZE7tSAGJqiyWi10jfs6VgNDWltjKFAAXdw tS4HKYWjWr0lQ/9IobZCOAeGSn0MPzGFng9xljo5vi7hd4Iv/8L05ZuE/c2Cl4f6RV3rozqvDCG HnBO6KdcCBq8dn5PuE= X-Google-Smtp-Source: AGHT+IEg+/N743oXcIq0ciRB44SxAmj3ck5rf7L8gATspDeLcAoYxScp44MI8ISyD4Zq0PaY2ptvmA== X-Received: by 2002:a17:903:1b03:b0:295:5da6:5ff7 with SMTP id d9443c01a7336-29d5a5379f5mr8003195ad.15.1764639317177; Mon, 01 Dec 2025 17:35:17 -0800 (PST) Received: from toolbx.alistair23.me (2403-580b-97e8-0-82ce-f179-8a79-69f4.ip6.aussiebb.net. [2403:580b:97e8:0:82ce:f179:8a79:69f4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29bceb54563sm132378575ad.89.2025.12.01.17.35.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 17:35:16 -0800 (PST) From: alistair23@gmail.com X-Google-Original-From: alistair.francis@wdc.com To: chuck.lever@oracle.com, hare@kernel.org, kernel-tls-handshake@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-nvme@lists.infradead.org, linux-nfs@vger.kernel.org Cc: kbusch@kernel.org, axboe@kernel.dk, hch@lst.de, sagi@grimberg.me, kch@nvidia.com, hare@suse.de, alistair23@gmail.com, Alistair Francis Subject: [PATCH v6 2/5] net/handshake: Define handshake_req_keyupdate Date: Tue, 2 Dec 2025 11:34:26 +1000 Message-ID: <20251202013429.1199659-3-alistair.francis@wdc.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251202013429.1199659-1-alistair.francis@wdc.com> References: <20251202013429.1199659-1-alistair.francis@wdc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Alistair Francis Add a new handshake_req_keyupdate() function which is similar to the existing handshake_req_submit(). The new handshake_req_keyupdate() does not add the request to the hash table (unlike handshake_req_submit()) but instead uses the existing request from the initial handshake. During the initial handshake handshake_req_submit() will add the request to the hash table. The request will not be removed from the hash table unless the socket is closed (reference count hits zero). After the initial handshake handshake_req_keyupdate() can be used to re-use the existing request in the hash table to trigger a KeyUpdate with userspace. Signed-off-by: Alistair Francis Reviewed-by: Hannes Reinecke --- v6: - New patch net/handshake/handshake.h | 2 + net/handshake/request.c | 95 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) diff --git a/net/handshake/handshake.h b/net/handshake/handshake.h index a48163765a7a..04feacd1e21d 100644 --- a/net/handshake/handshake.h +++ b/net/handshake/handshake.h @@ -84,6 +84,8 @@ void handshake_req_hash_destroy(void); void *handshake_req_private(struct handshake_req *req); struct handshake_req *handshake_req_hash_lookup(struct sock *sk); struct handshake_req *handshake_req_next(struct handshake_net *hn, int cla= ss); +int handshake_req_keyupdate(struct socket *sock, struct handshake_req *req, + gfp_t flags); int handshake_req_submit(struct socket *sock, struct handshake_req *req, gfp_t flags); void handshake_complete(struct handshake_req *req, unsigned int status, diff --git a/net/handshake/request.c b/net/handshake/request.c index 274d2c89b6b2..916caab88fe0 100644 --- a/net/handshake/request.c +++ b/net/handshake/request.c @@ -196,6 +196,101 @@ struct handshake_req *handshake_req_next(struct hands= hake_net *hn, int class) } EXPORT_SYMBOL_IF_KUNIT(handshake_req_next); =20 +/** + * handshake_req_keyupdate - Submit a KeyUpdate request + * @sock: open socket on which to perform the handshake + * @req: handshake arguments, this must already be allocated and exist + * in the hash table, which happens as part of handshake_req_submit() + * @flags: memory allocation flags + * + * Return values: + * %0: Request queued + * %-EINVAL: Invalid argument + * %-EBUSY: A handshake is already under way for this socket + * %-ESRCH: No handshake agent is available + * %-EAGAIN: Too many pending handshake requests + * %-ENOMEM: Failed to allocate memory + * %-EMSGSIZE: Failed to construct notification message + * %-EOPNOTSUPP: Handshake module not initialized + * + * A zero return value from handshake_req_submit() means that + * exactly one subsequent completion callback is guaranteed. + * + * A negative return value from handshake_req_submit() means that + * no completion callback will be done and that @req has been + * destroyed. + */ +int handshake_req_keyupdate(struct socket *sock, struct handshake_req *req, + gfp_t flags) +{ + struct handshake_net *hn; + struct net *net; + struct handshake_req *req_lookup; + int ret; + + if (!sock || !req || !sock->file) { + kfree(req); + return -EINVAL; + } + + req->hr_sk =3D sock->sk; + if (!req->hr_sk) { + kfree(req); + return -EINVAL; + } + req->hr_odestruct =3D req->hr_sk->sk_destruct; + req->hr_sk->sk_destruct =3D handshake_sk_destruct; + + ret =3D -EOPNOTSUPP; + net =3D sock_net(req->hr_sk); + hn =3D handshake_pernet(net); + if (!hn) + goto out_err; + + ret =3D -EAGAIN; + if (READ_ONCE(hn->hn_pending) >=3D hn->hn_pending_max) + goto out_err; + + spin_lock(&hn->hn_lock); + ret =3D -EOPNOTSUPP; + if (test_bit(HANDSHAKE_F_NET_DRAINING, &hn->hn_flags)) + goto out_unlock; + ret =3D -EBUSY; + + req_lookup =3D handshake_req_hash_lookup(sock->sk); + if (!req_lookup) + goto out_unlock; + + if (req_lookup !=3D req) + goto out_unlock; + if (!__add_pending_locked(hn, req)) + goto out_unlock; + spin_unlock(&hn->hn_lock); + + test_and_clear_bit(HANDSHAKE_F_REQ_COMPLETED, &req->hr_flags); + + ret =3D handshake_genl_notify(net, req->hr_proto, flags); + if (ret) { + trace_handshake_notify_err(net, req, req->hr_sk, ret); + if (remove_pending(hn, req)) + goto out_err; + } + + /* Prevent socket release while a handshake request is pending */ + sock_hold(req->hr_sk); + + trace_handshake_submit(net, req, req->hr_sk); + return 0; + +out_unlock: + spin_unlock(&hn->hn_lock); +out_err: + trace_handshake_submit_err(net, req, req->hr_sk, ret); + handshake_req_destroy(req); + return ret; +} +EXPORT_SYMBOL(handshake_req_keyupdate); + /** * handshake_req_submit - Submit a handshake request * @sock: open socket on which to perform the handshake --=20 2.51.1 From nobody Tue Dec 16 13:27:26 2025 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3AB8A22A4F4 for ; Tue, 2 Dec 2025 01:35:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764639326; cv=none; b=ECwi/bmyYvjbo5ffnX9Rn2AjW8f7cQrd8PFZ5gdDFxa3lKxPalkOIVJ78nJvLb5hCmkYWTPnHdYTdRsxd5h/mmG+UJJVhIUd8M63lCZ6EQxt+E/7Unc3BTk4Bpg6KkJk+mjNfbQmqBiBeErOMunQjjej19jzamWWGCNFZJJX35E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764639326; c=relaxed/simple; bh=Zg3WpvdVXm8ReZvjlQh5KjsX1yld92twpvjTMRAlaiA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YkJpOJq6Dhd2mcUztr3b0TJiEu+QY6ke7IwAmjWu5L8R01ICZi3tImwhqEH6Dla0b1i5eNETE965kSfU6U7rfSfE3CI6FutkCF07YkaTdV6fHJDkcpP+Dkx+qF94gugyTe0xuxqM5LZD/DvQ18OSq0MePWh7vfLS1z4HftUkb1U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=SEeqdNNH; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SEeqdNNH" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2980d9b7df5so58219325ad.3 for ; Mon, 01 Dec 2025 17:35:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764639323; x=1765244123; darn=vger.kernel.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=PkjdAHbsDFraRTlWyzh+N5LfJw+3oSTMhbqSeszwN7I=; b=SEeqdNNHXLIA7WOwZKKs/1Qj/D6ADxdZSIdhoNI588dgz4Dc0tGLiDbi7WAhaBEnb3 VfZl00z9Vs9dv30YzYWPyAmvm/rzKo/WbTZiEqJWyyafo8r9zuOoyS/0nr8fA3C7YpNM ZsFOf3RLmtwBOvLsnLUqbLT+Z/luMtSXMgFEYwSnFxUFo5j0fHWccMf3kifl5Ld2eyto SFKUfJJL4o+ASnvxkbi+5maw7NH163SCm9rX1bSKyWPto75I4VopRMgIxWUCu9IUKQfq lpm23LETsLbItEvoy5t1NLv6XQplzfnEHHnOR8QEblpDkAv+CHZ4FGDf1b4+zuCpz8T6 ArTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764639323; x=1765244123; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=PkjdAHbsDFraRTlWyzh+N5LfJw+3oSTMhbqSeszwN7I=; b=E9WRvYS2XBlk0Jfy71SLZVvwnroklhODEj02dZ2aVO93oWBONTVam/eNw2tsbcMNMr IeFLk+952ml/EWZE9iVGWY5UfHPd+59y0hAWEIQLsviXQ9kAuCbcApCPKqkEa4t0i7Zr Yp6t+z6j6sffBTqXGhrlOIcgdlezalLb2HffeTlSR0Ky/7Z8mJWHd5ZaU7Kc3QL4Nju/ xv8gt7+B7BpIRgwO5KiSBE3qq48b/xDmTaittuNTfczKhd4DEF0zxqmQU3sZAQCuLmJ2 VlKOufKKmDJMY3z0esYcvNLwiJ5DmHCUUaSUaxVAQqz1md27ou+4gSBPOswoMFJWxe2d Lkew== X-Forwarded-Encrypted: i=1; AJvYcCVbOA5XOUXgr4fnJ78YzLBOjw2r4Wtq1eFRUXAYoKbi/egq82gTeRxoFpmqk/zztK1+ChT9m9G32h/Zo1w=@vger.kernel.org X-Gm-Message-State: AOJu0YyCLK0BdQFzYrdOBeknMxY73VPnKtUt1QlLGooig0OfGE2NHAaH z1QBq41vRidR3Er5N3fDWZCxR0yvRXH7G91GrPClnFNrJTJWrYzI7sHz X-Gm-Gg: ASbGncsD0pH3LW6cEcxK4gaigTdkVRKv5zIMRid5WYoatJcbi/rqVInWmp7kyxxu1pq d+1a6LiisUBFQuVaivDmgpipRq90edqZxWAn2Om3o7GeEKKn9lLnMQ+f8UtXKZU2UVKISTM3zSY Z415gshhH1k6sh8W3W1x1cD7Gez5P+pM1VOnFbM097FiHO+/75Ysytq/xl9gVwakFQD41lavl0d kF0Acv8bryPiq9RkZAMIgGLCdFABMjXV8x5DTpY1SB1xrpd2D5fMgTK603YtoAjV2Vv6ne5oMTS ulzi6sEiV9t9DfedcIQ2Mka/E6Hks+pVnxv+o8tzyGxsXw86LWIZ4hypb947fjEyLq2l8yVKWPN EGKxEeEX+BR4ec89nL+z/vs1uFkZuUhjXz+nqd1F7QcK4LknePI7nSdbWyyS8TaFp9hWPF1Dy+b Px7+YkttGHEpYT0JnKSfKgZWy/TOFY/TDvMCdmbIO3YjJcT/VKLJ2bUkZh6VhN04FlHB2PpWwL5 NMv+j22iCyXa2ztCso= X-Google-Smtp-Source: AGHT+IE5hpf0B0tRrD3IJGSdevmhYDVDqHRJGb4vHo48RimN7HVmj0qDCGQ77PvktZ3De1OJGgWuYA== X-Received: by 2002:a17:902:dac7:b0:296:1beb:6776 with SMTP id d9443c01a7336-29b6bf9232dmr434914535ad.58.1764639323286; Mon, 01 Dec 2025 17:35:23 -0800 (PST) Received: from toolbx.alistair23.me (2403-580b-97e8-0-82ce-f179-8a79-69f4.ip6.aussiebb.net. [2403:580b:97e8:0:82ce:f179:8a79:69f4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29bceb54563sm132378575ad.89.2025.12.01.17.35.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 17:35:22 -0800 (PST) From: alistair23@gmail.com X-Google-Original-From: alistair.francis@wdc.com To: chuck.lever@oracle.com, hare@kernel.org, kernel-tls-handshake@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-nvme@lists.infradead.org, linux-nfs@vger.kernel.org Cc: kbusch@kernel.org, axboe@kernel.dk, hch@lst.de, sagi@grimberg.me, kch@nvidia.com, hare@suse.de, alistair23@gmail.com, Alistair Francis Subject: [PATCH v6 3/5] net/handshake: Support KeyUpdate message types Date: Tue, 2 Dec 2025 11:34:27 +1000 Message-ID: <20251202013429.1199659-4-alistair.francis@wdc.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251202013429.1199659-1-alistair.francis@wdc.com> References: <20251202013429.1199659-1-alistair.francis@wdc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Alistair Francis When reporting the msg-type to userspace let's also support reporting KeyUpdate events. This supports reporting a client/server event and if the other side requested a KeyUpdateRequest. Link: https://datatracker.ietf.org/doc/html/rfc8446#section-4.6.3 Signed-off-by: Alistair Francis Reviewed-by: Chuck Lever Reviewed-by: Hannes Reinecke --- v6: - Init th_key_update_request field to 0 v5: - Drop clientkeyupdaterequest and serverkeyupdaterequest v4: - Don't overload existing functions, instead create new ones v3: - Fixup yamllint and kernel-doc failures Documentation/netlink/specs/handshake.yaml | 16 ++++- drivers/nvme/host/tcp.c | 15 +++- drivers/nvme/target/tcp.c | 10 ++- include/net/handshake.h | 6 ++ include/uapi/linux/handshake.h | 11 +++ net/handshake/tlshd.c | 84 +++++++++++++++++++++- 6 files changed, 134 insertions(+), 8 deletions(-) diff --git a/Documentation/netlink/specs/handshake.yaml b/Documentation/net= link/specs/handshake.yaml index a273bc74d26f..2f77216c8ddf 100644 --- a/Documentation/netlink/specs/handshake.yaml +++ b/Documentation/netlink/specs/handshake.yaml @@ -21,12 +21,18 @@ definitions: type: enum name: msg-type value-start: 0 - entries: [unspec, clienthello, serverhello] + entries: [unspec, clienthello, serverhello, clientkeyupdate, + serverkeyupdate] - type: enum name: auth value-start: 0 entries: [unspec, unauth, psk, x509] + - + type: enum + name: key-update-type + value-start: 0 + entries: [unspec, send, received, received_request_update] =20 attribute-sets: - @@ -74,6 +80,13 @@ attribute-sets: - name: keyring type: u32 + - + name: key-update-request + type: u32 + enum: key-update-type + - + name: session-id + type: u32 - name: done attributes: @@ -116,6 +129,7 @@ operations: - certificate - peername - keyring + - session-id - name: done doc: Handler reports handshake completion diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 024d02248831..4797a4532b0d 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -20,6 +20,7 @@ #include #include #include +#include =20 #include "nvme.h" #include "fabrics.h" @@ -206,6 +207,10 @@ static struct workqueue_struct *nvme_tcp_wq; static const struct blk_mq_ops nvme_tcp_mq_ops; static const struct blk_mq_ops nvme_tcp_admin_mq_ops; static int nvme_tcp_try_send(struct nvme_tcp_queue *queue); +static int nvme_tcp_start_tls(struct nvme_ctrl *nctrl, + struct nvme_tcp_queue *queue, + key_serial_t pskid, + enum handshake_key_update_type keyupdate); =20 static inline struct nvme_tcp_ctrl *to_tcp_ctrl(struct nvme_ctrl *ctrl) { @@ -1729,7 +1734,8 @@ static void nvme_tcp_tls_done(void *data, int status,= key_serial_t pskid, =20 static int nvme_tcp_start_tls(struct nvme_ctrl *nctrl, struct nvme_tcp_queue *queue, - key_serial_t pskid) + key_serial_t pskid, + enum handshake_key_update_type keyupdate) { int qid =3D nvme_tcp_queue_id(queue); int ret; @@ -1751,7 +1757,10 @@ static int nvme_tcp_start_tls(struct nvme_ctrl *nctr= l, args.ta_timeout_ms =3D tls_handshake_timeout * 1000; queue->tls_err =3D -EOPNOTSUPP; init_completion(&queue->tls_complete); - ret =3D tls_client_hello_psk(&args, GFP_KERNEL); + if (keyupdate =3D=3D HANDSHAKE_KEY_UPDATE_TYPE_UNSPEC) + ret =3D tls_client_hello_psk(&args, GFP_KERNEL); + else + ret =3D tls_client_keyupdate_psk(&args, GFP_KERNEL, keyupdate); if (ret) { dev_err(nctrl->device, "queue %d: failed to start TLS: %d\n", qid, ret); @@ -1901,7 +1910,7 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nct= rl, int qid, =20 /* If PSKs are configured try to start TLS */ if (nvme_tcp_tls_configured(nctrl) && pskid) { - ret =3D nvme_tcp_start_tls(nctrl, queue, pskid); + ret =3D nvme_tcp_start_tls(nctrl, queue, pskid, HANDSHAKE_KEY_UPDATE_TYP= E_UNSPEC); if (ret) goto err_init_connect; } diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index 7f8516892359..818efdeccef1 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -1833,7 +1833,8 @@ static void nvmet_tcp_tls_handshake_timeout(struct wo= rk_struct *w) kref_put(&queue->kref, nvmet_tcp_release_queue); } =20 -static int nvmet_tcp_tls_handshake(struct nvmet_tcp_queue *queue) +static int nvmet_tcp_tls_handshake(struct nvmet_tcp_queue *queue, + enum handshake_key_update_type keyupdate) { int ret =3D -EOPNOTSUPP; struct tls_handshake_args args; @@ -1852,7 +1853,10 @@ static int nvmet_tcp_tls_handshake(struct nvmet_tcp_= queue *queue) args.ta_keyring =3D key_serial(queue->port->nport->keyring); args.ta_timeout_ms =3D tls_handshake_timeout * 1000; =20 - ret =3D tls_server_hello_psk(&args, GFP_KERNEL); + if (keyupdate =3D=3D HANDSHAKE_KEY_UPDATE_TYPE_UNSPEC) + ret =3D tls_server_hello_psk(&args, GFP_KERNEL); + else + ret =3D tls_server_keyupdate_psk(&args, GFP_KERNEL, keyupdate); if (ret) { kref_put(&queue->kref, nvmet_tcp_release_queue); pr_err("failed to start TLS, err=3D%d\n", ret); @@ -1934,7 +1938,7 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_po= rt *port, sk->sk_data_ready =3D port->data_ready; write_unlock_bh(&sk->sk_callback_lock); if (!nvmet_tcp_try_peek_pdu(queue)) { - if (!nvmet_tcp_tls_handshake(queue)) + if (!nvmet_tcp_tls_handshake(queue, HANDSHAKE_KEY_UPDATE_TYPE_UNSPEC)) return; /* TLS handshake failed, terminate the connection */ goto out_destroy_sq; diff --git a/include/net/handshake.h b/include/net/handshake.h index d9b2411d5523..54fb101202d2 100644 --- a/include/net/handshake.h +++ b/include/net/handshake.h @@ -10,6 +10,8 @@ #ifndef _NET_HANDSHAKE_H #define _NET_HANDSHAKE_H =20 +#include + enum { TLS_NO_KEYRING =3D 0, TLS_NO_PEERID =3D 0, @@ -39,8 +41,12 @@ struct tls_handshake_args { int tls_client_hello_anon(const struct tls_handshake_args *args, gfp_t fla= gs); int tls_client_hello_x509(const struct tls_handshake_args *args, gfp_t fla= gs); int tls_client_hello_psk(const struct tls_handshake_args *args, gfp_t flag= s); +int tls_client_keyupdate_psk(const struct tls_handshake_args *args, gfp_t = flags, + enum handshake_key_update_type keyupdate); int tls_server_hello_x509(const struct tls_handshake_args *args, gfp_t fla= gs); int tls_server_hello_psk(const struct tls_handshake_args *args, gfp_t flag= s); +int tls_server_keyupdate_psk(const struct tls_handshake_args *args, gfp_t = flags, + enum handshake_key_update_type keyupdate); =20 bool tls_handshake_cancel(struct sock *sk); void tls_handshake_close(struct socket *sock); diff --git a/include/uapi/linux/handshake.h b/include/uapi/linux/handshake.h index b68ffbaa5f31..483815a064f0 100644 --- a/include/uapi/linux/handshake.h +++ b/include/uapi/linux/handshake.h @@ -19,6 +19,8 @@ enum handshake_msg_type { HANDSHAKE_MSG_TYPE_UNSPEC, HANDSHAKE_MSG_TYPE_CLIENTHELLO, HANDSHAKE_MSG_TYPE_SERVERHELLO, + HANDSHAKE_MSG_TYPE_CLIENTKEYUPDATE, + HANDSHAKE_MSG_TYPE_SERVERKEYUPDATE, }; =20 enum handshake_auth { @@ -28,6 +30,13 @@ enum handshake_auth { HANDSHAKE_AUTH_X509, }; =20 +enum handshake_key_update_type { + HANDSHAKE_KEY_UPDATE_TYPE_UNSPEC, + HANDSHAKE_KEY_UPDATE_TYPE_SEND, + HANDSHAKE_KEY_UPDATE_TYPE_RECEIVED, + HANDSHAKE_KEY_UPDATE_TYPE_RECEIVED_REQUEST_UPDATE, +}; + enum { HANDSHAKE_A_X509_CERT =3D 1, HANDSHAKE_A_X509_PRIVKEY, @@ -46,6 +55,8 @@ enum { HANDSHAKE_A_ACCEPT_CERTIFICATE, HANDSHAKE_A_ACCEPT_PEERNAME, HANDSHAKE_A_ACCEPT_KEYRING, + HANDSHAKE_A_ACCEPT_KEY_UPDATE_REQUEST, + HANDSHAKE_A_ACCEPT_SESSION_ID, =20 __HANDSHAKE_A_ACCEPT_MAX, HANDSHAKE_A_ACCEPT_MAX =3D (__HANDSHAKE_A_ACCEPT_MAX - 1) diff --git a/net/handshake/tlshd.c b/net/handshake/tlshd.c index e72f45bdc226..d102211e9d77 100644 --- a/net/handshake/tlshd.c +++ b/net/handshake/tlshd.c @@ -41,6 +41,7 @@ struct tls_handshake_req { unsigned int th_num_peerids; key_serial_t th_peerid[5]; =20 + unsigned int th_key_update_request; key_serial_t th_handshake_session_id; }; =20 @@ -58,7 +59,9 @@ tls_handshake_req_init(struct handshake_req *req, treq->th_num_peerids =3D 0; treq->th_certificate =3D TLS_NO_CERT; treq->th_privkey =3D TLS_NO_PRIVKEY; - treq->th_handshake_session_id =3D TLS_NO_SESSION_ID; + treq->th_key_update_request =3D 0; + treq->th_handshake_session_id =3D args->ta_handshake_session_id; + return treq; } =20 @@ -265,6 +268,16 @@ static int tls_handshake_accept(struct handshake_req *= req, break; } =20 + ret =3D nla_put_u32(msg, HANDSHAKE_A_ACCEPT_SESSION_ID, + treq->th_handshake_session_id); + if (ret < 0) + goto out_cancel; + + ret =3D nla_put_u32(msg, HANDSHAKE_A_ACCEPT_KEY_UPDATE_REQUEST, + treq->th_key_update_request); + if (ret < 0) + goto out_cancel; + genlmsg_end(msg, hdr); return genlmsg_reply(msg, info); =20 @@ -373,6 +386,44 @@ int tls_client_hello_psk(const struct tls_handshake_ar= gs *args, gfp_t flags) } EXPORT_SYMBOL(tls_client_hello_psk); =20 +/** + * tls_client_keyupdate_psk - request a PSK-based TLS handshake on a socket + * @args: socket and handshake parameters for this request + * @flags: memory allocation control flags + * @keyupdate: specifies the type of KeyUpdate operation + * + * Return values: + * %0: Handshake request enqueue; ->done will be called when complete + * %-EINVAL: Wrong number of local peer IDs + * %-ESRCH: No user agent is available + * %-ENOMEM: Memory allocation failed + */ +int tls_client_keyupdate_psk(const struct tls_handshake_args *args, gfp_t = flags, + enum handshake_key_update_type keyupdate) +{ + struct tls_handshake_req *treq; + struct handshake_req *req; + unsigned int i; + + if (!args->ta_num_peerids || + args->ta_num_peerids > ARRAY_SIZE(treq->th_peerid)) + return -EINVAL; + + req =3D handshake_req_hash_lookup(args->ta_sock->sk); + if (!req) + return -ENOMEM; + treq =3D tls_handshake_req_init(req, args); + treq->th_type =3D HANDSHAKE_MSG_TYPE_CLIENTKEYUPDATE; + treq->th_key_update_request =3D keyupdate; + treq->th_auth_mode =3D HANDSHAKE_AUTH_PSK; + treq->th_num_peerids =3D args->ta_num_peerids; + for (i =3D 0; i < args->ta_num_peerids; i++) + treq->th_peerid[i] =3D args->ta_my_peerids[i]; + + return handshake_req_keyupdate(args->ta_sock, req, flags); +} +EXPORT_SYMBOL(tls_client_keyupdate_psk); + /** * tls_server_hello_x509 - request a server TLS handshake on a socket * @args: socket and handshake parameters for this request @@ -429,6 +480,37 @@ int tls_server_hello_psk(const struct tls_handshake_ar= gs *args, gfp_t flags) } EXPORT_SYMBOL(tls_server_hello_psk); =20 +/** + * tls_server_keyupdate_psk - request a server TLS KeyUpdate on a socket + * @args: socket and handshake parameters for this request + * @flags: memory allocation control flags + * @keyupdate: specifies the type of KeyUpdate operation + * + * Return values: + * %0: Handshake request enqueue; ->done will be called when complete + * %-ESRCH: No user agent is available + * %-ENOMEM: Memory allocation failed + */ +int tls_server_keyupdate_psk(const struct tls_handshake_args *args, gfp_t = flags, + enum handshake_key_update_type keyupdate) +{ + struct tls_handshake_req *treq; + struct handshake_req *req; + + req =3D handshake_req_hash_lookup(args->ta_sock->sk); + if (!req) + return -ENOMEM; + treq =3D tls_handshake_req_init(req, args); + treq->th_type =3D HANDSHAKE_MSG_TYPE_SERVERKEYUPDATE; + treq->th_key_update_request =3D keyupdate; + treq->th_auth_mode =3D HANDSHAKE_AUTH_PSK; + treq->th_num_peerids =3D 1; + treq->th_peerid[0] =3D args->ta_my_peerids[0]; + + return handshake_req_keyupdate(args->ta_sock, req, flags); +} +EXPORT_SYMBOL(tls_server_keyupdate_psk); + /** * tls_handshake_cancel - cancel a pending handshake * @sk: socket on which there is an ongoing handshake --=20 2.51.1 From nobody Tue Dec 16 13:27:26 2025 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5948323AB98 for ; Tue, 2 Dec 2025 01:35:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764639332; cv=none; b=i/J/yBakZYReruGGGzxLl8WZTnD0Ljzlrtbj2BMvHUO4ai1Cvf/lmEjKkTGobrHy1rDf12h8l5rMnSV/QtQpSmeQsnQ6OpJmAXX0315nYG4OstSJ18E3QHQexZH7vgP8Pop1li14865BGviOflSRn5Tt7vD+jo6c+Iluisnc1MM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764639332; c=relaxed/simple; bh=RUtCX8CP3W/yuDQ/ZW/ZJRJEJWXpd/A/PFm0/jER/wQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jLG46k+e9SuhKzX5NovrJuEx1M7hmz+ZVHikaSrHmdjidIAv5tvdIggHxAP/g/1WEMrgY2shg9UAs6x+V8L2EgqxuKsjZpl5C0YbMbDFJXqjECYuMPOrsA98DEuvdkF+3lu74ptjO8u/izkl/RVBHVvuneh6ItEv9ghJPBwiPuc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=NqR8s5jE; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NqR8s5jE" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2957850c63bso36207675ad.0 for ; Mon, 01 Dec 2025 17:35:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764639329; x=1765244129; darn=vger.kernel.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=alrcnF8hffQyqVii+35fGG8FiEZV1WdxKAf95IBHMhY=; b=NqR8s5jEztxYwuc0E7kXEy/Vfefn7i/ZsNniBNvBNGX9Cg3cKzL4Ot0B+IPNkFrLPO rxQjVGOdb3xVlE0PpSBu45Yjr34pvbUiaE5bRRmsdZpoadefanYEEBMBhr5FrELOhWbG omwO4NzJpWxdcujzNa9HaBiqLlq+ztJAV+CJdG7LP/JfisTjC+Bjn1E24AmNjjwOAElS 3E3L1USIAm+sQuDxIhhJVgwqti72jxJnXd0dwUReqrQ6MRpa9TVPkuu3JL+ZPc9eFhgT pN+tJ1O5ev8RIPr6IMhmhF/01ImVTNSMw9XRoCPajRfJkArnaF53zHN6L44FfhWQWU/8 bMIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764639329; x=1765244129; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=alrcnF8hffQyqVii+35fGG8FiEZV1WdxKAf95IBHMhY=; b=mcqJwhbFz0SYZ+wAPhStFIFiQrD3TC+HTrL9RdDZRgbNXv2g+D4W9sZUs5lOQwpXU7 TwQfvN0M80imcm0trYJmVs2ZrCPqz5hAjVpK5BfignAODkHZDhqeinoBMpmFUQPZLpQF USZ7hmOvEu+XbytMCdxs4FdUq8uthsD6KyKrQ03X76SJNpfdbOumc9Ayoxp1sWr/DEV+ OsaLnmeQ4ZoPOCUxIv9ymxdfIQ/wPOXzUlPXtcfwa6jb0wF3rybrkk0lACEy3KHCFEEm AfZfwmsnULoMMO7dMn8P722LjoCD+ZjkgDtbVM2+fGPHmza9GBja2ibFoSZfLn8bpQwa In2w== X-Forwarded-Encrypted: i=1; AJvYcCUX4j7zThwopi/0gkjg6JewGdbS/NpIWlW4DPLHdHHjhaeAi2+rOPyLmF/9sZC+efiiwbJWhoKEWf6dg3k=@vger.kernel.org X-Gm-Message-State: AOJu0YyO6prLt1/o8P7A5mbNea//SYZoEcAbPYRkHyp4uzkD/uptkXEK KivIOdGfTXHggKNg4w4j0XVRid1MxOCgqgcrfaH78MDbWL5Ad3fjZZvk X-Gm-Gg: ASbGncsgOmRWZzJVPYe/8jbhtw7pWEbSLWi4O+vVDsUaM7g+RhgmWx5y9N/AgIYcnwk M3stLibMuZ3LN5O4KVqsa8sw1Yip6lF7kDKcDjEIcY8amL9QsB4npmu/prBpTOiRtS3ANEqLM+W mYT8viaBAa0HKzICZyjCprbkzAt/YMtVAHUJLuJbKOH1mq/gtgcOftMMBDcZENmYf0F9tqQlmaU ar2p0Cl5OakajbbFrIv1PqU3D8NtEvSf24GzB7ZKj44bxxI7LEyxxna3rja7VKRcw0CidOEciuv IFiOQGxkLwfZtGKDFp4hrIoUcmDUPS+x29sXiqgCm3rmOjEEuurAFgTsbE6P0O4iTp9ick2Rcsg irSPDmPCO14PIWxTjtRgy6DaOZIuf1xki82zwIm+axijH6/ce3+5Sca1bbBh/tf8kriuEa8uVpr DnY7fFD1DiTrc1ycUq61LyMJ+uNHFYz2LzQLwxEsAetvA2h3xqOdoXGuu1Yte7ezLnv7fSkcjCQ ZlqXfsLWfjOI3Gy/p4= X-Google-Smtp-Source: AGHT+IHdYVOCmmOlbphB1W7UrAZ5O3XT23PE61UI8Mwhm5s9BH8EvESHLmAwNWu7QZRIDDb2agOulw== X-Received: by 2002:a17:902:f786:b0:298:88:c006 with SMTP id d9443c01a7336-29d5a48b3afmr8809815ad.4.1764639329398; Mon, 01 Dec 2025 17:35:29 -0800 (PST) Received: from toolbx.alistair23.me (2403-580b-97e8-0-82ce-f179-8a79-69f4.ip6.aussiebb.net. [2403:580b:97e8:0:82ce:f179:8a79:69f4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29bceb54563sm132378575ad.89.2025.12.01.17.35.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 17:35:28 -0800 (PST) From: alistair23@gmail.com X-Google-Original-From: alistair.francis@wdc.com To: chuck.lever@oracle.com, hare@kernel.org, kernel-tls-handshake@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-nvme@lists.infradead.org, linux-nfs@vger.kernel.org Cc: kbusch@kernel.org, axboe@kernel.dk, hch@lst.de, sagi@grimberg.me, kch@nvidia.com, hare@suse.de, alistair23@gmail.com, Alistair Francis Subject: [PATCH v6 4/5] nvme-tcp: Support KeyUpdate Date: Tue, 2 Dec 2025 11:34:28 +1000 Message-ID: <20251202013429.1199659-5-alistair.francis@wdc.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251202013429.1199659-1-alistair.francis@wdc.com> References: <20251202013429.1199659-1-alistair.francis@wdc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Alistair Francis If the nvme_tcp_try_send() or nvme_tcp_try_recv() functions return EKEYEXPIRED then the underlying TLS keys need to be updated. This occurs on an KeyUpdate event as described in RFC8446 https://datatracker.ietf.org/doc/html/rfc8446#section-4.6.3. If the NVMe Target (TLS server) initiates a KeyUpdate this patch will allow the NVMe layer to process the KeyUpdate request and forward the request to userspace. Userspace must then update the key to keep the connection alive. This patch allows us to handle the NVMe target sending a KeyUpdate request without aborting the connection. At this time we don't support initiating a KeyUpdate. Based-on: 2cbe1350-0bf5-4487-be33-1d317cb73acf@suse.de Signed-off-by: Alistair Francis Reviewed-by: Hannes Reinecke Reviewed-by: Christoph Hellwig --- v6: - Don't use `struct nvme_tcp_hdr` to determine TLS_HANDSHAKE_KEYUPDATE, instead look at the cmsg fields. - Don't flush async_event_work v5: - Cleanup code flow - Check for MSG_CTRUNC in the msg_flags return from recvmsg and use that to determine if it's a control message v4: - Remove all support for initiating KeyUpdate - Don't call cancel_work() when updating keys v3: - Don't cancel existing handshake requests v2: - Don't change the state - Use a helper function for KeyUpdates - Continue sending in nvme_tcp_send_all() after a KeyUpdate - Remove command message using recvmsg drivers/nvme/host/tcp.c | 93 +++++++++++++++++++++++++++++++++-------- 1 file changed, 75 insertions(+), 18 deletions(-) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 4797a4532b0d..c0966929f97b 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -172,6 +172,7 @@ struct nvme_tcp_queue { bool tls_enabled; u32 rcv_crc; u32 snd_crc; + key_serial_t handshake_session_id; __le32 exp_ddgst; __le32 recv_ddgst; struct completion tls_complete; @@ -858,7 +859,10 @@ static void nvme_tcp_handle_c2h_term(struct nvme_tcp_q= ueue *queue, static int nvme_tcp_recvmsg_pdu(struct nvme_tcp_queue *queue) { char *pdu =3D queue->pdu; + char cbuf[CMSG_LEN(sizeof(char))] =3D {}; struct msghdr msg =3D { + .msg_control =3D cbuf, + .msg_controllen =3D sizeof(cbuf), .msg_flags =3D MSG_DONTWAIT, }; struct kvec iov =3D { @@ -873,6 +877,12 @@ static int nvme_tcp_recvmsg_pdu(struct nvme_tcp_queue = *queue) if (ret <=3D 0) return ret; =20 + if (cbuf[CMSG_LEN(sizeof(char)) - 1] =3D=3D TLS_RECORD_TYPE_HANDSHAKE && + pdu[queue->pdu_offset] =3D=3D TLS_HANDSHAKE_KEYUPDATE) { + dev_err(queue->ctrl->ctrl.device, "KeyUpdate message\n"); + return 1; + } + queue->pdu_remaining -=3D ret; queue->pdu_offset +=3D ret; if (queue->pdu_remaining) @@ -944,14 +954,14 @@ static int nvme_tcp_recvmsg_data(struct nvme_tcp_queu= e *queue) struct request *rq =3D nvme_cid_to_rq(nvme_tcp_tagset(queue), pdu->command_id); struct nvme_tcp_request *req =3D blk_mq_rq_to_pdu(rq); + char cbuf[CMSG_LEN(sizeof(char))] =3D {}; + struct msghdr msg; + int ret; =20 if (nvme_tcp_recv_state(queue) !=3D NVME_TCP_RECV_DATA) return 0; =20 while (queue->data_remaining) { - struct msghdr msg; - int ret; - if (!iov_iter_count(&req->iter)) { req->curr_bio =3D req->curr_bio->bi_next; =20 @@ -975,11 +985,8 @@ static int nvme_tcp_recvmsg_data(struct nvme_tcp_queue= *queue) msg.msg_flags =3D MSG_DONTWAIT; =20 ret =3D sock_recvmsg(queue->sock, &msg, msg.msg_flags); - if (ret < 0) { - dev_err(queue->ctrl->ctrl.device, - "queue %d failed to receive request %#x data", - nvme_tcp_queue_id(queue), rq->tag); - return ret; + if (unlikely(ret < 0)) { + goto msg_control; } if (queue->data_digest) nvme_tcp_ddgst_calc(req, &queue->rcv_crc, ret); @@ -1002,6 +1009,29 @@ static int nvme_tcp_recvmsg_data(struct nvme_tcp_que= ue *queue) } } =20 + return 0; + +msg_control: + /* + * If MSG_CTRUNC is set, it's a control message, + * so let's read the control message. + */ + if (msg.msg_flags & MSG_CTRUNC) { + memset(&msg, 0, sizeof(msg)); + msg.msg_flags =3D MSG_DONTWAIT; + msg.msg_control =3D cbuf; + msg.msg_controllen =3D sizeof(cbuf); + + ret =3D sock_recvmsg(queue->sock, &msg, msg.msg_flags); + } + + if (ret < 0) { + dev_err(queue->ctrl->ctrl.device, + "queue %d failed to receive request %#x data, %d", + nvme_tcp_queue_id(queue), rq->tag, ret); + return ret; + } + return 0; } =20 @@ -1384,15 +1414,37 @@ static int nvme_tcp_try_recvmsg(struct nvme_tcp_que= ue *queue) } } while (result >=3D 0); =20 - if (result < 0 && result !=3D -EAGAIN) { - dev_err(queue->ctrl->ctrl.device, - "receive failed: %d\n", result); - queue->rd_enabled =3D false; - nvme_tcp_error_recovery(&queue->ctrl->ctrl); - } else if (result =3D=3D -EAGAIN) - result =3D 0; + if (result < 0) { + if (result !=3D -EKEYEXPIRED && result !=3D -EAGAIN) { + dev_err(queue->ctrl->ctrl.device, + "receive failed: %d\n", result); + queue->rd_enabled =3D false; + nvme_tcp_error_recovery(&queue->ctrl->ctrl); + } + return result; + } =20 - return result < 0 ? result : (queue->nr_cqe =3D nr_cqe); + queue->nr_cqe =3D nr_cqe; + return nr_cqe; +} + +static void update_tls_keys(struct nvme_tcp_queue *queue) +{ + int qid =3D nvme_tcp_queue_id(queue); + int ret; + + dev_dbg(queue->ctrl->ctrl.device, + "updating key for queue %d\n", qid); + + ret =3D nvme_tcp_start_tls(&(queue->ctrl->ctrl), + queue, queue->ctrl->ctrl.tls_pskid, + HANDSHAKE_KEY_UPDATE_TYPE_RECEIVED); + + if (ret < 0) { + dev_err(queue->ctrl->ctrl.device, + "failed to update the keys %d\n", ret); + nvme_tcp_fail_request(queue->request); + } } =20 static void nvme_tcp_io_work(struct work_struct *w) @@ -1417,8 +1469,11 @@ static void nvme_tcp_io_work(struct work_struct *w) result =3D nvme_tcp_try_recvmsg(queue); if (result > 0) pending =3D true; - else if (unlikely(result < 0)) - return; + else if (unlikely(result < 0)) { + if (result =3D=3D -EKEYEXPIRED) + update_tls_keys(queue); + break; + } =20 /* did we get some space after spending time in recv? */ if (nvme_tcp_queue_has_pending(queue) && @@ -1726,6 +1781,7 @@ static void nvme_tcp_tls_done(void *data, int status,= key_serial_t pskid, ctrl->ctrl.tls_pskid =3D key_serial(tls_key); key_put(tls_key); queue->tls_err =3D 0; + queue->handshake_session_id =3D handshake_session_id; } =20 out_complete: @@ -1755,6 +1811,7 @@ static int nvme_tcp_start_tls(struct nvme_ctrl *nctrl, keyring =3D key_serial(nctrl->opts->keyring); args.ta_keyring =3D keyring; args.ta_timeout_ms =3D tls_handshake_timeout * 1000; + args.ta_handshake_session_id =3D queue->handshake_session_id; queue->tls_err =3D -EOPNOTSUPP; init_completion(&queue->tls_complete); if (keyupdate =3D=3D HANDSHAKE_KEY_UPDATE_TYPE_UNSPEC) --=20 2.51.1 From nobody Tue Dec 16 13:27:26 2025 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0CFB32153D3 for ; Tue, 2 Dec 2025 01:35:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764639338; cv=none; b=Phbs5tV+WCvwl83E/uJLvQPzhWyj/Q9OCll29+o9pQ8yvqWEpvoK2wIWQma1xj7CxOCiIxvDfc4wG42yGVG8+HQ+QHFMK1Mz2b/2vKy5k6GvCKz9eGWyAnCYWgV/nBF6VKUGABpcP4KjNE6QbBEZy1zyq313HIKqrA7G4N6MboQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764639338; c=relaxed/simple; bh=aX4b/dtOJbU7+H1rQfMiZQtLMAdUZ1mamd1Fipz5Mhc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OIFZ1qhaZz1ACYQSxm0SurnFk8vpxgmRH0Nrw8mtH4hDiJBVYBU9o5byvj91OXDsv+1IQP1Y8zZcMS8gyKkjujCDn1Id9ESGafcoJbOj2XAwBKG8q7CT0b3QryNaYn+DRndXxc0Q8ttkoL+eoVKHkT6PhxPZOjPgk3uh5y7eVGI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=QVQJ0xCV; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QVQJ0xCV" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2955623e6faso53872485ad.1 for ; Mon, 01 Dec 2025 17:35:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764639335; x=1765244135; darn=vger.kernel.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=P/I0auzUVkVcxbH70BIVYr6yUr92WLMw+xrjecYcacA=; b=QVQJ0xCVxeIp4RsWB3gy57tU3EvfGIUOpHBKVZE9Uujn4wc2Lx34NMCm166iFJV04R hGNTWmYqpuQG0KfJ4sTfRw22jPJyONeMvbmldMn2LUqI5RVSHKs0HU50Gq4lMbHejlp0 zMIf8znfHfFwRtjLxZFM0Oxm7ajZUpA9DOAFEiT7fRDHtB9m9+bJw+YhitK2mbN5pMsb x8bd449toAq7D13nCbPirUHwmRiY7RKgjVC9u2eYWzgNafN13gvu9/e/UIap5ecFn2NG grPF3Ob973ZB1S0bPPIe5Z+GzAlVzPqr8/9+jmAKJ0dow/KdYGWMKC7EtyBk/dOtH8qv 0GkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764639335; x=1765244135; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=P/I0auzUVkVcxbH70BIVYr6yUr92WLMw+xrjecYcacA=; b=n3Ok2796k5o0pZveYrMhiccJQSM9H/ujMRp14C5Y7pNQRuXqp9dokuJkjt0Q4edTkh TT28yHTwKEEdH5Zjrf9Im9QFAbKZ0rPer9+lU9ubUbQjFm9JqhHgrbuHk/zSMeN+hjOC mcFRhUZarMTWEMc+AOyw+Dmj0kHRu1F40h+W3Ih+C6aDUEcIQa3N/E96CytEQSO4+Q24 +MmZCs10LQp/dkSMaS3MRzy121/QuJHakv//PQGJi+jr4lMFXr/MlDB+MLJ95maTpUfB lK432cMTzjLoAPcTS9VKYrGWtrFh2vnhiezBKMln74rOLGsx4pQCjuSmF2Bs0ChuIKQd ye7Q== X-Forwarded-Encrypted: i=1; AJvYcCVxokyUCEMmRkB/ihzNvcRx/CyJXeaTjf6tchVNmoWvX+6fjQMmh36yNLBdMhsCBle+XK9RHkdQ1usC0LE=@vger.kernel.org X-Gm-Message-State: AOJu0YwAIXiGS54vBYzX6/YBv9Mv+/txb142rY2bBLBO4vYpy2sCVM5F 1H3PzJMELMDFKUYe7Woalj9lKH0ewKMNFGBxBvALz6FIxbAd5NqcA0C8 X-Gm-Gg: ASbGncsTAErQKiDE7sq6Z6MDScBgTYM5DKz0aMsm6kawDLy1jUDDk8JMy53Yp6U5ttu VnRUkswRnUdPtEFZaSy8rIn3a8epmaPBsNA7NaDFSDc8zSJxL43cQhyCwIP8rY0DZ+tScl9sHNJ A59mLTHfMsr7KpKPETOagfGZqv7gqLeYRwEAPlVWqRmmKyDpN5Xwxa/NvNzqorwOLRhy0nt+m7I R3cEZi0KPzD8jHzDK4cceyLfUqxE0qvrD+7ATZJT8DalfDqtNSo22lPTf/L6CmobswFzzhLlmNb YEsrYowiLh1mfhOVma/UxMItj+3Pu1Q+g4bG9Bhfp0r1+m+Ipl4+2zr8totRpcAoaJvX6zIk67n irimgkO88pgNA7BO8mqBVmSSjl2/ayHmdyR69a+KJOcg4TpEWFh9s6H5559ZYZjc9CROcxiOmjP pi7nmsZOcRT2PNlL+kRBC0qCRBnzCaFvpQoAhwOJE+TLjzCoLyR2VhOy4dz82B/BPYckywzv+Qu fEmeA0zmev915gAkL8= X-Google-Smtp-Source: AGHT+IGQK/nb9FASk2chWpg9Ni/OJR5AgPXn3/ZK8ZXqfQ8nOYrkMVsl+JxFYgH88N7Fd3k6akiHDQ== X-Received: by 2002:a17:903:1670:b0:295:3ad7:948a with SMTP id d9443c01a7336-29baaf9a961mr298440265ad.16.1764639335372; Mon, 01 Dec 2025 17:35:35 -0800 (PST) Received: from toolbx.alistair23.me (2403-580b-97e8-0-82ce-f179-8a79-69f4.ip6.aussiebb.net. [2403:580b:97e8:0:82ce:f179:8a79:69f4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29bceb54563sm132378575ad.89.2025.12.01.17.35.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 17:35:34 -0800 (PST) From: alistair23@gmail.com X-Google-Original-From: alistair.francis@wdc.com To: chuck.lever@oracle.com, hare@kernel.org, kernel-tls-handshake@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-nvme@lists.infradead.org, linux-nfs@vger.kernel.org Cc: kbusch@kernel.org, axboe@kernel.dk, hch@lst.de, sagi@grimberg.me, kch@nvidia.com, hare@suse.de, alistair23@gmail.com, Alistair Francis Subject: [PATCH v6 5/5] nvmet-tcp: Support KeyUpdate Date: Tue, 2 Dec 2025 11:34:29 +1000 Message-ID: <20251202013429.1199659-6-alistair.francis@wdc.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251202013429.1199659-1-alistair.francis@wdc.com> References: <20251202013429.1199659-1-alistair.francis@wdc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Alistair Francis If the nvmet_tcp_try_recv() function return EKEYEXPIRED or if we receive a KeyUpdate handshake type then the underlying TLS keys need to be updated. If the NVMe Host (TLS client) initiates a KeyUpdate this patch will allow the NVMe layer to process the KeyUpdate request and forward the request to userspace. Userspace must then update the key to keep the connection alive. This patch allows us to handle the NVMe host sending a KeyUpdate request without aborting the connection. At this time we don't support initiating a KeyUpdate. Link: https://datatracker.ietf.org/doc/html/rfc8446#section-4.6.3 Signed-off-by: Alistair Francis Reviewed-by: Hannes Reinecke Reviewed-by: Christoph Hellwig --- v6: - Simplify the nvmet_tls_key_expired() check v5: - No change v4: - Restructure code to avoid #ifdefs and forward declarations - Use a helper function for checking -EKEYEXPIRED - Remove all support for initiating KeyUpdate - Use helper function for restoring callbacks v3: - Use a write lock for sk_user_data - Fix build with CONFIG_NVME_TARGET_TCP_TLS disabled - Remove unused variable v2: - Use a helper function for KeyUpdates - Ensure keep alive timer is stopped - Wait for TLS KeyUpdate to complete drivers/nvme/target/tcp.c | 200 ++++++++++++++++++++++++++------------ 1 file changed, 139 insertions(+), 61 deletions(-) diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index 818efdeccef1..0458a9691cbc 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -175,6 +175,7 @@ struct nvmet_tcp_queue { =20 /* TLS state */ key_serial_t tls_pskid; + key_serial_t handshake_session_id; struct delayed_work tls_handshake_tmo_work; =20 unsigned long poll_end; @@ -186,6 +187,8 @@ struct nvmet_tcp_queue { struct sockaddr_storage sockaddr_peer; struct work_struct release_work; =20 + struct completion tls_complete; + int idx; struct list_head queue_list; =20 @@ -214,6 +217,10 @@ static struct workqueue_struct *nvmet_tcp_wq; static const struct nvmet_fabrics_ops nvmet_tcp_ops; static void nvmet_tcp_free_cmd(struct nvmet_tcp_cmd *c); static void nvmet_tcp_free_cmd_buffers(struct nvmet_tcp_cmd *cmd); +#ifdef CONFIG_NVME_TARGET_TCP_TLS +static int nvmet_tcp_tls_handshake(struct nvmet_tcp_queue *queue, + enum handshake_key_update_type keyupdate); +#endif =20 static inline u16 nvmet_tcp_cmd_tag(struct nvmet_tcp_queue *queue, struct nvmet_tcp_cmd *cmd) @@ -832,6 +839,20 @@ static int nvmet_tcp_try_send_one(struct nvmet_tcp_que= ue *queue, return 1; } =20 +#ifdef CONFIG_NVME_TARGET_TCP_TLS +static bool nvmet_tls_key_expired(struct nvmet_tcp_queue *queue, int ret) +{ + return ret =3D=3D -EKEYEXPIRED && + queue->state !=3D NVMET_TCP_Q_DISCONNECTING && + queue->state !=3D NVMET_TCP_Q_TLS_HANDSHAKE; +} +#else +static bool nvmet_tls_key_expired(struct nvmet_tcp_queue *queue, int ret) +{ + return false; +} +#endif + static int nvmet_tcp_try_send(struct nvmet_tcp_queue *queue, int budget, int *sends) { @@ -1106,6 +1127,103 @@ static inline bool nvmet_tcp_pdu_valid(u8 type) return false; } =20 +static void nvmet_tcp_release_queue(struct kref *kref) +{ + struct nvmet_tcp_queue *queue =3D + container_of(kref, struct nvmet_tcp_queue, kref); + + WARN_ON(queue->state !=3D NVMET_TCP_Q_DISCONNECTING); + queue_work(nvmet_wq, &queue->release_work); +} + +static void nvmet_tcp_schedule_release_queue(struct nvmet_tcp_queue *queue) +{ + spin_lock_bh(&queue->state_lock); + if (queue->state =3D=3D NVMET_TCP_Q_TLS_HANDSHAKE) { + /* Socket closed during handshake */ + tls_handshake_cancel(queue->sock->sk); + } + if (queue->state !=3D NVMET_TCP_Q_DISCONNECTING) { + queue->state =3D NVMET_TCP_Q_DISCONNECTING; + kref_put(&queue->kref, nvmet_tcp_release_queue); + } + spin_unlock_bh(&queue->state_lock); +} + +static void nvmet_tcp_restore_socket_callbacks(struct nvmet_tcp_queue *que= ue) +{ + struct socket *sock =3D queue->sock; + + if (!queue->state_change) + return; + + write_lock_bh(&sock->sk->sk_callback_lock); + sock->sk->sk_data_ready =3D queue->data_ready; + sock->sk->sk_state_change =3D queue->state_change; + sock->sk->sk_write_space =3D queue->write_space; + sock->sk->sk_user_data =3D NULL; + write_unlock_bh(&sock->sk->sk_callback_lock); +} + +#ifdef CONFIG_NVME_TARGET_TCP_TLS +static void nvmet_tcp_tls_handshake_timeout(struct work_struct *w) +{ + struct nvmet_tcp_queue *queue =3D container_of(to_delayed_work(w), + struct nvmet_tcp_queue, tls_handshake_tmo_work); + + pr_warn("queue %d: TLS handshake timeout\n", queue->idx); + /* + * If tls_handshake_cancel() fails we've lost the race with + * nvmet_tcp_tls_handshake_done() */ + if (!tls_handshake_cancel(queue->sock->sk)) + return; + spin_lock_bh(&queue->state_lock); + if (WARN_ON(queue->state !=3D NVMET_TCP_Q_TLS_HANDSHAKE)) { + spin_unlock_bh(&queue->state_lock); + return; + } + queue->state =3D NVMET_TCP_Q_FAILED; + spin_unlock_bh(&queue->state_lock); + nvmet_tcp_schedule_release_queue(queue); + kref_put(&queue->kref, nvmet_tcp_release_queue); +} + +static int update_tls_keys(struct nvmet_tcp_queue *queue) +{ + int ret; + + cancel_work(&queue->io_work); + queue->state =3D NVMET_TCP_Q_TLS_HANDSHAKE; + + nvmet_tcp_restore_socket_callbacks(queue); + + INIT_DELAYED_WORK(&queue->tls_handshake_tmo_work, + nvmet_tcp_tls_handshake_timeout); + + ret =3D nvmet_tcp_tls_handshake(queue, HANDSHAKE_KEY_UPDATE_TYPE_RECEIVED= ); + + if (ret < 0) + return ret; + + ret =3D wait_for_completion_interruptible_timeout(&queue->tls_complete, + 10 * HZ); + + if (ret <=3D 0) { + tls_handshake_cancel(queue->sock->sk); + return ret; + } + + queue->state =3D NVMET_TCP_Q_LIVE; + + return 0; +} +#else +static int update_tls_keys(struct nvmet_tcp_queue *queue) +{ + return -EPFNOSUPPORT; +} +#endif + static int nvmet_tcp_tls_record_ok(struct nvmet_tcp_queue *queue, struct msghdr *msg, char *cbuf) { @@ -1131,6 +1249,9 @@ static int nvmet_tcp_tls_record_ok(struct nvmet_tcp_q= ueue *queue, ret =3D -EAGAIN; } break; + case TLS_RECORD_TYPE_HANDSHAKE: + ret =3D -EAGAIN; + break; default: /* discard this record type */ pr_err("queue %d: TLS record %d unhandled\n", @@ -1340,6 +1461,8 @@ static int nvmet_tcp_try_recv(struct nvmet_tcp_queue = *queue, for (i =3D 0; i < budget; i++) { ret =3D nvmet_tcp_try_recv_one(queue); if (unlikely(ret < 0)) { + if (nvmet_tls_key_expired(queue, ret)) + goto done; nvmet_tcp_socket_error(queue, ret); goto done; } else if (ret =3D=3D 0) { @@ -1351,29 +1474,6 @@ static int nvmet_tcp_try_recv(struct nvmet_tcp_queue= *queue, return ret; } =20 -static void nvmet_tcp_release_queue(struct kref *kref) -{ - struct nvmet_tcp_queue *queue =3D - container_of(kref, struct nvmet_tcp_queue, kref); - - WARN_ON(queue->state !=3D NVMET_TCP_Q_DISCONNECTING); - queue_work(nvmet_wq, &queue->release_work); -} - -static void nvmet_tcp_schedule_release_queue(struct nvmet_tcp_queue *queue) -{ - spin_lock_bh(&queue->state_lock); - if (queue->state =3D=3D NVMET_TCP_Q_TLS_HANDSHAKE) { - /* Socket closed during handshake */ - tls_handshake_cancel(queue->sock->sk); - } - if (queue->state !=3D NVMET_TCP_Q_DISCONNECTING) { - queue->state =3D NVMET_TCP_Q_DISCONNECTING; - kref_put(&queue->kref, nvmet_tcp_release_queue); - } - spin_unlock_bh(&queue->state_lock); -} - static inline void nvmet_tcp_arm_queue_deadline(struct nvmet_tcp_queue *qu= eue) { queue->poll_end =3D jiffies + usecs_to_jiffies(idle_poll_period_usecs); @@ -1404,8 +1504,12 @@ static void nvmet_tcp_io_work(struct work_struct *w) ret =3D nvmet_tcp_try_recv(queue, NVMET_TCP_RECV_BUDGET, &ops); if (ret > 0) pending =3D true; - else if (ret < 0) + else if (ret < 0) { + if (ret =3D=3D -EKEYEXPIRED) + break; + return; + } =20 ret =3D nvmet_tcp_try_send(queue, NVMET_TCP_SEND_BUDGET, &ops); if (ret > 0) @@ -1415,6 +1519,11 @@ static void nvmet_tcp_io_work(struct work_struct *w) =20 } while (pending && ops < NVMET_TCP_IO_WORK_BUDGET); =20 + if (ret =3D=3D -EKEYEXPIRED) { + update_tls_keys(queue); + pending =3D true; + } + /* * Requeue the worker if idle deadline period is in progress or any * ops activity was recorded during the do-while loop above. @@ -1517,21 +1626,6 @@ static void nvmet_tcp_free_cmds(struct nvmet_tcp_que= ue *queue) kfree(cmds); } =20 -static void nvmet_tcp_restore_socket_callbacks(struct nvmet_tcp_queue *que= ue) -{ - struct socket *sock =3D queue->sock; - - if (!queue->state_change) - return; - - write_lock_bh(&sock->sk->sk_callback_lock); - sock->sk->sk_data_ready =3D queue->data_ready; - sock->sk->sk_state_change =3D queue->state_change; - sock->sk->sk_write_space =3D queue->write_space; - sock->sk->sk_user_data =3D NULL; - write_unlock_bh(&sock->sk->sk_callback_lock); -} - static void nvmet_tcp_uninit_data_in_cmds(struct nvmet_tcp_queue *queue) { struct nvmet_tcp_cmd *cmd =3D queue->cmds; @@ -1794,6 +1888,7 @@ static void nvmet_tcp_tls_handshake_done(void *data, = int status, } if (!status) { queue->tls_pskid =3D peerid; + queue->handshake_session_id =3D handshake_session_id; queue->state =3D NVMET_TCP_Q_CONNECTING; } else queue->state =3D NVMET_TCP_Q_FAILED; @@ -1809,28 +1904,7 @@ static void nvmet_tcp_tls_handshake_done(void *data,= int status, else nvmet_tcp_set_queue_sock(queue); kref_put(&queue->kref, nvmet_tcp_release_queue); -} - -static void nvmet_tcp_tls_handshake_timeout(struct work_struct *w) -{ - struct nvmet_tcp_queue *queue =3D container_of(to_delayed_work(w), - struct nvmet_tcp_queue, tls_handshake_tmo_work); - - pr_warn("queue %d: TLS handshake timeout\n", queue->idx); - /* - * If tls_handshake_cancel() fails we've lost the race with - * nvmet_tcp_tls_handshake_done() */ - if (!tls_handshake_cancel(queue->sock->sk)) - return; - spin_lock_bh(&queue->state_lock); - if (WARN_ON(queue->state !=3D NVMET_TCP_Q_TLS_HANDSHAKE)) { - spin_unlock_bh(&queue->state_lock); - return; - } - queue->state =3D NVMET_TCP_Q_FAILED; - spin_unlock_bh(&queue->state_lock); - nvmet_tcp_schedule_release_queue(queue); - kref_put(&queue->kref, nvmet_tcp_release_queue); + complete(&queue->tls_complete); } =20 static int nvmet_tcp_tls_handshake(struct nvmet_tcp_queue *queue, @@ -1852,11 +1926,15 @@ static int nvmet_tcp_tls_handshake(struct nvmet_tcp= _queue *queue, args.ta_data =3D queue; args.ta_keyring =3D key_serial(queue->port->nport->keyring); args.ta_timeout_ms =3D tls_handshake_timeout * 1000; + args.ta_handshake_session_id =3D queue->handshake_session_id; + + init_completion(&queue->tls_complete); =20 if (keyupdate =3D=3D HANDSHAKE_KEY_UPDATE_TYPE_UNSPEC) ret =3D tls_server_hello_psk(&args, GFP_KERNEL); else ret =3D tls_server_keyupdate_psk(&args, GFP_KERNEL, keyupdate); + if (ret) { kref_put(&queue->kref, nvmet_tcp_release_queue); pr_err("failed to start TLS, err=3D%d\n", ret); --=20 2.51.1