From patchwork Wed Sep 13 17:59:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 112463 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1226564qgf; Wed, 13 Sep 2017 11:02:22 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAUxbRAQPJrlH9W5vG45pTd1S1WtQODRZlN9kNNBt90RPNHPPd2Ta8sWP8BdhyAHkmQbMZp X-Received: by 10.107.84.3 with SMTP id i3mr9360854iob.52.1505325742173; Wed, 13 Sep 2017 11:02:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505325742; cv=none; d=google.com; s=arc-20160816; b=iw4ehr8qcMUOIzwW/ewbAbalUSRAaL7qrITR4kYlFEIm2r2GK2duM6nuYXZLlJkAIB njjrJNQaWxX/SVYVNDjwN+z+D/GUvoXHrHXhBrXkqRpb1M0rgpQuRf65QaOvlFM0WHBr a7pLJIF2AEw8M27B2BuDKo79n3UUDFPWKF+0NZh+dCPrZCR3seY+po6YPGwkn/JHduTo vyuizp/V62ZefCv7V0S1KsqK7ZWvFEOofJ1r9KwsZyksTqNbpptQQ6RajM2VijsfNYTF d28/lMgUg6Fwkp+T0ykJQG3zLNeGC80b7KRy3tdCSMcQIskikGTKy9DzIGzn7JQw9XlS an4Q== 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=pPsEzHvPRQ9dzvF0hdh7eNjZr5zK+WTPSSm1XQ34L1c=; b=Zwp3yrJvmfPWmETdmn9hL0z6mnoKwN2fA3vDF6CyrTvEX32rIjUquB/lYLI7y1ZTLk L0MykJkntScrMx5Rh/ZfDJGj031gwDWgWL3NYKcYr3Hwff8z1FpSSuGZrqzBNTc6CULt X08bx8ucTjTQD+KWU74WrWsmk8vQEuVS+vDLxmT9jVF+x0fVoYmP96VIGKEmqR3tfp4P 3bV6DqMbnbYIGVo5fAFC8/3hWKhYb6Y2nkgGaak86clShEGj6q0HAwLqunPKFcWsi49m txWQBFDF9T47o3QWBemcyxnRnCbmpk4mVUX7yevHJyp8VknTByHZQcZYZshLh5vsl47X /yrQ== 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 l71si13587331iol.121.2017.09.13.11.02.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Sep 2017 11:02:22 -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 1dsBxX-00086B-IC; Wed, 13 Sep 2017 18:00:23 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dsBxV-000833-VD for xen-devel@lists.xen.org; Wed, 13 Sep 2017 18:00:22 +0000 Received: from [193.109.254.147] by server-7.bemta-6.messagelabs.com id 13/09-03610-53279B95; Wed, 13 Sep 2017 18:00:21 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRWlGSWpSXmKPExsVysyfVTdekaGe kwbX1phZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8aDZWfZCzrEKtrblrI1MJ4Q6GLk4hAS2Mwo cWfGP3YI5zSjxN8Z05m6GDk52AQ0Je58/gRmiwhIS1z7fJkRpIhZYDGjxOf9vcwgCWGBVImZ/ 5sYQWwWAVWJ1TensoPYvAJWEgt3dIHZEgLyErvaLrKC2JxA8ZlfFwAN5QDaZilxuidqAiP3Ak aGVYwaxalFZalFuoZGeklFmekZJbmJmTm6hgZmermpxcWJ6ak5iUnFesn5uZsYgR5mAIIdjJc 3BhxilORgUhLl3au7M1KILyk/pTIjsTgjvqg0J7X4EKMMB4eSBK9EIVBOsCg1PbUiLTMHGGow aQkOHiURXm2QNG9xQWJucWY6ROoUoy5Hx827f5iEWPLy81KlxHljQIoEQIoySvPgRsDC/hKjr JQwLyPQUUI8BalFuZklqPKvGMU5GJWEeb8VAE3hycwrgdv0CugIJqAjzpzeAXJESSJCSqqBcd qSNe/5LYO7J2U/3/MwZ3+MRk19pUyntq+n6ZLX+T8kUuN3zbW5M42naJvSypy639MrXXbobPl /ueQlk3eKXJ+VX+NKJ36ByKvN3Ny+e2ZHvslK2/9aQHxBvsokl4OmTpN7Q27EesyvVTLg33N1 3Trltha9uRv2+795ad9weaHKafnT+S9KlViKMxINtZiLihMBl6Q/S3YCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1505325620!93412729!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31042 invoked from network); 13 Sep 2017 18:00:20 -0000 Received: from usa-sjc-mx-foss1.foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-10.tower-27.messagelabs.com with SMTP; 13 Sep 2017 18:00:20 -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 2B483169F; Wed, 13 Sep 2017 11:00:20 -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 1858A3F483; Wed, 13 Sep 2017 11:00:18 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 13 Sep 2017 18:59:52 +0100 Message-Id: <20170913175953.16942-15-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 14/15] xen/x86: p2m-pod: Use typesafe gfn for the fields reclaim_single and max_guest 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" Signed-off-by: Julien Grall --- Cc: George Dunlap Cc: Jan Beulich Cc: Andrew Cooper --- xen/arch/x86/mm/p2m-pod.c | 11 +++++------ xen/include/asm-x86/p2m.h | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index 5c79444d7b..311762b1ce 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -977,10 +977,10 @@ p2m_pod_emergency_sweep(struct p2m_domain *p2m) p2m_type_t t; - if ( p2m->pod.reclaim_single == 0 ) + if ( gfn_eq(p2m->pod.reclaim_single, _gfn(0)) ) p2m->pod.reclaim_single = p2m->pod.max_guest; - start = p2m->pod.reclaim_single; + start = gfn_x(p2m->pod.reclaim_single); limit = (start > POD_SWEEP_LIMIT) ? (start - POD_SWEEP_LIMIT) : 0; /* FIXME: Figure out how to avoid superpages */ @@ -990,7 +990,7 @@ p2m_pod_emergency_sweep(struct p2m_domain *p2m) * careful about spinlock recursion limits and POD_SWEEP_STRIDE. */ p2m_lock(p2m); - for ( i = p2m->pod.reclaim_single; i > 0 ; i-- ) + for ( i = gfn_x(p2m->pod.reclaim_single); i > 0 ; i-- ) { p2m_access_t a; (void)p2m->get_entry(p2m, _gfn(i), &t, &a, 0, NULL, NULL); @@ -1020,7 +1020,7 @@ p2m_pod_emergency_sweep(struct p2m_domain *p2m) p2m_pod_zero_check(p2m, gfns, j); p2m_unlock(p2m); - p2m->pod.reclaim_single = i ? i - 1 : i; + p2m->pod.reclaim_single = _gfn(i ? i - 1 : i); } @@ -1135,8 +1135,7 @@ p2m_pod_demand_populate(struct p2m_domain *p2m, gfn_t gfn, goto out_of_memory; /* Keep track of the highest gfn demand-populated by a guest fault */ - if ( gfn_x(gfn) > p2m->pod.max_guest ) - p2m->pod.max_guest = gfn_x(gfn); + p2m->pod.max_guest = gfn_max(gfn, p2m->pod.max_guest); /* * Get a page f/ the cache. A NULL return value indicates that the diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 1ae9216404..e8a9dca480 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -316,8 +316,8 @@ struct p2m_domain { single; /* Non-super lists */ long count, /* # of pages in cache lists */ entry_count; /* # of pages in p2m marked pod */ - unsigned long reclaim_single; /* Last gpfn of a scan */ - unsigned long max_guest; /* gpfn of max guest demand-populate */ + gfn_t reclaim_single; /* Last gfn of a scan */ + gfn_t max_guest; /* gfn of max guest demand-populate */ /* * Tracking of the most recently populated PoD pages, for eager