From patchwork Mon Jun 26 09:57:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= X-Patchwork-Id: 9809013 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6ECD060329 for ; Mon, 26 Jun 2017 09:58:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74A1D2847C for ; Mon, 26 Jun 2017 09:58:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 67BF628488; Mon, 26 Jun 2017 09:58:58 +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=-6.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 C83642847D for ; Mon, 26 Jun 2017 09:58:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751755AbdFZJ6x (ORCPT ); Mon, 26 Jun 2017 05:58:53 -0400 Received: from mail-wm0-f48.google.com ([74.125.82.48]:35715 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751806AbdFZJ6W (ORCPT ); Mon, 26 Jun 2017 05:58:22 -0400 Received: by mail-wm0-f48.google.com with SMTP id w126so2846557wme.0 for ; Mon, 26 Jun 2017 02:58:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lightnvm-io.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KE15xcnHcSC1KHE6OgLwEaJBddaGT+HtvmH3YvY/Kfw=; b=tnW64SGV1lRobXhMfrU7rWVA+GxJnYequw1GqdkgsuvLqgd0k1hrCMwprHlBukQEhE gTir3k7pEmXTyQ8t9qptwsc319h8B66JC6P6hKJVeyp+NbfMtsLdzpPAVSQTlp+muJF/ 8bS6HwNYNBkjPKrSRDZNR8x3E/V2olzP3Vyfr7Bq6O5YeaagF5zRLo33eUS7gpu7UO0E YMYYWNLUILqBb2arG2GjLMKbjZ+VrvYa4LCKYlXTRjyhpGW8QgbTRSNjVyzHG83dScy3 iL+QuXwae2upVb9Mb/u+9JILvH8M6MZgID+HJTZc3i3tBaU5CkJRb0Mcsr6LMcsr6kD2 wkfw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=KE15xcnHcSC1KHE6OgLwEaJBddaGT+HtvmH3YvY/Kfw=; b=AeFN/rFbIryXiKNbRMgyGuYdeySNuuRY7L5kHL09uw/fS1jK9XoDzIaiiuEXuYk6kP vRzxZXccnahsRKJYxHN9d2wtjlX/zXhnnlY3lewEpGTdacA9HIJBQFNatGObCPhaCdyH 5d7xR8Mr2l2itUgzZjzVT6TwivRoFOFJPlG2eIBZ2d0J30h0igzZc7yiEg+3S1foCMJA kwRjmZlOVNsUDuhiJRqrChmq8/YcCy7G+g/Qb8H/g9+znPWFRhlgeV0H/Qemgh3dXctW 4kL5Pj0WGuI/HBkjy08gez9cstxyoQ7SnJFgSXX+WeYMxTbVp/b53JzyzNqEWt96fJeV LieA== X-Gm-Message-State: AKS2vOyxDwBS3qkwDysB4G4qO9+EBa6BG7o6PoD+OizXJ4e3d+6vi6Gp Zq4+BM/EAhCD/QuN X-Received: by 10.80.195.207 with SMTP id i15mr15930654edf.70.1498471100843; Mon, 26 Jun 2017 02:58:20 -0700 (PDT) Received: from uHalley.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id n26sm5212537edd.51.2017.06.26.02.58.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Jun 2017 02:58:20 -0700 (PDT) From: "=?UTF-8?q?Javier=20Gonz=C3=A1lez?=" X-Google-Original-From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= To: mb@lightnvm.io, axboe@fb.com Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= , =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH 12/20] lightnvm: pblk: simplify meta. memory allocation Date: Mon, 26 Jun 2017 11:57:21 +0200 Message-Id: <1498471049-25505-13-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498471049-25505-1-git-send-email-javier@cnexlabs.com> References: <1498471049-25505-1-git-send-email-javier@cnexlabs.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP smeta size will always be suitable for a kmalloc allocation. Simplify the code and leave the vmalloc fallback only for emeta, where the pblk configuration has an impact. Signed-off-by: Javier González Signed-off-by: Matias Bjørling --- drivers/lightnvm/pblk-core.c | 3 ++- drivers/lightnvm/pblk-init.c | 9 ++++----- drivers/lightnvm/pblk-write.c | 3 ++- drivers/lightnvm/pblk.h | 1 - 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c index 29565f89a85e..b5f7f3f19105 100644 --- a/drivers/lightnvm/pblk-core.c +++ b/drivers/lightnvm/pblk-core.c @@ -665,7 +665,8 @@ static int pblk_line_submit_emeta_io(struct pblk *pblk, struct pblk_line *line, } reinit_completion(&wait); - bio_put(bio); + if (likely(pblk->l_mg.emeta_alloc_type == PBLK_VMALLOC_META)) + bio_put(bio); if (rqd.error) { if (dir == WRITE) diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c index 968c2e390cef..c49115d74e85 100644 --- a/drivers/lightnvm/pblk-init.c +++ b/drivers/lightnvm/pblk-init.c @@ -354,9 +354,9 @@ static void pblk_line_meta_free(struct pblk *pblk) kfree(l_mg->vsc_list); for (i = 0; i < PBLK_DATA_LINES; i++) { - pblk_mfree(&l_mg->sline_meta[i], l_mg->smeta_alloc_type); + kfree(l_mg->sline_meta[i]); pblk_mfree(l_mg->eline_meta[i]->buf, l_mg->emeta_alloc_type); - kfree(&l_mg->eline_meta[i]); + kfree(l_mg->eline_meta[i]); } kfree(pblk->lines); @@ -549,7 +549,6 @@ static int pblk_lines_alloc_metadata(struct pblk *pblk) /* smeta is always small enough to fit on a kmalloc memory allocation, * emeta depends on the number of LUNs allocated to the pblk instance */ - l_mg->smeta_alloc_type = PBLK_KMALLOC_META; for (i = 0; i < PBLK_DATA_LINES; i++) { l_mg->sline_meta[i] = kmalloc(lm->smeta_len, GFP_KERNEL); if (!l_mg->sline_meta[i]) @@ -603,12 +602,12 @@ static int pblk_lines_alloc_metadata(struct pblk *pblk) fail_free_emeta: while (--i >= 0) { vfree(l_mg->eline_meta[i]->buf); - kfree(&l_mg->eline_meta[i]); + kfree(l_mg->eline_meta[i]); } fail_free_smeta: for (i = 0; i < PBLK_DATA_LINES; i++) - pblk_mfree(&l_mg->sline_meta[i], l_mg->smeta_alloc_type); + kfree(l_mg->sline_meta[i]); return -ENOMEM; } diff --git a/drivers/lightnvm/pblk-write.c b/drivers/lightnvm/pblk-write.c index a29a34786ac5..3db2cbe5b788 100644 --- a/drivers/lightnvm/pblk-write.c +++ b/drivers/lightnvm/pblk-write.c @@ -442,7 +442,8 @@ int pblk_submit_meta_io(struct pblk *pblk, struct pblk_line *meta_line) list_add(&meta_line->list, &meta_line->list); spin_unlock(&l_mg->close_lock); fail_free_bio: - bio_put(bio); + if (likely(l_mg->emeta_alloc_type == PBLK_VMALLOC_META)) + bio_put(bio); fail_free_rqd: pblk_free_rqd(pblk, rqd, READ); return ret; diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h index eb8515fd9044..6c8d01198e8b 100644 --- a/drivers/lightnvm/pblk.h +++ b/drivers/lightnvm/pblk.h @@ -446,7 +446,6 @@ struct pblk_line_mgmt { __le32 *vsc_list; /* Valid sector counts for all lines */ /* Metadata allocation type: VMALLOC | KMALLOC */ - int smeta_alloc_type; int emeta_alloc_type; /* Pre-allocated metadata for data lines */