From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 D06F63B5846 for ; Wed, 27 May 2026 13:47:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779889640; cv=none; b=eCZlAqWsP34vBmclErNWcN5QKW9jOkYiVuGXlaWapHmpB0PEZN9kdQ4Dvkoi9QJ8PfIHCR7L1GT2wr8R9/z10PlWMcdj2iXN5ScvCIqrmNu7f+kxu4APnXsK69ap16FXmmJl3ND59ZVbdOJ7TK1abCvMYYzwx4rmiOX4u+Fihvg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779889640; c=relaxed/simple; bh=xVL/CdwtFPiF0DkU62pK4uyM+NLeHRycoyexVb8tF7s=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=ZFB5oHTPFSjRj9lKDasEcQ2Deiq8Uz3pIwPmkxJRQv8+iSjnO2HKnFalGpEYUaZacwKiMFUlGeH1fTBvKawHIcWQ74g53JyTqG40f/yRq/N9L0PCm6nBHPT1CaCoo1vySombvVLYReCZ+e5oKW4ZvqLX+JCliSziHFcf8gp6dko= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=NMbx2UvT; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=bsTcGt/R; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=cWFktdgV; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=X5JYzyGD; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="NMbx2UvT"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="bsTcGt/R"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="cWFktdgV"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="X5JYzyGD" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id EFFAA678DB; Wed, 27 May 2026 13:47:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1779889637; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yhRH8G6+EsA/W9fSxr5C2XFKrvx1155gwm4IxMdIpBc=; b=NMbx2UvT/9Fy2igZOMhrUdotzXY/EyG3y0hjkfUW/qFUaEcKO402CKfdmPBb3sjb4HrLUJ DHlEpcrkOA0HF9cQew4YNUYeOutsUmcORFw0an1y1u/8Z1A9EjgtWt/ZosIRDoawr/DxBn JWwGnqNgrpbeCiPSYn6UNrcf6KYmi1A= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1779889637; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yhRH8G6+EsA/W9fSxr5C2XFKrvx1155gwm4IxMdIpBc=; b=bsTcGt/R5ssj4uR6GkzTt0LTkIjQCThe6zFFa3Sn7FQ0bJq2sIdjMgpwl5dNwUL6CtnZni QprSyNLHEw1F8nAQ== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=cWFktdgV; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=X5JYzyGD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1779889636; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yhRH8G6+EsA/W9fSxr5C2XFKrvx1155gwm4IxMdIpBc=; b=cWFktdgVae9wG++Rcn5fQkTAtF3NUNFBN9e0mwSN1SnkFdToui3PxJtYivq3EE+jU+IU94 9LNpHVifa7zhb85QxnHioISmIK+EV43iJVsQChsQh+Ux10PtHZahzrhOYTfDMn7nYE3bvY CLs2znu7eWNvhQJxyY/3k4kqPOi1E5Y= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1779889636; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yhRH8G6+EsA/W9fSxr5C2XFKrvx1155gwm4IxMdIpBc=; b=X5JYzyGDTbt0ZsCxA44dIfNODlkQW/GUHpHUn9gC9c6tqK8a5+UsW0s2vsdO3ISQFJWsl9 gobkewNLtzUHrhCw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id CB6CD5A869; Wed, 27 May 2026 13:47:16 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 0O6pL+T1Fmr9OQAAD6G6ig (envelope-from ); Wed, 27 May 2026 13:47:16 +0000 Message-ID: <4a5ce927-7ea4-46ce-b8aa-910db2dc13cd@suse.de> Date: Wed, 27 May 2026 15:47:16 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] nvme/tcp: handle rejected keys for secure concatnation To: Wilfred Mallawa , Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, alistair.francis@wdc.com, Wilfred Mallawa References: <20260511005454.2486599-2-wilfred.opensource@gmail.com> Content-Language: en-US From: Hannes Reinecke In-Reply-To: <20260511005454.2486599-2-wilfred.opensource@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Action: no action X-Rspamd-Queue-Id: EFFAA678DB X-Spam-Flag: NO X-Spam-Score: -3.01 X-Spam-Level: X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; SUSPICIOUS_RECIPS(1.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_TO(0.00)[gmail.com,kernel.org,kernel.dk,lst.de,grimberg.me]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; MID_RHS_MATCH_FROM(0.00)[]; HAS_WP_URI(0.00)[]; RCPT_COUNT_SEVEN(0.00)[9]; RCVD_VIA_SMTP_AUTH(0.00)[]; TAGGED_RCPT(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:email,suse.de:mid,imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo] On 5/11/26 02:54, Wilfred Mallawa wrote: > From: Wilfred Mallawa > > The NVMe-TCP specification [1] states that if the PSK retained or > generated is not available on the subsystem, the TLS 1.3 handshake shall > be aborted with an unknown_psk_identity alert and the connection be > closed. > > Currently, when an unknown_psk_identity alert is sent from an endpoint, > tlshd returns EACCES as the TLS error. On subsequent reconnection > attempts, we fail with the same error because we keep attempting to > connect with a stale key. This may occur if the endpoint experienced a > full reset and lost its PSK. > > With support in tlshd to return -EKEYREJECTED when an unknown_psk_identity > alert is received, the kernel can now detect this condition and revoke the > current tls_key. This allows the subsequent reconnect to perform > re-authentication via DHCHAP to generate a fresh PSK. > > [1] https://nvmexpress.org/wp-content/uploads/NVM-Express-TCP-Transport-Specification-Revision-1.1-2024.08.05-Ratified.pdf > > Signed-off-by: Wilfred Mallawa > --- > drivers/nvme/host/tcp.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c > index 15d36d6a728e..eff68eb7a5fe 100644 > --- a/drivers/nvme/host/tcp.c > +++ b/drivers/nvme/host/tcp.c > @@ -1767,6 +1767,17 @@ static int nvme_tcp_start_tls(struct nvme_ctrl *nctrl, > dev_err(nctrl->device, > "queue %d: TLS handshake complete, error %d\n", > qid, queue->tls_err); > + > + /* > + * Key maybe stale, revoke it such that on a subsequent > + * reconnect, we will generate a new PSK. > + */ > + if (queue->tls_err == EKEYREJECTED && qid == 0 && > + nctrl->opts->concat && nctrl->opts->tls_key) { > + nvme_auth_revoke_tls_key(nctrl); > + dev_warn(nctrl->device, > + "qid 0: revoking stale key\n"); > + } > } else { > dev_dbg(nctrl->device, > "queue %d: TLS handshake complete\n", qid); Reviewed-by: Hannes Reinecke Cheers, Hannes -- Dr. Hannes Reinecke Kernel Storage Architect hare@suse.de +49 911 74053 688 SUSE Software Solutions GmbH, Frankenstr. 146, 90461 Nürnberg HRB 36809 (AG Nürnberg), GF: I. Totev, A. McDonald, W. Knoblich