From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1E4E2CDB483 for ; Thu, 19 Oct 2023 12:57:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=dxpUZ93s140nRiZitesqZPUfv11BlSi5AUYAGqBEYAk=; b=gRT50vHNuUruLM8vZtI1s2yCWu L5NgIBWgJbZrleHlHccYrVX7Ih6aYtKkNeETqvNQ4lxs4vDcorGL6dDCV0QUM9JQSq5GVggckCGDJ jmf3y/BgRQQh18ID6iW6/DuGBLBotdWFuo99bXIV8C273CF3zqt4s1j9wQ28aQOdl/O3JJNYw5xOo fYVm8sZwPb48WFQ0rnyLNmgKhtSkHtXS0nHy7rmzTuCArvMB0tTQN0stXj8dyL4AqcJTyFRq9kgTD dURTdUgAGGxb0jdEMsQRWWblQFus/h3/5Dd1Bz8e2Q4Wnj6t8XSizD19nCQpCIgqRi2feA8MWP1Bz T25ZFE+g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qtSat-00HSW5-3D; Thu, 19 Oct 2023 12:57:44 +0000 Received: from smtp-out2.suse.de ([195.135.220.29]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qtSXJ-00HOmG-2D for linux-nvme@lists.infradead.org; Thu, 19 Oct 2023 12:54:03 +0000 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id B562A1F45B; Thu, 19 Oct 2023 12:53:53 +0000 (UTC) Received: from adalid.arch.suse.de (adalid.arch.suse.de [10.161.8.13]) by relay2.suse.de (Postfix) with ESMTP id 7AD632C547; Thu, 19 Oct 2023 12:53:52 +0000 (UTC) Received: by adalid.arch.suse.de (Postfix, from userid 16045) id C9AED51EC0FA; Thu, 19 Oct 2023 14:53:52 +0200 (CEST) From: Hannes Reinecke To: Christoph Hellwig Cc: Sagi Grimberg , Keith Busch , Yi Zhang , linux-nvme@lists.infradead.org, Hannes Reinecke , Maurizio Lombardi Subject: [PATCH] nvmet-tcp: do not try to cancel uninitialized tls_handshake_tmo_work Date: Thu, 19 Oct 2023 14:53:36 +0200 Message-Id: <20231019125336.138578-1-hare@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: ++ Authentication-Results: smtp-out2.suse.de; dkim=none; dmarc=none; spf=softfail (smtp-out2.suse.de: 149.44.160.134 is neither permitted nor denied by domain of hare@suse.de) smtp.mailfrom=hare@suse.de X-Rspamd-Server: rspamd2 X-Spamd-Result: default: False [2.66 / 50.00]; ARC_NA(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[149.44.160.134:from]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; NEURAL_HAM_LONG(-3.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.20)[suse.de]; BROKEN_CONTENT_TYPE(1.50)[]; R_SPF_SOFTFAIL(0.60)[~all:c]; TO_MATCH_ENVRCPT_SOME(0.00)[]; VIOLATED_DIRECT_SPF(3.50)[]; MX_GOOD(-0.01)[]; BLOCKLISTDE_FAIL(0.00)[149.44.160.134:query timed out]; RCPT_COUNT_SEVEN(0.00)[7]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_NO_TLS_LAST(0.10)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.20)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; BAYES_HAM(-2.83)[99.28%] X-Rspamd-Queue-Id: B562A1F45B X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231019_055401_893104_2F69D95E X-CRM114-Status: UNSURE ( 8.66 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org The TLS handshake timeout workqueue is only initialized if TLS is configured, so we shouldn't try to de-initialize it unconditionally. Suggested-by: Maurizio Lombardi Signed-off-by: Hannes Reinecke --- drivers/nvme/target/tcp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index 4336fe048e43..e155bcaa42fa 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -1587,7 +1587,9 @@ static void nvmet_tcp_release_queue_work(struct work_struct *w) mutex_unlock(&nvmet_tcp_queue_mutex); nvmet_tcp_restore_socket_callbacks(queue); +#ifdef CONFIG_NVME_TARGET_TCP_TLS cancel_delayed_work_sync(&queue->tls_handshake_tmo_work); +#endif cancel_work_sync(&queue->io_work); /* stop accepting incoming data */ queue->rcv_state = NVMET_TCP_RECV_ERR; -- 2.35.3