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=-12.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 A42E8C433ED for ; Wed, 28 Apr 2021 09:03:43 +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 203B4613EF for ; Wed, 28 Apr 2021 09:03:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 203B4613EF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org 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.119102.225432 (Exim 4.92) (envelope-from ) id 1lbg6U-0007AW-W2; Wed, 28 Apr 2021 09:03:30 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 119102.225432; Wed, 28 Apr 2021 09:03:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lbg6U-0007AP-T0; Wed, 28 Apr 2021 09:03:30 +0000 Received: by outflank-mailman (input) for mailman id 119102; Wed, 28 Apr 2021 09:03:29 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lbg6T-0007AK-9x for xen-devel@lists.xenproject.org; Wed, 28 Apr 2021 09:03:29 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lbg6Q-0001bC-Lb; Wed, 28 Apr 2021 09:03:26 +0000 Received: from [54.239.6.186] (helo=a483e7b01a66.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1lbg6Q-0001f6-Eq; Wed, 28 Apr 2021 09:03:26 +0000 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" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:Content-Type:In-Reply-To: MIME-Version:Date:Message-ID:From:References:Cc:To:Subject; bh=eHFzXnHUscmXvrgxAaF8yNtuyNlmy6RdKsx6rlFJHpc=; b=TfaNUbE1ksxC67omLjCM1MFgsZ 7DsGXXObcMC+3fLCLrevbLozMhG41vHP5hz4ytNAXqcmfexZYnD89evViOAn0GfUmS0LeKGcHXFWl GyD68jED9bLBuyIfsW6suydzr47Qszdrn9ZzQs5Ieq3dAGsczI1rhjcCETus9eEhZRoo=; Subject: Re: [PATCH 3/5] tools/libs/foreignmemory: Fix PAGE_SIZE redefinition error To: Costin Lupu , xen-devel@lists.xenproject.org Cc: Ian Jackson , Wei Liu References: From: Julien Grall Message-ID: <8803561c-b3bd-4979-f9ef-3f58542af70b@xen.org> Date: Wed, 28 Apr 2021 10:03:23 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Hi Costin, On 27/04/2021 13:05, Costin Lupu wrote: > tools/libs/foreignmemory/private.h | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/tools/libs/foreignmemory/private.h b/tools/libs/foreignmemory/private.h > index 1ee3626dd2..f3c1ba2867 100644 > --- a/tools/libs/foreignmemory/private.h > +++ b/tools/libs/foreignmemory/private.h > @@ -10,11 +10,13 @@ > #include > #include > > -#ifndef PAGE_SHIFT /* Mini-os, Yukk */ > +#ifndef PAGE_SHIFT > #define PAGE_SHIFT 12 > #endif > -#ifndef __MINIOS__ /* Yukk */ > +#ifndef PAGE_SIZE > #define PAGE_SIZE (1UL << PAGE_SHIFT) > +#endif > +#ifndef PAGE_MASK > #define PAGE_MASK (~(PAGE_SIZE-1)) > #endif Looking at the usage, I believe PAGE_* are referring to the page granularity of Xen rather than the page granularity of the control domain itself. So it would be incorrect to use the domain's page granularity here and would break dom0 using 64KB page granularity on Arm. Instead, we should replace PAGE_* with XC_PAGE_*. If some of them are still referring to the control domain granularity, then we should use getpageshift() (Or equivalent) because the userspace shouldn't rely on a specific page granularity. Cheers, -- Julien Grall