From patchwork Tue Jul 28 12:01:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matias Bjorling X-Patchwork-Id: 6884111 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0F0D7C05AC for ; Tue, 28 Jul 2015 12:01:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 257A3206C7 for ; Tue, 28 Jul 2015 12:01:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0A7C52073E for ; Tue, 28 Jul 2015 12:01:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932158AbbG1MB0 (ORCPT ); Tue, 28 Jul 2015 08:01:26 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:37442 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755314AbbG1MBR (ORCPT ); Tue, 28 Jul 2015 08:01:17 -0400 Received: by wibud3 with SMTP id ud3so155975523wib.0 for ; Tue, 28 Jul 2015 05:01:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-type:content-transfer-encoding; bh=6890/PzfU5LSQZXfxcSZP7X1mHqbXDzm/gXk6S50Xg0=; b=loucDLmAJsjFGQNhjURNV7D3ZmtPswvfDSanoRUUFptDGwjAtaFJ5S0L4J4/7kfFXj EwOqAvgRG4HEmhzmk/ExCbbt/iAql0F86Q9kCG2D4i0jTPJ/BAYqekC+fph7N0+Rx99T tL9lV8V8DjmDEe7UNpCVhvMWnJILLX1s5gfhOARkb6jTkLLRsXOYmJDdVzFAMUvAEUzA 6Rc0Fctlz0T6frLwjYKr1qFgvBEe4Wj5cYAzFIcQVX1MqToQk0B3Kf1lORjdUYPU3b4w AhlP2zQA3G2Ej7Qf+TiJzXWa4RrdgfyauuxFim/2CnhtZq8tZkTAlJ+loFClJweqFxg/ 3Tdg== X-Gm-Message-State: ALoCoQnRiS8qwD+SYwAdyg663kN6fSLVFj6+WeRZETcj79FJI294GBnOk8YNFekvGqMlGN0upDiC X-Received: by 10.180.87.105 with SMTP id w9mr34434212wiz.32.1438084876426; Tue, 28 Jul 2015 05:01:16 -0700 (PDT) Received: from localhost.localdomain (6164198-cl69.boa.fiberby.dk. [193.106.164.198]) by smtp.gmail.com with ESMTPSA id ma4sm32917070wjb.38.2015.07.28.05.01.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jul 2015 05:01:15 -0700 (PDT) From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: axboe@fb.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH] null_blk: fix memory leak on cleanup Date: Tue, 28 Jul 2015 14:01:02 +0200 Message-Id: <1438084862-31899-1-git-send-email-mb@lightnvm.io> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Driver was not freeing the memory allocated for internal nullb queues. This patch frees the memory during driver unload. Signed-off-by: Matias Bjørling --- drivers/block/null_blk.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c index 69de41a..90f6781 100644 --- a/drivers/block/null_blk.c +++ b/drivers/block/null_blk.c @@ -406,6 +406,22 @@ static struct blk_mq_ops null_mq_ops = { .complete = null_softirq_done_fn, }; +static void cleanup_queue(struct nullb_queue *nq) +{ + kfree(nq->tag_map); + kfree(nq->cmds); +} + +static void cleanup_queues(struct nullb *nullb) +{ + int i; + + for (i = 0; i < nullb->nr_queues; i++) + cleanup_queue(&nullb->queues[i]); + + kfree(nullb->queues); +} + static void null_del_dev(struct nullb *nullb) { list_del_init(&nullb->list); @@ -415,6 +431,7 @@ static void null_del_dev(struct nullb *nullb) if (queue_mode == NULL_Q_MQ) blk_mq_free_tag_set(&nullb->tag_set); put_disk(nullb->disk); + cleanup_queues(nullb); kfree(nullb); } @@ -459,22 +476,6 @@ static int setup_commands(struct nullb_queue *nq) return 0; } -static void cleanup_queue(struct nullb_queue *nq) -{ - kfree(nq->tag_map); - kfree(nq->cmds); -} - -static void cleanup_queues(struct nullb *nullb) -{ - int i; - - for (i = 0; i < nullb->nr_queues; i++) - cleanup_queue(&nullb->queues[i]); - - kfree(nullb->queues); -} - static int setup_queues(struct nullb *nullb) { nullb->queues = kzalloc(submit_queues * sizeof(struct nullb_queue),