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 X-Spam-Level: X-Spam-Status: No, score=-14.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57EA9C43461 for ; Mon, 14 Sep 2020 14:45:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 10A05205F4 for ; Mon, 14 Sep 2020 14:45:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600094709; bh=LAfFhiOE3xHJguNypRaGsjbzpd8KOcKaxbh8s9VOogE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=R3Lz21NbFfzRxRxGKj5tnUnJTX1UFN4cnc/OCBeKHsejFMCTuXvH9dyGkk6Gx0d0B QWbR5JAxpuwKbQE8vfkI7HglaUnt+FJPgaDX2DZPEMSQcOoZuHbY0M2eU2OElFM5sM GL8hU2CQ7ih+DwDLa5UMeycMCF49KgPvEYIFaIJ4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726482AbgINOpH (ORCPT ); Mon, 14 Sep 2020 10:45:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:32878 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726643AbgINNFm (ORCPT ); Mon, 14 Sep 2020 09:05:42 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4F4F22223F; Mon, 14 Sep 2020 13:04:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600088693; bh=LAfFhiOE3xHJguNypRaGsjbzpd8KOcKaxbh8s9VOogE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rxAfaGo/bEYUFB0FIA1W7gAKPk19IKgxw6Y17tv81R3+u6JgOmQqeO0TpjzJuDHyS 84SO1p/Z1V0vQ2Dbwl4nD1aQM5n4GHlWPvpo4e7CtW8nQzYV1ErvDkx1GDskn7g+57 90H2VKceUWSUJW28ny5PbsnbM68MMZYIYcZ+g7Jc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: David Milburn , Keith Busch , Sagi Grimberg , Christoph Hellwig , Sasha Levin , linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 15/22] nvme-tcp: cancel async events before freeing event struct Date: Mon, 14 Sep 2020 09:04:27 -0400 Message-Id: <20200914130434.1804478-15-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200914130434.1804478-1-sashal@kernel.org> References: <20200914130434.1804478-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Milburn [ Upstream commit ceb1e0874dba5cbfc4e0b4145796a4bfb3716e6a ] Cancel async event work in case async event has been queued up, and nvme_tcp_submit_async_event() runs after event has been freed. Signed-off-by: David Milburn Reviewed-by: Keith Busch Reviewed-by: Sagi Grimberg Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/host/tcp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 0166ff0e4738e..26eccad043a20 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -1506,6 +1506,7 @@ static struct blk_mq_tag_set *nvme_tcp_alloc_tagset(struct nvme_ctrl *nctrl, static void nvme_tcp_free_admin_queue(struct nvme_ctrl *ctrl) { if (to_tcp_ctrl(ctrl)->async_req.pdu) { + cancel_work_sync(&ctrl->async_event_work); nvme_tcp_free_async_req(to_tcp_ctrl(ctrl)); to_tcp_ctrl(ctrl)->async_req.pdu = NULL; } -- 2.25.1