From nobody Tue Dec 16 21:28:46 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