From patchwork Tue Oct 9 11:11:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matias Bjorling X-Patchwork-Id: 10632325 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E6679112B for ; Tue, 9 Oct 2018 11:17:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C6FE628A45 for ; Tue, 9 Oct 2018 11:17:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB18328A6E; Tue, 9 Oct 2018 11:17:28 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 4F65528A45 for ; Tue, 9 Oct 2018 11:17:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727253AbeJISaR (ORCPT ); Tue, 9 Oct 2018 14:30:17 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:33708 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727047AbeJISaR (ORCPT ); Tue, 9 Oct 2018 14:30:17 -0400 Received: by mail-pl1-f193.google.com with SMTP id s4-v6so679457plp.0 for ; Tue, 09 Oct 2018 04:13:51 -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=vBmseQYpd6ClG24uD0LYJiRIgM5ORPJ3WfMiUc0Ungk=; b=IYvhoLaLXXZfoMbdrAG46zofcFtvXYMU4FftjuYoDo9EjOxRkSCZarc4C5qOJMw/WT gE8o2wr76VEzScs+NsHZfz5dnc57aJsXINnemnUlcQZTF2QlakjigOPLQiVHVoVnKos9 UssMbMwq0qb5iwt2Ic7tvNYk8D0UQlWzjrK4YiOIUFPlMkWig+zyCOvGSi1FD2+t9Xd1 JxPZTcQJp076oMLhNXfuYiCMuDvUZxRDVG2g6D1oGimBH488zc7iarNHNk2ryP+e0Q+d Pmiqu06dByDIQfNlT5vxhPJQ+1n/n1ELcDR7iTAm5kCe1IKTK0bd2+XQvcYRDHdN0PhU kDTQ== 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=vBmseQYpd6ClG24uD0LYJiRIgM5ORPJ3WfMiUc0Ungk=; b=XDKeB+B8I788xJ4+a6rejJQbkKohE2yF0zfls1PPu1EQWDHgBLEFrtfhjy16AuUiQD eSvm+pJnTbxIxAgz+F1YIOG26qRBRTkkNp32xaP6Z5EeS8XrZ6qEePqThRoI2vczY89/ Rv1zbS4D1L5bhFgC7Q0QaH3oHB6M8Mrbx47AZQGaAfNBUDVdY9AOwzoBGJ5XqDS/7T9p 5uLAoZbtTIQZAn+wjDAdDFDfjoshG4XGEIDmHanry8pNrzwMh36AlHny88HsCSFbQLO2 hCk53NAB8JGNtsP797Htg2nAKU0RhLnOYEleAYyuFyTImoSaPnwHsS3dhiOqPWhSWkTe isJw== X-Gm-Message-State: ABuFfohvWUbPK3x4tBa9OSmyoLr+e436X3v/r1UpLaRrnBHKmDQkbYn8 dRGsZZ70VGq7/6xd8DImrDaJ1A== X-Google-Smtp-Source: ACcGV63IPp/K2DByQ/PBmkgkOA4yPYyniqH5tYSaARz9Y3SMnbUiDdSSScuXftGdejZKRUSeajVX+g== X-Received: by 2002:a17:902:8c84:: with SMTP id t4-v6mr28533559plo.188.1539083630339; Tue, 09 Oct 2018 04:13:50 -0700 (PDT) Received: from skyninja.hgst.com (rap-us.hgst.com. [199.255.44.250]) by smtp.gmail.com with ESMTPSA id p1-v6sm25342380pff.128.2018.10.09.04.13.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Oct 2018 04:13:49 -0700 (PDT) From: =?utf-8?q?Matias_Bj=C3=B8rling?= To: axboe@fb.com Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Jav?= =?utf-8?q?ier_Gonz=C3=A1lez?= , =?utf-8?q?Javier_Gonz?= =?utf-8?q?=C3=A1lez?= , =?utf-8?q?Matias_Bj=C3=B8rling?= Subject: [GIT PULL 11/45] lightnvm: pblk: add helpers for chunk addresses Date: Tue, 9 Oct 2018 13:11:41 +0200 Message-Id: <20181009111215.7653-12-mb@lightnvm.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181009111215.7653-1-mb@lightnvm.io> References: <20181009111215.7653-1-mb@lightnvm.io> 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 From: Javier González Implement helpers to go from ppas to a chunk within a line and an address within a chunk. These helpers will be used on the patches adding trace support in pblk, which will be sent in this window. Signed-off-by: Javier González Signed-off-by: Matias Bjørling --- drivers/lightnvm/pblk.h | 19 +++++++++++++++++++ include/linux/lightnvm.h | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h index be67bbfa3d0a..f95fe75fef6e 100644 --- a/drivers/lightnvm/pblk.h +++ b/drivers/lightnvm/pblk.h @@ -1034,6 +1034,25 @@ static inline struct ppa_addr addr_to_gen_ppa(struct pblk *pblk, u64 paddr, return ppa; } +static inline struct nvm_chk_meta *pblk_dev_ppa_to_chunk(struct pblk *pblk, + struct ppa_addr p) +{ + struct nvm_tgt_dev *dev = pblk->dev; + struct nvm_geo *geo = &dev->geo; + struct pblk_line *line = &pblk->lines[pblk_ppa_to_line(p)]; + int pos = pblk_ppa_to_pos(geo, p); + + return &line->chks[pos]; +} + +static inline u64 pblk_dev_ppa_to_chunk_addr(struct pblk *pblk, + struct ppa_addr p) +{ + struct nvm_tgt_dev *dev = pblk->dev; + + return dev_to_chunk_addr(dev->parent, &pblk->addrf, p); +} + static inline u64 pblk_dev_ppa_to_line_addr(struct pblk *pblk, struct ppa_addr p) { diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h index 0106984400bc..77743a02ec0d 100644 --- a/include/linux/lightnvm.h +++ b/include/linux/lightnvm.h @@ -487,6 +487,25 @@ static inline struct ppa_addr dev_to_generic_addr(struct nvm_dev *dev, return l; } +static inline u64 dev_to_chunk_addr(struct nvm_dev *dev, void *addrf, + struct ppa_addr p) +{ + struct nvm_geo *geo = &dev->geo; + u64 caddr; + + if (geo->version == NVM_OCSSD_SPEC_12) { + struct nvm_addrf_12 *ppaf = (struct nvm_addrf_12 *)addrf; + + caddr = (u64)p.g.pg << ppaf->pg_offset; + caddr |= (u64)p.g.pl << ppaf->pln_offset; + caddr |= (u64)p.g.sec << ppaf->sec_offset; + } else { + caddr = p.m.sec; + } + + return caddr; +} + typedef blk_qc_t (nvm_tgt_make_rq_fn)(struct request_queue *, struct bio *); typedef sector_t (nvm_tgt_capacity_fn)(void *); typedef void *(nvm_tgt_init_fn)(struct nvm_tgt_dev *, struct gendisk *,