| Message ID | 1535531871-23255-1-git-send-email-javier@cnexlabs.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | lightnvm: pblk: add helpers for chunk addresses | expand |
On 08/29/2018 10:37 AM, Javier González wrote: > 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 <javier@cnexlabs.com> > --- > drivers/lightnvm/pblk.h | 31 +++++++++++++++++++++++++++++++ > 1 file changed, 31 insertions(+) > > diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h > index be67bbfa3d0a..1bfbd3315598 100644 > --- a/drivers/lightnvm/pblk.h > +++ b/drivers/lightnvm/pblk.h > @@ -1034,6 +1034,37 @@ 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; > + struct nvm_geo *geo = &dev->geo; > + u64 caddr; > + > + if (geo->version == NVM_OCSSD_SPEC_12) { Please move this into core. > + struct nvm_addrf_12 *ppaf = (struct nvm_addrf_12 *)&pblk->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; > +} > + > static inline u64 pblk_dev_ppa_to_line_addr(struct pblk *pblk, > struct ppa_addr p) > { >
> On 29 Aug 2018, at 14.36, Matias Bjørling <mb@lightnvm.io> wrote: > > On 08/29/2018 10:37 AM, Javier González wrote: >> 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 <javier@cnexlabs.com> >> --- >> drivers/lightnvm/pblk.h | 31 +++++++++++++++++++++++++++++++ >> 1 file changed, 31 insertions(+) >> diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h >> index be67bbfa3d0a..1bfbd3315598 100644 >> --- a/drivers/lightnvm/pblk.h >> +++ b/drivers/lightnvm/pblk.h >> @@ -1034,6 +1034,37 @@ 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; >> + struct nvm_geo *geo = &dev->geo; >> + u64 caddr; >> + >> + if (geo->version == NVM_OCSSD_SPEC_12) { > > Please move this into core. Wanted to wait until the rest of address conversions were moved, but you can get a v2 for this. Javier
diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h index be67bbfa3d0a..1bfbd3315598 100644 --- a/drivers/lightnvm/pblk.h +++ b/drivers/lightnvm/pblk.h @@ -1034,6 +1034,37 @@ 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; + struct nvm_geo *geo = &dev->geo; + u64 caddr; + + if (geo->version == NVM_OCSSD_SPEC_12) { + struct nvm_addrf_12 *ppaf = (struct nvm_addrf_12 *)&pblk->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; +} + static inline u64 pblk_dev_ppa_to_line_addr(struct pblk *pblk, struct ppa_addr p) {
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 <javier@cnexlabs.com> --- drivers/lightnvm/pblk.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)