From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id A6455F11 for ; Wed, 29 Aug 2018 14:35:09 +0200 (CEST) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Aug 2018 05:35:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,303,1531810800"; d="scan'208";a="85459834" Received: from bricha3-mobl.ger.corp.intel.com ([10.237.221.107]) by fmsmga001.fm.intel.com with SMTP; 29 Aug 2018 05:35:06 -0700 Received: by (sSMTP sendmail emulation); Wed, 29 Aug 2018 13:35:05 +0100 Date: Wed, 29 Aug 2018 13:35:05 +0100 From: Bruce Richardson To: Anatoly Burakov Cc: dev@dpdk.org, dpdk@stormmq.com Message-ID: <20180829123505.GA39260@bricha3-MOBL.ger.corp.intel.com> References: <4694d02efdd764a45e84d2da00f1dff284694963.1535543250.git.anatoly.burakov@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4694d02efdd764a45e84d2da00f1dff284694963.1535543250.git.anatoly.burakov@intel.com> Organization: Intel Research and Development Ireland Ltd. User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [dpdk-dev] [PATCH 2/7] pci/vfio: improve musl compatibility X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Aug 2018 12:35:10 -0000 On Wed, Aug 29, 2018 at 12:56:16PM +0100, Anatoly Burakov wrote: > Musl already has PAGE_SIZE defined, and our define clashed with it. > Rename our define to SYS_PAGE_SIZE. > > Bugzilla ID: 36 > > Signed-off-by: Anatoly Burakov > --- Would it not be easier to just do? #ifndef PAGE_SIZE #define PAGE_SIZE ... #endif > drivers/bus/pci/linux/pci_vfio.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c > index 686386d6a..88bcfb88b 100644 > --- a/drivers/bus/pci/linux/pci_vfio.c > +++ b/drivers/bus/pci/linux/pci_vfio.c > @@ -35,8 +35,8 @@ > > #ifdef VFIO_PRESENT > > -#define PAGE_SIZE (sysconf(_SC_PAGESIZE)) > -#define PAGE_MASK (~(PAGE_SIZE - 1)) > +#define SYS_PAGE_SIZE (sysconf(_SC_PAGESIZE)) > +#define SYS_PAGE_MASK (~(SYS_PAGE_SIZE - 1)) > > static struct rte_tailq_elem rte_vfio_tailq = { > .name = "VFIO_RESOURCE_LIST", > @@ -344,8 +344,8 @@ pci_vfio_mmap_bar(int vfio_dev_fd, struct mapped_pci_resource *vfio_res, > */ > uint32_t table_start = msix_table->offset; > uint32_t table_end = table_start + msix_table->size; > - table_end = (table_end + ~PAGE_MASK) & PAGE_MASK; > - table_start &= PAGE_MASK; > + table_end = (table_end + ~SYS_PAGE_MASK) & SYS_PAGE_MASK; > + table_start &= SYS_PAGE_MASK; > > if (table_start == 0 && table_end >= bar->size) { > /* Cannot map this BAR */ > -- > 2.17.1