From patchwork Wed Sep 13 17:59:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 112468 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1226687qgf; Wed, 13 Sep 2017 11:02:27 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCc4M7/0U1SDUrpt/Pep0wMJ8ygQLaIR9ruPXXjvvrNxeWQCEQETTe47z9d/jlDN78D0OkJ X-Received: by 10.107.200.86 with SMTP id y83mr26430451iof.24.1505325747810; Wed, 13 Sep 2017 11:02:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505325747; cv=none; d=google.com; s=arc-20160816; b=GOgaGmrsTN8h5P6KjP3FlXAwZHOjkgNfJP8HFXjNCdWhAEJs+wnqi62fuVVLQbJmvV eRf5dr2/afN3j2SA83AE/+57tihTd0j99kkKpmbb69gzdG80wOtAuMb29tgTnUPaJSQs 85ZC6y5Q5p2X94PdCLtYJ6+rR8OqymK+j/oG/QIHtJFOx+K6/LeaWslxnWghSfsn6Jn2 zJspTr+TkgvIEIBoCrfLDOt7NISbctRpH86r4TpeT9lGe0D6KNmrLEhkh78yfbY3cSBZ SiR0QSNl+VQdPg/Ln9IgFsZ1EEPkjIydy9kSLb38CBVsQ8kBEm2sOTMpTYTDlbhPqV+3 Ijbw== 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=0RtFrkEev/aHUl2fibG6tyk8PfrdS5oIo4KHLfOl6zE=; b=KuUVsPnRYtIqNPHM90f0CHyrW/4s4le0x/QZLhPPf9QgDGpJPZcaJ4EF71TIzz9GLT 1evHUt7Qmx0DMlH2H6iGIWNY/abdu9YVajXlk4gG63O1H2Gf2xqgkl8Ms1vw3QRozLSj FxWXzz2TYOD/07p2tdhS4fDparLN5B1GuHwG97trd2wK4t1xrGFgn7x//IAOU/CPpC21 prmD5krd991cwq4ketTaCOlPkTVXuL1LbPIoMPwA/YEQ1nH8ZkYji/79PSG3+Ho4Ee6f HLLwRQlCarTN4JMjH+BB8/2lgApISwRSJVDVNdo8dWUPY0bwIPtCz3n3+CjihnfDkETW +VuA== 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 t10si9986214iod.3.2017.09.13.11.02.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Sep 2017 11:02:27 -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 1dsBxY-000891-TB; Wed, 13 Sep 2017 18:00:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dsBxX-00085f-ML for xen-devel@lists.xen.org; Wed, 13 Sep 2017 18:00:23 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id E1/50-01910-63279B95; Wed, 13 Sep 2017 18:00:22 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRWlGSWpSXmKPExsVysyfVTdesaGe kwa9GCYslHxezODB6HN39mymAMYo1My8pvyKBNeNi+y72gqnqFZN+TmJsYJwu08XIxSEksJlR 4nfjF9YuRk4g5zSjxI2lzCA2m4CmxJ3Pn5hAbBEBaYlrny8zgjQwCyxmlPi8vxesSFggROJD1 1WwIhYBVYlTa7aCDeIVsJLYcvEhWFxCQF5iV9tFsDgnUHzm1wVAcQ6gZZYSp3uiJjByL2BkWM WoUZxaVJZapGtkpJdUlJmeUZKbmJmja2hgrJebWlycmJ6ak5hUrJecn7uJEejfegYGxh2MU0/ 4HWKU5GBSEuXdq7szUogvKT+lMiOxOCO+qDQntfgQowwHh5IEr0QhUE6wKDU9tSItMwcYaDBp CQ4eJRFebZA0b3FBYm5xZjpE6hSjLkfHzbt/mIRY8vLzUqXEeWNAigRAijJK8+BGwIL+EqOsl DAvIwMDgxBPQWpRbmYJqvwrRnEORiVhXj2QKTyZeSVwm14BHcEEdMSZ0ztAjihJREhJNTDOdM ly4oncH5FzUGbL9Keq0hNUC9xCeOvWbLHxfD/pqnhS4b/vqse+Z27QufnxHPdB11+SThPaJji 8XD/rpHGo28X6ru4ZHWIan89Pv8vYXN/12UDEelGxdtukncm7bWx+imvU8AgtluLeVLeoWv3g vTdP1x4p+X1MaH+ITet6+yLdGWl/FuoosRRnJBpqMRcVJwIA22Ob8HUCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1505325621!114657007!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 58388 invoked from network); 13 Sep 2017 18:00:22 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-3.tower-31.messagelabs.com with SMTP; 13 Sep 2017 18:00:22 -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 789271435; Wed, 13 Sep 2017 11:00:21 -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 673443F483; Wed, 13 Sep 2017 11:00:20 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 13 Sep 2017 18:59:53 +0100 Message-Id: <20170913175953.16942-16-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170913175953.16942-1-julien.grall@arm.com> References: <20170913175953.16942-1-julien.grall@arm.com> Cc: George Dunlap , Andrew Cooper , Julien Grall , Jan Beulich Subject: [Xen-devel] [PATCH 15/15] xen/x86: p2m-pod: Rework prototype of p2m_pod_demand_populate 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" - Switch the return type to bool - Remove the parameter p2m_query_t q as it is not used Signed-off-by: Julien Grall --- Cc: George Dunlap Cc: Jan Beulich Cc: Andrew Cooper --- xen/arch/x86/mm/p2m-ept.c | 5 ++--- xen/arch/x86/mm/p2m-pod.c | 15 +++++++-------- xen/arch/x86/mm/p2m-pt.c | 6 +++--- xen/include/asm-x86/p2m.h | 6 ++---- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 36627f1ce0..641b90ec07 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -965,7 +965,7 @@ static mfn_t ept_get_entry(struct p2m_domain *p2m, index = gfn_remainder >> ( i * EPT_TABLE_ORDER); ept_entry = table + index; - if ( !p2m_pod_demand_populate(p2m, gfn_t, i * EPT_TABLE_ORDER, q) ) + if ( p2m_pod_demand_populate(p2m, gfn_t, i * EPT_TABLE_ORDER) ) goto retry; else goto out; @@ -987,8 +987,7 @@ static mfn_t ept_get_entry(struct p2m_domain *p2m, ASSERT(i == 0); - if ( p2m_pod_demand_populate(p2m, gfn_t, - PAGE_ORDER_4K, q) ) + if ( !p2m_pod_demand_populate(p2m, gfn_t, PAGE_ORDER_4K) ) goto out; } diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index 311762b1ce..89b7dc949d 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -1075,10 +1075,9 @@ static void pod_eager_record(struct p2m_domain *p2m, gfn_t gfn, mrp->idx %= ARRAY_SIZE(mrp->list); } -int +bool p2m_pod_demand_populate(struct p2m_domain *p2m, gfn_t gfn, - unsigned int order, - p2m_query_t q) + unsigned int order) { struct domain *d = p2m->domain; struct page_info *p = NULL; /* Compiler warnings */ @@ -1116,7 +1115,7 @@ p2m_pod_demand_populate(struct p2m_domain *p2m, gfn_t gfn, */ p2m_set_entry(p2m, gfn_aligned, INVALID_MFN, PAGE_ORDER_2M, p2m_populate_on_demand, p2m->default_access); - return 0; + return true; } /* Only reclaim if we're in actual need of more cache. */ @@ -1178,7 +1177,7 @@ p2m_pod_demand_populate(struct p2m_domain *p2m, gfn_t gfn, } pod_unlock(p2m); - return 0; + return true; out_of_memory: pod_unlock(p2m); @@ -1186,10 +1185,10 @@ out_of_memory: __func__, d->domain_id, d->tot_pages, p2m->pod.entry_count, current->domain->domain_id); domain_crash(d); - return -1; + return false; out_fail: pod_unlock(p2m); - return -1; + return false; remap_and_retry: BUG_ON(order != PAGE_ORDER_2M); pod_unlock(p2m); @@ -1215,7 +1214,7 @@ remap_and_retry: __trace_var(TRC_MEM_POD_SUPERPAGE_SPLINTER, 0, sizeof(t), &t); } - return 0; + return true; } diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index 3dd4bef66e..86946a09db 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -802,7 +802,7 @@ pod_retry_l3: { if ( q & P2M_ALLOC ) { - if ( !p2m_pod_demand_populate(p2m, gfn_t, PAGE_ORDER_1G, q) ) + if ( p2m_pod_demand_populate(p2m, gfn_t, PAGE_ORDER_1G) ) goto pod_retry_l3; gdprintk(XENLOG_ERR, "%s: Allocate 1GB failed!\n", __func__); } @@ -844,7 +844,7 @@ pod_retry_l2: if ( p2m_flags_to_type(flags) == p2m_populate_on_demand ) { if ( q & P2M_ALLOC ) { - if ( !p2m_pod_demand_populate(p2m, gfn_t, PAGE_ORDER_2M, q) ) + if ( p2m_pod_demand_populate(p2m, gfn_t, PAGE_ORDER_2M) ) goto pod_retry_l2; } else *t = p2m_populate_on_demand; @@ -883,7 +883,7 @@ pod_retry_l1: if ( l1t == p2m_populate_on_demand ) { if ( q & P2M_ALLOC ) { - if ( !p2m_pod_demand_populate(p2m, gfn_t, PAGE_ORDER_4K, q) ) + if ( p2m_pod_demand_populate(p2m, gfn_t, PAGE_ORDER_4K) ) goto pod_retry_l1; } else *t = p2m_populate_on_demand; diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index e8a9dca480..70f00c332f 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -719,10 +719,8 @@ extern void audit_p2m(struct domain *d, #endif /* Called by p2m code when demand-populating a PoD page */ -int -p2m_pod_demand_populate(struct p2m_domain *p2m, gfn_t gfn, - unsigned int order, - p2m_query_t q); +bool +p2m_pod_demand_populate(struct p2m_domain *p2m, gfn_t gfn, unsigned int order); /* * Functions specific to the p2m-pt implementation