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;
Subject: [PATCH 3/6] xen/x86: adjust xen_set_fixmap()
From:   Jan Beulich <jbeulich@suse.com>
To:     Juergen Gross <jgross@suse.com>,
        Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc:     Stefano Stabellini <sstabellini@kernel.org>,
        lkml <linux-kernel@vger.kernel.org>,
        "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
References: <022b1a5e-4121-6bae-f07c-4ad5eac12481@suse.com>
Message-ID: <11fcaea2-ec17-3edd-ecdf-4cdd2d472bd0@suse.com>
Date:   Thu, 30 Sep 2021 14:35:52 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101
 Thunderbird/78.14.0
In-Reply-To: <022b1a5e-4121-6bae-f07c-4ad5eac12481@suse.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UFB3UlR3YkVQSU5ic1M5TlFsT3BjMURKYjNCZEtTdjFDaDhMbjk1WFB4ZFIx?=
 =?utf-8?B?Q1FVNFNDVVRLQVdzNCtJRmduckJMcS9PSm9tUHBqNy9JMm5RZCsxQUFZM0ht?=
 =?utf-8?B?UkpHcUtUNGhtbi9uZHFteVpsTUovRHRqczZ2UzNuQ1pENlRwVms4TWZCaGtq?=
 =?utf-8?B?emxWOHQwZ1k0cHNmaHlqZ3F3cmRkdW5pUGs5MFd2NExlL01mbVdHNllxRmlE?=
 =?utf-8?B?ZjZsTzhtbUZyTGMzdzdOaFMyZ1ppWHV0N0c5d3ZXOWlSOGNWVjJGNjd0VWI1?=
 =?utf-8?B?OGU4b2hQOXhIbTNTZ211R3U5bTJ3OGo1NjhJdHJjY0QvQ1FaUHJlYlZkTkxW?=
 =?utf-8?B?cUVFMWhOVTl1MHVLaDQzaG51SGV0ck12akxSZDBtRGZrbHZER0RIWkFpdkhl?=
 =?utf-8?B?SEg1bDNzcnFRSU9uR3BKUzYyNy9YMTB1TE1vUmNWR2piTHJOblN3WnhZdEhI?=
 =?utf-8?B?b2c5eWkvRENQNEkxWllaanFUdkxjaktvcVgxY0oxSXdWVFF5M3BXa1V1eGhI?=
 =?utf-8?B?NUJIRXZtQkdMN1dXYnRzMXNmeG9ZQW5ua3ZsMThHd2tVMmlBb1YwOUNDTFNr?=
 =?utf-8?B?Tk1JQi93alF6VkIxL3RtTmtncWdwWVkvV1R1VWdmeGY1YzkzRDVheDE0c3M0?=
 =?utf-8?B?YnFaL0NBU2pNL0xwSTI2dXpFRktnNlo4L1AwNkh3c3lpVjFwUmFLVTB0MS81?=
 =?utf-8?B?ZG4ySTY3V3Y5djF3a0VkZzFUTWcvR2h4Ui85ajhWU2lPY1NLRlNOYVJ3K0wx?=
 =?utf-8?B?V21lSlptZk9mNmlLMTNTbXE3aHI2eVMzVkpyUWt2emxybXByNWdVTDRXSmpv?=
 =?utf-8?B?UlB6b1FKais1WkJNTlBKeml1RW1heW8xeWtxSWxrZHh6S1RGaHEyRTQ3Wm1F?=
 =?utf-8?B?dkxxc0dzV0xqZ0ZGTnBCWXlHWTRTWkJKUzhwNmgwcVAydDZWNldZL2FSclhG?=
 =?utf-8?B?VHhBRnZvSFdmQXk0MWNuMHozNEtQVUtFYWg5Vk9JSzBGSTNOWlA4TmpXMmRC?=
 =?utf-8?B?M1V5eStWS2VtL1Awa1QxQi80UTVCWE8yQlBPR2tCVEg1cG84cnl2WFhzUyt6?=
 =?utf-8?B?ODRaZG1ZdGd1aWxQSjIrUnFhYXViN29QRU5mMGZCWDM0UE9HZUwxeXRBemM1?=
 =?utf-8?B?ZnRFZ2JmREgyVlBRd0dwb2lDVWpIYjhZdVFaL1JDczJUZEsxUlNZL043WGtT?=
 =?utf-8?B?SmMrNS9YRDBSN1lYR3VvbWw1OUVGdXpwcXZuMERpRjRrNVBUN3ZKSlhZbzk4?=
 =?utf-8?B?RTdjeUR5cDhadWdsV3gySzR1VnlyTlR4RGpHVTlsZXNCQjFocFlrTStyVkNx?=
 =?utf-8?B?WEplR1FBYTVFc2hIUlhZS1hkU0I5ZGJLN09jMzFTbE9WQmE4VVRqQml2c1l1?=
 =?utf-8?B?Vmxid0UyVDAvN1NrbElQT2N1Nlk3dXlQdVdjMFFiS0dUeGx4LzY3a1l5U1VL?=
 =?utf-8?B?UkYyNWNxNjNKcXlyaEdWYXpnamRDTHNYc1lQY2N0T2o0aCtmUmwybVFDTUhl?=
 =?utf-8?B?OFZ3a0ZMZnFBTXJSK1NBWG44VFRHSnZMTEppaHhBczN4ek16eHQvdnZycWJZ?=
 =?utf-8?B?MzZKQ1NaMDBYSUprVmtvUGZ3b2M2VUcvNm5QdlhWeXIvSVprblc1QVp1SjYr?=
 =?utf-8?B?WjF0ZEJ3TnhLTnlaNWlndlNVNEZLa1ovdVYxN1VXVjB1MXcrdFlKbU9OQmJ2?=
 =?utf-8?B?NFRFNmg3ODlSdXkwUkp1d3planBYRUcvTXFPS0paaUQ1QW5OZzBxWWlscExm?=
 =?utf-8?Q?rX8YE4XHd/jpxBwtdja4KUYuj5kV+O7aAPytAvi?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 733cb1a5-c54a-41c4-369a-08d9840ed853
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2021 12:35:54.4645
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: SgL0mzeJ4pJiRZIPT79Ewr88HsQdIU/G/WhWCllKZd+ErP5iAy3MdUnMGElgEPiueK0J3e7on0LHxLRtAnkq2w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6383
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Using __native_set_fixmap() here means guaranteed trap-and-emulate
instances the hypervisor has to deal with. Since the virtual address
covered by the to be adjusted page table entry is easy to determine (and
actually already gets obtained in a special case), simply use an
available, easy to invoke hypercall instead.

Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- a/arch/x86/xen/mmu_pv.c
+++ b/arch/x86/xen/mmu_pv.c
@@ -2010,6 +2010,7 @@ static unsigned char dummy_mapping[PAGE_
 static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)
 {
 	pte_t pte;
+	unsigned long vaddr;
 
 	phys >>= PAGE_SHIFT;
 
@@ -2050,15 +2051,15 @@ static void xen_set_fixmap(unsigned idx,
 		break;
 	}
 
-	__native_set_fixmap(idx, pte);
+	vaddr = __fix_to_virt(idx);
+	if (HYPERVISOR_update_va_mapping(vaddr, pte, UVMF_INVLPG))
+		BUG();
 
 #ifdef CONFIG_X86_VSYSCALL_EMULATION
 	/* Replicate changes to map the vsyscall page into the user
 	   pagetable vsyscall mapping. */
-	if (idx == VSYSCALL_PAGE) {
-		unsigned long vaddr = __fix_to_virt(idx);
+	if (idx == VSYSCALL_PAGE)
 		set_pte_vaddr_pud(level3_user_vsyscall, vaddr, pte);
-	}
 #endif
 }