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 4/6] xen/x86: adjust handling of the L3 user vsyscall special
 page table
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: <1048f5b8-b726-dcc1-1216-9d5ac328ce82@suse.com>
Date:   Thu, 30 Sep 2021 14:36:16 +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?bTAwNm9TS1RoekNsWmJkVWdpeW9PRkNqb2cxVmRFTnl5ZjZwUjJDWDJtNC9Y?=
 =?utf-8?B?bDkxdU1tczhwNHpmVXdCSDltUWg0S2xzaC9uUUcycG9yMjd5S2V5b20wWlRV?=
 =?utf-8?B?Vk9FZG5sUlc0dmRFUHZ5Q083NVgzTHlSMWxwOGNzZ0pwWVJvM3k5MWdmWlFt?=
 =?utf-8?B?SGQ0TjdVNHh5eUJyRXpGZFJ6eDVmbW5OcFpCSWc2ajlsK2p1SThaZDYwSWdo?=
 =?utf-8?B?NmdWNkcrTFVhUHk2UGxKRWFQN3VDOXQxREt6MTBjaE82c1dqazFHcEN1eUVz?=
 =?utf-8?B?QWt6eU1MK3BaMnoyRGRzSkxCWElpK0h2bEMrdDVrL1NDM0I4d3F6Y2UwVmpP?=
 =?utf-8?B?dDFraFhnVHlsanRQS1RjTDZMSTJONzFyTFZpc1RuV1ZCSmpyN0hhUko3TU5v?=
 =?utf-8?B?cWRoSVZZZWRocytRMHAwMUUrSUREZTlHcjRMMzlKTUM1ZStYYmQ2TU1yRThE?=
 =?utf-8?B?d21NZ1dSV2J4WE1WOEdBZlE1UjlUZTZXS1VZK2ZDelNzWVhBSVdVUWZDL2h4?=
 =?utf-8?B?RDdqb2NvNTVzM2s3dlVKS3RUOHhZTVVoUGQvQTFPandFWXZIRVA2Q09qNUZP?=
 =?utf-8?B?VnJWcGRuQnVycFJKUW1aN3JlK0k2M3VBWU9icXNrRGdSNTBYUUErNWx6clMx?=
 =?utf-8?B?NmxEK0dQemZNc2ZydTVkRnFudlFmdTJJYktrNnZneENIOUhiQ3pIckpoWTl6?=
 =?utf-8?B?R28ybTU4dTN2TGFxM2lKY0pDZEpVTzc2UkNlQ1p2VEp0UEN4UzVML1VRbFhY?=
 =?utf-8?B?VU0rck5TZEw4MTZ5Y05EUzNweW5FQkEwUzhFeDQrd3BxRFdaMVg1dUhmZTJz?=
 =?utf-8?B?bkQ4V29tQUk2T0MrZzVJWmptbVRLUCtUbXk2OWRMOTFPL2ZFdVNtNVE1SzJn?=
 =?utf-8?B?QmpuUTZxbTRpY3pKNGdwYk9ZMUtCT0kyWDBxTTB4K0plWTYvOEV0YUNQRmZa?=
 =?utf-8?B?d3V1NFJQTVRZVlFLQUpPQkFiUjhrMFVUMmJsMldvQjNaS0E4QWZnOW9uMlRn?=
 =?utf-8?B?Q0EyUnBMM1FESWkzVUkvTS9KQkpJc2tzQkYzMWdidGEyMFpnY2xQVTg4RjA5?=
 =?utf-8?B?c2N2NWhVeEc5TFRMbGVscC9DQm5nczA3TlJwMUFBTnpzQjAyU0hvRFBTeVdE?=
 =?utf-8?B?TDRDVk9tWTluSzNQK0Y1eGFjcDc4NUxZVjl0alFMZlNiM0QyamZ3SC81NWl0?=
 =?utf-8?B?Q3FtbmtSRktlRDJtOWVlOGNFeVhUOGcxOExNWVZ4ZVlkV282Tnh3cEljKzVG?=
 =?utf-8?B?WTNSMzRtS0FEeDJZMmw1V2MyWWtDQmU3alNjTGtvTTNPMHE3TmUwVjloOWFo?=
 =?utf-8?B?M3VISXVDOUJqSWQ2bEpCek4wSks4OWl6MWZPTXQvWDB4V1hET1BCTFJwY2Uw?=
 =?utf-8?B?QkJjUENPVm84eFV5amhlblFjMEJXREg3RlhwczU5cG15cHVtTHo5TWdLbmk3?=
 =?utf-8?B?QUlSMXdaY2RwTVpMM2tXMEhZdWJlb2tYZmVHRnBXSHpSTE9PMGhaZy9mYlNJ?=
 =?utf-8?B?VS9aWktHd2xpUW54L3BodDhoeDFZRGhEOW00OEpXcUNyS3MzV2htTk9BaDJr?=
 =?utf-8?B?SHdmeGVrai8xcnk3NTJlSGgyVXZxQjk3anNBN25hY2docnZRVVZHYnA3VllW?=
 =?utf-8?B?MGpsUlhsbERiYkZZb0NrYWpxME9yVlE4QklMQkFIODBOOFQyMlIwemlqYnpJ?=
 =?utf-8?B?VDlYUWoyQ0JtTzZsZGQyaXRUTysxYWxxRTcvczlJMDZiamV3Zmx2eHVQajVO?=
 =?utf-8?Q?c9peOGsyC02fuM45TWZ2tI0IDfAblxG1zFUz95G?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2b717692-eea2-41fb-d7d2-08d9840ee6e7
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:36:18.9427
 (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: p/UVvcBHTex3EDann2EoFsoQf08BAYRzVOqe4nNdq8gQITWVXi39PUQVG29gmdW3u5gyJ6YEe5ipqfbkTqb8sg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6383
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Marking the page tableas pinned without ever actually pinning is was
probably an oversight in the first place. The main reason for the change
is more subtle, though: The write of the one present entry each here and
in the subsequently allocated L2 table engage a code path in the
hypervisor which exists only for thought-to-be-broken guests: An mmu-
update operation to a page which is neither a page table nor marked
writable. The hypervisor merely assumes (or should I say "hopes") that
the fact that a writable reference to the page can be obtained means it
is okay to actually write to that page in response to such a hypercall.

While there make all involved code and data dependent upon
X86_VSYSCALL_EMULATION (some code was already).

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

--- a/arch/x86/xen/mmu_pv.c
+++ b/arch/x86/xen/mmu_pv.c
@@ -86,8 +86,10 @@
 #include "mmu.h"
 #include "debugfs.h"
 
+#ifdef CONFIG_X86_VSYSCALL_EMULATION
 /* l3 pud for userspace vsyscall mapping */
 static pud_t level3_user_vsyscall[PTRS_PER_PUD] __page_aligned_bss;
+#endif
 
 /*
  * Protects atomic reservation decrease/increase against concurrent increases.
@@ -791,7 +793,9 @@ static void __init xen_mark_pinned(struc
 static void __init xen_after_bootmem(void)
 {
 	static_branch_enable(&xen_struct_pages_ready);
+#ifdef CONFIG_X86_VSYSCALL_EMULATION
 	SetPagePinned(virt_to_page(level3_user_vsyscall));
+#endif
 	xen_pgd_walk(&init_mm, xen_mark_pinned, FIXADDR_TOP);
 }
 
@@ -1761,7 +1765,6 @@ void __init xen_setup_kernel_pagetable(p
 	set_page_prot(init_top_pgt, PAGE_KERNEL_RO);
 	set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
 	set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
-	set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
 	set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
 	set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
 	set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
@@ -1778,6 +1781,13 @@ void __init xen_setup_kernel_pagetable(p
 	/* Unpin Xen-provided one */
 	pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, PFN_DOWN(__pa(pgd)));
 
+#ifdef CONFIG_X86_VSYSCALL_EMULATION
+	/* Pin user vsyscall L3 */
+	set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
+	pin_pagetable_pfn(MMUEXT_PIN_L3_TABLE,
+			  PFN_DOWN(__pa_symbol(level3_user_vsyscall)));
+#endif
+
 	/*
 	 * At this stage there can be no user pgd, and no page structure to
 	 * attach it to, so make sure we just set kernel pgd.