From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id ED7E15677 for ; Fri, 22 Jul 2016 18:23:35 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP; 22 Jul 2016 09:23:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,405,1464678000"; d="scan'208";a="1027221341" Received: from irsmsx153.ger.corp.intel.com ([163.33.192.75]) by fmsmga002.fm.intel.com with ESMTP; 22 Jul 2016 09:23:34 -0700 Received: from irsmsx109.ger.corp.intel.com ([169.254.13.24]) by IRSMSX153.ger.corp.intel.com ([169.254.9.206]) with mapi id 14.03.0248.002; Fri, 22 Jul 2016 17:23:05 +0100 From: "Jastrzebski, MichalX K" To: Thomas Monjalon CC: "Richardson, Bruce" , "dev@dpdk.org" , "Kobylinski, MichalX" , "Gonzalez Monroy, Sergio" , "david.marchand@6wind.com" Thread-Topic: [PATCH v2] eal: fix check number of bytes from read function Thread-Index: AQHR5C04gfDJJwbFCkijtQuDpk1P8KAkohGg Date: Fri, 22 Jul 2016 16:23:04 +0000 Message-ID: <60ABE07DBB3A454EB7FAD707B4BB158213AC9072@IRSMSX109.ger.corp.intel.com> References: <1469024689-1076-1-git-send-email-michalx.k.jastrzebski@intel.com> <1469198030-8664-1-git-send-email-michalx.k.jastrzebski@intel.com> <2746518.l5JpmnHLoW@xps13> In-Reply-To: <2746518.l5JpmnHLoW@xps13> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [163.33.239.180] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v2] eal: fix check number of bytes from read function X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jul 2016 16:23:36 -0000 > -----Original Message----- > From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com] > Sent: Friday, July 22, 2016 5:25 PM > To: Jastrzebski, MichalX K > Cc: Richardson, Bruce ; dev@dpdk.org; > Kobylinski, MichalX ; Gonzalez Monroy, > Sergio ; david.marchand@6wind.com > Subject: Re: [PATCH v2] eal: fix check number of bytes from read function >=20 > 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 >=20 > Looks better. > Note: this changelog should be below --- to avoid appearing in > the commit. >=20 > > 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. >=20 > Better title to explain the issue: > mem: fix check of physical address retrieval >=20 > > +#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 =3D read(fd, &page, sizeof(uint64_t)); >=20 > We could use PFN_MASK_SIZE here >=20 > > + close(fd); > > + if (retval < 0) { > > RTE_LOG(ERR, EAL, "%s(): cannot read /proc/self/pagemap: > %s\n", > > __func__, strerror(errno)); > > - close(fd); > > + >=20 > useless whitespace >=20 > > + return RTE_BAD_PHYS_ADDR; > > + } else if (retval !=3D PFN_MASK_SIZE) { > > + RTE_LOG(ERR, EAL, "%s(): read %d bytes from > /proc/self/pagemap " > > + "but expected %d:\n", > > + __func__, retval, PFN_MASK_SIZE); > > + >=20 > useless whitespace >=20 > > return RTE_BAD_PHYS_ADDR; > > } > > > > @@ -222,7 +233,7 @@ rte_mem_virt2phy(const void *virtaddr) > > */ > > physaddr =3D ((page & 0x7fffffffffffffULL) * page_size) > > + ((unsigned long)virtaddr % page_size); > > - close(fd); > > + > > return physaddr; > > } >=20 > If you and Sergio agree, I can make the minor changes before applying. Thanks Thomas. Please apply.