From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB49CC47082 for ; Tue, 8 Jun 2021 12:36:06 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5F38A61360 for ; Tue, 8 Jun 2021 12:36:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5F38A61360 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=cs.pub.ro Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.138458.256331 (Exim 4.92) (envelope-from ) id 1lqaxb-0000MV-RV; Tue, 08 Jun 2021 12:35:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 138458.256331; Tue, 08 Jun 2021 12:35:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lqaxb-0000MK-MN; Tue, 08 Jun 2021 12:35:59 +0000 Received: by outflank-mailman (input) for mailman id 138458; Tue, 08 Jun 2021 12:35:58 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lqaxa-0007Ok-8j for xen-devel@lists.xenproject.org; Tue, 08 Jun 2021 12:35:58 +0000 Received: from mx.upb.ro (unknown [141.85.13.231]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 2fc4d4b7-96d5-4a35-8117-8c13f80885ce; Tue, 08 Jun 2021 12:35:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mx.upb.ro (Postfix) with ESMTP id E9E40B560198; Tue, 8 Jun 2021 15:35:42 +0300 (EEST) Received: from mx.upb.ro ([127.0.0.1]) by localhost (mx.upb.ro [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id BwKakGLi3CjN; Tue, 8 Jun 2021 15:35:39 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by mx.upb.ro (Postfix) with ESMTP id 81FB0B56019C; Tue, 8 Jun 2021 15:35:39 +0300 (EEST) Received: from mx.upb.ro ([127.0.0.1]) by localhost (mx.upb.ro [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id h32ba2wsXpzQ; Tue, 8 Jun 2021 15:35:39 +0300 (EEST) Received: from localhost.localdomain (unknown [188.25.174.245]) by mx.upb.ro (Postfix) with ESMTPSA id 1F3A5B56019A; Tue, 8 Jun 2021 15:35:39 +0300 (EEST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 2fc4d4b7-96d5-4a35-8117-8c13f80885ce X-Virus-Scanned: amavisd-new at upb.ro From: Costin Lupu To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Wei Liu Subject: [PATCH v4 4/5] tools/libs/gnttab: Fix PAGE_SIZE redefinition error Date: Tue, 8 Jun 2021 15:35:28 +0300 Message-Id: <84d03c4595428e4ff857dcacc72f6b9c04476849.1623155575.git.costin.lupu@cs.pub.ro> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable If PAGE_SIZE is already defined in the system (e.g. in /usr/include/limit= s.h header) then gcc will trigger a redefinition error because of -Werror. Th= is patch replaces usage of PAGE_* macros with XC_PAGE_* macros in order to a= void confusion between control domain page granularity (PAGE_* definitions) an= d guest domain page granularity. The exception is in osdep_xenforeignmemory_map() where we need the system= page size to check whether the PFN array should be allocated with mmap() or wi= th dynamic allocation. Signed-off-by: Costin Lupu --- tools/libs/gnttab/freebsd.c | 28 +++++++++++++--------------- tools/libs/gnttab/linux.c | 28 +++++++++++++--------------- tools/libs/gnttab/netbsd.c | 23 ++++++++++------------- 3 files changed, 36 insertions(+), 43 deletions(-) diff --git a/tools/libs/gnttab/freebsd.c b/tools/libs/gnttab/freebsd.c index 768af701c6..e42ac3fbf3 100644 --- a/tools/libs/gnttab/freebsd.c +++ b/tools/libs/gnttab/freebsd.c @@ -30,14 +30,11 @@ =20 #include =20 +#include #include =20 #include "private.h" =20 -#define PAGE_SHIFT 12 -#define PAGE_SIZE (1UL << PAGE_SHIFT) -#define PAGE_MASK (~(PAGE_SIZE-1)) - #define DEVXEN "/dev/xen/gntdev" =20 int osdep_gnttab_open(xengnttab_handle *xgt) @@ -77,10 +74,11 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, int domids_stride; unsigned int refs_size =3D ROUNDUP(count * sizeof(struct ioctl_gntdev_grant_re= f), - PAGE_SHIFT); + XC_PAGE_SHIFT); + int os_page_size =3D getpagesize(); =20 domids_stride =3D (flags & XENGNTTAB_GRANT_MAP_SINGLE_DOMAIN) ? 0 : = 1; - if ( refs_size <=3D PAGE_SIZE ) + if ( refs_size <=3D os_page_size ) map.refs =3D malloc(refs_size); else { @@ -107,7 +105,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, goto out; } =20 - addr =3D mmap(NULL, PAGE_SIZE * count, prot, MAP_SHARED, fd, + addr =3D mmap(NULL, XC_PAGE_SIZE * count, prot, MAP_SHARED, fd, map.index); if ( addr !=3D MAP_FAILED ) { @@ -116,7 +114,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, =20 notify.index =3D map.index; notify.action =3D 0; - if ( notify_offset < PAGE_SIZE * count ) + if ( notify_offset < XC_PAGE_SIZE * count ) { notify.index +=3D notify_offset; notify.action |=3D UNMAP_NOTIFY_CLEAR_BYTE; @@ -131,7 +129,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, if ( rv ) { GTERROR(xgt->logger, "ioctl SET_UNMAP_NOTIFY failed"); - munmap(addr, count * PAGE_SIZE); + munmap(addr, count * XC_PAGE_SIZE); addr =3D MAP_FAILED; } } @@ -150,7 +148,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, } =20 out: - if ( refs_size > PAGE_SIZE ) + if ( refs_size > os_page_size ) munmap(map.refs, refs_size); else free(map.refs); @@ -189,7 +187,7 @@ int osdep_gnttab_unmap(xengnttab_handle *xgt, } =20 /* Next, unmap the memory. */ - if ( (rc =3D munmap(start_address, count * PAGE_SIZE)) ) + if ( (rc =3D munmap(start_address, count * XC_PAGE_SIZE)) ) return rc; =20 /* Finally, unmap the driver slots used to store the grant informati= on. */ @@ -256,7 +254,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs, goto out; } =20 - area =3D mmap(NULL, count * PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_S= HARED, + area =3D mmap(NULL, count * XC_PAGE_SIZE, PROT_READ | PROT_WRITE, MA= P_SHARED, fd, gref_info.index); =20 if ( area =3D=3D MAP_FAILED ) @@ -268,7 +266,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs, =20 notify.index =3D gref_info.index; notify.action =3D 0; - if ( notify_offset < PAGE_SIZE * count ) + if ( notify_offset < XC_PAGE_SIZE * count ) { notify.index +=3D notify_offset; notify.action |=3D UNMAP_NOTIFY_CLEAR_BYTE; @@ -283,7 +281,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs, if ( err ) { GSERROR(xgs->logger, "ioctl SET_UNMAP_NOTIFY failed"); - munmap(area, count * PAGE_SIZE); + munmap(area, count * XC_PAGE_SIZE); area =3D NULL; } =20 @@ -306,7 +304,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs, int osdep_gntshr_unshare(xengntshr_handle *xgs, void *start_address, uint32_t count) { - return munmap(start_address, count * PAGE_SIZE); + return munmap(start_address, count * XC_PAGE_SIZE); } =20 /* diff --git a/tools/libs/gnttab/linux.c b/tools/libs/gnttab/linux.c index 74331a4c7b..5628fd5719 100644 --- a/tools/libs/gnttab/linux.c +++ b/tools/libs/gnttab/linux.c @@ -32,14 +32,11 @@ #include #include =20 +#include #include =20 #include "private.h" =20 -#define PAGE_SHIFT 12 -#define PAGE_SIZE (1UL << PAGE_SHIFT) -#define PAGE_MASK (~(PAGE_SIZE-1)) - #define DEVXEN "/dev/xen/" =20 #ifndef O_CLOEXEC @@ -92,6 +89,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, int fd =3D xgt->fd; struct ioctl_gntdev_map_grant_ref *map; unsigned int map_size =3D sizeof(*map) + (count - 1) * sizeof(map->r= efs[0]); + int os_page_size =3D sysconf(_SC_PAGESIZE); void *addr =3D NULL; int domids_stride =3D 1; int i; @@ -99,11 +97,11 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, if (flags & XENGNTTAB_GRANT_MAP_SINGLE_DOMAIN) domids_stride =3D 0; =20 - if ( map_size <=3D PAGE_SIZE ) + if ( map_size <=3D os_page_size ) map =3D alloca(map_size); else { - map_size =3D ROUNDUP(map_size, PAGE_SHIFT); + map_size =3D ROUNDUP(map_size, XC_PAGE_SHIFT); map =3D mmap(NULL, map_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON | MAP_POPULATE, -1, 0); if ( map =3D=3D MAP_FAILED ) @@ -127,7 +125,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, } =20 retry: - addr =3D mmap(NULL, PAGE_SIZE * count, prot, MAP_SHARED, fd, + addr =3D mmap(NULL, XC_PAGE_SIZE * count, prot, MAP_SHARED, fd, map->index); =20 if (addr =3D=3D MAP_FAILED && errno =3D=3D EAGAIN) @@ -152,7 +150,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, struct ioctl_gntdev_unmap_notify notify; notify.index =3D map->index; notify.action =3D 0; - if (notify_offset < PAGE_SIZE * count) { + if (notify_offset < XC_PAGE_SIZE * count) { notify.index +=3D notify_offset; notify.action |=3D UNMAP_NOTIFY_CLEAR_BYTE; } @@ -164,7 +162,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, rv =3D ioctl(fd, IOCTL_GNTDEV_SET_UNMAP_NOTIFY, ¬ify); if (rv) { GTERROR(xgt->logger, "ioctl SET_UNMAP_NOTIFY failed"); - munmap(addr, count * PAGE_SIZE); + munmap(addr, count * XC_PAGE_SIZE); addr =3D MAP_FAILED; } } @@ -184,7 +182,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, } =20 out: - if ( map_size > PAGE_SIZE ) + if ( map_size > os_page_size ) munmap(map, map_size); =20 return addr; @@ -220,7 +218,7 @@ int osdep_gnttab_unmap(xengnttab_handle *xgt, } =20 /* Next, unmap the memory. */ - if ( (rc =3D munmap(start_address, count * PAGE_SIZE)) ) + if ( (rc =3D munmap(start_address, count * XC_PAGE_SIZE)) ) return rc; =20 /* Finally, unmap the driver slots used to store the grant informati= on. */ @@ -466,7 +464,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs, goto out; } =20 - area =3D mmap(NULL, count * PAGE_SIZE, PROT_READ | PROT_WRITE, + area =3D mmap(NULL, count * XC_PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, gref_info->index); =20 if (area =3D=3D MAP_FAILED) { @@ -477,7 +475,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs, =20 notify.index =3D gref_info->index; notify.action =3D 0; - if (notify_offset < PAGE_SIZE * count) { + if (notify_offset < XC_PAGE_SIZE * count) { notify.index +=3D notify_offset; notify.action |=3D UNMAP_NOTIFY_CLEAR_BYTE; } @@ -489,7 +487,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs, err =3D ioctl(fd, IOCTL_GNTALLOC_SET_UNMAP_NOTIFY, ¬ify); if (err) { GSERROR(xgs->logger, "ioctl SET_UNMAP_NOTIFY failed"); - munmap(area, count * PAGE_SIZE); + munmap(area, count * XC_PAGE_SIZE); area =3D NULL; } =20 @@ -510,7 +508,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs, int osdep_gntshr_unshare(xengntshr_handle *xgs, void *start_address, uint32_t count) { - return munmap(start_address, count * PAGE_SIZE); + return munmap(start_address, count * XC_PAGE_SIZE); } =20 /* diff --git a/tools/libs/gnttab/netbsd.c b/tools/libs/gnttab/netbsd.c index f8d7c356eb..a4ad624b54 100644 --- a/tools/libs/gnttab/netbsd.c +++ b/tools/libs/gnttab/netbsd.c @@ -28,15 +28,12 @@ #include #include =20 +#include #include #include =20 #include "private.h" =20 -#define PAGE_SHIFT 12 -#define PAGE_SIZE (1UL << PAGE_SHIFT) -#define PAGE_MASK (~(PAGE_SIZE-1)) - #define DEVXEN "/kern/xen/privcmd" =20 int osdep_gnttab_open(xengnttab_handle *xgt) @@ -87,19 +84,19 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, } =20 map.count =3D count; - addr =3D mmap(NULL, count * PAGE_SIZE, + addr =3D mmap(NULL, count * XC_PAGE_SIZE, prot, flags | MAP_ANON | MAP_SHARED, -1, 0); if ( map.va =3D=3D MAP_FAILED ) { GTERROR(xgt->logger, "osdep_gnttab_grant_map: mmap failed"); - munmap((void *)map.va, count * PAGE_SIZE); + munmap((void *)map.va, count * XC_PAGE_SIZE); addr =3D MAP_FAILED; } map.va =3D addr; =20 map.notify.offset =3D 0; map.notify.action =3D 0; - if ( notify_offset < PAGE_SIZE * count ) + if ( notify_offset < XC_PAGE_SIZE * count ) { map.notify.offset =3D notify_offset; map.notify.action |=3D UNMAP_NOTIFY_CLEAR_BYTE; @@ -115,7 +112,7 @@ void *osdep_gnttab_grant_map(xengnttab_handle *xgt, { GTERROR(xgt->logger, "ioctl IOCTL_GNTDEV_MMAP_GRANT_REF failed: %d", rv); - munmap(addr, count * PAGE_SIZE); + munmap(addr, count * XC_PAGE_SIZE); addr =3D MAP_FAILED; } =20 @@ -136,7 +133,7 @@ int osdep_gnttab_unmap(xengnttab_handle *xgt, } =20 /* Next, unmap the memory. */ - rc =3D munmap(start_address, count * PAGE_SIZE); + rc =3D munmap(start_address, count * XC_PAGE_SIZE); =20 return rc; } @@ -187,7 +184,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs, alloc.domid =3D domid; alloc.flags =3D writable ? GNTDEV_ALLOC_FLAG_WRITABLE : 0; alloc.count =3D count; - area =3D mmap(NULL, count * PAGE_SIZE, + area =3D mmap(NULL, count * XC_PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_ANON | MAP_SHARED, -1, 0); =20 if ( area =3D=3D MAP_FAILED ) @@ -200,7 +197,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs, =20 alloc.notify.offset =3D 0; alloc.notify.action =3D 0; - if ( notify_offset < PAGE_SIZE * count ) + if ( notify_offset < XC_PAGE_SIZE * count ) { alloc.notify.offset =3D notify_offset; alloc.notify.action |=3D UNMAP_NOTIFY_CLEAR_BYTE; @@ -215,7 +212,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs, if ( err ) { GSERROR(xgs->logger, "IOCTL_GNTDEV_ALLOC_GRANT_REF failed"); - munmap(area, count * PAGE_SIZE); + munmap(area, count * XC_PAGE_SIZE); area =3D MAP_FAILED; goto out; } @@ -230,7 +227,7 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs, int osdep_gntshr_unshare(xengntshr_handle *xgs, void *start_address, uint32_t count) { - return munmap(start_address, count * PAGE_SIZE); + return munmap(start_address, count * XC_PAGE_SIZE); } =20 /* --=20 2.20.1