Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758774AbcDEPJg (ORCPT ); Tue, 5 Apr 2016 11:09:36 -0400 Received: from mx2.suse.de ([195.135.220.15]:55262 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758293AbcDEPJe (ORCPT ); Tue, 5 Apr 2016 11:09:34 -0400 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Date: Tue, 05 Apr 2016 17:09:32 +0200 From: Johannes Thumshirn To: =?UTF-8?Q?Matias_Bj=C3=B8rling?= Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block-owner@vger.kernel.org Subject: Re: [PATCH 3/5] lightnvm: add fpg_size and pfpg_size to struct nvm_dev In-Reply-To: <1459868131-15133-4-git-send-email-m@bjorling.me> References: <1459868131-15133-1-git-send-email-m@bjorling.me> <1459868131-15133-4-git-send-email-m@bjorling.me> Message-ID: <3ff250c0ffc900317d09694b5b8058f6@suse.de> User-Agent: Roundcube Webmail Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3906 Lines: 110 On 2016-04-05 16:55, Matias Bjørling wrote: > The flash page size (fpg) and size across planes (pfpg) are convenient > to know when allocating buffer sizes. This has previously been a > calculated in various places. Replace with the pre-calculated values. > > Signed-off-by: Matias Bjørling > --- > drivers/lightnvm/core.c | 2 ++ > drivers/lightnvm/sysblk.c | 17 +++++++---------- > include/linux/lightnvm.h | 2 ++ > 3 files changed, 11 insertions(+), 10 deletions(-) > > diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c > index f4e04a5..652b8c7 100644 > --- a/drivers/lightnvm/core.c > +++ b/drivers/lightnvm/core.c > @@ -476,6 +476,8 @@ static int nvm_core_init(struct nvm_dev *dev) > dev->pgs_per_blk = grp->num_pg; > dev->blks_per_lun = grp->num_blk; > dev->nr_planes = grp->num_pln; > + dev->fpg_size = grp->fpg_sz; > + dev->pfpg_size = grp->fpg_sz * grp->num_pln; > dev->sec_size = grp->csecs; > dev->oob_size = grp->sos; > dev->sec_per_pg = grp->fpg_sz / grp->csecs; > diff --git a/drivers/lightnvm/sysblk.c b/drivers/lightnvm/sysblk.c > index 321de1f..8835d89 100644 > --- a/drivers/lightnvm/sysblk.c > +++ b/drivers/lightnvm/sysblk.c > @@ -154,13 +154,12 @@ static int nvm_scan_block(struct nvm_dev *dev, > struct ppa_addr *ppa, > struct nvm_system_block *sblk) > { > struct nvm_system_block *cur; > - int pg, cursz, ret, found = 0; > + int pg, ret, found = 0; > > /* the full buffer for a flash page is allocated. Only the first of > it > * contains the system block information > */ > - cursz = dev->sec_size * dev->sec_per_pg * dev->nr_planes; > - cur = kmalloc(cursz, GFP_KERNEL); > + cur = kmalloc(dev->pfpg_size, GFP_KERNEL); > if (!cur) > return -ENOMEM; > > @@ -169,7 +168,7 @@ static int nvm_scan_block(struct nvm_dev *dev, > struct ppa_addr *ppa, > ppa->g.pg = ppa_to_slc(dev, pg); > > ret = nvm_submit_ppa(dev, ppa, 1, NVM_OP_PREAD, NVM_IO_SLC_MODE, > - cur, cursz); > + cur, dev->pfpg_size); > if (ret) { > if (ret == NVM_RSP_ERR_EMPTYPAGE) { > pr_debug("nvm: sysblk scan empty ppa (%u %u %u %u)\n", > @@ -272,14 +271,12 @@ static int nvm_write_and_verify(struct nvm_dev > *dev, struct nvm_sb_info *info, > { > struct nvm_system_block nvmsb; > void *buf; > - int i, sect, ret, bufsz; > + int i, sect, ret; > struct ppa_addr *ppas; > > nvm_cpu_to_sysblk(&nvmsb, info); > > - /* buffer for flash page */ > - bufsz = dev->sec_size * dev->sec_per_pg * dev->nr_planes; > - buf = kzalloc(bufsz, GFP_KERNEL); > + buf = kzalloc(dev->pfpg_size, GFP_KERNEL); > if (!buf) > return -ENOMEM; > memcpy(buf, &nvmsb, sizeof(struct nvm_system_block)); > @@ -309,7 +306,7 @@ static int nvm_write_and_verify(struct nvm_dev > *dev, struct nvm_sb_info *info, > } > > ret = nvm_submit_ppa(dev, ppas, dev->sec_per_pg, NVM_OP_PWRITE, > - NVM_IO_SLC_MODE, buf, bufsz); > + NVM_IO_SLC_MODE, buf, dev->pfpg_size); > if (ret) { > pr_err("nvm: sysblk failed program (%u %u %u)\n", > ppas[0].g.ch, > @@ -319,7 +316,7 @@ static int nvm_write_and_verify(struct nvm_dev > *dev, struct nvm_sb_info *info, > } > > ret = nvm_submit_ppa(dev, ppas, dev->sec_per_pg, NVM_OP_PREAD, > - NVM_IO_SLC_MODE, buf, bufsz); > + NVM_IO_SLC_MODE, buf, dev->pfpg_size); > if (ret) { > pr_err("nvm: sysblk failed read (%u %u %u)\n", > ppas[0].g.ch, > diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h > index 38814e2..f7c607f 100644 > --- a/include/linux/lightnvm.h > +++ b/include/linux/lightnvm.h > @@ -323,6 +323,8 @@ struct nvm_dev { > int sec_per_pg; /* only sectors for a single page */ > int pgs_per_blk; > int blks_per_lun; > + int fpg_size; > + int pfpg_size; /* size of buffer if all pages are to be read */ > int sec_size; > int oob_size; > int mccap; Reviewed-by: Johannes Thumshirn