From: "Jastrzebski, MichalX K" <michalx.k.jastrzebski@intel.com>
To: Thomas Monjalon <thomas.monjalon@6wind.com>
Cc: "Richardson, Bruce" <bruce.richardson@intel.com>,
"dev@dpdk.org" <dev@dpdk.org>,
"Kobylinski, MichalX" <michalx.kobylinski@intel.com>,
"Gonzalez Monroy, Sergio" <sergio.gonzalez.monroy@intel.com>,
"david.marchand@6wind.com" <david.marchand@6wind.com>
Subject: Re: [dpdk-dev] [PATCH v2] eal: fix check number of bytes from read function
Date: Fri, 22 Jul 2016 16:23:04 +0000 [thread overview]
Message-ID: <60ABE07DBB3A454EB7FAD707B4BB158213AC9072@IRSMSX109.ger.corp.intel.com> (raw)
In-Reply-To: <2746518.l5JpmnHLoW@xps13>
> -----Original Message-----
> From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com]
> Sent: Friday, July 22, 2016 5:25 PM
> To: Jastrzebski, MichalX K <michalx.k.jastrzebski@intel.com>
> Cc: Richardson, Bruce <bruce.richardson@intel.com>; dev@dpdk.org;
> Kobylinski, MichalX <michalx.kobylinski@intel.com>; Gonzalez Monroy,
> Sergio <sergio.gonzalez.monroy@intel.com>; david.marchand@6wind.com
> Subject: Re: [PATCH v2] eal: fix check number of bytes from read function
>
> 2016-07-22 16:33, Michal Jastrzebski:
> > v2:
> > -moved close(fd) just after read.
> > -when read() from fd we expect 8 bytes, so PFN_MASK_SIZE macro
> > was introduced instead sizeof(uint64_t).
> > -removed errno print when read returns less than 8 bytes
>
> Looks better.
> Note: this changelog should be below --- to avoid appearing in
> the commit.
>
> > In rte_mem_virt2phy: Value returned from a function and indicating the
> > number of bytes was ignored. This could cause a wrong pfn (page frame
> > number) mask read from pagemap file.
> > When read returns less than the number of sizeof(uint64_t) bytes,
> > function rte_mem_virt2phy returns error.
>
> Better title to explain the issue:
> mem: fix check of physical address retrieval
>
> > +#define PFN_MASK_SIZE 8
> > +
> > #ifdef RTE_LIBRTE_XEN_DOM0
> > int rte_xen_dom0_supported(void)
> > {
> > @@ -158,7 +160,7 @@ rte_mem_lock_page(const void *virt)
> > phys_addr_t
> > rte_mem_virt2phy(const void *virtaddr)
> > {
> > - int fd;
> > + int fd, retval;
> > uint64_t page, physaddr;
> > unsigned long virt_pfn;
> > int page_size;
> > @@ -209,10 +211,19 @@ rte_mem_virt2phy(const void *virtaddr)
> > close(fd);
> > return RTE_BAD_PHYS_ADDR;
> > }
> > - if (read(fd, &page, sizeof(uint64_t)) < 0) {
> > +
> > + retval = read(fd, &page, sizeof(uint64_t));
>
> We could use PFN_MASK_SIZE here
>
> > + close(fd);
> > + if (retval < 0) {
> > RTE_LOG(ERR, EAL, "%s(): cannot read /proc/self/pagemap:
> %s\n",
> > __func__, strerror(errno));
> > - close(fd);
> > +
>
> useless whitespace
>
> > + return RTE_BAD_PHYS_ADDR;
> > + } else if (retval != PFN_MASK_SIZE) {
> > + RTE_LOG(ERR, EAL, "%s(): read %d bytes from
> /proc/self/pagemap "
> > + "but expected %d:\n",
> > + __func__, retval, PFN_MASK_SIZE);
> > +
>
> useless whitespace
>
> > return RTE_BAD_PHYS_ADDR;
> > }
> >
> > @@ -222,7 +233,7 @@ rte_mem_virt2phy(const void *virtaddr)
> > */
> > physaddr = ((page & 0x7fffffffffffffULL) * page_size)
> > + ((unsigned long)virtaddr % page_size);
> > - close(fd);
> > +
> > return physaddr;
> > }
>
> If you and Sergio agree, I can make the minor changes before applying.
Thanks Thomas. Please apply.
prev parent reply other threads:[~2016-07-22 16:23 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-20 14:24 [dpdk-dev] [PATCH] " Michal Jastrzebski
2016-07-21 14:35 ` Thomas Monjalon
2016-07-21 20:50 ` Jastrzebski, MichalX K
2016-07-21 23:09 ` Thomas Monjalon
2016-07-21 14:37 ` Sergio Gonzalez Monroy
2016-07-22 14:38 ` Jastrzebski, MichalX K
2016-07-22 14:33 ` [dpdk-dev] [PATCH v2] " Michal Jastrzebski
2016-07-22 15:24 ` Thomas Monjalon
2016-07-22 16:02 ` Sergio Gonzalez Monroy
2016-07-22 16:22 ` Thomas Monjalon
2016-07-22 16:23 ` Jastrzebski, MichalX K [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=60ABE07DBB3A454EB7FAD707B4BB158213AC9072@IRSMSX109.ger.corp.intel.com \
--to=michalx.k.jastrzebski@intel.com \
--cc=bruce.richardson@intel.com \
--cc=david.marchand@6wind.com \
--cc=dev@dpdk.org \
--cc=michalx.kobylinski@intel.com \
--cc=sergio.gonzalez.monroy@intel.com \
--cc=thomas.monjalon@6wind.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).