From patchwork Mon Nov 21 12:10:35 2016 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: 9439349 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 BD6F060235 for ; Mon, 21 Nov 2016 12:12:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AAFF028A81 for ; Mon, 21 Nov 2016 12:12:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9F37B28AA0; Mon, 21 Nov 2016 12:12:30 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 F0F6928A71 for ; Mon, 21 Nov 2016 12:12:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754443AbcKUMMK (ORCPT ); Mon, 21 Nov 2016 07:12:10 -0500 Received: from mail-wm0-f44.google.com ([74.125.82.44]:38200 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754061AbcKUMLJ (ORCPT ); Mon, 21 Nov 2016 07:11:09 -0500 Received: by mail-wm0-f44.google.com with SMTP id f82so141188984wmf.1 for ; Mon, 21 Nov 2016 04:11:08 -0800 (PST) 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=P0J+0yfY3CCE9YEbQ2HbCCkGCHQCqpAKhLQJ6bi6tR8=; b=htIefl815LLtiViey/3Lz5vvcPPE4a36UF1wbYmNmmUv9mbjZVNFL5NGxSCp5iYef3 a429XK2vAUZpkk8tOvrnPt1uroYn9qZAROcTIaDdX2dOcBc0aWls5rfRcletdIJJgZa2 4e68OVSjGGAo/7k2FhTtM6ks5CWasYuPKM6OVgickkJj1vAU6j+HTtzHVAzTS/W9AqUH yO5kcG2hE273oa39k01sSCxZ+gUctiR1LLJL+SsmhD/7cYeM64M5N7pFfW5dnAiC2BAz VyUS6Zlx5REJrHCHcOTla5QIOzV39NOFUEupUv1dE31J0FVJnDwZXvrP6nsnYB7PRKZI 1S4A== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=P0J+0yfY3CCE9YEbQ2HbCCkGCHQCqpAKhLQJ6bi6tR8=; b=LofBSsy21Kr8OP5lKN8lbPcL19E/1nfKeFcuzre55Vwe4mPR3yb6K/UKMrsiqkcuty dg4ZGwlevAMk/Jt0GohrFIjwJDjNODCuXnNEqjC5HoxpEWHD61Z8UKtaKBpfpyPl9kAz 3pI6sXG715mj1CCFqUh1Gdu43zNfqJ0K1xz3Hph52mx8F49jzlZ+PunkjhyHSefO0fAK y3NwstpH8N2AHvesf05H2BEiluRjoCFC6PL6AG2ryJK7a5it5+IjaiNls2SUfvQyo+bN fDd+QR8ZKQ80MNo65aIQorpo6YkDt+APWMRxZq1GUpddeF+pYotHJ0XbKKux8rt6NauA P1tg== X-Gm-Message-State: AKaTC01L/tOo8Re2Hg0lQfs2CJmXc+QopRzGuJMoQABGTihFRo6cuiU8MsddLAQCtf/OHA== X-Received: by 10.28.10.147 with SMTP id 141mr13400528wmk.65.1479730267489; Mon, 21 Nov 2016 04:11:07 -0800 (PST) Received: from uHalley.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id b3sm8374975wjy.40.2016.11.21.04.11.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Nov 2016 04:11:07 -0800 (PST) From: "=?UTF-8?q?Javier=20Gonz=C3=A1lez?=" X-Google-Original-From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= To: mb@lightnvm.io Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= Subject: [PATCH 6/8] lightnvm: introduce helpers for generic ops in rrpc Date: Mon, 21 Nov 2016 13:10:35 +0100 Message-Id: <1479730237-20797-7-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479730237-20797-1-git-send-email-javier@cnexlabs.com> References: <1479730237-20797-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 Avoid calling media manager and device-specific operations directly from rrpc. Create helper functions on lightnvm's core instead. Signed-off-by: Javier González --- drivers/lightnvm/core.c | 22 ++++++++++++++++++++++ drivers/lightnvm/gennvm.c | 2 -- drivers/lightnvm/rrpc.c | 11 +++-------- include/linux/lightnvm.h | 3 --- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c index 23d582f..69f261e 100644 --- a/drivers/lightnvm/core.c +++ b/drivers/lightnvm/core.c @@ -219,6 +219,28 @@ int nvm_erase_blk(struct nvm_tgt_dev *tgt_dev, struct ppa_addr *p, int flags) } EXPORT_SYMBOL(nvm_erase_blk); +int nvm_get_l2p_tbl(struct nvm_dev *dev, u64 slba, u32 nlb, + nvm_l2p_update_fn *update_l2p, void *priv) +{ + if (!dev->ops->get_l2p_tbl) + return 0; + + return dev->ops->get_l2p_tbl(dev, slba, nlb, update_l2p, priv); +} +EXPORT_SYMBOL(nvm_get_l2p_tbl); + +int nvm_get_area(struct nvm_dev *dev, sector_t *lba, sector_t len) +{ + return dev->mt->get_area(dev, lba, len); +} +EXPORT_SYMBOL(nvm_get_area); + +void nvm_put_area(struct nvm_dev *dev, sector_t lba) +{ + dev->mt->put_area(dev, lba); +} +EXPORT_SYMBOL(nvm_put_area); + void nvm_addr_to_generic_mode(struct nvm_dev *dev, struct nvm_rq *rqd) { int i; diff --git a/drivers/lightnvm/gennvm.c b/drivers/lightnvm/gennvm.c index 5d7c8c4..befa828 100644 --- a/drivers/lightnvm/gennvm.c +++ b/drivers/lightnvm/gennvm.c @@ -175,8 +175,6 @@ static struct nvm_tgt_dev *gen_create_tgt_dev(struct nvm_dev *dev, tgt_dev->geo.luns_per_chnl = (lun_balanced) ? prev_nr_luns : -1; tgt_dev->total_secs = nr_luns * tgt_dev->geo.sec_per_lun; tgt_dev->q = dev->q; - tgt_dev->ops = dev->ops; - tgt_dev->mt = dev->mt; tgt_dev->map = dev_map; tgt_dev->luns = luns; memcpy(&tgt_dev->identity, &dev->identity, sizeof(struct nvm_id)); diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c index 75ed12a..5826c6b 100644 --- a/drivers/lightnvm/rrpc.c +++ b/drivers/lightnvm/rrpc.c @@ -1166,11 +1166,8 @@ static int rrpc_map_init(struct rrpc *rrpc) r->addr = ADDR_EMPTY; } - if (!dev->ops->get_l2p_tbl) - return 0; - /* Bring up the mapping table from device */ - ret = dev->ops->get_l2p_tbl(dev->parent, rrpc->soffset, rrpc->nr_sects, + ret = nvm_get_l2p_tbl(dev->parent, rrpc->soffset, rrpc->nr_sects, rrpc_l2p_update, rrpc); if (ret) { pr_err("nvm: rrpc: could not read L2P table.\n"); @@ -1370,13 +1367,12 @@ static int rrpc_luns_init(struct rrpc *rrpc, struct ppa_addr *luns) static int rrpc_area_init(struct rrpc *rrpc, sector_t *begin) { struct nvm_tgt_dev *dev = rrpc->dev; - struct nvmm_type *mt = dev->mt; sector_t size = rrpc->nr_sects * dev->geo.sec_size; int ret; size >>= 9; - ret = mt->get_area(dev->parent, begin, size); + ret = nvm_get_area(dev->parent, begin, size); if (!ret) *begin >>= (ilog2(dev->geo.sec_size) - 9); @@ -1386,10 +1382,9 @@ static int rrpc_area_init(struct rrpc *rrpc, sector_t *begin) static void rrpc_area_free(struct rrpc *rrpc) { struct nvm_tgt_dev *dev = rrpc->dev; - struct nvmm_type *mt = dev->mt; sector_t begin = rrpc->soffset << (ilog2(dev->geo.sec_size) - 9); - mt->put_area(dev->parent, begin); + nvm_put_area(dev->parent, begin); } static void rrpc_free(struct rrpc *rrpc) diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h index 2222853..b3ca603 100644 --- a/include/linux/lightnvm.h +++ b/include/linux/lightnvm.h @@ -320,9 +320,6 @@ struct nvm_tgt_dev { struct nvm_id identity; struct request_queue *q; - struct nvmm_type *mt; - struct nvm_dev_ops *ops; - void *parent; void *map; };