From patchwork Wed Sep 6 10:50:59 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: 9940403 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 0C262602CC for ; Wed, 6 Sep 2017 10:56:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0138928B9C for ; Wed, 6 Sep 2017 10:56:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA3D528BA3; Wed, 6 Sep 2017 10:56:41 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=unavailable 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 7BA2128B9C for ; Wed, 6 Sep 2017 10:56:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753232AbdIFK40 (ORCPT ); Wed, 6 Sep 2017 06:56:26 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:38525 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753303AbdIFKwn (ORCPT ); Wed, 6 Sep 2017 06:52:43 -0400 Received: by mail-wm0-f53.google.com with SMTP id 187so29403326wmn.1 for ; Wed, 06 Sep 2017 03:52:42 -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=htvawVYgdmBe6+JhYzK+BnOyjaddOvFizVKZfNTUlO4=; b=FmSozZryBEA+dHA0TzqEbago1hLqw/y16VXsqfkCSXv26NLkzCBgq+I81wKwKy96pj MyMq8K3Hf45VDV5u73Aoq4ahC50fhZD9nXkgvpjo2Itfbh/EEm33dCjqSlWxJOsWTf73 uVWyKZUHq/r1dnxIbeZI8vlNWSz/SXoILtCK1M25BmiII+H9NjQYnUsmG1trX6xUZEPI 6L1o7qNRH+suqV9OfBiixhGEYbrTrqIgv8z0oYBEhzstD0GyGz8y74TgcCdXXFvawnzT f+rO+sYR7isqkerp6EcWxadktBNlAt4ODeseVi+XmS4rzgo3xxNMBVBZ6kw7v+b4GZEk E3PA== 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=htvawVYgdmBe6+JhYzK+BnOyjaddOvFizVKZfNTUlO4=; b=WrWOMveIcXX8kvuINjzhNb99QmOvdWIHbiCN5PkiFWU/VNlacAn9t+SZYoRfQr6aT2 lxX5EJBkC9IdehzYmdx1mUqw2krsAG+HzAcoKl3Yokc8h0gqTKmvirzsakMkIK62Nvq5 C4W0j0BUxV4s4LFpneuFp/Ga1zEXjrh2Bh8EmTpYjDiLPXADR2tuRj9T/xNS4EG/zwj1 JYb6WlbK0Z73zrq88EarGifb4IoIVkllIf8pZu0mCSIuyeNAcTwv6TSeEQzZKonhjceX 8zbmmsihApaG1y4lccjo/8h25NToHnmUG0PE1b3ajcvBLIOhwlPPJBeHAZB9sQmxecV2 Pn6g== X-Gm-Message-State: AHPjjUiDyv1/si2BoLIhzQmEWGuR5ywycFOit9KCzoDEcVHUCoFX1LgA ZwcOZgTPMcH50AtI X-Google-Smtp-Source: ADKCNb5G4F+S+bocv88NPogspttuYpui3lfz+PMve9xsweZHj1lSqqv+gtm8W44RJ6msBONdRCZ+9w== X-Received: by 10.80.186.238 with SMTP id x101mr5443922ede.262.1504695161836; Wed, 06 Sep 2017 03:52:41 -0700 (PDT) Received: from uHalley.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id b8sm1044007edi.46.2017.09.06.03.52.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Sep 2017 03:52:41 -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 06/18] lightnvm: pblk: use right flag for GC allocation Date: Wed, 6 Sep 2017 12:50:59 +0200 Message-Id: <1504695071-25928-7-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504695071-25928-1-git-send-email-javier@cnexlabs.com> References: <1504695071-25928-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 The data buffer for the GC path allocates virtual memory through vmalloc. When this change was introduced, a flag signaling kmalloc'ed memory was wrongly introduced. Use the right flag when creating a bio from this buffer. Fixes: de54e703a422 ("lightnvm: pblk: use vmalloc for GC data buffer") Signed-off-by: Javier González Signed-off-by: Matias Bjørling --- drivers/lightnvm/pblk-read.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/lightnvm/pblk-read.c b/drivers/lightnvm/pblk-read.c index db9a3b575f62..9bbdca8a65ab 100644 --- a/drivers/lightnvm/pblk-read.c +++ b/drivers/lightnvm/pblk-read.c @@ -490,7 +490,7 @@ int pblk_submit_read_gc(struct pblk *pblk, u64 *lba_list, void *data, data_len = (*secs_to_gc) * geo->sec_size; bio = pblk_bio_map_addr(pblk, data, *secs_to_gc, data_len, - PBLK_KMALLOC_META, GFP_KERNEL); + PBLK_VMALLOC_META, GFP_KERNEL); if (IS_ERR(bio)) { pr_err("pblk: could not allocate GC bio (%lu)\n", PTR_ERR(bio)); goto err_free_dma; @@ -510,7 +510,7 @@ int pblk_submit_read_gc(struct pblk *pblk, u64 *lba_list, void *data, if (ret) { bio_endio(bio); pr_err("pblk: GC read request failed\n"); - goto err_free_dma; + goto err_free_bio; } if (!wait_for_completion_io_timeout(&wait, @@ -532,10 +532,13 @@ int pblk_submit_read_gc(struct pblk *pblk, u64 *lba_list, void *data, atomic_long_sub(*secs_to_gc, &pblk->inflight_reads); #endif + bio_put(bio); out: nvm_dev_dma_free(dev->parent, rqd.meta_list, rqd.dma_meta_list); return NVM_IO_OK; +err_free_bio: + bio_put(bio); err_free_dma: nvm_dev_dma_free(dev->parent, rqd.meta_list, rqd.dma_meta_list); return NVM_IO_ERR;