Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934577AbcDMI02 (ORCPT ); Wed, 13 Apr 2016 04:26:28 -0400 Received: from mail-pa0-f65.google.com ([209.85.220.65]:34077 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934039AbcDMI0V (ORCPT ); Wed, 13 Apr 2016 04:26:21 -0400 From: Wenwei Tao To: mb@lightnvm.io Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org Subject: [PATCH 3/3] lightnvm: fix address issues related to multi target Date: Wed, 13 Apr 2016 16:27:52 +0800 Message-Id: <1460536072-1728-3-git-send-email-ww.tao0320@gmail.com> X-Mailer: git-send-email 2.7.1.windows.2 In-Reply-To: <1460536072-1728-1-git-send-email-ww.tao0320@gmail.com> References: <1460536072-1728-1-git-send-email-ww.tao0320@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3426 Lines: 103 In rrpc, some of the address operations are based on one target assumption, the global values are always used. Now multi target is available, we should use relative/global values properly. In rrpc_l2p_update, we use relative logical address to deal with trans_map and rev_trans_map, and check the bound of target's own intead of global device's. In rrpc_block_map_update, we should use the global physcical address to compare with the one in trans_map, since we store the global value in it. Signed-off-by: Wenwei Tao --- drivers/lightnvm/rrpc.c | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c index 3143b98..159dc3b 100644 --- a/drivers/lightnvm/rrpc.c +++ b/drivers/lightnvm/rrpc.c @@ -116,15 +116,6 @@ static int block_is_full(struct rrpc *rrpc, struct rrpc_block *rblk) return (rblk->next_page == rrpc->dev->sec_per_blk); } -/* Calculate relative addr for the given block, considering instantiated LUNs */ -static u64 block_to_rel_addr(struct rrpc *rrpc, struct rrpc_block *rblk) -{ - struct nvm_block *blk = rblk->parent; - int lun_blk = blk->id % (rrpc->dev->blks_per_lun * rrpc->nr_luns); - - return lun_blk * rrpc->dev->sec_per_blk; -} - /* Calculate global addr for the given block */ static u64 block_to_addr(struct rrpc *rrpc, struct rrpc_block *rblk) { @@ -997,24 +988,29 @@ static void rrpc_map_free(struct rrpc *rrpc) static int rrpc_l2p_update(u64 slba, u32 nlb, __le64 *entries, void *private) { struct rrpc *rrpc = (struct rrpc *)private; - struct nvm_dev *dev = rrpc->dev; - struct rrpc_addr *addr = rrpc->trans_map + slba; - struct rrpc_rev_addr *raddr = rrpc->rev_trans_map; - u64 elba = slba + nlb; - u64 i; + struct rrpc_addr *addr; + struct rrpc_rev_addr *raddr; + u64 i, elba = slba + nlb - 1; - if (unlikely(elba > dev->total_secs)) { + if (unlikely(slba < rrpc->soffset || + elba > rrpc->soffset + rrpc->nr_sects - 1)) { pr_err("nvm: L2P data from device is out of bounds!\n"); return -EINVAL; } + slba -= rrpc->soffset; + addr = rrpc->trans_map + slba; + raddr = rrpc->rev_trans_map; + for (i = 0; i < nlb; i++) { u64 pba = le64_to_cpu(entries[i]); unsigned int mod; /* LNVM treats address-spaces as silos, LBA and PBA are * equally large and zero-indexed. */ - if (unlikely(pba >= dev->total_secs && pba != U64_MAX)) { + if (unlikely((pba < rrpc->poffset || + pba > rrpc->poffset + rrpc->nr_sects - 1) && + (pba != U64_MAX && pba != 0))) { pr_err("nvm: L2P data entry is out of bounds!\n"); return -EINVAL; } @@ -1289,19 +1285,20 @@ static void rrpc_block_map_update(struct rrpc *rrpc, struct rrpc_block *rblk) struct nvm_dev *dev = rrpc->dev; int offset; struct rrpc_addr *laddr; - u64 bpaddr, paddr, pladdr; + u64 paddr, rpaddr, pladdr; + + paddr = block_to_addr(rrpc, rblk); + rpaddr = paddr - rrpc->poffset; - bpaddr = block_to_rel_addr(rrpc, rblk); for (offset = 0; offset < dev->sec_per_blk; offset++) { - paddr = bpaddr + offset; - pladdr = rrpc->rev_trans_map[paddr].addr; + pladdr = rrpc->rev_trans_map[rpaddr + offset].addr; if (pladdr == ADDR_EMPTY) continue; laddr = &rrpc->trans_map[pladdr]; - if (paddr == laddr->addr) { + if (paddr + offset == laddr->addr) { laddr->rblk = rblk; } else { set_bit(offset, rblk->invalid_pages); -- 1.8.3.1