From patchwork Fri May 3 23:35:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10929467 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1A96292A for ; Fri, 3 May 2019 23:35:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A6D1287CF for ; Fri, 3 May 2019 23:35:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF2A9287E2; Fri, 3 May 2019 23:35:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90D96287CF for ; Fri, 3 May 2019 23:35:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726531AbfECXfl (ORCPT ); Fri, 3 May 2019 19:35:41 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:33246 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726220AbfECXfl (ORCPT ); Fri, 3 May 2019 19:35:41 -0400 Received: by mail-pf1-f195.google.com with SMTP id z28so3649637pfk.0 for ; Fri, 03 May 2019 16:35:41 -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=SHEjHfO9A5bRiMAqWYWHqc/8OGhvcUxNJFwk8XrvHsE=; b=E1kHCtY3StjY2jL6mVYyFBDOHkYOyxkDZHKrjgcQsUNJy8dDwNhCXMPstgxWlAWDVu N6/tKl0/5fSaSVUZeI/AswN2edBTfVnN7rBh5z5LP395vsJXAlfWtuvsqNrYQVbSP7/9 hwBMR6j63Xx/mEajgFYbn6QXfKqogcl8pxheQ= 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=SHEjHfO9A5bRiMAqWYWHqc/8OGhvcUxNJFwk8XrvHsE=; b=pFKje4PUWnFD1E7t73vKb1DnKlU9sbmWJjEbVVJo5h5i7NPhxvDzO6klG9uKjDiFBy o+RthoJTmih7YOF8jxMH8j/OI1TGEc5XnCNTF/EQ2XA0ZTbaM9rOJvBO5lVzYBcBmfW5 JTO+CNfoU0Na2AIJETwTTjy4+3JSwi4moZLHIuqrckmi97uoLbYqMlPvjNaHeRE7Xmxx OG8y/Gcgm4cfUzKOLFLgzCdPV74NJeu9UEouFSx7WXsqpLoZlmnLPOyYg2PK5vNCWlgU q9kx4yZIAD5J+9EkB5C0OeFrcVZk5+BzLFJ21f9qQDuPhvl1MgHROALiHe8Ql2kiJ+9v tT4w== X-Gm-Message-State: APjAAAWNBoSCirr6ZPKcfF395ypoEBA9Z0KC7ctrvgF1GCc7Ed//s72L dBIFT6zYUMlPW+EwSQ81S6e2ag== X-Google-Smtp-Source: APXvYqxSl2kbX2wBpR+4fMn6q0ci7jtMz8uiaw/Pxs3UtU6+iNJMRtgXKO7o7X0k+XZwbkDsvK4mwA== X-Received: by 2002:a65:62d2:: with SMTP id m18mr14209583pgv.122.1556926540856; Fri, 03 May 2019 16:35:40 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:24fa:e766:52c9:e3b2]) by smtp.gmail.com with ESMTPSA id l184sm7763304pfc.98.2019.05.03.16.35.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 May 2019 16:35:39 -0700 (PDT) From: Douglas Anderson To: Ulf Hansson , Adrian Hunter , Linus Walleij Cc: linux-rockchip@lists.infradead.org, groeck@chromium.org, mka@chromium.org, drinkcat@chromium.org, Douglas Anderson , Ming Lei , linux-mmc@vger.kernel.org, Hannes Reinecke , linux-kernel@vger.kernel.org, Jens Axboe , Omar Sandoval Subject: [PATCH] mmc: block: Fix memory leak in blk-mq when cleaning up Date: Fri, 3 May 2019 16:35:26 -0700 Message-Id: <20190503233526.226272-1-dianders@chromium.org> X-Mailer: git-send-email 2.21.0.1020.gf2820cf01a-goog MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If I run the following on rk3288-veyron-minnie (a 2GB machine) cd /sys/bus/platform/drivers/dwmmc_rockchip for i in $(seq 1 3000); do echo "========================" $i echo ff0f0000.dwmmc > unbind sleep .5 echo ff0f0000.dwmmc > bind while true; do if [ -e /dev/mmcblk2 ]; then break; fi sleep .1 done done Then I start OOMing somewhere between iteration 200 and 250. Using kmemleak, I see reports like: unreferenced object 0xe39c5580 (size 64): comm "kworker/1:0", pid 17, jiffies 4294821091 (age 96.952s) hex dump (first 32 bytes): 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [] __kmalloc+0x1ec/0x2dc [] blk_mq_alloc_tag_set+0x27c/0x2bc [<0955ae01>] mmc_init_queue+0xa8/0x2a8 [<5102b986>] mmc_blk_alloc_req+0xf8/0x2d4 [] mmc_blk_probe+0x4a8/0x6c0 [<0dfdd9d5>] mmc_bus_probe+0x24/0x28 It's pretty clear that we're missing a call to blk_mq_free_tag_set(). Let's add it. Fixes: 81196976ed94 ("mmc: block: Add blk-mq support") Signed-off-by: Douglas Anderson Reviewed-by: Matthias Kaehlcke Reviewed-by: Guenter Roeck Reviewed-by: Linus Walleij --- drivers/mmc/core/queue.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c index 7c364a9c4eeb..09071e13282e 100644 --- a/drivers/mmc/core/queue.c +++ b/drivers/mmc/core/queue.c @@ -480,6 +480,8 @@ void mmc_cleanup_queue(struct mmc_queue *mq) */ flush_work(&mq->complete_work); + blk_mq_free_tag_set(&mq->tag_set); + mq->card = NULL; }