Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1694213ybt; Thu, 2 Jul 2020 11:25:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJymY6zExL58iqJYGvBiTwAe58OJKOqcNV5+dxYqZON22fFL1VDqhNH1WrzXeZCajwUyJyln X-Received: by 2002:a17:906:b0d3:: with SMTP id bk19mr30640098ejb.167.1593714327130; Thu, 02 Jul 2020 11:25:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593714327; cv=none; d=google.com; s=arc-20160816; b=GD7dJ833/gnXtuhQH2oBMAsGBAmS+wXVzYYY85ARhs3dPnbn4Yg7MIKg5K+WvpI22a KWOJeTQoJZU1P3xml89eQo6kPDv1Zajlhzsi1J8dxtKwEkGLhT+q7aTg60+seXtvqnOJ q4T5lQ2dgfaixqz9IrD8AEf9N2X0LV59XpWcb5yNaF+OTo2MicxtWI0YFJd5S/kPdnZA KffXn+b3a5aOruGBNq2cMBNoMtk2q6LQDq4400AAeqNC6PE7cIbFLKYudnQEKOakqPhA z+l4n2FRNHcThaWS1wyruZtuq6EdG/+t2Ez/eHydsc9oXQgTMqLBHrPcPq+4TLunbcFi GOqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:to :from:date:ironport-sdr:dkim-signature; bh=L0wmgxX+Ovp8pu3YnIUM23eFCfp/nVBG2avgRDi4ITE=; b=TyVomL9Y7LiD8DhvkcDieIWSxJBLCtGRareRyIQKfKJt4lxuJrPYvV7sakXrHb656/ K+gfsnaNQxadHwsyPRdE932kM5d85si3fC7ygrUG/huxZxGB36n20SVQ/KBUsn6LtFsz 0AXGLZpgn1UdtdreLj+D38+03WCgyezPXGx+5SbBZo3aMD+TPLmkeccgo6wVZW5e8xSR JDKN86F6NiUpgPre3MurzlzsnoUP/o6VorGZ2G9XDwmQl8cHukFTRBk8bjHYqevWvdwo 6h6/zD+vRt9YVOrRygWeE1N45pWM81TSXegi8IkyIyOIUUIm/mJQiGdQs/FmzEGAr5x0 LcpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=AYpFS4qf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g14si1297473edv.102.2020.07.02.11.25.04; Thu, 02 Jul 2020 11:25:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=AYpFS4qf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728168AbgGBSWg (ORCPT + 99 others); Thu, 2 Jul 2020 14:22:36 -0400 Received: from smtp-fw-9102.amazon.com ([207.171.184.29]:3235 "EHLO smtp-fw-9102.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728128AbgGBSW2 (ORCPT ); Thu, 2 Jul 2020 14:22:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1593714148; x=1625250148; h=date:from:to:subject:message-id:references:mime-version: in-reply-to; bh=L0wmgxX+Ovp8pu3YnIUM23eFCfp/nVBG2avgRDi4ITE=; b=AYpFS4qf//QSf1DXaidpas5RaihxjrIv9aA3HVGT/6cvwO7Cqvzf0WDM KHGrE03l3CSOcVCMt8LLo2b3Vkpus5fGJjmvBfHBgHz+vwAYepQyb7wKK ekiYo9ootHWH/4CBY9Zmu8VbRsxEnZTIMeo2Re+BZu00KiSwLR4lpqXNo s=; IronPort-SDR: phoIWWm5EGmTpHtUjCgKWFQfuW7oI7r/z0P4Vuu21Tm6bBK93XjGosJHiCJSK1i+PGpOrR2b63 /Mq6kJcMc4Tg== X-IronPort-AV: E=Sophos;i="5.75,305,1589241600"; d="scan'208";a="56964556" Received: from sea32-co-svc-lb4-vlan3.sea.corp.amazon.com (HELO email-inbound-relay-1e-17c49630.us-east-1.amazon.com) ([10.47.23.38]) by smtp-border-fw-out-9102.sea19.amazon.com with ESMTP; 02 Jul 2020 18:22:26 +0000 Received: from EX13MTAUEB002.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1e-17c49630.us-east-1.amazon.com (Postfix) with ESMTPS id C81B2A188E; Thu, 2 Jul 2020 18:22:18 +0000 (UTC) Received: from EX13D08UEB002.ant.amazon.com (10.43.60.107) by EX13MTAUEB002.ant.amazon.com (10.43.60.12) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 2 Jul 2020 18:21:52 +0000 Received: from EX13MTAUEA002.ant.amazon.com (10.43.61.77) by EX13D08UEB002.ant.amazon.com (10.43.60.107) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 2 Jul 2020 18:21:52 +0000 Received: from dev-dsk-anchalag-2a-9c2d1d96.us-west-2.amazon.com (172.22.96.68) by mail-relay.amazon.com (10.43.61.169) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 2 Jul 2020 18:21:52 +0000 Received: by dev-dsk-anchalag-2a-9c2d1d96.us-west-2.amazon.com (Postfix, from userid 4335130) id 05A9F40844; Thu, 2 Jul 2020 18:21:52 +0000 (UTC) Date: Thu, 2 Jul 2020 18:21:52 +0000 From: Anchal Agarwal To: , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v2 03/11] x86/xen: Introduce new function to map HYPERVISOR_shared_info on Resume Message-ID: <3601db44e7c543016ca67327393d9ae37019e408.1593665947.git.anchalag@amazon.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce a small function which re-uses shared page's PA allocated during guest initialization time in reserve_shared_info() and not allocate new page during resume flow. It also does the mapping of shared_info_page by calling xen_hvm_init_shared_info() to use the function. Changelog: v1->v2: Remove extra check for shared_info_pfn to be NULL Signed-off-by: Anchal Agarwal --- arch/x86/xen/enlighten_hvm.c | 6 ++++++ arch/x86/xen/xen-ops.h | 1 + 2 files changed, 7 insertions(+) diff --git a/arch/x86/xen/enlighten_hvm.c b/arch/x86/xen/enlighten_hvm.c index 3e89b0067ff0..d91099928746 100644 --- a/arch/x86/xen/enlighten_hvm.c +++ b/arch/x86/xen/enlighten_hvm.c @@ -28,6 +28,12 @@ static unsigned long shared_info_pfn; +void xen_hvm_map_shared_info(void) +{ + xen_hvm_init_shared_info(); + HYPERVISOR_shared_info = __va(PFN_PHYS(shared_info_pfn)); +} + void xen_hvm_init_shared_info(void) { struct xen_add_to_physmap xatp; diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index 53b224fd6177..41e9e9120f2d 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h @@ -54,6 +54,7 @@ void xen_enable_sysenter(void); void xen_enable_syscall(void); void xen_vcpu_restore(void); +void xen_hvm_map_shared_info(void); void xen_hvm_init_shared_info(void); void xen_unplug_emulated_devices(void); -- 2.20.1