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=-10.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=ham 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 ED422C433B4 for ; Tue, 4 May 2021 07:53:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BFBB7613BC for ; Tue, 4 May 2021 07:53:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229815AbhEDHx4 (ORCPT ); Tue, 4 May 2021 03:53:56 -0400 Received: from verein.lst.de ([213.95.11.211]:38440 "EHLO verein.lst.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229601AbhEDHx4 (ORCPT ); Tue, 4 May 2021 03:53:56 -0400 Received: by verein.lst.de (Postfix, from userid 2407) id 42C1568AFE; Tue, 4 May 2021 09:52:58 +0200 (CEST) Date: Tue, 4 May 2021 09:52:57 +0200 From: Christoph Hellwig To: mwilck@suse.com Cc: Keith Busch , Sagi Grimberg , Christoph Hellwig , Chao Leng , Hannes Reinecke , Daniel Wagner , linux-nvme@lists.infradead.org, stable@vger.kernel.org Subject: Re: [PATCH v4] nvme: rdma/tcp: fix list corruption with anatt timer Message-ID: <20210504075257.GA17142@lst.de> References: <20210427093110.16461-1-mwilck@suse.com> <20210429122433.GA27567@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210429122433.GA27567@lst.de> User-Agent: Mutt/1.5.17 (2007-11-01) Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Thu, Apr 29, 2021 at 02:24:33PM +0200, Christoph Hellwig wrote: > Martin, > > can you give this patch a spin and check if this solves your issue? ping? > > diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c > index 0d0de3433f37..68f4d9d0ce58 100644 > --- a/drivers/nvme/host/multipath.c > +++ b/drivers/nvme/host/multipath.c > @@ -780,6 +780,8 @@ void nvme_mpath_remove_disk(struct nvme_ns_head *head) > > int nvme_mpath_init(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) > { > + size_t max_transfer_size = ctrl->max_hw_sectors << SECTOR_SHIFT; > + size_t ana_log_size; > int error; > > /* check if multipath is enabled and we have the capability */ > @@ -787,47 +789,45 @@ int nvme_mpath_init(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) > !(ctrl->subsys->cmic & NVME_CTRL_CMIC_ANA)) > return 0; > > + if (!ctrl->identified) { > + mutex_init(&ctrl->ana_lock); > + timer_setup(&ctrl->anatt_timer, nvme_anatt_timeout, 0); > + INIT_WORK(&ctrl->ana_work, nvme_ana_work); > + } > + > ctrl->anacap = id->anacap; > ctrl->anatt = id->anatt; > ctrl->nanagrpid = le32_to_cpu(id->nanagrpid); > ctrl->anagrpmax = le32_to_cpu(id->anagrpmax); > > - mutex_init(&ctrl->ana_lock); > - timer_setup(&ctrl->anatt_timer, nvme_anatt_timeout, 0); > - ctrl->ana_log_size = sizeof(struct nvme_ana_rsp_hdr) + > - ctrl->nanagrpid * sizeof(struct nvme_ana_group_desc); > - ctrl->ana_log_size += ctrl->max_namespaces * sizeof(__le32); > - > - if (ctrl->ana_log_size > ctrl->max_hw_sectors << SECTOR_SHIFT) { > + ana_log_size = sizeof(struct nvme_ana_rsp_hdr) + > + ctrl->nanagrpid * sizeof(struct nvme_ana_group_desc) + > + ctrl->max_namespaces * sizeof(__le32); > + if (ana_log_size > max_transfer_size) { > dev_err(ctrl->device, > - "ANA log page size (%zd) larger than MDTS (%d).\n", > - ctrl->ana_log_size, > - ctrl->max_hw_sectors << SECTOR_SHIFT); > + "ANA log page size (%zd) larger than MDTS (%zd).\n", > + ana_log_size, max_transfer_size); > dev_err(ctrl->device, "disabling ANA support.\n"); > return 0; > } > > - INIT_WORK(&ctrl->ana_work, nvme_ana_work); > - kfree(ctrl->ana_log_buf); > - ctrl->ana_log_buf = kmalloc(ctrl->ana_log_size, GFP_KERNEL); > - if (!ctrl->ana_log_buf) { > - error = -ENOMEM; > - goto out; > + if (ana_log_size > ctrl->ana_log_size) { > + nvme_mpath_uninit(ctrl); > + ctrl->ana_log_buf = kmalloc(ctrl->ana_log_size, GFP_KERNEL); > + if (!ctrl->ana_log_buf) > + return -ENOMEM; > + ctrl->ana_log_size = ana_log_size; > } > > error = nvme_read_ana_log(ctrl); > if (error) > - goto out_free_ana_log_buf; > - return 0; > -out_free_ana_log_buf: > - kfree(ctrl->ana_log_buf); > - ctrl->ana_log_buf = NULL; > -out: > + nvme_mpath_uninit(ctrl); > return error; > } > > void nvme_mpath_uninit(struct nvme_ctrl *ctrl) > { > + nvme_mpath_stop(ctrl); > kfree(ctrl->ana_log_buf); > ctrl->ana_log_buf = NULL; > } ---end quoted text---