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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT 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 657BCC43219 for ; Thu, 2 May 2019 19:07:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3646E20675 for ; Thu, 2 May 2019 19:07:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Zl8iu0TP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726267AbfEBTHX (ORCPT ); Thu, 2 May 2019 15:07:23 -0400 Received: from mail-it1-f196.google.com ([209.85.166.196]:54231 "EHLO mail-it1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725962AbfEBTHW (ORCPT ); Thu, 2 May 2019 15:07:22 -0400 Received: by mail-it1-f196.google.com with SMTP id l10so5293666iti.3 for ; Thu, 02 May 2019 12:07:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nSKRt3WKRfyEbWZKT2Q22cyuORb9Gh6Tvn4Sl4qmV0M=; b=Zl8iu0TP2UMpdP29UFkOjInL0C10Yr31yzOT9KYJaorbnymWcvJeNGINAwKzYrKSlp 1+OSUZ1OAtb+Rx/IldzFFpkSlBqdOwf6DinD4+PGovjuRjmEURBxl4FQHvZoftOznXeM ZmH3sh5RjtInG4aRL1RED3+rowII2KaA7wfQQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nSKRt3WKRfyEbWZKT2Q22cyuORb9Gh6Tvn4Sl4qmV0M=; b=IHNIDwXM5xb5RdPGgtHKYnXMCPHq2ZEkVMjNFTObvfgVz/poloRs66g/l8pQPCCpvK 7S+Cm1G5DdfFAWWqYnRCqTwS29LeleutgW8jU2VEZL5Z57XwgTIPnO09oGL+l/YR89+6 ukjseudAJEciX5tnofxp7mquRDscTxYGqMs+v29rKEekzjz/Bvo9qzMkKPU0ro4Q0769 0BVbRQ5QnSVBxyfKy0wgqT3NI8WWHuiC7oKQcfi/4j0uNjj3dTghh78TCYtWHjpN0H+O x0JuMHLYhHV0OkpCGeQzDFbTVqoElk4R/YH2p/p5q2TMATUBA96tBetsKK9AWiUX2f2I YkLw== X-Gm-Message-State: APjAAAUlVK4o6+HWaGKSODrK0V1Yrlw8vxYmuaMtejQ6+Bm5mauBRnEq a0Ghz1ksrGD7gX9po6VtFTwLWw== X-Google-Smtp-Source: APXvYqzdK+GIbc9SB9LRwE/81P6E9I0LoEpNla1HajsEWBv7dWBdjOkuk4jwxW7KkyceTbI3CfEmoA== X-Received: by 2002:a24:4d8a:: with SMTP id l132mr3770654itb.70.1556824042042; Thu, 02 May 2019 12:07:22 -0700 (PDT) Received: from localhost ([2620:15c:183:0:20b8:dee7:5447:d05]) by smtp.gmail.com with ESMTPSA id g13sm2044503iom.46.2019.05.02.12.07.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 May 2019 12:07:21 -0700 (PDT) From: Raul E Rangel To: linux-mmc@vger.kernel.org Cc: avri.altman@wdc.com, djkurtz@chromium.org, zwisler@chromium.org, Raul E Rangel , Ming Lei , Adrian Hunter , Hannes Reinecke , linux-kernel@vger.kernel.org, Jens Axboe , Omar Sandoval , Ulf Hansson Subject: [PATCH] mmc: Fix tag set memory leak Date: Thu, 2 May 2019 13:07:14 -0600 Message-Id: <20190502190714.181664-1-rrangel@chromium.org> X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The tag set is allocated in mmc_init_queue but never freed. This results in a memory leak. This change makes sure we free the tag set when the queue is also freed. Signed-off-by: Raul E Rangel --- I found this using kmemleak and plugging and unplugging an SD card in a few times. Here is an example of the output of kmemleak: unreferenced object 0xffff888125be4ce8 (size 8): comm "kworker/1:0", pid 17, jiffies 4294901575 (age 204.773s) hex dump (first 8 bytes): 00 00 00 00 00 00 00 00 ........ backtrace: [<0000000061cb8887>] blk_mq_alloc_tag_set+0xe9/0x234 [<00000000cf532a0f>] mmc_init_queue+0xa9/0x2f0 [<000000001e085171>] mmc_blk_alloc_req+0x125/0x2f9 [<00000000eae1bd01>] mmc_blk_probe+0x1e2/0x6c1 [<00000000a0b4a87d>] really_probe+0x1bd/0x3b0 [<00000000e58f3eb9>] driver_probe_device+0xe1/0x115 [<00000000358f3b3c>] bus_for_each_drv+0x89/0xac [<00000000ef52ccbe>] __device_attach+0xb0/0x14a [<00000000c9daafa7>] bus_probe_device+0x33/0x9f [<0000000008ac5779>] device_add+0x34b/0x5e2 [<00000000b42623cc>] mmc_add_card+0x1f5/0x20d [<00000000f114ebc3>] mmc_attach_sd+0xc5/0x14b [<000000006e915e0d>] mmc_rescan+0x261/0x2b6 [<00000000e5b49c26>] process_one_work+0x1d3/0x31f [<0000000068c8cd3c>] worker_thread+0x1cd/0x2bf [<00000000326e2e22>] kthread+0x14f/0x157 Once I applied this patch the leak went away. p.s., I included a small white space fix. Hope that's ok. drivers/mmc/core/queue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c index 7c364a9c4eeb..176a08748cf1 100644 --- a/drivers/mmc/core/queue.c +++ b/drivers/mmc/core/queue.c @@ -402,7 +402,7 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card) mq->card = card; mq->use_cqe = host->cqe_enabled; - + spin_lock_init(&mq->lock); memset(&mq->tag_set, 0, sizeof(mq->tag_set)); @@ -472,6 +472,7 @@ void mmc_cleanup_queue(struct mmc_queue *mq) blk_mq_unquiesce_queue(q); blk_cleanup_queue(q); + blk_mq_free_tag_set(&mq->tag_set); /* * A request can be completed before the next request, potentially -- 2.21.0.593.g511ec345e18-goog