From patchwork Tue Dec 12 19:02:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 121641 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4508647qgn; Tue, 12 Dec 2017 11:04:41 -0800 (PST) X-Google-Smtp-Source: ACJfBotZBq3kprtJM7RDMxfi7buxK1kfUNVbitvvp1HuwSzD7m9OI35iFbqvEZ1FCrrMUlxjY/Aj X-Received: by 10.107.195.70 with SMTP id t67mr7009576iof.74.1513105481781; Tue, 12 Dec 2017 11:04:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513105481; cv=none; d=google.com; s=arc-20160816; b=Pbztczy4MF9IMHXe0oeEqzz3wPfqMXJn2TSdO9eRewsHd548vG02OGKQLMBOYFgpYr 5YZqbI+JjJdDXCW2lo+jDo8I1zui4myz2vM0ub9Y1gn4NTkeXREuESIVdjJjYpg4QDxm JM7kEbEWlOBHGVt54w52Jpe1sbxjx4JMHVPtsT1jSqH1289o0zDg9nTOlOg9KpxD3H3j S/tJ2XgI6sfUMPPY0n++T52lqbe4M5RL/rMmRALNWmmo7uBRmUhHWqGr8aBfBJaXJiD2 7fKEYeEU1AYb1XboTVc4/YWeCYUUp0wdgpI5paWK1ogKeb0Sntr6bHNJC0U79ZYglyor abAA== 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:dkim-signature:arc-authentication-results; bh=J/7+XDx7B7uXtHPbAerUyL/c3mshQzk/vnX5ElYs+LM=; b=P/yyRK1W3ENJcdaI3xMBT/kTXNZz/wUCzLxSnKwHjvvVr3yv4CBqnA9PzulTCxBgdJ 0cNDwF2+5tYSaPUWraFxW4bKjEMrMNVlNeVAvLVyNIDuezIlAu8X29lA44QBtzyo3XZy isklZtrz0IWvyJ37zgLaNv16J1SS+Qn5bjon1J2IN+aE5hkWpUQFFXW0RiEy0OUFlpjT 3lopr+y7+H4QdaKQlYdGA/iHmo8UlsulLrUV/QEBVsX0kLsUbJovHaz64MH6aGDr3ikz aI8Eyk2xNag9CRNxWqBC1M064fOTCMNAeyLaRPVL9arbvPskUnJ/M/IjkufQBCPWqA/M S2Rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=MvCY6jfX; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id w21si185026ita.83.2017.12.12.11.04.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Dec 2017 11:04:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=MvCY6jfX; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.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 1eOppB-0002gF-Gm; Tue, 12 Dec 2017 19:02:41 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eOppA-0002f3-7a for xen-devel@lists.xen.org; Tue, 12 Dec 2017 19:02:40 +0000 X-Inumbo-ID: f22d23bc-df6e-11e7-b4a6-bc764e045a96 Received: from mail-wm0-x243.google.com (unknown [2a00:1450:400c:c09::243]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id f22d23bc-df6e-11e7-b4a6-bc764e045a96; Tue, 12 Dec 2017 20:02:06 +0100 (CET) Received: by mail-wm0-x243.google.com with SMTP id 64so698315wme.3 for ; Tue, 12 Dec 2017 11:02:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=c7lqXg8maW6sBnICeiDRVz9+9FK1rWYdzhNYk3D8MxQ=; b=MvCY6jfX5bCrSncISjFGbUQjiEYSh9bEowStCyR/ChScBmc8apb0XjtNNhxZuymAGI auCAI3iiN0/Q0mgrVjOAGTHHwP282qhqfxm2vvkCSEegxBKqUUSw684pf5bZ73T+DXxH Bc4eAmYw8m4aT4JaOjr3jba/4A/1wbx1CnY88= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=c7lqXg8maW6sBnICeiDRVz9+9FK1rWYdzhNYk3D8MxQ=; b=iGP9bt5qbBpcmuzDrNM+1tq83AoIQBQk0BWcM2hQAtDSMDMa4/rwFICMGlCpyUAnO7 JqCfGf6V2uBrE32KyK8gYO4JjdFh7f5eReY/QrgJl7xP/wCyuD1sUjo/7gTCeveK0dX6 KfKjORgdUypbZn3TUgnYHt4OyZqrdDQBnLWru+cglViC71CNFz2CCggHANuEdQVvq8d2 IBFK2eC062COfN9Zd1e1JZAg6yqViz+/3FL9OCP9vJymHJ+IXP8FPtb3OB+BseN2caI6 j7Ju2GCJ54d7wl4JRZLmiWy8WlaisAHw8+X5ePlPEKXJkDWJwl64Ht29mjjLbH1vDKU/ Pnug== X-Gm-Message-State: AKGB3mIwh5+T9xV08ckvlNQ0x2dUsrfPK444dN1zvsobskVfE5y9aibL PjCmWWE7ofo8Xl9rtMAdrBJ487YAYuA= X-Received: by 10.28.35.80 with SMTP id j77mr2674797wmj.109.1513105357171; Tue, 12 Dec 2017 11:02:37 -0800 (PST) Received: from e108454-lin.cambridge.arm.com ([2001:41d0:1:6c23::1]) by smtp.gmail.com with ESMTPSA id n14sm207508wmh.37.2017.12.12.11.02.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Dec 2017 11:02:33 -0800 (PST) From: Julien Grall To: xen-devel@lists.xen.org Date: Tue, 12 Dec 2017 19:02:07 +0000 Message-Id: <20171212190212.5535-12-julien.grall@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171212190212.5535-1-julien.grall@linaro.org> References: <20171212190212.5535-1-julien.grall@linaro.org> Cc: sstabellini@kernel.org, Julien Grall , andre.przywara@linaro.org Subject: [Xen-devel] [v2 11/16] xen/arm: p2m: Rename p2m_flush_tlb and p2m_flush_tlb_sync X-BeenThere: xen-devel@lists.xenproject.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.xenproject.org Sender: "Xen-devel" Rename p2m_flush_tlb and p2m_flush_tlb_sync to respectively p2m_tlb_flush and p2m_force_tlb_flush_sync. At first glance, inverting 'flush' and 'tlb' might seem pointless but would be helpful in the future in order to get more easily some code ported from x86 P2M or even to shared with. For p2m_flush_tlb_sync, the 'force' was added because the TLBs are flush unconditionally. A follow-up patch will add an helper to flush TLBs only in certain cases. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- Changes in v2: - Add Stefano's reviewed-by --- xen/arch/arm/p2m.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 7bf34aaa8c..95090874c3 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -51,7 +51,7 @@ static const paddr_t level_masks[] = static const uint8_t level_orders[] = { ZEROETH_ORDER, FIRST_ORDER, SECOND_ORDER, THIRD_ORDER }; -static void p2m_flush_tlb(struct p2m_domain *p2m); +static void p2m_tlb_flush(struct p2m_domain *p2m); /* Unlock the flush and do a P2M TLB flush if necessary */ void p2m_write_unlock(struct p2m_domain *p2m) @@ -64,7 +64,7 @@ void p2m_write_unlock(struct p2m_domain *p2m) * to avoid someone else modify the P2M before the TLB * invalidation has completed. */ - p2m_flush_tlb(p2m); + p2m_tlb_flush(p2m); } write_unlock(&p2m->lock); @@ -137,7 +137,7 @@ void p2m_restore_state(struct vcpu *n) *last_vcpu_ran = n->vcpu_id; } -static void p2m_flush_tlb(struct p2m_domain *p2m) +static void p2m_tlb_flush(struct p2m_domain *p2m) { unsigned long flags = 0; uint64_t ovttbr; @@ -169,11 +169,11 @@ static void p2m_flush_tlb(struct p2m_domain *p2m) * * Must be called with the p2m lock held. */ -static void p2m_flush_tlb_sync(struct p2m_domain *p2m) +static void p2m_force_tlb_flush_sync(struct p2m_domain *p2m) { ASSERT(p2m_is_write_locked(p2m)); - p2m_flush_tlb(p2m); + p2m_tlb_flush(p2m); p2m->need_flush = false; } @@ -674,7 +674,7 @@ static void p2m_free_entry(struct p2m_domain *p2m, * flush? */ if ( p2m->need_flush ) - p2m_flush_tlb_sync(p2m); + p2m_force_tlb_flush_sync(p2m); mfn = _mfn(entry.p2m.base); ASSERT(mfn_valid(mfn)); @@ -863,7 +863,7 @@ static int __p2m_set_entry(struct p2m_domain *p2m, * For more details see (D4.7.1 in ARM DDI 0487A.j). */ p2m_remove_pte(entry, p2m->clean_pte); - p2m_flush_tlb_sync(p2m); + p2m_force_tlb_flush_sync(p2m); p2m_write_pte(entry, split_pte, p2m->clean_pte); @@ -939,7 +939,7 @@ static int __p2m_set_entry(struct p2m_domain *p2m, { if ( likely(!p2m->mem_access_enabled) || P2M_CLEAR_PERM(pte) != P2M_CLEAR_PERM(orig_pte) ) - p2m_flush_tlb_sync(p2m); + p2m_force_tlb_flush_sync(p2m); else p2m->need_flush = true; } @@ -1143,7 +1143,7 @@ static int p2m_alloc_table(struct domain *d) * Make sure that all TLBs corresponding to the new VMID are flushed * before using it */ - p2m_flush_tlb(p2m); + p2m_tlb_flush(p2m); return 0; }