From patchwork Mon Oct 9 13:23:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 115213 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2557287qgn; Mon, 9 Oct 2017 06:25:58 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBz5xvBtgzT0gl5Rjm0qCFmSZfTtLQiOQFVr5ItRQ34qEDguFeETmNgIFzhAEvsl0KLxx4J X-Received: by 10.107.161.80 with SMTP id k77mr13920268ioe.206.1507555558711; Mon, 09 Oct 2017 06:25:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507555558; cv=none; d=google.com; s=arc-20160816; b=hVAaySac4LIWLETTOe5XMH1HJEkE898oQMz7LwmaGlgd9pmXiJytFUs2mMqMUyXvS5 zxCCA4cnCw7EylkXJBn82iSV/B3niIfji6skxvyKM/gWe/dEZMAsfA5Z3vDvBv7lBudf XyxYxApibRPzwNS2WyY8mkQ3mM+rhF4YvcJ9EonXlW+LeucPKJFh1leD+A7IDU4gyNwK f/Rrad4+v7OR8ORQ5o2XzbK4TZmXkzClZPnKQen0xFFwbU8jstaEWDYm+V3pyrFJM7uD vC7QUQvRL+K61OhFOU/6HLYCi561RxBbEIdUsGDYCxtlUm3mCvaalTVCSag6X6k/Fksx oXUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:cc:references:in-reply-to:message-id:date:to :from:arc-authentication-results; bh=PhC7j3IXC9MG9VOxl2D8EZbjZXYlDTSG+91UEWWAUbI=; b=Rc4Cts/1p+u8X/4pH39JlMU/Mz6Fdwa5t9XwH+Ncewv8ToOTne4iUEVPEqLFY/abCZ DtDByNG06WuLZjiFI2VorSISA5Dk/+wd289uYBSyvb6O6liEx8VLpD8z5H/hvy54REit 2NY7KoZkI54XL28z2u8g3qI7GOzTMRKAbX/aRPyxMfHvnORvDZK7CNxtN0mOQ7XKU5yC UP7Zv11HnL4Gir6SFRufh4KeagjpxlOWAxRGdAgg+hecxjoBY1OKtFDYObX5Db7ka34E 6+hQgqPiVfZOo0JkSauilgykn4Gc2ZqYLXMtrG14JsRDpO/o27WJmBr3lXqBq7K5+qex OVcg== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id z2si7201882iti.153.2017.10.09.06.25.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Oct 2017 06:25:58 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e1Y2I-000809-4k; Mon, 09 Oct 2017 13:23:58 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e1Y2H-0007zj-Nm for xen-devel@lists.xen.org; Mon, 09 Oct 2017 13:23:57 +0000 Received: from [193.109.254.147] by server-11.bemta-6.messagelabs.com id 87/12-03638-D687BD95; Mon, 09 Oct 2017 13:23:57 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRWlGSWpSXmKPExsVysyfVTTen4na kwb9ZGhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bMudfYC+4IVZybNYWtgfE0XxcjF4eQwGZG iUVdf9ggnNOMEi3nDjF1MXJysAloStz5/AnMFhGQlrj2+TIjiM0sEClx+MMPdhBbWCBB4ua5F 2A1LAKqEld/QtTzClhIbHvfBWZLCMhL7Gq7yApicwpYSkzbPJ0ZxBYCqrn8YQfrBEbuBYwMqx g1ilOLylKLdI0M9JKKMtMzSnITM3N0DQ3M9HJTi4sT01NzEpOK9ZLzczcxAj3MAAQ7GH8tCzj EKMnBpCTKO6XgdqQQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCV77cqCcYFFqempFWmYOMNRg0hIc PEoivKEgad7igsTc4sx0iNQpRl2Ojpt3/zAJseTl56VKifP6ghQJgBRllObBjYCF/SVGWSlhX kago4R4ClKLcjNLUOVfMYpzMCoJ834qA5rCk5lXArfpFdARTEBHMBbfADmiJBEhJdXAOOHoRb V1Mcb7bS/sm/aUPfud4kcZyes6VxaJ/9x9VNvKcElk6r8fv/V7XyWyPD62tvfzJ96ph7MZKiu keU03P/2ziUEq6VXep7aKrv8nFTeu3bxhsijL0vvKh29K95n36DMJP1VMSXv++/C88yphr6p3 S14O1Z6hkyZ9UP9Y6PyplQ0vV0/mlVBiKc5INNRiLipOBABpsUuJdgIAAA== X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1507555436!106195016!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 59104 invoked from network); 9 Oct 2017 13:23:56 -0000 Received: from usa-sjc-mx-foss1.foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-7.tower-27.messagelabs.com with SMTP; 9 Oct 2017 13:23:56 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EC60C1529; Mon, 9 Oct 2017 06:23:55 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.206.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0B2F83F578; Mon, 9 Oct 2017 06:23:54 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Mon, 9 Oct 2017 14:23:38 +0100 Message-Id: <20171009132341.1678-8-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171009132341.1678-1-julien.grall@arm.com> References: <20171009132341.1678-1-julien.grall@arm.com> Cc: andre.przywara@arm.com, Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH v4 07/10] xen/arm: page: Describe the layout of flags used to update page tables X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" Currently, the flags used to update page tables (i.e PAGE_HYPERVISOR_*) only contains the memory attribute index. Follow-up patches will add more information in it. So document the current layout. At the same time introduce PAGE_AI_MASK to get the memory attribute index easily. Signed-off-by: Julien Grall Reviewed-by: Andre Przywara Reviewed-by: Stefano Stabellini --- Changes in v4: - Use PAGE_AI_MASK in set_fixmap Changes in v3: - Add Stefano's reviewed-by Changes in v2: - Slightly update the commit message to specify we describe the current layout. - Add Andre's reviewed-by --- xen/arch/arm/mm.c | 4 ++-- xen/include/asm-arm/page.h | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 70a03015ec..c1dad61a20 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -331,7 +331,7 @@ static inline lpae_t mfn_to_xen_entry(mfn_t mfn, unsigned attr) /* Map a 4k page in a fixmap entry */ void set_fixmap(unsigned map, mfn_t mfn, unsigned int flags) { - lpae_t pte = mfn_to_xen_entry(mfn, flags); + lpae_t pte = mfn_to_xen_entry(mfn, PAGE_AI_MASK(flags)); pte.pt.table = 1; /* 4k mappings always have this bit set */ pte.pt.xn = 1; write_pte(xen_fixmap + third_table_offset(FIXMAP_ADDR(map)), pte); @@ -1021,7 +1021,7 @@ static int create_xen_entries(enum xenmap_operation op, } if ( op == RESERVE ) break; - pte = mfn_to_xen_entry(mfn, flags); + pte = mfn_to_xen_entry(mfn, PAGE_AI_MASK(flags)); pte.pt.table = 1; write_pte(entry, pte); break; diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 0ae1a2587b..aa3e83f5b4 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -65,6 +65,13 @@ #define MAIR0VAL (MAIRVAL & 0xffffffff) #define MAIR1VAL (MAIRVAL >> 32) +/* + * Layout of the flags used for updating the hypervisor page tables + * + * [0:2] Memory Attribute Index + */ +#define PAGE_AI_MASK(x) ((x) & 0x7U) + #define PAGE_HYPERVISOR (MT_NORMAL) #define PAGE_HYPERVISOR_NOCACHE (MT_DEVICE_nGnRE) #define PAGE_HYPERVISOR_WC (MT_NORMAL_NC)