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=-3.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 72E93C433DF for ; Wed, 20 May 2020 17:27:45 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 2EB9C2075F for ; Wed, 20 May 2020 17:27:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ffQv+j8l" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2EB9C2075F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xVemv0fDCnS3FfZpqHRVheJzHvuGjiBYPOYTMlMoxrc=; b=ffQv+j8lD8EJpu +9Rq2DhrqVYjLuBVU1k61A4Rf4zrvJ8KLjYoaefIeu672AqpY8hgwm7T3yYDoyGcO+nzPcmoS8POo A2i/IdcHODE2aTvYpDKQgYaRLAkUMy77BWgYSgOgBzYsSrHTov3ssQRUoArWCSuIHsLInA5gCDYha zTeXAcoUmAKBR5R0gHqigr3UgfHpQl20yUQCG+cbbyRxMfYMkO++Yo3EXSrL3SADLXroNc6cHxBVO qPlI4v03EKWHY9kHXudVSMGdDIxQUAFGzGPr+iDtdniQtJowKSCAbDL8ARtbcgcmJ8/rwe4BdYKPh mfFK+RMcorSVEP/sMs1w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jbSVL-0004r9-6t; Wed, 20 May 2020 17:27:43 +0000 Received: from hch by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jbSVJ-0004qr-Du; Wed, 20 May 2020 17:27:41 +0000 Date: Wed, 20 May 2020 10:27:41 -0700 From: Christoph Hellwig To: David Milburn Subject: Re: [PATCH v2 2/2] nvmet: avoid memleak by freeing any remaining aens in nvmet_async_events_free Message-ID: <20200520172741.GB22182@infradead.org> References: <1589828396-144513-1-git-send-email-dmilburn@redhat.com> <1589828396-144513-3-git-send-email-dmilburn@redhat.com> <388242d3-5ccc-d694-c7a0-ac489f63f26a@grimberg.me> <20200520061613.GA18308@infradead.org> <0018af56-e3f9-8730-3c57-c4f19e478014@grimberg.me> <20200520070330.GA26871@infradead.org> <20200520071526.GA7008@infradead.org> <41bae172-289e-1407-93a6-4147491a346c@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <41bae172-289e-1407-93a6-4147491a346c@redhat.com> X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christoph Hellwig , linux-nvme@lists.infradead.org, dwagner@suse.de, Sagi Grimberg , chaitanya.kulkarni@wdc.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org On Wed, May 20, 2020 at 05:39:18AM -0500, David Milburn wrote: > Yi was able to reproduce the memleak using the v2 of the patch series > since nvmet_async_events_free() ran before nvmet_add_async_event(). > > http://lists.infradead.org/pipermail/linux-nvme/2020-May/030512.html > > With Sagi's patch below, I do see after nvmet_add_async_event(), > nvmet_async_events_process pulls the request, decrements > ctrl->nr_async_event_cmds to 0, and frees the aen, > and no memory leak. > > http://lists.infradead.org/pipermail/linux-nvme/2020-May/030548.html Ok, let's try a version of Sagis latest suggestion then. What about this (replacement for this patch only, I applied the first one already): diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c index 54679260e6648..1525426d0a31f 100644 --- a/drivers/nvme/target/core.c +++ b/drivers/nvme/target/core.c @@ -129,8 +129,10 @@ static u32 nvmet_async_event_result(struct nvmet_async_event *aen) return aen->event_type | (aen->event_info << 8) | (aen->log_page << 16); } -static void nvmet_async_events_process(struct nvmet_ctrl *ctrl, u16 status) +static void nvmet_async_event_work(struct work_struct *work) { + struct nvmet_ctrl *ctrl = + container_of(work, struct nvmet_ctrl, async_event_work); struct nvmet_async_event *aen; struct nvmet_req *req; @@ -139,21 +141,20 @@ static void nvmet_async_events_process(struct nvmet_ctrl *ctrl, u16 status) aen = list_first_entry(&ctrl->async_events, struct nvmet_async_event, entry); req = ctrl->async_event_cmds[--ctrl->nr_async_event_cmds]; - if (status == 0) - nvmet_set_result(req, nvmet_async_event_result(aen)); + nvmet_set_result(req, nvmet_async_event_result(aen)); list_del(&aen->entry); kfree(aen); mutex_unlock(&ctrl->lock); trace_nvmet_async_event(ctrl, req->cqe->result.u32); - nvmet_req_complete(req, status); + nvmet_req_complete(req, 0); mutex_lock(&ctrl->lock); } mutex_unlock(&ctrl->lock); } -static void nvmet_async_events_free(struct nvmet_ctrl *ctrl) +static void nvmet_async_events_fail_all(struct nvmet_ctrl *ctrl) { struct nvmet_req *req; @@ -167,12 +168,14 @@ static void nvmet_async_events_free(struct nvmet_ctrl *ctrl) mutex_unlock(&ctrl->lock); } -static void nvmet_async_event_work(struct work_struct *work) +static void nvmet_async_events_free(struct nvmet_ctrl *ctrl) { - struct nvmet_ctrl *ctrl = - container_of(work, struct nvmet_ctrl, async_event_work); + struct nvmet_async_event *aen, *n; - nvmet_async_events_process(ctrl, 0); + list_for_each_entry_safe(aen, n, &ctrl->async_events, entry) { + list_del(&aen->entry); + kfree(aen); + } } void nvmet_add_async_event(struct nvmet_ctrl *ctrl, u8 event_type, @@ -768,17 +771,14 @@ static void nvmet_confirm_sq(struct percpu_ref *ref) void nvmet_sq_destroy(struct nvmet_sq *sq) { - u16 status = NVME_SC_INTERNAL | NVME_SC_DNR; struct nvmet_ctrl *ctrl = sq->ctrl; /* * If this is the admin queue, complete all AERs so that our * queue doesn't have outstanding requests on it. */ - if (ctrl && ctrl->sqs && ctrl->sqs[0] == sq) { - nvmet_async_events_process(ctrl, status); - nvmet_async_events_free(ctrl); - } + if (ctrl && ctrl->sqs && ctrl->sqs[0] == sq) + nvmet_async_events_fail_all(ctrl); percpu_ref_kill_and_confirm(&sq->ref, nvmet_confirm_sq); wait_for_completion(&sq->confirm_done); wait_for_completion(&sq->free_done); @@ -1368,6 +1368,7 @@ static void nvmet_ctrl_free(struct kref *ref) ida_simple_remove(&cntlid_ida, ctrl->cntlid); + nvmet_async_events_free(ctrl); kfree(ctrl->sqs); kfree(ctrl->cqs); kfree(ctrl->changed_ns_list); _______________________________________________ linux-nvme mailing list linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme