From patchwork Mon Aug 9 14:47:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Costin Lupu X-Patchwork-Id: 12426769 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 4DAF6C4320A for ; Mon, 9 Aug 2021 15:07:13 +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 A289860F11 for ; Mon, 9 Aug 2021 15:07:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A289860F11 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=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.165036.301591 (Exim 4.92) (envelope-from ) id 1mD6rk-0001KX-FW; Mon, 09 Aug 2021 15:07:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 165036.301591; Mon, 09 Aug 2021 15:07:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mD6rk-0001KQ-CI; Mon, 09 Aug 2021 15:07:00 +0000 Received: by outflank-mailman (input) for mailman id 165036; Mon, 09 Aug 2021 15:06:59 +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 1mD6rj-0001KE-Jk for xen-devel@lists.xenproject.org; Mon, 09 Aug 2021 15:06:59 +0000 Received: from mx.upb.ro (unknown [141.85.13.221]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 70d0b23e-f923-11eb-9f1f-12813bfff9fa; Mon, 09 Aug 2021 15:06:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mx.upb.ro (Postfix) with ESMTP id D266AB5600A7; Mon, 9 Aug 2021 17:48:14 +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 RX58a2PqFQni; Mon, 9 Aug 2021 17:48:11 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by mx.upb.ro (Postfix) with ESMTP id B2EDDB560090; Mon, 9 Aug 2021 17:48:11 +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 XQQYJsvFPE4s; Mon, 9 Aug 2021 17:48:11 +0300 (EEST) Received: from localhost.localdomain (unknown [86.121.144.181]) by mx.upb.ro (Postfix) with ESMTPSA id 1E081B5600A8; Mon, 9 Aug 2021 17:48:11 +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: 70d0b23e-f923-11eb-9f1f-12813bfff9fa X-Virus-Scanned: amavisd-new at upb.ro From: Costin Lupu To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Wei Liu , Juergen Gross , Julien Grall Subject: [PATCH 3/4] libs/foreignmemory: Use XEN_PAGE_* definitions Date: Mon, 9 Aug 2021 17:47:58 +0300 Message-Id: <35028145d07cde5e53e4ab20dc492ec322c92c2f.1628519855.git.costin.lupu@cs.pub.ro> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 These changes refine the changes in 0dbb4be7 which added a dependency to xenctrl library. We use the XEN_PAGE_* definitions instead of the XC_PAGE_* definitions and therefore we get rid of the unnecessary dependency. Signed-off-by: Costin Lupu --- tools/libs/foreignmemory/core.c | 2 +- tools/libs/foreignmemory/freebsd.c | 10 +++++----- tools/libs/foreignmemory/linux.c | 18 +++++++++--------- tools/libs/foreignmemory/minios.c | 10 +--------- tools/libs/foreignmemory/netbsd.c | 10 +++++----- tools/libs/foreignmemory/private.h | 2 +- tools/libs/foreignmemory/solaris.c | 6 +++--- 7 files changed, 25 insertions(+), 33 deletions(-) diff --git a/tools/libs/foreignmemory/core.c b/tools/libs/foreignmemory/core.c index 7edc6f0dbf..ad1ad9fc67 100644 --- a/tools/libs/foreignmemory/core.c +++ b/tools/libs/foreignmemory/core.c @@ -202,7 +202,7 @@ int xenforeignmemory_resource_size( if ( rc ) return rc; - *size = fres.nr_frames << XC_PAGE_SHIFT; + *size = fres.nr_frames << XEN_PAGE_SHIFT; return 0; } diff --git a/tools/libs/foreignmemory/freebsd.c b/tools/libs/foreignmemory/freebsd.c index 2cf0fa1c38..9439c4ca6a 100644 --- a/tools/libs/foreignmemory/freebsd.c +++ b/tools/libs/foreignmemory/freebsd.c @@ -63,7 +63,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, privcmd_mmapbatch_t ioctlx; int rc; - addr = mmap(addr, num << XC_PAGE_SHIFT, prot, flags | MAP_SHARED, fd, 0); + addr = mmap(addr, num << XEN_PAGE_SHIFT, prot, flags | MAP_SHARED, fd, 0); if ( addr == MAP_FAILED ) return NULL; @@ -78,7 +78,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, { int saved_errno = errno; - (void)munmap(addr, num << XC_PAGE_SHIFT); + (void)munmap(addr, num << XEN_PAGE_SHIFT); errno = saved_errno; return NULL; } @@ -89,7 +89,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem, void *addr, size_t num) { - return munmap(addr, num << XC_PAGE_SHIFT); + return munmap(addr, num << XEN_PAGE_SHIFT); } int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem, @@ -101,7 +101,7 @@ int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem, int osdep_xenforeignmemory_unmap_resource(xenforeignmemory_handle *fmem, xenforeignmemory_resource_handle *fres) { - return fres ? munmap(fres->addr, fres->nr_frames << XC_PAGE_SHIFT) : 0; + return fres ? munmap(fres->addr, fres->nr_frames << XEN_PAGE_SHIFT) : 0; } int osdep_xenforeignmemory_map_resource(xenforeignmemory_handle *fmem, @@ -120,7 +120,7 @@ int osdep_xenforeignmemory_map_resource(xenforeignmemory_handle *fmem, /* Request for resource size. Skip mmap(). */ goto skip_mmap; - fres->addr = mmap(fres->addr, fres->nr_frames << XC_PAGE_SHIFT, + fres->addr = mmap(fres->addr, fres->nr_frames << XEN_PAGE_SHIFT, fres->prot, fres->flags | MAP_SHARED, fmem->fd, 0); if ( fres->addr == MAP_FAILED ) return -1; diff --git a/tools/libs/foreignmemory/linux.c b/tools/libs/foreignmemory/linux.c index 9062117407..9dabf28cae 100644 --- a/tools/libs/foreignmemory/linux.c +++ b/tools/libs/foreignmemory/linux.c @@ -134,7 +134,7 @@ static int retry_paged(int fd, uint32_t dom, void *addr, /* At least one gfn is still in paging state */ ioctlx.num = 1; ioctlx.dom = dom; - ioctlx.addr = (unsigned long)addr + (i<addr, fres->nr_frames << XC_PAGE_SHIFT) : 0; + return fres ? munmap(fres->addr, fres->nr_frames << XEN_PAGE_SHIFT) : 0; } int osdep_xenforeignmemory_map_resource( @@ -313,7 +313,7 @@ int osdep_xenforeignmemory_map_resource( /* Request for resource size. Skip mmap(). */ goto skip_mmap; - fres->addr = mmap(fres->addr, fres->nr_frames << XC_PAGE_SHIFT, + fres->addr = mmap(fres->addr, fres->nr_frames << XEN_PAGE_SHIFT, fres->prot, fres->flags | MAP_SHARED, fmem->fd, 0); if ( fres->addr == MAP_FAILED ) return -1; diff --git a/tools/libs/foreignmemory/minios.c b/tools/libs/foreignmemory/minios.c index f2f4dfb2be..2454eb9af3 100644 --- a/tools/libs/foreignmemory/minios.c +++ b/tools/libs/foreignmemory/minios.c @@ -17,14 +17,6 @@ * Copyright 2007-2008 Samuel Thibault . */ -/* - * xenctrl.h currently defines __XEN_TOOLS__ which affects what is - * exposed by Xen headers. As the define needs to be set consistently, - * we want to include xenctrl.h before the mini-os headers (they include - * public headers). - */ -#include - #include #include #include @@ -63,7 +55,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem, void *addr, size_t num) { - return munmap(addr, num << XC_PAGE_SHIFT); + return munmap(addr, num << XEN_PAGE_SHIFT); } /* diff --git a/tools/libs/foreignmemory/netbsd.c b/tools/libs/foreignmemory/netbsd.c index 597db775d7..ba69b9c6bb 100644 --- a/tools/libs/foreignmemory/netbsd.c +++ b/tools/libs/foreignmemory/netbsd.c @@ -76,7 +76,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, { int fd = fmem->fd; privcmd_mmapbatch_v2_t ioctlx; - addr = mmap(addr, num * XC_PAGE_SIZE, prot, + addr = mmap(addr, num * XEN_PAGE_SIZE, prot, flags | MAP_ANON | MAP_SHARED, -1, 0); if ( addr == MAP_FAILED ) { PERROR("osdep_xenforeignmemory_map: mmap failed"); @@ -93,7 +93,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, { int saved_errno = errno; PERROR("osdep_xenforeignmemory_map: ioctl failed"); - munmap(addr, num * XC_PAGE_SIZE); + munmap(addr, num * XEN_PAGE_SIZE); errno = saved_errno; return NULL; } @@ -104,7 +104,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem, void *addr, size_t num) { - return munmap(addr, num * XC_PAGE_SIZE); + return munmap(addr, num * XEN_PAGE_SIZE); } int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem, @@ -117,7 +117,7 @@ int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem, int osdep_xenforeignmemory_unmap_resource( xenforeignmemory_handle *fmem, xenforeignmemory_resource_handle *fres) { - return fres ? munmap(fres->addr, fres->nr_frames << XC_PAGE_SHIFT) : 0; + return fres ? munmap(fres->addr, fres->nr_frames << XEN_PAGE_SHIFT) : 0; } int osdep_xenforeignmemory_map_resource( @@ -136,7 +136,7 @@ int osdep_xenforeignmemory_map_resource( /* Request for resource size. Skip mmap(). */ goto skip_mmap; - fres->addr = mmap(fres->addr, fres->nr_frames << XC_PAGE_SHIFT, + fres->addr = mmap(fres->addr, fres->nr_frames << XEN_PAGE_SHIFT, fres->prot, fres->flags | MAP_ANON | MAP_SHARED, -1, 0); if ( fres->addr == MAP_FAILED ) return -1; diff --git a/tools/libs/foreignmemory/private.h b/tools/libs/foreignmemory/private.h index 8540303adc..1200f98067 100644 --- a/tools/libs/foreignmemory/private.h +++ b/tools/libs/foreignmemory/private.h @@ -1,7 +1,6 @@ #ifndef XENFOREIGNMEMORY_PRIVATE_H #define XENFOREIGNMEMORY_PRIVATE_H -#include #include #include @@ -9,6 +8,7 @@ #include #include +#include #include struct xenforeignmemory_handle { diff --git a/tools/libs/foreignmemory/solaris.c b/tools/libs/foreignmemory/solaris.c index 958fb01f6d..4466780bd8 100644 --- a/tools/libs/foreignmemory/solaris.c +++ b/tools/libs/foreignmemory/solaris.c @@ -72,7 +72,7 @@ void *osdep_map_foreign_batch(xenforeignmem_handle *fmem, uint32_t dom, { int fd = fmem->fd; privcmd_mmapbatch_t ioctlx; - addr = mmap(addr, num*XC_PAGE_SIZE, prot, flags | MAP_SHARED, fd, 0); + addr = mmap(addr, num*XEN_PAGE_SIZE, prot, flags | MAP_SHARED, fd, 0); if ( addr == MAP_FAILED ) return NULL; @@ -84,7 +84,7 @@ void *osdep_map_foreign_batch(xenforeignmem_handle *fmem, uint32_t dom, { int saved_errno = errno; - (void)munmap(addr, num*XC_PAGE_SIZE); + (void)munmap(addr, num*XEN_PAGE_SIZE); errno = saved_errno; return NULL; } @@ -94,7 +94,7 @@ void *osdep_map_foreign_batch(xenforeignmem_handle *fmem, uint32_t dom, int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem, void *addr, size_t num) { - return munmap(addr, num*XC_PAGE_SIZE); + return munmap(addr, num*XEN_PAGE_SIZE); } /*