From: David Milburn <dmilburn@redhat.com>
To: linux-nvme@lists.infradead.org
Cc: hch@infradead.org, chaitanya.kulkarni@wdc.com, dwagner@suse.de
Subject: [PATCH v2 2/2] nvmet: avoid memleak by freeing any remaining aens in nvmet_async_events_free
Date: Mon, 18 May 2020 13:59:56 -0500 [thread overview]
Message-ID: <1589828396-144513-3-git-send-email-dmilburn@redhat.com> (raw)
In-Reply-To: <1589828396-144513-1-git-send-email-dmilburn@redhat.com>
Make sure we free all resources including any remaining aens
which may result in a memory leak.
$ cat /sys/kernel/debug/kmemleak
unreferenced object 0xffff888c1af2c000 (size 32):
comm "nvmetcli", pid 5164, jiffies 4295220864 (age 6829.924s)
hex dump (first 32 bytes):
28 01 82 3b 8b 88 ff ff 28 01 82 3b 8b 88 ff ff (..;....(..;....
02 00 04 65 76 65 6e 74 5f 66 69 6c 65 00 00 00 ...event_file...
backtrace:
[<00000000217ae580>] nvmet_add_async_event+0x57/0x290 [nvmet]
[<0000000012aa2ea9>] nvmet_ns_changed+0x206/0x300 [nvmet]
[<00000000bb3fd52e>] nvmet_ns_disable+0x367/0x4f0 [nvmet]
[<00000000e91ca9ec>] nvmet_ns_free+0x15/0x180 [nvmet]
[<00000000a15deb52>] config_item_release+0xf1/0x1c0
[<000000007e148432>] configfs_rmdir+0x555/0x7c0
[<00000000f4506ea6>] vfs_rmdir+0x142/0x3c0
[<0000000000acaaf0>] do_rmdir+0x2b2/0x340
[<0000000034d1aa52>] do_syscall_64+0xa5/0x4d0
[<00000000211f13bc>] entry_SYSCALL_64_after_hwframe+0x6a/0xdf
Steps to Reproduce:
target:
1. nvmetcli restore rdma.json
client:
2. nvme connect -t rdma -a $IP -s 4420 -n testnqn
target:
3. nvmetcli clear
4. sleep 5 && nvmetcli restore rdma.json
5. cat /sys/kernel/debug/kmemleak after 5 minutes
Reported-by: Yi Zhang <yi.zhang@redhat.com>
Signed-off-by: David Milburn <dmilburn@redhatcom>
---
Changes from v1:
- declare struct nvmet_async_event in this patch.
drivers/nvme/target/core.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index dc036a815d39..dda888672f31 100644
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@ -154,6 +154,7 @@ static void nvmet_async_events_process(struct nvmet_ctrl *ctrl, u16 status)
static void nvmet_async_events_free(struct nvmet_ctrl *ctrl)
{
+ struct nvmet_async_event *aen;
struct nvmet_req *req;
mutex_lock(&ctrl->lock);
@@ -163,6 +164,13 @@ static void nvmet_async_events_free(struct nvmet_ctrl *ctrl)
nvmet_req_complete(req, NVME_SC_INTERNAL | NVME_SC_DNR);
mutex_lock(&ctrl->lock);
}
+
+ while (!list_empty(&ctrl->async_events)) {
+ aen = list_first_entry(&ctrl->async_events,
+ struct nvmet_async_event, entry);
+ list_del(&aen->entry);
+ kfree(aen);
+ }
mutex_unlock(&ctrl->lock);
}
--
2.18.1
_______________________________________________
linux-nvme mailing list
linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2020-05-18 19:00 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-18 18:59 [PATCH v2 0/2] nvmet: fixup processing async events David Milburn
2020-05-18 18:59 ` [PATCH v2 1/2] nvmet: check command slot before pulling and freeing aen David Milburn
2020-05-20 17:18 ` Christoph Hellwig
2020-05-18 18:59 ` David Milburn [this message]
2020-05-19 8:33 ` [PATCH v2 2/2] nvmet: avoid memleak by freeing any remaining aens in nvmet_async_events_free Sagi Grimberg
2020-05-19 19:14 ` David Milburn
2020-05-19 20:42 ` Sagi Grimberg
2020-05-19 20:51 ` Sagi Grimberg
2020-05-20 6:18 ` Christoph Hellwig
2020-05-20 7:01 ` Sagi Grimberg
2020-05-20 6:16 ` Christoph Hellwig
2020-05-20 6:59 ` Sagi Grimberg
2020-05-20 7:03 ` Christoph Hellwig
2020-05-20 7:08 ` Sagi Grimberg
2020-05-20 7:15 ` Christoph Hellwig
2020-05-20 8:06 ` Sagi Grimberg
2020-05-20 10:39 ` David Milburn
2020-05-20 17:19 ` Sagi Grimberg
2020-05-20 17:23 ` David Milburn
2020-05-20 17:30 ` Christoph Hellwig
2020-05-20 17:27 ` Christoph Hellwig
2020-05-20 17:41 ` Sagi Grimberg
2020-05-20 17:46 ` Christoph Hellwig
2020-05-20 18:04 ` Sagi Grimberg
2020-05-20 18:15 ` Christoph Hellwig
2020-05-20 19:40 ` Sagi Grimberg
2020-05-19 8:40 ` [PATCH v2 0/2] nvmet: fixup processing async events Chaitanya Kulkarni
2020-05-19 19:17 ` David Milburn
2020-05-20 6:20 ` hch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1589828396-144513-3-git-send-email-dmilburn@redhat.com \
--to=dmilburn@redhat.com \
--cc=chaitanya.kulkarni@wdc.com \
--cc=dwagner@suse.de \
--cc=hch@infradead.org \
--cc=linux-nvme@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).