From patchwork Mon Sep 30 10:33:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11166427 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4C4DE13BD for ; Mon, 30 Sep 2019 10:36:16 +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 283C621855 for ; Mon, 30 Sep 2019 10:36:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="FjDl5ReA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 283C621855 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amazon.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iEt1F-0007fO-6J; Mon, 30 Sep 2019 10:35:05 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iEt1D-0007df-R1 for xen-devel@lists.xenproject.org; Mon, 30 Sep 2019 10:35:03 +0000 X-Inumbo-ID: ec2fc6f4-e36d-11e9-97fb-bc764e2007e4 Received: from smtp-fw-6002.amazon.com (unknown [52.95.49.90]) by localhost (Halon) with ESMTPS id ec2fc6f4-e36d-11e9-97fb-bc764e2007e4; Mon, 30 Sep 2019 10:34:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569839686; x=1601375686; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=SQh+B8Qj4A93IoC6Ds2kYPPws3P2iKoUgq/Hi2iZ6RM=; b=FjDl5ReAZI80sVJ7r3sLlLn3BrZMQJvHXtXJtAQ0de5U4CiJa1l+8nZl CF6aru5FF1U4Ot4toybK+0v+yrtdAw3yhe9V0Ke4gzMHh6Nu/ItWTVcE2 tivdv4LnRqBmdYCJZRmrRFnLOCq8eYXY2cA7QCXaMkVTUR/QYVuv/iJo3 U=; X-IronPort-AV: E=Sophos;i="5.64,565,1559520000"; d="scan'208";a="424630114" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1d-9ec21598.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-6002.iad6.amazon.com with ESMTP; 30 Sep 2019 10:34:45 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1d-9ec21598.us-east-1.amazon.com (Postfix) with ESMTPS id 48C05A2267; Mon, 30 Sep 2019 10:34:44 +0000 (UTC) Received: from EX13D11UEE001.ant.amazon.com (10.43.62.132) by EX13MTAUEA001.ant.amazon.com (10.43.61.82) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:15 +0000 Received: from EX13MTAUEE001.ant.amazon.com (10.43.62.200) by EX13D11UEE001.ant.amazon.com (10.43.62.132) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:14 +0000 Received: from u9d785c4ba99158.ant.amazon.com (10.125.106.78) by mail-relay.amazon.com (10.43.62.226) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Mon, 30 Sep 2019 10:34:14 +0000 From: Hongyan Xia To: Date: Mon, 30 Sep 2019 11:33:17 +0100 Message-ID: <7686120b7f9e3abdefabd930cf1b89818792cab1.1569833766.git.hongyax@amazon.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk Subject: [Xen-devel] [PATCH v2 25/55] x86_64/mm: introduce pl2e in setup_m2p_table X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Wei Liu , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Wei Liu Signed-off-by: Wei Liu --- xen/arch/x86/x86_64/mm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 103932720b..f31bd4ffde 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -397,7 +397,7 @@ static int setup_m2p_table(struct mem_hotadd_info *info) { unsigned long i, va, smap, emap; unsigned int n; - l2_pgentry_t *l2_ro_mpt = NULL; + l2_pgentry_t *pl2e = NULL, *l2_ro_mpt; l3_pgentry_t *l3_ro_mpt = NULL; int ret = 0; @@ -458,7 +458,7 @@ static int setup_m2p_table(struct mem_hotadd_info *info) _PAGE_PSE)); if ( l3e_get_flags(l3_ro_mpt[l3_table_offset(va)]) & _PAGE_PRESENT ) - l2_ro_mpt = l3e_to_l2e(l3_ro_mpt[l3_table_offset(va)]) + + pl2e = l3e_to_l2e(l3_ro_mpt[l3_table_offset(va)]) + l2_table_offset(va); else { @@ -473,11 +473,12 @@ static int setup_m2p_table(struct mem_hotadd_info *info) l3e_write(&l3_ro_mpt[l3_table_offset(va)], l3e_from_paddr(__pa(l2_ro_mpt), __PAGE_HYPERVISOR_RO | _PAGE_USER)); - l2_ro_mpt += l2_table_offset(va); + pl2e = l2_ro_mpt; + pl2e += l2_table_offset(va); } /* NB. Cannot be GLOBAL: guest user mode should not see it. */ - l2e_write(l2_ro_mpt, l2e_from_mfn(mfn, + l2e_write(pl2e, l2e_from_mfn(mfn, /*_PAGE_GLOBAL|*/_PAGE_PSE|_PAGE_USER|_PAGE_PRESENT)); } i += ( 1UL << (L2_PAGETABLE_SHIFT - 3));