From nobody Wed May 1 03:42:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1658851474; cv=pass; d=zohomail.com; s=zohoarc; b=ibBWQjmATX6NhFHB3A0pVHuO/ur2fPyr7rMoRQQ8HqOMmCrwxwnX6/l7dCDz0DnzePKUipt49Mwx+I0W5RJ1MW10cvclwyc9vOJp63zdDcFg7Zb6pCnZRUDeqwCKxiAAI/UaHZfX9PI3y5KLumWc1rLn4IRqQQt6wnvxhxhh71A= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658851474; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5J6VHiXD4VRqnlBRJoS4Bi+7owZxh4DSFzpTxUKvMX4=; b=TodzU+eiqGwegh8b4VJ8BZPxugIKW16RzXnHuv28W7AqkHi6yqED3gQ2lKMKl7ieT08L3i5/rt0gVFgeudY4h188XE0712vJUUhzkjzpIf/zg9rDelBY3X0QeQ3cD9W3zUtjrkGCBdbW+EHNsjNWWGrtAfDthL2sfngOLfLqpPM= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1658851474165649.8601725228604; Tue, 26 Jul 2022 09:04:34 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.375496.607912 (Exim 4.92) (envelope-from ) id 1oGN2E-0004Kr-Ma; Tue, 26 Jul 2022 16:03:50 +0000 Received: by outflank-mailman (output) from mailman id 375496.607912; Tue, 26 Jul 2022 16:03:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGN2E-0004Kk-JC; Tue, 26 Jul 2022 16:03:50 +0000 Received: by outflank-mailman (input) for mailman id 375496; Tue, 26 Jul 2022 16:03:49 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGN2D-0004Kb-Cl for xen-devel@lists.xenproject.org; Tue, 26 Jul 2022 16:03:49 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2055.outbound.protection.outlook.com [40.107.22.55]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 887ca3dd-0cfc-11ed-924f-1f966e50362f; Tue, 26 Jul 2022 18:03:48 +0200 (CEST) Received: from AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) by DBBPR04MB7532.eurprd04.prod.outlook.com (2603:10a6:10:207::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.25; Tue, 26 Jul 2022 16:03:41 +0000 Received: from AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::dd30:2cbc:361d:2d1e]) by AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::dd30:2cbc:361d:2d1e%6]) with mapi id 15.20.5438.023; Tue, 26 Jul 2022 16:03:41 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 887ca3dd-0cfc-11ed-924f-1f966e50362f ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BIsewXBuinDiU6BWlep3Kw0xfVyWr3/hkR75U4tM78IIJN1mWcZ9d/SA/f8gmXeDKe2lS0t2p+ji/eXvpF6SG/aQcL8GGuK12OoWVwCgAi8sOWZ9mC4oaiWvks8prnumwl03Ai1In0cxdx8y6HS0LytoN/OG+KPskTXd4hZ/QMVxbrSQE1QidR0QtoVCqIVZ/KnxviD4TVf2nZOiuE9NmoohEt17DEZOeod6Dap7yNoLadGqMsSF/3qMTF6QpZHHIYUwbR9VxhCVGEmnwGXwisPjVrV/X37ZG/CGLCZBuviBJcPfGnUDfwC5dXW5V/tuaU1jaqhJYDTXuzZ+HT2ATg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5J6VHiXD4VRqnlBRJoS4Bi+7owZxh4DSFzpTxUKvMX4=; b=WZkJujO4AXI2Hdo7p2KfaHNAJ7Ukf8eN3I+y9lKI4zLiUitkWPFtCakPxYpcTp1hBLakvyNVTzp+KNlIemmsVODeX/VjSSXklKtDKzdzHUI3p/m+GjUYbBTolWEHOTBDtz4dXvXrDPLkICq5alnPdTmuYi5zLkEhQ2appKiR7crbRKl1lN0pDuO2b+DtAVTDg/vybjJFN7mVHZrxZFqR7jxvZTO+AdYGmNP9mu5JvhhFWR/OYwF7tVyix1Q/isFuszUaU/jeI9qJAqnaaxvEvX+R38wmnKIBdhYTaG496h+vSbMFW1OacMjN9JSAg8yG92J9impEwrzCSvGdHSDzIw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5J6VHiXD4VRqnlBRJoS4Bi+7owZxh4DSFzpTxUKvMX4=; b=KPTvcddME0TE/pwUKDg7OwmIeggQWrMSQcGNISNyM+KwraL6jAIbHuidThvftYKJOEoB2fHuYByXMBNiXtZCqu7j/26xoRtha0lXvtNHecgA2XksSmm8KkifbT7XU64Tpttf2ajtsMFm25ueVMxxxVmTcm9dQIxmRzCdLg7BRoqYkK5hVveZeVOx4OheRYnQozBzlW2WVB0aW+uAdEdZiTuqTznBOFieyOepVBSMdjx2imZTCnXY1pSd/yai1uFKY7LxfrM/QUCXuOZs+etUiSUozQIZWJSzXS/sYnQoY/6HP7NnFUMw+9zuBMhB7ZROghV/TLfpUJveyFNkyM1Q3A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <50abcb9b-8f69-0789-5f12-c422ff71c3ac@suse.com> Date: Tue, 26 Jul 2022 18:03:39 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH 1/8] x86/shadow: drop shadow_prepare_page_type_change()'s 3rd parameter Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , George Dunlap , Tim Deegan References: <3fdfad2a-7891-0b08-5541-3b226e0555e1@suse.com> In-Reply-To: <3fdfad2a-7891-0b08-5541-3b226e0555e1@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR06CA0189.eurprd06.prod.outlook.com (2603:10a6:20b:45d::7) To AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 049105d3-9bc2-4823-e063-08da6f206880 X-MS-TrafficTypeDiagnostic: DBBPR04MB7532:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DPxeoeQ9foYRKH856maPe6KNA4wi42EwGrUk4Vu1GamaK+EiKUbyNT/U0CLAhFUx5P3r811YvoTm65YdUCXAz4n+p/k7K9ZIb7QxkdIqZlQBavZvfObpYZNUzfe7iJW9d79cWgY7aePyc81dT6MMCAwagaJYPZvX0CSqwxw8lNjAsMCqAZy32fxVgwKN5xjNj3Ui3ZELlAkTWPik4R7RSIlkslcIE0UJThOjadZi6E6RQCRtj+9a+enh2kaynHcdUj+W1ShVL5/ZQtT0lfLgYPVfxuRHLrZ7IJIkZVh2Qs9VMEU0lvaP9NqC0UMgwt2PsVkqFJOyfNRV3JoUirbJB8kOhxWG5ImJyY+k9F9CSLPLxr2go3zmFoaDY0jAfx+d/REVoz24eujfuet2JqY66Dx/BZnP1+jT6kniXSHFZsgAYMX6CXodRN8DuNNdI/jEfKQ3Y3pMZ/Opy4CAPc3X1gyVcgKGRNIxts/MMQxnImlwY5x2EEiL3DCOldLij8F9PukceVYb1aagoc0x9M4k+wFYoQ/HAd98Io2OiiZELf/F8NLm1VVzH57NsooskpJW1oS5X+X9c+K4RReZyEqDY0TUfG7KUEh7w2jKUKYd11xoom6UdUxea+zV+My7Sd3+ElpX5tYZl87SU02fseHUKBeUzaMUeesyT2Hds7NSwHfADuAGqy0qjyTiO+lNLy9ZhhtajWWyKsd6oXF5IqLatZShnezUd+diLWaLXSdFs5jTJxJGcWQVGgfbqtDFKR+aEmo64LKQAmJq2gfDApoBAvCbiTyoyYXgxsyd0CvtEdm4Xntqwy6XuZVWdnqt6e+vlOxiZEjlwQdCbG6L21YMhw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB6551.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(39860400002)(136003)(376002)(346002)(396003)(366004)(54906003)(6512007)(26005)(6916009)(66556008)(4326008)(86362001)(66476007)(8676002)(186003)(6506007)(66946007)(31696002)(83380400001)(2616005)(8936002)(316002)(6486002)(478600001)(5660300002)(2906002)(41300700001)(31686004)(38100700002)(36756003)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SVFlMjBmN0ZEWTQvalg3dHp5OW5IT0c0cTVRMkczZSs0V0YrOStKWVhrcjdC?= =?utf-8?B?ektpUUx2TEZjdjJtUTBEM2VMQTlYb0M2UWJsRk5YaCt6VFRyRXQ5dlRhbUpH?= =?utf-8?B?dGpzV3pGTnpLeWRPR1ZBQjJweFp6M2Z6aVNjeTJEWG1CTGk4TzNOakoyTzMz?= =?utf-8?B?aXBadVNBWEpvVWdNODhvTllEb0htc2Nvc1ZYNXIyVG5tV1FBeXBiQ1FwdTc4?= =?utf-8?B?SjZSTHVUaUREbWpzM2VyYVFUcTI0Zm5hc09KR05lT2JuK3RRaHk4MjBuR0Fm?= =?utf-8?B?b0hmSjNXQVJqNEk3R0p6Sm9kV1RiNGdCUEZkN0VzVldCakQ3YnZaMjZ5TWJM?= =?utf-8?B?di8ycnF4b0h0WWx6QkxjWWJzUmN2QzcrbTVzOHlpTVM0Ym14S294c0VvK2FC?= =?utf-8?B?QjdSenZDOFNWL1llcFhkSjk5ckhESlpXYVVScHBMRmw3VkpWZlluUitYTW4v?= =?utf-8?B?Z1cvVklWdmk5eDJyZ3E4WE54OGF0eU9wR000NW1DcDRiNEZtSU80bEQwV04y?= =?utf-8?B?c1kzVzBDZG1JcDQ5eHNWSzhHSkhrL1ZNRU5OWGFyMnVORUpMRTZsNDFBY3Js?= =?utf-8?B?NTUxKzFrUWtzaWU1SElBdk1jM3N3a2F6cUlJMEZ5dFRUUnZJTlUwNk90dTVG?= =?utf-8?B?MXNGUXpYZFFTc0pEQ3dHcXkveEh4ZWRkc2RBM3BrNDZBM1VXVWhLSUNOMkZO?= =?utf-8?B?L010NkJXbU1EazdMWWlOS2FCbDBKeG1ydFJYSUxzT2tDeE5jTE12N05ZaWNT?= =?utf-8?B?ZHh2c3p0OXZ5bHRVKzNIS3dLMGV4VFBEbTBRRVcyYWdoUGgwZXpqTlpxQUlC?= =?utf-8?B?NXdZbWdvbWM4aXBDeVBjcVV0UTdVRTB0QjJ5aWZ3Z0gxMXNmVmhTdzU4REgz?= =?utf-8?B?dE5HNU40RzFOVjNoUEtmQnVQaG11Vmx0K1IrTE5QajNmbW5YdCtiaDdSVHhs?= =?utf-8?B?N1JsMC94eVgvWXF0Mm1LelNkSnExVkVFeS9IRVFGZ2l0ZEJPa3hGZDBGZkNL?= =?utf-8?B?ZHBhd3ZaT24xanVlOHEweUJIWGgyOG9VSGJjQjYvcEQxMFZuUWZMd1F2WDhX?= =?utf-8?B?dTkzZGF3Tk9xSzl6SnQrQVN5VHMwWXlxVGpIeWhKUTRrSDlwakorT280bUw1?= =?utf-8?B?UVNKZG55TEN5TWFGMUVMV00ydnk0b2FmQ20zWUFCOTRFUEFrYWtOQ0R3MCt1?= =?utf-8?B?YUVQbmkwTGkrK2FlV2daOWczamc5SjFidEdhbXgzNlRSaHdxM2hOaVUzOWZK?= =?utf-8?B?SUlBOEp5ZW02VDRlanAzelpCK0tPcXBVV1lOanRuWEhrK0JuL3BkcUFmV2JR?= =?utf-8?B?U1RSMHhSQjF1Tk5Wd3JIdjRvR1NMSkhnbVlGQUNRaFc5aC9Xd1NNSDdPUDhD?= =?utf-8?B?UmVnVFpkMDRJRzB1cTJBRGVRUGRKaEgyRFR0Uk5wUnkvajQ5SVZDVE1yVUc4?= =?utf-8?B?NHFaeXBSWnFCWUFHdElpbHlTeG9qeW9YVFVzRitLb1ZiR3hGSGg3NDRzWG5k?= =?utf-8?B?bzZHaHQ0U05aVm5XT0Fjb3htdGtBRlp6eW1VVGxwbDhCRXVsK0VEUU0rLzVR?= =?utf-8?B?STF3a1NFSENkWGc0eXBlS3J2MUlJNjNOWWtvVUdvZzhMUUc5WkwrbStkV2ZE?= =?utf-8?B?V0FJMWdlNjkxVCt0RHFLcXM2QnduOGFjS2o1RVJnQ1A0clpTUmR5cUxMSkRV?= =?utf-8?B?K09RNkcvMXFCZ01JOFdqeXZ2Z09FdmlUVVZHUTRsdlM4Qm5xNmFmek9WTDlq?= =?utf-8?B?V3lDQjY1QjdQSnJueVNWYUZ0UWhCQU1DaEZUeWhjNUFuU2VWNW1LR3dNelha?= =?utf-8?B?OFRNeHBaNXdmNGFYKzMyNFBxMHVtQlZOeE9hVjNEZTNmY3R1U3ZQUDcvTjNt?= =?utf-8?B?QUFjV1BKWGdNZksxNndPaS8yOTZtNWIxVnhLUUc0UzdYeG1rbFlzRFpYZG1D?= =?utf-8?B?UVdMM09jdGlHKzhVeW9SQVlOeXJjVCsrSitkS1JWbG52bnlweXROR3p2Nzk0?= =?utf-8?B?UFhpNG1WVm5yU08reGpzMlB3a3pkVTZseEZma3lpS3RwL0dkbnRtaE1BNDFo?= =?utf-8?B?VnJZUHN1VlU4WUN4VFlNSzRLcjc0dlJLbENSUkRKNGlQeUV4NGpnUno4TEps?= =?utf-8?Q?a/lU0NGkgq7DMxKN/fUU+S1T2?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 049105d3-9bc2-4823-e063-08da6f206880 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6551.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 16:03:41.0353 (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: Dx3lNN++gmLy3rVh0U249Lzw5bt6EjBSZrPUUKocUSY8Xu9lt1kVSRXU70SfWbySKxOtNQMvr/ICgpP0GTnC/w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7532 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1658851474799100001 Content-Type: text/plain; charset="utf-8" As of 8cc5036bc385 ("x86/pv: Fix ABAC cmpxchg() race in _get_page_type()") this no longer needs passing separately - the type can now be read from struct page_info, as the call now happens after its writing. While there also constify the 2nd parameter. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- a/xen/arch/x86/include/asm/shadow.h +++ b/xen/arch/x86/include/asm/shadow.h @@ -84,8 +84,8 @@ void shadow_final_teardown(struct domain void sh_remove_shadows(struct domain *d, mfn_t gmfn, int fast, int all); =20 /* Adjust shadows ready for a guest page to change its type. */ -void shadow_prepare_page_type_change(struct domain *d, struct page_info *p= age, - unsigned long new_type); +void shadow_prepare_page_type_change(struct domain *d, + const struct page_info *page); =20 /* Discard _all_ mappings from the domain's shadows. */ void shadow_blow_tables_per_domain(struct domain *d); @@ -113,8 +113,7 @@ static inline void sh_remove_shadows(str int fast, int all) {} =20 static inline void shadow_prepare_page_type_change(struct domain *d, - struct page_info *page, - unsigned long new_type)= {} + const struct page_info = *page) {} =20 static inline void shadow_blow_tables_per_domain(struct domain *d) {} =20 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3018,7 +3018,7 @@ static int _get_page_type(struct page_in struct domain *d =3D page_get_owner(page); =20 if ( d && shadow_mode_enabled(d) ) - shadow_prepare_page_type_change(d, page, type); + shadow_prepare_page_type_change(d, page); =20 if ( (x & PGT_type_mask) !=3D type ) { --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2265,8 +2265,8 @@ void sh_remove_shadows(struct domain *d, paging_unlock(d); } =20 -void shadow_prepare_page_type_change(struct domain *d, struct page_info *p= age, - unsigned long new_type) +void shadow_prepare_page_type_change(struct domain *d, + const struct page_info *page) { if ( !(page->count_info & PGC_page_table) ) return; @@ -2278,7 +2278,7 @@ void shadow_prepare_page_type_change(str * pages are allowed to become writeable. */ if ( (page->shadow_flags & SHF_oos_may_write) && - new_type =3D=3D PGT_writable_page ) + (page->u.inuse.type_info & PGT_type_mask) =3D=3D PGT_writable_pag= e ) return; #endif From nobody Wed May 1 03:42:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1658851514; cv=pass; d=zohomail.com; s=zohoarc; b=HdXoUL1ZmN0eSi1etx+wK7TC7zdKQ3igtkcJSHEVEPDp3RvTjPvyszF+SrrdEuEvw8O1VABbyv9+0sCFuOpPvYgSQjP1C+OIKTvZoZA9LK0+D50saIO/rqB2VPZhpulnpdig/XZkBkVQ6WEZMHledugf93hjDRXJnjfChWYuiuE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658851514; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zrAeJ+7JwL3BaEmhi04AyXYTC/yrxXIxXKPGzKWit1k=; b=Calpl/mFtzVAlF/UMzzTb0mwxzf8jf1eZJbI9QQ4ZJrzeP5e32f9Q6zrxR2qjYVBqo/5j6sZZLZktvl3tvxXlHGy/0UGL2Ld48yYM0u68arNIn3LWNEDmkQ7JyCrci3FLUDT11Rc+V98HfHAAnaJ9LNcIDWTeCgCGNRmlNyWYKg= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 165885151475069.72605937275671; Tue, 26 Jul 2022 09:05:14 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.375498.607922 (Exim 4.92) (envelope-from ) id 1oGN2l-0004ro-18; Tue, 26 Jul 2022 16:04:23 +0000 Received: by outflank-mailman (output) from mailman id 375498.607922; Tue, 26 Jul 2022 16:04:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGN2k-0004rh-Uf; Tue, 26 Jul 2022 16:04:22 +0000 Received: by outflank-mailman (input) for mailman id 375498; Tue, 26 Jul 2022 16:04:22 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGN2k-0004qN-5c for xen-devel@lists.xenproject.org; Tue, 26 Jul 2022 16:04:22 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2070.outbound.protection.outlook.com [40.107.22.70]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 9c332135-0cfc-11ed-924f-1f966e50362f; Tue, 26 Jul 2022 18:04:21 +0200 (CEST) Received: from AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) by DBBPR04MB7532.eurprd04.prod.outlook.com (2603:10a6:10:207::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.25; Tue, 26 Jul 2022 16:04:20 +0000 Received: from AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::dd30:2cbc:361d:2d1e]) by AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::dd30:2cbc:361d:2d1e%6]) with mapi id 15.20.5438.023; Tue, 26 Jul 2022 16:04:20 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9c332135-0cfc-11ed-924f-1f966e50362f ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ILxcUxJLb7q9yy1y5PRcRAIVslwpqfmSuIL82NVIb+nxzvFTOWy96TWhcL9gxtLE1C4Rg0X1fBOjk1C247J/R2nDegcPakx1HqE06PIBKSAdjG69n0enhms3AqnlmH40Ag9FPP/sZA3n7H+OwGShBNJQ7qIAKp0X4xpc8m7AgbVkqeMxcJg+SdM2niendm78S5KrACvCT95lUE93s71esZPhF8UVLHwEFrmREl5UTh42UK4JeUkin3wGXsHcyEBE8d0OQQ8t15bnsZq+jzfTOY91qW4bcpyeEsyrabA+6kzsQDmYS/83Mj6n3P+XcPi+dXriujYWus9LF5AQGFYBNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zrAeJ+7JwL3BaEmhi04AyXYTC/yrxXIxXKPGzKWit1k=; b=JaE4PxB/feSaTEZa8MSQRCrS9wwef6BETjInWBg1M0Q+9/moESrHdqLYDZ8OGzrQehAeXgTJraA4plylB1qtsFyf5WTN/XTGBdOXeCYKy0dKU03cu/Vt426t7hXgC7GerfBssu9EgZEuZUxfqVlU8/HyjAsY/DQxqSfqrjt2C0mTLFkNLnQgjdYHmjRSY8qNOgCvr8SuqC3UVC2+O3K0PsjidVimG5e+aSsrsLQVwwcS/K2p4haoPwg5WE89yBZYeAlk1AHQkT7urzA4N5OOuUXO1yo2AVNXA/UkwvgMBtrInKovb0uYdRiVeFckqqx0XQLOWF7MZf+iPGCLGaGvyg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zrAeJ+7JwL3BaEmhi04AyXYTC/yrxXIxXKPGzKWit1k=; b=2hO1q4da9PgrGJOKCsrZvH5I8ssBkjwnzGbrYYtY6wr6x3hT/wzWlocQZpA3ZBjM+vbg8aHF6Gt7+Tl0VvrLWVNUdLIbS2+wu0mRNRtVfPjznFp+C9kq3n5Yn9ow/w+Onmd6aYnkkrbOVHDpPkVuV2ajilFQ4icBcp6lhpRxvxIN752512GaV3WnPqh+DdhI3x2xFN8+9aQ9/bRN8EI7vzeqc3EHxFaTUlzVDWgRwklnTTiodUIE2skTIVkqKlCyWTbBOND+0THc22CDRlmDAQK9x4vdHi97q4S1W5xstV51LE7gCPV6E+iUpnGBjF5ZvU9aR2H0bk1keYv80qXa5g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Tue, 26 Jul 2022 18:04:18 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH 2/8] x86/shadow: properly handle get_page() failing Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , George Dunlap , Tim Deegan References: <3fdfad2a-7891-0b08-5541-3b226e0555e1@suse.com> In-Reply-To: <3fdfad2a-7891-0b08-5541-3b226e0555e1@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR06CA0188.eurprd06.prod.outlook.com (2603:10a6:20b:45d::15) To AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a961b870-8995-478a-3513-08da6f207fc4 X-MS-TrafficTypeDiagnostic: DBBPR04MB7532:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: e8qw2uv5ETEeFEMU8WfBMkRIPCFz4G2LadShFmtgnQ+gvYXn7z6/bp7uMkpbke25qc0IRkY3i96nLLGlevJUl6mG87uRxwvXykn37kDhfleLkhLF4FvwEMuVb1DE2HFt1H/W/JEWeQENIxdLwsJk7qoVBVDT89d9NdaGWobaHtteEDrGAA7kDZwhqsG0t43xEc3OVg6wLEOxnm758zGa9acasBJf05mJjcpYcZn5b6kpp5KQzX9tKukHA78EvfajgZlS++ux2EMAGMDC5l0xL3W8+9g2J9smafwr5+0g+1DhoWbDZtgGpPhTO4zpS6yc/d/OrNZsA8QD0elXbwuxMOzEowQ4H9dvQJZ4/z1cOpP/q2SafihTwWsWpuhisK1xYXPOMpo3Lf+mfErjTnFO8Q/MGgqAPRd1cWqFBa/cjvgEmTRnIoz9vhBXJ/ls6rXORBGEAUyzHNen5liDWs6ReFY90ZRQIwEJZk0wOGOgrLvuZXRElaf0kC/lCzVm7gzh8jJuuVTq8HBalljrd5fhoCO+bwad0oXzI24iKt8gX3ozxoEPwei9pfbtnB7K/ujPyhlAf9qI0N5zuYznrNMzvK1T4QxRRyavjG/7lskmmJsjhIDXwFTdeS2H5SXVUVkrHj1MvFsspIGuyb2yvpo9urM7l38Uhptdmy6KZ66QtqFiwLLuyaavZUrNnesZCWUEz+YC3YchaAYVqW1USoB97TxfDBfl1VcmfVPBIa1RhnJjZzNNMMgJACk22JJEX/QKKooYp4TWo+dwFjVsxYtZC9QlmOtokJbt8jxdRw4VJQhdQG/5fWgEyKcQDWbvn1HxfBRFOgYT98DEjF8aNvAwWg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB6551.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(366004)(396003)(346002)(376002)(136003)(39860400002)(2616005)(316002)(8936002)(83380400001)(38100700002)(2906002)(36756003)(41300700001)(31686004)(6486002)(5660300002)(478600001)(6916009)(26005)(6512007)(54906003)(31696002)(66556008)(8676002)(66476007)(4326008)(86362001)(66946007)(186003)(6506007)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MWNFdlNrZElPZXRzeVNoMXQ4MjVjczFYdnM5d05GRC9kaExMUExReThWVng4?= =?utf-8?B?S3RvM0RoMTkxZnZsSnY1R1RQcWlVaGJiUE5saVhORTBqUTRUWWZucFJYT21V?= =?utf-8?B?WWM1SnNyWHBidFd0cCswSHhrUU9tK3RZUHVkUnM2bTRURHlBRWZ4c3Arb3Ev?= =?utf-8?B?NDhCUmo1RXNXZ2M1RWRPTlFDNi9CenlWYUovRWgzTWFqdkh5d3JTUkcvVXAw?= =?utf-8?B?RW1iMnU3V0VQWDZFUXFIMGhIcHFZMlREMCtRajRKRjZNc094Nnk0ajBpWmhO?= =?utf-8?B?L0lKdTVzM0UrQTJQNVUyRlROYzROYlFIY1ZNMDk4dFoyLzNtU0xXUFBlQ0o2?= =?utf-8?B?ay9mTEpnY3dzQjNWZFNrT25vanpBTWpyWlY3UEFvK2huelkxdGt5Q3htaXJ4?= =?utf-8?B?RnUwQm55eWJJa00rZXV6SGJCUWVLdVBpa1FHSlBnRm9jeEo1WWNLQXlHRk0z?= =?utf-8?B?TGZ1aUdRUExDQWhhVlhtMVJXcWw3cGZKRUdDUEhFMUtjM0tPNktTQTcwZzd2?= =?utf-8?B?NEh6VHM3RnByamhpcjV1SHVYQVhmUHdyeWpvVjkvZHR6QzlLaWh0ZnFibity?= =?utf-8?B?VWhoTVBhTVBadjNFL3gzOHhKLy9QWXNTY2hySXpURnNTWjE2ZlJ5dHdkcEJQ?= =?utf-8?B?dkxNMHByQ1ltaFdtY0UvMFI2VlNzSHlGMEl6SUx2SU1aUnRhMVEyWk9jSVlv?= =?utf-8?B?K2NWUjVURVJmTE5zOWF2RktCRjQxZkhpYVZxM2ZhSEZOOTZBY3Rad0VITkdv?= =?utf-8?B?SC9zM3hhcEhsdWtuNDhCbHNQejRkblc1cU5oOHp3RVZHc216UXZuQ1drcjUz?= =?utf-8?B?dTc1ajdCNk9ZaW5Wd0dWWE5TRDJOcXB2YS8ySHFzSlhrYkVJSnlJQTF4SXJv?= =?utf-8?B?MWkyYWR3Qm5QckViUVliOXN1b3hDaHFtbkFuU21EdklNQVJHTFN0b09jNWo1?= =?utf-8?B?WlNuZEZBVklkK0x2ZE1qdWhzU0s0cm9FeWVqU2VYMi9qeHUrNlpzc1RHTXlP?= =?utf-8?B?eFJoSGNhNTlwT1BDZXhvTm9TR1A0TlNxR29HanQ5Y3hoUWFNRytRWHliRG1S?= =?utf-8?B?OEs4bExaaThxY0g4UDRXdDJ5eFNEWkVjMXNuVzBHVWlhMWhoUzFWbUtEakVh?= =?utf-8?B?S3ZUbHlsU1Z0U1oxbnhLSlk5WXVBL28rQ1Z0emhtVnFnTlBnYVh2QWdJa0NK?= =?utf-8?B?aFdKSE9xT3NRQlFZRzkyUjRyZDlsS2x0MTR2RjdjU1JqN0RYQW5xekZwVFQz?= =?utf-8?B?MkhZOVVKQWpoVkJlMFdQUlBFNi82OXBMWUpMOVNudTlGSEpEWHFlUG51SmRj?= =?utf-8?B?WWUwdG9oazRIQVB1cFE4SXBuMVVJaTB4ck9jMkJvbko5QnJMRTh0M2xCejhY?= =?utf-8?B?aHEwMjZiTTN5Q3hpbU1hcjcvU3h2OHFzU1ZIbUZTc2Uvc3o0VkJPVkhsNGxj?= =?utf-8?B?M25ybXBLRVpFOFN6VTY3SDdxWlRaN3B1R3h4ZlVxN0RUblVVMSs0UnY1TExP?= =?utf-8?B?b3MvbE0yemtRV25pVTBKQW96QTZaWnhaQjZ3VEhSUUJHcm84enZxc2FyUWxk?= =?utf-8?B?bW5XVjFtcFdkTVNIYzg2REswekhadWhEVXhuNmVwVWJNMjNHdWxlQWFjVE1r?= =?utf-8?B?SWh0S0RxWVZtUVFrbm5HTTlwQVp3blk5a0N2WW1GblNTeHdPRkxJd1MxbHB5?= =?utf-8?B?Z0Y3V1B3NUtjdEtRN3F2aTVHT3ljQTd5NlJVdHRSYzhiT3NvRVI3a3QwWHZz?= =?utf-8?B?OGFBN21uM1B3cUdxRldzRG5LcGhIS3Y2MXlXZEg5SDhFVjRnZTdJaXpMOSs5?= =?utf-8?B?Y1NWVVBXbGc1WlBwMSszQnhhNENyTnhzTUtNd1J1VVF2SFg3LzlYVWN3M2Uy?= =?utf-8?B?VjRIUHV0QTYxTHdiU3lXeXdNRUwyTXhTRVhGbi8yOUo5dm1hL0Nwc1ZQdTNS?= =?utf-8?B?UHV2RkpXdW5HRU0rbDdwa1ZRZ0tsdWdETG9PY3NmbVh3R01jUHozdzBNK0M5?= =?utf-8?B?RnVRS05mbTIrZld4N1BiWmFhNnFDOU52Z250QThtM3plR2U3dG5kQkNJa1lQ?= =?utf-8?B?cWlOeFN0RjRtclFmWTMyUlhEVnZ3RGIxa0J4ajJvSzN4dks0NHFXRTRmbkdE?= =?utf-8?Q?hyn0ca5/7Kq6oEn5o4ZTEN9Yz?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a961b870-8995-478a-3513-08da6f207fc4 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6551.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 16:04:20.0485 (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: JO9FxrYO8nc0Okp9G8Xi5sRPolurkK9QHd0xYEfbgxPPScWEgcbwTyCxia7U9U+NKxF6lqZbvLBnv4xpYFPlXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7532 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1658851517319100001 Content-Type: text/plain; charset="utf-8" We should not blindly (in a release build) insert the new entry in the hash if a reference to the guest page cannot be obtained, or else an excess reference would be put when removing the hash entry again. Crash the domain in that case instead. The sole caller doesn't further care about the state of the guest page: All it does is return the corresponding shadow page (which was obtained successfully before) to its caller. To compensate we further need to adjust hash removal: Since the shadow page already has had its backlink set, domain cleanup code would try to destroy the shadow, and hence still cause a put_page() without corresponding get_page(). Leverage that the failed get_page() leads to no hash insertion, making shadow_hash_delete() no longer assume it will find the requested entry. Instead return back whether the entry was found. This way delete_shadow_status() can avoid calling put_page() in the problem scenario. For the other caller of shadow_hash_delete() simply reinstate the otherwise dropped assertion at the call site. While touching the conditionals in {set,delete}_shadow_status() anyway, also switch around their two pre-existing parts, to have the cheap one first (frequently allowing to avoid evaluation of the expensive - due to evaluate_nospec() - one altogether). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper , although with --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1581,7 +1581,7 @@ void shadow_hash_insert(struct domain *d sh_hash_audit_bucket(d, key); } =20 -void shadow_hash_delete(struct domain *d, unsigned long n, unsigned int t, +bool shadow_hash_delete(struct domain *d, unsigned long n, unsigned int t, mfn_t smfn) /* Excise the mapping (n,t)->smfn from the hash table */ { @@ -1606,10 +1606,8 @@ void shadow_hash_delete(struct domain *d { /* Need to search for the one we want */ x =3D d->arch.paging.shadow.hash_table[key]; - while ( 1 ) + while ( x ) { - ASSERT(x); /* We can't have hit the end, since our target is - * still in the chain somehwere... */ if ( next_shadow(x) =3D=3D sp ) { x->next_shadow =3D sp->next_shadow; @@ -1617,10 +1615,14 @@ void shadow_hash_delete(struct domain *d } x =3D next_shadow(x); } + if ( !x ) + return false; } set_next_shadow(sp, NULL); =20 sh_hash_audit_bucket(d, key); + + return true; } =20 typedef int (*hash_vcpu_callback_t)(struct vcpu *v, mfn_t smfn, mfn_t othe= r_mfn); --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -132,7 +132,8 @@ delete_fl1_shadow_status(struct domain * SHADOW_PRINTK("gfn=3D%"SH_PRI_gfn", type=3D%08x, smfn=3D%"PRI_mfn"\n", gfn_x(gfn), SH_type_fl1_shadow, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); - shadow_hash_delete(d, gfn_x(gfn), SH_type_fl1_shadow, smfn); + if ( !shadow_hash_delete(d, gfn_x(gfn), SH_type_fl1_shadow, smfn) ) + ASSERT_UNREACHABLE(); } =20 =20 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -375,7 +375,7 @@ shadow_size(unsigned int shadow_type) mfn_t shadow_hash_lookup(struct domain *d, unsigned long n, unsigned int t= ); void shadow_hash_insert(struct domain *d, unsigned long n, unsigned int t, mfn_t smfn); -void shadow_hash_delete(struct domain *d, +bool shadow_hash_delete(struct domain *d, unsigned long n, unsigned int t, mfn_t smfn); =20 /* shadow promotion */ @@ -773,18 +773,19 @@ static inline void set_shadow_status(struct domain *d, mfn_t gmfn, u32 shadow_type, mfn_t smf= n) /* Put a shadow into the hash table */ { - int res; - SHADOW_PRINTK("d%d gmfn=3D%lx, type=3D%08x, smfn=3D%lx\n", d->domain_id, mfn_x(gmfn), shadow_type, mfn_x(smfn)); =20 ASSERT(mfn_to_page(smfn)->u.sh.head); =20 /* 32-bit PV guests don't own their l4 pages so can't get_page them */ - if ( !is_pv_32bit_domain(d) || shadow_type !=3D SH_type_l4_64_shadow ) + if ( (shadow_type !=3D SH_type_l4_64_shadow || !is_pv_32bit_domain(d))= && + !get_page(mfn_to_page(gmfn), d) ) { - res =3D get_page(mfn_to_page(gmfn), d); - ASSERT(res =3D=3D 1); + printk(XENLOG_G_ERR "%pd: cannot get page for MFN %" PRI_mfn "\n", + d, mfn_x(gmfn)); + domain_crash(d); + return; } =20 shadow_hash_insert(d, mfn_x(gmfn), shadow_type, smfn); @@ -797,9 +798,9 @@ delete_shadow_status(struct domain *d, m SHADOW_PRINTK("d%d gmfn=3D%"PRI_mfn", type=3D%08x, smfn=3D%"PRI_mfn"\n= ", d->domain_id, mfn_x(gmfn), shadow_type, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); - shadow_hash_delete(d, mfn_x(gmfn), shadow_type, smfn); - /* 32-bit PV guests don't own their l4 pages; see set_shadow_status */ - if ( !is_pv_32bit_domain(d) || shadow_type !=3D SH_type_l4_64_shadow ) + if ( shadow_hash_delete(d, mfn_x(gmfn), shadow_type, smfn) && + /* 32-bit PV guests don't own their l4 pages; see set_shadow_stat= us */ + (shadow_type !=3D SH_type_l4_64_shadow || !is_pv_32bit_domain(d))= ) put_page(mfn_to_page(gmfn)); } From nobody Wed May 1 03:42:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1658851532; cv=pass; d=zohomail.com; s=zohoarc; b=hSVvWsV2fgbiFyfi2j68gBeU3kMDZ+LYt/bW2jt/KTlw63UOZnk9SNxRFDHpEuX0Z2tw/0LmpdmAbEsYksnkmAZqM/EqKmerF1BaIcK8oIEKdqqIWhq6dkPhvV/U2obMOKBSJ9l+Z/9/l1a6NVwASYpjqDocm+58EK4C5JYqzoE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658851532; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wpdBYL7DGs8sd5XkLM9xP2jAqMKLzNp/KEuELZbnd8A=; b=HO6XuXBMvPu9Bebl2hBVbIRLJupXUAs2P6yYQLy+i9JpqNfhbH4+++iXChHVxRF77Q1XKmgyFIknKqWNwGHuZD0EU+50nf49jI7oa4kHG9Y2l419UtTr6FidY442bNU1FYCRg5WH1apKKX6mRP16inbdZM73xReuwSLODXmzbBg= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1658851532012860.741302438429; Tue, 26 Jul 2022 09:05:32 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.375505.607934 (Exim 4.92) (envelope-from ) id 1oGN3E-0005Pk-9w; Tue, 26 Jul 2022 16:04:52 +0000 Received: by outflank-mailman (output) from mailman id 375505.607934; Tue, 26 Jul 2022 16:04:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGN3E-0005Pd-6N; Tue, 26 Jul 2022 16:04:52 +0000 Received: by outflank-mailman (input) for mailman id 375505; Tue, 26 Jul 2022 16:04:50 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGN3C-0004qN-RG for xen-devel@lists.xenproject.org; Tue, 26 Jul 2022 16:04:50 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2067.outbound.protection.outlook.com [40.107.22.67]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id acddf9ba-0cfc-11ed-924f-1f966e50362f; Tue, 26 Jul 2022 18:04:49 +0200 (CEST) Received: from AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) by DBBPR04MB7532.eurprd04.prod.outlook.com (2603:10a6:10:207::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.25; Tue, 26 Jul 2022 16:04:48 +0000 Received: from AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::dd30:2cbc:361d:2d1e]) by AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::dd30:2cbc:361d:2d1e%6]) with mapi id 15.20.5438.023; Tue, 26 Jul 2022 16:04:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: acddf9ba-0cfc-11ed-924f-1f966e50362f ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Emh5IvoUsjG/La8T6T1iozSiR/dDOjnEO4hxifz5fnilXmNZgZCQkM0/FyxgA0oGoiAei9ib26eS3rmJpn8lJQeym4Ebutp4BOfRps8KFKkh23USjbk/au7CJLSlc6ToeD8u8XimOtHRSTQ9iqeLu22VQS5ILK4kV6ZrXyn5n5zyQacG75yux6/a3BLd6dykXVTDhtlLKvbMrz9YCvmIUUXKb8SP3OCx2GJlXf/myz+iFTdAvH4bsJM7q2EB193WZFAcE8ganldHK+NTE5LiujkELnfZS4YYf4/ILEbx/vatd9CbIx75NkbVAJoCwbhMJ3955QtL6LAMRslJjGGFsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=wpdBYL7DGs8sd5XkLM9xP2jAqMKLzNp/KEuELZbnd8A=; b=GhQy2IGPiYtRfhJNQrv+kNx+Uo55l0MoyFtmmw9aBlzLqDNQVNEIrGB4lpsfRV+NMZOVQitWofIyVDNoMQjDQzv2Z9evjzljvyTS/pYV6M0lgTjFDI/E/7Kmw/YHXyppge+qiHKQEV5xz4Ep/lR0Ctfd2DAXijzrAabz6+1zrnD4BYIW4kfGXExVulT5JteDI9KuXr7CRV2OEZHYwS0SVzMS4mSA3o6J0dvou7ywtRzPThgl9ZNMqq0ae2Svbpx2hOmUW2ikCpR9FJGe+41SDsQeNr4aJ03r1bQ8cfSIIF6Hu6oUPsG72Fk01HsMtZG6wih+eX1wipPAXNq7sHFDbA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wpdBYL7DGs8sd5XkLM9xP2jAqMKLzNp/KEuELZbnd8A=; b=lKcsJxSkbh4Z+awVEQv5uvkzGdVIL9YJdq+O6UNR181NPF3wcMR5pQrd9SS8Ww3KCuwyvOsRHNOAPkn79f+rCsNB3i7x8c+fz02LrRWLpPyCAjwYyEdgUW56+P6WZRX7gHinivbaY6IgwdWGaU2PAYha9OTYbYSH+t5efJhDlaa4yfwULDWwe9l3THTXwXM8JnOgBcIPWXqCHhLf6f35alb2EeiJnUWMloWx938ZJqDRrDc8/4gUGO0zQoM3+3ayzE3PK4+2SJW9//F2W8XTOeY4cOy87J9zafstx6Av2EL8SmiuOuy9yY9aFBlMpTKF31mBpHVOTWj/O2Q3KqJjqw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Tue, 26 Jul 2022 18:04:47 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH 3/8] mm: enforce return value checking on get_page() Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Tim Deegan , Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu References: <3fdfad2a-7891-0b08-5541-3b226e0555e1@suse.com> In-Reply-To: <3fdfad2a-7891-0b08-5541-3b226e0555e1@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR04CA0104.eurprd04.prod.outlook.com (2603:10a6:20b:50e::17) To AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6957a700-7d7a-480e-3d42-08da6f2090ab X-MS-TrafficTypeDiagnostic: DBBPR04MB7532:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2gYGTyu7u//wFO9YVVleHJOi7fAi9QwGHGlNWnFqEAp6LzVwG37vDh/uvaUDio9yN7GjT7/6OK13VGWX/qJ5sJf0CivZfWbjffAS6uCkQtaZoMkNl/txIRUrDHLpd8G3XwPSIbVYojMlRORrRlbUp9gX9STW9L/hVb31A+tYRANqkc82U7tJUof2z3kpunZ/UFozcGWaqIFm+iZcdgbdVp/ayeC46DOmKrOaGTvhmPuSOioXVtye8d/W7oKbfiRNNdV6nbjq/wY5+On+kCya5Tbo9zyIgaeMdkA3IRsbvtbKEOXUpvs6d/f5mBzJW711BAVEmvBPhO8yXwOEsANftntyy5I66OXsUkgS63iDkdRSTMhF11oMVdiCpzl4/j8Zn16ZKIplEk/60so9Kt37ImDr8Xqn+QvkhrtLaXYKy5ca2ia5GeyuZ/BbxnHeNmUfkJvlzr1dT3wJ6csQvmDJZvLTS4YCL+sWm/YU7c2UuDU2K4alRbbC84AZekMIvNF6FvtbfNwMybvS/ARlfTxtE2DtTELs0XP0TgqbtrOi2U1eA2S3N1n4H0DFf76jt1eN2LR6QkW1PBbylyMt0uZ+MrYsizOentGvmmUKjhlpYV9lf8X0cQ4OXA8QEvBfPUBvqexWQ6RWyWNrCSAgrCGJ0DWzojUvKvWyqRRtXbqE04RDZJlAQBUiNn2oYzr/yN6HmPbLlEPFoPjD+bZHHoQrdXyxNlr6NWvZYL6+Ra1RByhd/OTCTZVZ5LuNEO1jLqG2kkOOgiL5fhdmZHkrNo32jJPgoQ8D1X65YgFwHQ2PRYCBQJWwLh7VdlynBdt3yaByDg6Dp9oLBLpCg04WuGjEEg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB6551.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(366004)(396003)(346002)(376002)(136003)(39860400002)(2616005)(316002)(8936002)(38100700002)(2906002)(4744005)(36756003)(41300700001)(31686004)(6486002)(5660300002)(478600001)(6916009)(26005)(6512007)(54906003)(31696002)(66556008)(8676002)(66476007)(4326008)(86362001)(66946007)(186003)(6506007)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WjR1ckQ4RXBhVVJHM1lkY1BrSnBURnRXRVVrc0hSSlB1dWRPdDN6Q0JnVitX?= =?utf-8?B?bk96OVZ0bGF2ZUhUaWhaRnFnSjRiV292VCtiL0QycHRvRDBYQ29xcU9Od2Jx?= =?utf-8?B?cEEyVWphSXJQb2wvSWFnVWloeE40RGJSc0ZKU3pTNVA1a2FHSDBrZTJpNmQx?= =?utf-8?B?M1lLajRzZDdjUGZaUlV3ajdsbGZTem4yQ1MzUTVUU1I3bm1MYU1RdDhGUU1K?= =?utf-8?B?YTJEZHFNaU41bVR5aklUSUNMN3hrU1BSbU1yb1NKbFpXM3VyUnZDeWdnL2s1?= =?utf-8?B?WWpFclZlNzAwSnNIa0hDQXEyZklFdXphbmNMd0xnWkNpRjEyODVRTFFnOVlj?= =?utf-8?B?Ry9vejQ4UkU1RUNHSzBzMlZqWXRvZnYycjFSOGNhRTJGNzJ5aHlKdVlXZzBx?= =?utf-8?B?M3pXSHlTVjZiVjJodXc2WGVRT3R2OXM3RS9xTUl1L0I0ay93TFFub0dxNjJQ?= =?utf-8?B?R0M0YUN6UEgwa05iaS92TWJpYzNzb2N0WGlrK1NkOUJuRjRqNjNORDExY20w?= =?utf-8?B?U1NibXBWMUtreFNKRGFJNUtTaFJkS3QzcmswMGtTSlNBQ3d6cThOTDVCa1lO?= =?utf-8?B?TENKYyt6d0VXL0pmYTJhQXBEaWVlNHhUVjNXZnVpajVEaVdQZFFKWXJ2eTJE?= =?utf-8?B?U015Z0o5aTNtMmJLRHMwZmZQVVVSVGxLRXFoc3o4enZvY3N6dFAySVE5ajd4?= =?utf-8?B?Q1hpelU3d2dHc3FNMmMyUDNPWXoyTTluQ2J4azArS1g2U1ppZDRxczErNDVQ?= =?utf-8?B?VVA4cnFjKzIvZFA3VUxHazhGa0hQd0ovcVFDMnJ6aUlDUlYrNnJMcWcyYUtZ?= =?utf-8?B?eEVqYkJzejlDY2hDVGNITVkzV2FXSnVJQjFoNklpTlJiNEVySXVSTnVxbGZU?= =?utf-8?B?MnJySXZJV0FQbm1BdTA0OGJsQ28rU0U4NzcvZVFyRFdyUi9yOVZWMER6OU15?= =?utf-8?B?Z3phM2M4dTI2QXRmV2Mxd1BHakM0VlRBR2E0SU1CUkhGaGFaK2I4K2h4OFpR?= =?utf-8?B?VVZHZWRhNFhmUnRMNlBOaDJxVkhmaDBMdHVQSG1sSnhDZXE5SXdTL3IvMjRp?= =?utf-8?B?R01ZdDhzRXlTT29XbDRpbjA1YXhjWDZpMTJQQ0NBK3B6OEJIdjMvd1hMY0wy?= =?utf-8?B?SHlVVGt6eTZzdk9MOWlvVDM1TWw4M1JFMFJrRk1QeEpxZ2tXS3NTc0s2TXRv?= =?utf-8?B?SDB1dXRlWUVjbUlXSkFOanVybWhxU2RxVGt1VEtUZEhBL3JZbU5PeWpyRENw?= =?utf-8?B?djNrMFJsWEJOaGhNcStxSlpwOEpXTVhTSElJK1Vjd0Y5dU5SejNDSmlzRFBn?= =?utf-8?B?cUZmNFFNTHdJTmNPUFh1Q1JDZHVkZmhJRzM1M0E4TzJUMThZRmw5c2hOVlMr?= =?utf-8?B?a0dkOTFTQS84c3A3Yjh4bUJOUTZGRWt0K3pVMkJkTTBoRkJFOVJrSGU1QWFX?= =?utf-8?B?RGxBSVYzamVwK25ieXMrLy9QTVJXUkpwUkQ1WWV3NVBkQzdvSUJuSGp4NmZU?= =?utf-8?B?M0hPYUdnRFN3ZHlXVjYyQzl4cm5LakhSbTNBd2VWd24xU3BraFExdit0dk1j?= =?utf-8?B?eGh6ZUpEV1NYY0RSdStvaFdGUThLbisxWUN5SmNGdVVveDVNMW5DaEtoakRC?= =?utf-8?B?M0prVjlSSkNDcVVRVGpUT0FiTlpSRzVnNWhZdVV1b3hzNnovL0lYbEpUL1Av?= =?utf-8?B?bTV3N00vU1c0citLclFvbnJPcGdWNnpOSHRpNmJCNFJqaDQrTjFtM2lBOG1m?= =?utf-8?B?NzNOcVRPbUNRa3orVUl1d0o1MmRJRGNXTTVRODFXMlRPNVJYb1RrTm9QSFdj?= =?utf-8?B?b2IzTzlaaUxEclBOUXNiTStRMFd0MVVKSHpiT3IwVzNRLzkxSDNhM29NelZr?= =?utf-8?B?K3VXY3lNUVNOZC9jZ25YTzJ1K055akFIOE5UdjMrL0Z6NStqa29iTnVNcmty?= =?utf-8?B?UWNyRmp6ZnMvWHp0NmlqdTd2czlxNDBNR3V6VEp6U3BXYnVhTW5QYkMxMGkx?= =?utf-8?B?a1lmYmZnQ04yR2xoTzJFOEt3T3hBQy9uT1hsWHlzYk9iS2c4dzhjM2xWTVF6?= =?utf-8?B?dkE4cEk2aytYK1FKOFBHK09wUHZRVFdmeDJ4U3RRVy96K0NGWmFiTStVbndY?= =?utf-8?Q?Sm+HfJ1Xg3djDNQ9ZBka3wJwi?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6957a700-7d7a-480e-3d42-08da6f2090ab X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6551.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 16:04:48.4218 (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: fSvm2rAanrlQVrj0raNTWzGWKubM5EgVgM75YZ0S3eqrqEK/xjOoZ6eamcxnv4v4LiDsYMG9prw45fW+vcTdKQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7532 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1658851533291100001 Content-Type: text/plain; charset="utf-8" It's hard to imagine a case where an error may legitimately be ignored here. It's bad enough that in at least one case (set_shadow_status()) the return value was checked only by way of ASSERT()ing. Signed-off-by: Jan Beulich Acked-by: Julien Grall --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -61,7 +61,7 @@ struct page_info; =20 void put_page(struct page_info *); -bool get_page(struct page_info *, const struct domain *); +bool __must_check get_page(struct page_info *, const struct domain *); struct domain *__must_check page_get_owner_and_reference(struct page_info = *); =20 /* Boot-time allocator. Turns into generic allocator after bootstrap. */ From nobody Wed May 1 03:42:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1658851561; cv=pass; d=zohomail.com; s=zohoarc; b=drL9Qpvwtvc2rshTq3PRMMYCfktQKvp4DaBRJq4M3KQaNWK0azZxuMoKnXhS8I5J0PBD/fMNfqUueDI3Zpo1s5ykisDwiQsLh5FhN/WNECf72Q8Ri2ELewxD0y6vuo9IMMf+C5evVZ0ANCRSJXo8OWbht/ptw6Avy82hK4zylx0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658851561; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vNV26NOfufeFyGjTdaxcVFoXazfc7X52s6BuntjbBgI=; b=Olsg2/XpQ5a07bWxvZ9J1xYwg4Rva8LU6LlYxssvAMpJ5oZKgY1j6x7yO3jhJptYV7HHwzzfEL+GzaA/TUrQ99WMDDJlP5k7QFXohrFUU9tmVinz8NcHWjv4nlg2HEpdAimk4QPRAXEOMGZtKE+p2SXZUoi2bE5KYBvn/qg9bKM= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1658851561523343.99412559766745; Tue, 26 Jul 2022 09:06:01 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.375509.607945 (Exim 4.92) (envelope-from ) id 1oGN3i-0005zg-IK; Tue, 26 Jul 2022 16:05:22 +0000 Received: by outflank-mailman (output) from mailman id 375509.607945; Tue, 26 Jul 2022 16:05:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGN3i-0005zZ-FM; Tue, 26 Jul 2022 16:05:22 +0000 Received: by outflank-mailman (input) for mailman id 375509; Tue, 26 Jul 2022 16:05:21 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGN3h-0005zG-Jo for xen-devel@lists.xenproject.org; Tue, 26 Jul 2022 16:05:21 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2059.outbound.protection.outlook.com [40.107.21.59]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id bf7e644f-0cfc-11ed-924f-1f966e50362f; Tue, 26 Jul 2022 18:05:20 +0200 (CEST) Received: from AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) by DBBPR04MB7532.eurprd04.prod.outlook.com (2603:10a6:10:207::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.25; Tue, 26 Jul 2022 16:05:19 +0000 Received: from AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::dd30:2cbc:361d:2d1e]) by AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::dd30:2cbc:361d:2d1e%6]) with mapi id 15.20.5438.023; Tue, 26 Jul 2022 16:05:19 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: bf7e644f-0cfc-11ed-924f-1f966e50362f ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fU5YvNEHqQNoOuJjEs+mMOo71ElNLgyJi/GwyLshbhKUcXohr6Spx4BewGX1c5mDfe0skvVVIyJ6tCnW7DNt3f1f2iXBjM7PkAPDgNtL5XmYnYIEDGUJEPpUz7xFENoVPS061rSJ0TRmOnMUe6hADh18LZsEj78FCB/fGurqMYUQtkm5lCxc4BZuVxHHyLCRmPMxW+RapinPpcg1rCq6J3VfX8sezXsFZEjQulUFsO2iRWZLO+9eZJVngeCkID1MzMSXSdWmgYIZ6c0MeMDl8Nq0Hjuftv/uXm/C5zKv4MfEwoZTizvGVWTEVdZAaPLNO4GhMTCdEM7HWIz/eAcp/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vNV26NOfufeFyGjTdaxcVFoXazfc7X52s6BuntjbBgI=; b=Mm3mHhVvjuQjo90oBhYOf40r3acid5scgEX6jx2GfMzgycg2n2heHb0MOSRtYRJHvkeYWuMfhTFnkaNMkMB+xyXBc/geyNA7/gkzyDyvQlst9KIq3Fv7yPTsc0dtP5fCSLuBCN1WtaSl3SMM/JaFFrcQ3zTAHhFk1YRaOgO4KQl0CxlqlGnI5abxOZx+e7v1VvrPIq1aeJ3a9SwnQs9qegmh3OlN3ySqBBy5CoxLfvTsI6boxNjiid3oZW9135OX7uR+DhjsxaSJBCfbWS7sTm4nxCM4QJCyQf66EXRsTkk7wgCKVDHacbr6OEe6BI68aTNuzTHVcktt3wCALqnzQw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vNV26NOfufeFyGjTdaxcVFoXazfc7X52s6BuntjbBgI=; b=LZVRVnvcQfYhCvisa4qFlBSJlTHwWP7zEyTIYuNGqEp0v12NpWnvYwUobRzOvUSloJoLZd1rwClWVYVoHmdPc6eajpIArkHtWfpLJMGiUPfhVqgwAWFM4kRqZwq/gOcknhX7iuy7PMZ7MdGH2oFsj7DB4MrZ5oZxyOGvdGOqpfINK3oG/jWU7X1Jz7Gx4iZrKetPa0C3zsXA45uzAw0t9DqRaGyennIa2aTlir7RkQIg37WvGeRPPW2Czx2EBbILgKsEsn1P206zibUJ7CistZ+3rw1v8WE55+XyklnroAOJaXuhVFW3G46Svbilvae5V/4wZUrBUlddEZ3MznZJrg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <75dd380e-5dab-8d19-b9da-b59188bc4997@suse.com> Date: Tue, 26 Jul 2022 18:05:17 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH 4/8] x86/shadow: exclude HVM-only code from sh_remove_shadows() when !HVM Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , George Dunlap , Tim Deegan References: <3fdfad2a-7891-0b08-5541-3b226e0555e1@suse.com> In-Reply-To: <3fdfad2a-7891-0b08-5541-3b226e0555e1@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR0P281CA0108.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a8::8) To AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 504a1d27-1975-47eb-f324-08da6f20a30a X-MS-TrafficTypeDiagnostic: DBBPR04MB7532:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mvF2OrRIAG55LmR7cH/h5/AnxvuNQSOWST55yuaOhiLeGl/OO0WrheiEE+ck+Ce7VzKJWSP6Un/N1CGUe85OyRjP3u+STSAPhfilJ6GxWLIg8R0tQza1u8Mh+6QGUx10UHWuw7rE+vqKz81+4O5PcwPWMc9tfMk6l2/5tzYmAKa05Qt0ns/yLrtnC4elXg44O2eEJ1tAyU+VIfLuqG1SSmHZ5LfrARL4KpisQepj5BXuisG743p+TzKOAp2wx3hF8m0K/t5pZW7hanKdBOjpZCi/ynqgb5DVaVMeT/eIzrQ5gWtgFbY0M7uIwVFNRrTH6ahShUPp+mlugnd1qmEHI/xe8njtyOEGjgqzcksGY8HbwS4tEalb2rYtTJXgAO8rDhDp+dCjbfo7PoYipnB6z1bCcSNdIjEfoMquqlRCENAkjTMjQJXmKNtphtrb+TBJnbObF5MvzyyDFo607bSj/TlBcwJn5WlL+rL1r27XHHK4oPYQ/W+RbbzdP+2ZvUJ7gPZuunrdFlqFVXL2g8Hgi12CnUPKgFCTwr+SiGKwPouxrVPQhD5+AkzenzNFVUJQoTeHcqokfRKEzM33KT1uKyxWdUZGKRN1IwlH31Chp/azUxZs6QLGmUtsD2gKAgN2C5NPjKhtz58TP2Q8uSxSo+eXbaW3DDayiZWyo6T9I66E+5qsfDlgrZ1fpgA4/9Q4kP93wgpehXLitVG8OqCPCMrCipQoZyGnxmIXkVRD6AePJLbReeW+bpCsn88840Zz4i2nffZNbuzvxgeVDeFz4RDouVv9Q4FXY+WjQvYRLB3NNYSwdhDuSMo6OIYTOsuwr35P0wQx229F99n7ArWeYQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB6551.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(366004)(396003)(346002)(376002)(136003)(39860400002)(2616005)(316002)(8936002)(38100700002)(2906002)(4744005)(36756003)(41300700001)(31686004)(6486002)(5660300002)(478600001)(6916009)(26005)(6512007)(54906003)(31696002)(66556008)(8676002)(66476007)(4326008)(86362001)(66946007)(186003)(6506007)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Wko0dUdoOGg3bmxUeFdGV0cxZmZHZnMwKzBNOThERWwxZSs3UENxQmFOV0gr?= =?utf-8?B?ZVVpS0Z1TDRpcjZEOVpLWmUvY3NYSDhaWnordWZ3SjBqV0FwK2g1NDJHQXZj?= =?utf-8?B?OEN6TVRKelFyZ2EzV3AySmxlMUJoYWJqdWlJRS9MWU9SOW5VdVpYcko5VGJi?= =?utf-8?B?UXBYbFRLei9DcEViejFnWjMxTm9mWnYrTlVOMk9XSDBSREw1K3pyVlNYZWVE?= =?utf-8?B?amFiR1hvZVlsSDFYOW9kV3FBQ0JVdkFwSTJBK1ZlaVRsb1JKWU9VRHA5VUw4?= =?utf-8?B?N2ZSdXhKcThQNER2VFp6QktCSjJkUjJVT1ZxZkVvUjdadjNQTDRPOEZpUFNG?= =?utf-8?B?SW5TaGYvUGhId0o5enJiWmdET1hOWVhKak5YNzhBQVFpQkZIa1V1WWhoMXlx?= =?utf-8?B?ZHIrUy9kTy9QMnVud0t1c0tzbFFkek52TjhteGs3T3pqaFllVGdZK0VDMEhT?= =?utf-8?B?Z3JjbytBcC9OQkdvNEU5MEVib1NDMmE3RTRVZTBJeWp5dDlTSWxSMktDWWxh?= =?utf-8?B?TE9KU2pMV1Y4MTZud0hJdW9oOGErVnZxa0hzWjE4VlpaM3lkOTZqcHBjN05O?= =?utf-8?B?SEM4Zkc3RzlhWHpENmJvVjd1Y2tFb3RuSHFTT054eFI4Szk2NkZzQ3ZtQVFT?= =?utf-8?B?czhkeWw2UXkzLzVJeWlsT0hacTRrcG92Ymlzb0tRWXRHUWF0bE9DaU9YTmQv?= =?utf-8?B?T3Y1UUE2VGZxTU1JalJ6dkkwZmJhS2RjcEU5T2cwVW10WEt2NklROWI3VG96?= =?utf-8?B?blZrc1hINkVRYXI5Njd6c1FTYk1Kai9sck9jMXBLZXZnMW5kZk1EK2dIcUFF?= =?utf-8?B?dWJ4N21xMVl1eFZkcjd3a1plMld4eFRmM0xmTndkdlN4Qi8ySnhOdmRtWU4w?= =?utf-8?B?RkRnemh5eks5amxMaTZHWERyUEJGYk5OcVJzS25IdjMxdnZKVTNkNTN4NTZM?= =?utf-8?B?dmt3bnQzdUZKaTdRNlhTcHg4UDN4S2pWc05GZzFrb1hvSFc2T2ljMDdhQjdD?= =?utf-8?B?MmhLTXZOalpBR2QvR3BHVTBtZWwwSXp3ckJBWG1Ld3pOb3d2eVJ3bnpLTEgw?= =?utf-8?B?dFpzdmU4aG90U1ZRZWpSTTM4VEQxYlJGb3prWG1MNjJWUnpjNjFIeG9xSDlp?= =?utf-8?B?cjhIZWhPOXhXRE1oUnZuNm1KeWorMTkwekNzUlFQcHIwTkpBckZVVnh2cVMv?= =?utf-8?B?Z2VicnYwNXZQR3VCNi9pcGY4QjMyR0xwQ2cvY1FheFZnVjNjYmNkWXR3ZW1o?= =?utf-8?B?WkpOeWZzaXhtV2RNV25samhOYi9TR0xsZ2NTc2VWTEVHZkZ3MU9lU2d1K2FQ?= =?utf-8?B?K1ArSlZwc0JocDMvV3hzc08vWjV5Qy81bVNZM000Nk1CZEVKKzVtcXBLZFVx?= =?utf-8?B?bUF5aXJYK0l2R3BTS3ZnR2hDS1ZsWVdncVQ1K05Zc0RmTFQxRXIxZmpGZ3hu?= =?utf-8?B?aU9YTkF5NVBqZzZOdDljOWF0RFlDWVhuUjhmZmRQb2VObEJiK0x4K3d2SEZT?= =?utf-8?B?WmNueUg0dStUanY3bW5HM01RWk41dCtTRVFPd0FnbjhQMDJHeWI3eWNhOEFq?= =?utf-8?B?YjZTU0dBYmkxamxFU0g4NEMxNmdsdDh3bUNQTThhZHFkVWcyR1RtZHE2NGdz?= =?utf-8?B?cEpuZjVWZmtUZnk3SU5naENNV2hqcks3T1diYUJLVGxYM1ZkVzVQdXBZckpz?= =?utf-8?B?amhqUXpXQ1BqRkNaN1NvTXJncUFCckxOcXBBRk9WRnZsTkFEZXVCMmIzVFhr?= =?utf-8?B?RkJiRWNpSUNvV3hiWUVEcThBMnhrZW5HSm5rcmU5UjYvVzVQNFdseWE5Z2FC?= =?utf-8?B?QjQ1VlN0NklGQmlqZEo5T1VpWmlab3VyeDAzamFzWXlSQmhvUlVNb1puOGRh?= =?utf-8?B?U0NTb2YxSDJvVGxOZmkwSjBHMjlMR3k1cm5obXdOa3BEUDB3MTFJak1XQ1JW?= =?utf-8?B?dVNGT1dtT3BvYjlsalZ0UCtHWS9iSFhTZ3IvZnNrdFB6bmdqM0JES0pZWkkv?= =?utf-8?B?YkJYNmc0SWRBRnp2Y3NaOHRtbmZnZUxSUzJQQWlMUjU2dGZkNFo3NXJURDFy?= =?utf-8?B?TnpKSStSUHNXY2wrUzk5UVVDelJldVcxbXBpUVZDdHZUajRnUFFTa3BjYjVE?= =?utf-8?Q?H6ZDJ/9bK3Z+uA/zXE70gCxY5?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 504a1d27-1975-47eb-f324-08da6f20a30a X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6551.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 16:05:19.2168 (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: hWn/Ob8IMMiZoclI88lLaLwc5TnK22xzdab/7d0nLMNkZbv8jDcFJKCbDDpUnZIFUSr2gGF9U61rs6h47wNgTA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7532 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1658851561978100001 Content-Type: text/plain; charset="utf-8" In my (debug) build this amounts to well over 500 bytes of dead code. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2240,10 +2240,12 @@ void sh_remove_shadows(struct domain *d, } \ } while (0) =20 +#ifdef CONFIG_HVM DO_UNSHADOW(SH_type_l2_32_shadow); DO_UNSHADOW(SH_type_l1_32_shadow); DO_UNSHADOW(SH_type_l2_pae_shadow); DO_UNSHADOW(SH_type_l1_pae_shadow); +#endif DO_UNSHADOW(SH_type_l4_64_shadow); DO_UNSHADOW(SH_type_l3_64_shadow); DO_UNSHADOW(SH_type_l2h_64_shadow); From nobody Wed May 1 03:42:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1658851590; cv=pass; d=zohomail.com; s=zohoarc; b=OqairI8uj9GB63Cl1Dacn6GEsPu3/E5pE+OGSdR2t6ecGVPzzGYzanxYYQTQwFrgiXZGbbyYDs1kufaic7AxFV49XC//TyXfXZwUY/2nEUwAkuwLfvWYKIK2rD9ZLG/LoY3Ii6ets9OMNGTU+Ay5PjhObRzk3ZE20ZL59+U1UDg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658851590; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PaVObIIKwSsNFmuQ6pXbbqRuzlKrtGx5TcJJvcCnz5M=; b=gfOo19XdFpiYeQnHQl/mHpQ9TIMu64GZVnOJlf9l3KTvc/tsiq9XgwFER6uFXt+r+H5LMsg2QSr0FjyvaHd03lHv8a54FIPYvWtPm98zWLCOsJXIAwhCwsawKybby3eprhjo1jMofQfrwsBQr/dLyUkzUzoUhRMBkzsYIngGnL0= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1658851590312825.990009398211; Tue, 26 Jul 2022 09:06:30 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.375516.607956 (Exim 4.92) (envelope-from ) id 1oGN4G-0006fc-10; Tue, 26 Jul 2022 16:05:56 +0000 Received: by outflank-mailman (output) from mailman id 375516.607956; Tue, 26 Jul 2022 16:05:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGN4F-0006fV-UD; Tue, 26 Jul 2022 16:05:55 +0000 Received: by outflank-mailman (input) for mailman id 375516; Tue, 26 Jul 2022 16:05:54 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGN4E-0005zG-Bb for xen-devel@lists.xenproject.org; Tue, 26 Jul 2022 16:05:54 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2080.outbound.protection.outlook.com [40.107.21.80]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id d3284579-0cfc-11ed-924f-1f966e50362f; Tue, 26 Jul 2022 18:05:53 +0200 (CEST) Received: from AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) by DBBPR04MB7532.eurprd04.prod.outlook.com (2603:10a6:10:207::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.25; Tue, 26 Jul 2022 16:05:50 +0000 Received: from AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::dd30:2cbc:361d:2d1e]) by AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::dd30:2cbc:361d:2d1e%6]) with mapi id 15.20.5438.023; Tue, 26 Jul 2022 16:05:49 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: d3284579-0cfc-11ed-924f-1f966e50362f ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZWMypyfxcoStgzw3imPIRWUl04DLwak49WfhFmf6OOzQdpkR9ojZRlQwQAoKW6h+0rrHu5CMMkxjF0aYdEPzb5IgLO3iRs5DU2SHDJYAM5FxSEWHXC0eCl6L8zvBhdqnHf9TPeHol9ijFxMoZhokt1f5P5q0rpYRaMrZrakbGivVuJtzztMtFW+6RGyOcv7iZipYXkCvK7Hv4K8kPIFGgZ1eqavjHOxuvpSntOr9AmD5XfbxFZAglHrROOJJ0xaPBm3Np7JIDtJewQ0GG0NmUKXgs3hRdoNiQNN21E2SsItplJxhZs2UsiRzRxq3k23fgGdUgqGsXMdWcKiVPP4dKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PaVObIIKwSsNFmuQ6pXbbqRuzlKrtGx5TcJJvcCnz5M=; b=GmYDE6n/HAqG8k7JrqpWc5zhZjr9medaA/jWzhjRRUQAbJE4WPZUxg4muXXetm1ZomS8MzU2CvtwR8FGtqacoXTQPFzncbvxxjFb+5Jn5BXY0s3Br47N5C7+19mLaG75FqGoP2ai99Ctapdl5fOYcRmqyjr46WolgbRMET6/4HRSoKkQQnKqoknY0ZW9c8cqYjLcJm6bU4eUQjzmpdBi9aD/pu77d1sUIAFpahVo5WHd0XBu+zqRH4N3PydHs1ojK4CEoJJmynUN7bdwosiybHAqTdCpSPsOYX8Z8+CV/C97P2PqTgBFfKUFoRTdKdSV3GnFI/V+9XA9o+/H58qJjQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PaVObIIKwSsNFmuQ6pXbbqRuzlKrtGx5TcJJvcCnz5M=; b=wNHNedfhu2VIgCiNYN7M3qfHRdksfhI8Bqo/QnK82DFFCo0aJ4QuHIeCpZ54euKK7b41P1MvT2r4S+K/LEltJf2uAJhqACumVLLu4JRckyz7g9XFiH4ETNB4uslyOsh7Me+0EmxyD3/W0xqLkMgv5AXcJjNcJnZLNb9SztJKb0350OstMAVRaIkm03VwJS8+pGimIYzN3ZU7XViX3KY1pvwxMay2gojb4gdy33+UarnynrXHmCA5u3s6j48Of7yWaHBu0EOEUYVLkZhiqm/4ckvQOS50Ao261jQr2XQGh2hpKvpkPaBMVzKwG2z+GAkTi0GYlFzcfmKua52FLN8U/Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <9af0bb78-f419-b4f7-d20f-cd46a5073f01@suse.com> Date: Tue, 26 Jul 2022 18:05:48 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH 5/8] x86/shadow: don't open-code shadow_remove_all_shadows() Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , George Dunlap , Tim Deegan References: <3fdfad2a-7891-0b08-5541-3b226e0555e1@suse.com> In-Reply-To: <3fdfad2a-7891-0b08-5541-3b226e0555e1@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR0P281CA0078.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::17) To AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e0ce0f70-cf2e-404a-2198-08da6f20b542 X-MS-TrafficTypeDiagnostic: DBBPR04MB7532:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wIeM2wE3Cy2H3m6E057OvXYEmamOmpyHYJPRSsl4T0KhhNlmiKBWX4EaCru6ZZRgJWIsr2//XPg7l9+eqEyau47CC4W4Iv9zEipOOE97hJWRCKzqO5iR680moEqk52hbb70YukAdzmhqmMZPaCnPXgkMuRFOItL/WG31K0/0YOGscF5/wb99hd8vaCu3Cp3o+xYM5SVOVeU0RcrWmNt40DnFmzyjhlkjzjSMRxEO4cC2RW9suSloQ5wGkJOFe9om8FKtyIXUTH6velI8KKS6EURuM5fxGbOIUcSz8M0hLOJLmOlFnlLsFDpf+NLgumKWN6JnbQDDExr7BI4PW1GDic7RkTGdOdEaItxgc0EFjJlIaEjaLDU/DJ+GPjnOW1B/jwKzLSu9GlMZnqMzuFANMyCv7UbEbC1ovxfUv11gnIOpmaZhnyp9nJjOeDNg0Ca4Zhc6qOS64dAFINAbKoSpCbCk1OwobZXlMdLFPXYvQm4K8M1y58OYfcDZYxsm1PN5Bq8T3EG2CLJpiw8k89a90b+EIQc3feGJbhS01Mh3ZtwrDnzoIcxwSyAmE2O1bNRMIlKSFinxnJcrT7LOHtA7oZZLxWiaeeAI9aT41IuJqNUxad3NDHRF3LcAU+p4fh6MtVoNSaiZcmrA0LJuZ8XqYGXJxpQdmShefNjEC8ohsTotB7OFYbp5lJiTt9CxjbtVo5AhsQQTpGD/dBbriYEKHysj07JKsIPzR5ubSTz5P9rbs9V7FQZozKxEqZ1V+swq0DO+8IISl1bOlGK4CTuqJJZkrxOycDIEcNznxSfsHix8ISZ9oLwxycbmADo4WuY4KR84EZMHfRhsqmu4S/l0/ZctZJsVkF8OPyJRf4kDesY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB6551.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(366004)(396003)(346002)(376002)(136003)(39860400002)(2616005)(316002)(8936002)(83380400001)(38100700002)(2906002)(36756003)(41300700001)(31686004)(6486002)(5660300002)(478600001)(6916009)(26005)(6512007)(54906003)(31696002)(66556008)(8676002)(66476007)(4326008)(86362001)(66946007)(186003)(6506007)(21314003)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Y1prYnJCQlF6dGpVUU9LTitKWllLQTBtVnFaSjBXb3RMSUt5Wi90V0ZmOEJE?= =?utf-8?B?ME1KRFVzbFRrWDg3RDk5Z254VHJaclhicXh1OUYwRWNERU14L1QrcDB0Nk1R?= =?utf-8?B?MXpvY2V2NnVkRGxYRGZMRXhrL2pYSCtrOGlVdERaQlhoNnRmRiszNVd4amtK?= =?utf-8?B?SWZpNTQ4VFdCSStpaVFYUDdZNjF0VHlZQWNraGRJWThWeWxXY0pyVWJ6Sndk?= =?utf-8?B?TXQzdGJtaTBFa29sbjBQSlBEdVRCNy9XUmExZWhqTzJuek5IWHZLdS9oOEp2?= =?utf-8?B?MzZDOW9iL09vbGlUSjloeVBXdndCZGpMeUIxUHhYaGtDRDJRL2dUNXhZNjlG?= =?utf-8?B?WkoxN2tLRURoNW9QMFBHbnVvMDNpaEgwRmY0L0hzNXVwZWNiRW5JNnZGZDBO?= =?utf-8?B?U2VGK1VEY05ZeTRmb0sxMEFBblNNYnJLb2MzVFlEL1lkd1dPME1rTzZGMTJq?= =?utf-8?B?ZFdSc3p4NkZtMTRub2lyc1VYeUFjSHJzVlVtemdIQjV4TFUrRXRrMm5GS24v?= =?utf-8?B?WVIwaFYxd2VEYnlJSWIrc2FlWWpKTEplQlBNclIyTFhUdU83WTJCZUdmRVF5?= =?utf-8?B?SnhRV25TQ3hKRWJBZHlIMWswdmtBMVlpZDFURWpjTlNaSDVaYWRCc1RGT1I1?= =?utf-8?B?c1JNUkM4Y2hxYWphVDB5OFJCcVMrSGNsdFBFdGJTbWw3b2tGb1NVa2pndndO?= =?utf-8?B?blduNEludms4aXBCOElWZ2JHWE04Zlg3VjIwdzdMVFh5UEpqTGIvYzNudzV1?= =?utf-8?B?ZmlmYjJlT2VqMTFjQ3RmZ3dHYXZwVm1pSzU4UEgrMlpQcEp4cEpMMkcwN1RC?= =?utf-8?B?SUhFSHZ2dVA0Q3BHVHRCWkp1Z3hIblB3MkdOZkFpV290cFppa1JxZVc1V1J2?= =?utf-8?B?cUYxcUMwc1dOb2pZNFBoc1lpRENQSnRSRGRIcXozSVdmYWl2anZyS2VieDlU?= =?utf-8?B?WjNaL3RSM0s1dXM5ZWlJVmxqaWZRY1hqR3hRY1FaTE9CQXh0WWRjaHJGRnZs?= =?utf-8?B?NUtaTmdwT2tLV1N3WFlUaE5iUDVkUUd4OXExTjFmV1RVWUR6QXBoOUphZTlP?= =?utf-8?B?dzVMWlhPaklFYWk4Y2pST1A4d1FWYndRckpkSTFUT2JjZ25kdzRhT2c2ZHRR?= =?utf-8?B?cGVnN1N5MmFZT1ljQVlIei9iN3IxYnJSWmNieXRIbjYxOEs2VjJBeVovblM4?= =?utf-8?B?OFoxTms5dzBQOUhOUjU0OThPeDNtVFBaNTNnemlvcVIwdUJqRWNFVDVQSGNG?= =?utf-8?B?QWV1NXlpWGxFNi8vK1FFcjZzVGRrbTk4NllyQmFCYlltRkl4endrcjBxWGJK?= =?utf-8?B?TmtSNUdJT2xMam1KWEJYMExtSkFPK0VZQ3p6Rk11QnVsb2JHYXdTaTFRTkhr?= =?utf-8?B?VjJNMmNTMGdUNHpCSFJRWVJqaURxaUFVVnNEcFVTc2p5RDJhMm1meTRWdkxz?= =?utf-8?B?WC9jZGNnWStONDhpcExoQXE3TVVRekdZSUVJa2dFdmNYWW5DSHVoVGJRSW5E?= =?utf-8?B?eTNuSkxLVGxCcHZJWW94SUMyekVFQ0ZxWlIzVmRqem9ySnQ5cU1TZ3ZlUEEr?= =?utf-8?B?alFacTdSMm1yV2x3L285b3RCeTh2OS8wZ1NsUmFEQk9nZGQ3ZlIxbFVscHpB?= =?utf-8?B?SE0rdnFtcjdDTk1Wb2YvOUpzRTFYMGJKNzNTOXhDOFdXcEZLZFRXQml0UkN4?= =?utf-8?B?aVFSOWJ5MFFrcm5DNlNVbVdQK0FWT3NNTjljeThQSGNvZXpJM2EwZ2Q0ZmJG?= =?utf-8?B?RU5BMmhwUmtXVUh5c1BON3A4alFJY0M0M0NGMjVNeWJIbE1TL3lkTXN5RWlG?= =?utf-8?B?bHVYNUlMWWlqQUpROWV5UDFEbEcwclJaam5xQWtCS2hDU3VveEZBVnhJK3U5?= =?utf-8?B?dnVkeHEwSld3MkNkanVQWlZ4MEx1OU9IMUdDazhZYnE0UkNTZm5RSHl0TGRL?= =?utf-8?B?eWVucHF3MVl6cmNuMG9kTjUxMmw4MDRLb3E5S3BOQ1B3c1RxL2tuKy9GSlFZ?= =?utf-8?B?OGkxdkRhY1lzM0syQ2RzelozclZHUEF1VkpERi8xZ0IwMm1pMFRlelh4NHN1?= =?utf-8?B?MkQ2MHk4SitUZDFTQkNsZHFXVTZSSnJueVlSemM1QVdwL25hTUpaQkRUZ2Ev?= =?utf-8?Q?GB0ZkMn+91RK7joW+jdvkvmj3?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0ce0f70-cf2e-404a-2198-08da6f20b542 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6551.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 16:05:49.8086 (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: +kNMhtrAlHC6LL2HZETkkkWXu+mq7AuraTjF9Dk2R0Ysd39mebETulS0+ShpibKoIkCT6EcV8B5JVDU7H5NggQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7532 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1658851592392100001 Content-Type: text/plain; charset="utf-8" Let's use the existing inline wrapper instead of repeating respective commentary at every site. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -389,7 +389,7 @@ static int oos_remove_write_access(struc * the page. If that doesn't work either, the guest is granting * his pagetables and must be killed after all. * This will flush the tlb, so we can return with no worries. */ - sh_remove_shadows(d, gmfn, 0 /* Be thorough */, 1 /* Must succeed = */); + shadow_remove_all_shadows(d, gmfn); return 1; } =20 --- a/xen/arch/x86/mm/shadow/hvm.c +++ b/xen/arch/x86/mm/shadow/hvm.c @@ -783,7 +783,7 @@ sh_remove_all_shadows_and_parents(struct /* Even harsher: this is a HVM page that we thing is no longer a pagetable. * Unshadow it, and recursively unshadow pages that reference it. */ { - sh_remove_shadows(d, gmfn, 0, 1); + shadow_remove_all_shadows(d, gmfn); /* XXX TODO: * Rework this hashtable walker to return a linked-list of all * the shadows it modified, then do breadth-first recursion --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2632,7 +2632,7 @@ static int cf_check sh_page_fault( SHADOW_PRINTK("user-mode fault to PT, unshadowing mfn %#lx\n", mfn_x(gmfn)); perfc_incr(shadow_fault_emulate_failed); - sh_remove_shadows(d, gmfn, 0 /* thorough */, 1 /* must succeed */); + shadow_remove_all_shadows(d, gmfn); trace_shadow_emulate_other(TRC_SHADOW_EMULATE_UNSHADOW_USER, va, gfn); goto done; @@ -2718,7 +2718,7 @@ static int cf_check sh_page_fault( v->arch.paging.last_write_emul_ok =3D 0; } #endif - sh_remove_shadows(d, gmfn, 0 /* thorough */, 1 /* must succeed */); + shadow_remove_all_shadows(d, gmfn); trace_shadow_emulate_other(TRC_SHADOW_EMULATE_UNSHADOW_EVTINJ, va, gfn); return EXCRET_fault_fixed; From nobody Wed May 1 03:42:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1658851625; cv=pass; d=zohomail.com; s=zohoarc; b=Z/msaewQZb9a5+8ewkkvLmxRiw/aAopaPGInPzyl20XllH3YHkq9FN9yAYyUWqstUVwOw3LgRxtV52g+LuNM/w1RhfF5HWk2TOq7nhh+STApLxO54cJ/CZSJe4r5Wpr6n/HGDbdT7aj+aII7Br3cLidmBFQwASSz3ilQEjGLLyU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658851625; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=td/gCrrRCkDZYLC/FRwdlmkxYPkOjvQqTnNypaVN5WA=; b=B7rkR4Wol0zPgMR39OQFL9F0t2alWSB/vnS4myZToXKMlLVys2YEoAlLsp2Kl/H0t8BJ7liP1lC7sJePt3MoZb9DV96pZVZ9MeFqrYNn7GZ+Bm2QQ5FLbAEvq2+E9ZgiiIpW0n4uTtTcDoAkSTqQKYM+UrKztNvD6ce5E6KTEls= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 165885162519853.16964790690997; Tue, 26 Jul 2022 09:07:05 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.375522.607967 (Exim 4.92) (envelope-from ) id 1oGN4o-0007FD-9A; Tue, 26 Jul 2022 16:06:30 +0000 Received: by outflank-mailman (output) from mailman id 375522.607967; Tue, 26 Jul 2022 16:06:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGN4o-0007F6-6D; Tue, 26 Jul 2022 16:06:30 +0000 Received: by outflank-mailman (input) for mailman id 375522; Tue, 26 Jul 2022 16:06:29 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGN4n-0005Nn-MR for xen-devel@lists.xenproject.org; Tue, 26 Jul 2022 16:06:29 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2046.outbound.protection.outlook.com [40.107.20.46]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e82a5372-0cfc-11ed-bd2d-47488cf2e6aa; Tue, 26 Jul 2022 18:06:28 +0200 (CEST) Received: from AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) by DBBPR04MB7772.eurprd04.prod.outlook.com (2603:10a6:10:1e3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.25; Tue, 26 Jul 2022 16:06:26 +0000 Received: from AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::dd30:2cbc:361d:2d1e]) by AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::dd30:2cbc:361d:2d1e%6]) with mapi id 15.20.5438.023; Tue, 26 Jul 2022 16:06:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e82a5372-0cfc-11ed-bd2d-47488cf2e6aa ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qz5cIIKurAc6jEq8H27vU6WZrLmn9Hs/L1M0bEHSRlUaEjDssZx8vFC7mRk7QA0e9WTbdcekJlua+ElCF6UJfElkfOWzNITFKHCkUgOy0fh3cQeW5CXgk8EQZRyHnphcqUvNsSw0hCHr2aywUVGYGNAr1SAEofQI02iCIIIfzVCiWo66km/maB1VO5jDHxzbqYWact2eGFcxk9S1x6w9pTLoz9dRg9CVRXr/8im5t4c5qlsby+odEv3aIAWX8lj82wSyEY5EcgAaFdztEW5oooLMQecBRYQhHYpkX9MAWnQB40lGbbsvwWIWQRdC1P+e6/IVWj4YFkR7bDdWiH++kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=td/gCrrRCkDZYLC/FRwdlmkxYPkOjvQqTnNypaVN5WA=; b=mNcrB+BlOKWKXGLQlNCKFc7rp4A22OqLxuyW/smUFzj23y8OgDJy0iDSnqY72lSUIFsM0inSYIctHRZUEPlUraFQKqx3aTNFsoMpAfPhg94SJ1O/cR4+DmChCSFAF17SsDEKZpovtbGVAaWD16xj51auMHnib6UcrKT1U/vUtnh/AC+cRgqbEWgFk3VrlLSYcq/+kzK1IyfQZhSpSMfbuCc0aK+YlbqTyky6iTpscHWOTOpqnYDp6ZQsO/X+yVbdNQhp+g/Y1rFcJGt0vhdFKiqsT3ls0zT2G0BPWI2vLRtsnAeY/QaJfn+ti4uzHjX5jVGszY3KAzpDj9dnW2Aqug== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=td/gCrrRCkDZYLC/FRwdlmkxYPkOjvQqTnNypaVN5WA=; b=aqmYC09rv5pmdNxtTqvJMYsyOR/i4hyQRkN6pftRImbhrEE4sovkHRPD6CVYPEX67UQWI01rfkqUFm7r1dy3QrIppo0Wwp8h5gajrzWAZ2//jrzasVoYuL2j/ulmoR/pntVNam5Wnc3DuG1DhfyP6i5v1k6X1kKCn6RWHOsVZoI/Uv43jlMdgs/wPngw6oCmymjoHXHXd3KJ+CZWwehdhNIkL/y3Bn1EbWOB3KPC7O0g+knSo2AvkCa87BQ/GNdWhNajRfUB0KwZSvszp5GanOoHmubs+nAmsdwUcNl50xtrPxkyXDGfUqnSFxxjBKnFLjR6NQ385f2Zeb0DydK8Uw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <03ef104f-91a5-596b-235d-1a0fa47963e4@suse.com> Date: Tue, 26 Jul 2022 18:06:25 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH 6/8] x86/shadow: drop CONFIG_HVM conditionals from sh_update_cr3() Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , George Dunlap , Tim Deegan References: <3fdfad2a-7891-0b08-5541-3b226e0555e1@suse.com> In-Reply-To: <3fdfad2a-7891-0b08-5541-3b226e0555e1@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS8PR04CA0116.eurprd04.prod.outlook.com (2603:10a6:20b:31e::31) To AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ffc06cc4-9299-47d2-b060-08da6f20cb56 X-MS-TrafficTypeDiagnostic: DBBPR04MB7772:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iMi6jD8qL98z1OcsJE7sUapntf9wQu073LVho5xTW9T6V/i1CuQw8h0AFWnbejIgbWgbjxKcZy4+k9jbykCGd2mNWvBgvzol9APfHb4HUOkoisE2yHb44SwkDTtPOCLLMg1o7apgCNPdUh2H3xD4xE/Ng5MOaqgwD1i68xI0KmMELyUtTPbn+qODwTd9dU6hc8Vz8ZX2MliFtjsj56yXwIKvDfGAJxtcnO2fWADvAV6vPg1WcBTCOm0DGcyfsCAsB5Rau20KKuxGRSxq/fEL652KhV29S1HY/OFCyXWGC7nKCVPOMpHUkyeOyJ/sJkJmRgdvRP8jsFFG8Hg2STa+AqRBYncikeIaGFOi49zW/jU50mFF7mYpX4kcY+NHU4slZ8CxOEMnool5emA24c+z970NvMg5Mg27gWLIzrdBunsOYYhyCN6Oo7GwbhukZBgbpv4HPiARD613MmKSgJ7RDhCXf4nff3tEpfi6XrzMLk1lxyXwVhtdRYCYtepQndxJOL8BclJG0gwPwLXgxeHvxlmXmxF0qFMQHiA1zhmi7EZC4zL52JxYJLq9nzcGt5Fycpc72tDdFhgDrBK6q095p68BErBKQf2I5SKbO9UsFwfp/WBbgpuW0jLx9EjIgUEn/Il7OCY8Fut79vGQjFUXmsjCwbIhhAX75Oj0WAuc6tV6h39j0lXb2qEG6cjKZfE4Lxxj6g89bgh1TCgAhlMlrn4OcjbFqZasWCtp/MsX40zUo588qDqKdNFwim8JWb0nOhoYpSk28y6JhTrBY5iRZ4ZLuinpr0WtFV2qR2Vowz2l/jgoa3+ik6Q0cqyM3BwZEvcwBUZzyEJ/PNALvi7Rag== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB6551.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(396003)(39860400002)(346002)(366004)(136003)(376002)(41300700001)(186003)(2906002)(6506007)(6512007)(26005)(5660300002)(86362001)(6486002)(31696002)(478600001)(2616005)(8936002)(83380400001)(6916009)(31686004)(36756003)(316002)(54906003)(38100700002)(66946007)(66556008)(4326008)(8676002)(66476007)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MUV2KytDMmIrcGxpL1RoWGo1em9LK0EycTY4dkx3UlIrbnlpRG94VkNNT2p4?= =?utf-8?B?S3AyN0s1alp3WXRvRXI3dzZZaWZpcWZpeXR6dGlDYXhCdHRkdkt5N1IvUzF2?= =?utf-8?B?WlVmODJkNlpqK05KNlRlT0Vvcno3SEVJZElPbFI5dmJJUDlPRHZNNE5jWkhy?= =?utf-8?B?M3hKRDN3YTVEZXRHNGdnb2lDTUx3eHFiVGI1R3BVaS9FSVF2V1JlZFRvaWdG?= =?utf-8?B?Y25Xelp6eFJDeGJTUEQyY2dVV21QUjJuOTZjUG15bk5kNGIvSE5ncUVZVEN3?= =?utf-8?B?VXpHU1c4a0VqOTJrdWx5TGJkTitlN1R6ZkplWm5NdmZnQVcyYmNQMUhRYnk2?= =?utf-8?B?bnBOQlpEbXBkZ2k3L1ZHMFFGUUZmSHU1ZmlmSHJWbVAwa1ZjVkJPM2MwSUEw?= =?utf-8?B?UHFFU2xSN2UzU2FOSjEvQ2g3OFROaXF3ZE9maytRK2NSUVcvQ0JuMW5STS9v?= =?utf-8?B?RE5lWU16SE90SmdSWHpCdXpLcThOaHdrelRrMW9XZEczVFZDZ0h0WmxtbHBn?= =?utf-8?B?K3l3QW01SllTZ3ZPSVdocDNEMlhhM2RiRElzUEhRRnBIVzgxYlN0cmpwUnB6?= =?utf-8?B?OGYyaDJsM2QycnRKTERtU0ZTUEpQTUlHcURvRC9ZUG1PMWJSZllRdmVKVGNG?= =?utf-8?B?MVIxQ0pDY3JkQk1wUnB1NmhGSFlLSEMwZmIyL0NPNnV6YUhGYzdtTU5qd0ln?= =?utf-8?B?RUNuYmx3a04xRXh6dG5tSEt5aSt1TFljVXEweVgxTlZtK0JGNWZxVUhmUHQv?= =?utf-8?B?eVBwZzBBbjBhUkhMcW9mVlA3dnVGblhYZjlhc2plUzFRbDg2bG5jdFlEQXZH?= =?utf-8?B?UXp0TVpOZjJjVk4vV2JUVVdRZWVqdmVSMXlyWXNKM0hXM2hlWWJuY2F6SjJB?= =?utf-8?B?SlM1RU5oODJCQXROS3FaSXJRaVpmR3oraHNrNzdnS3ZpZUtWUWhYbkpScHM0?= =?utf-8?B?b2ZKY1FvNUJxMzJ5bnl5M0VhRk93QnNGQmtCZUlNYmUzWDI2MThXaUlNQlBi?= =?utf-8?B?cnIrMnhGYmk3VHd5cnFQWTUrWG1DQmtvaGcrMHhMYnZjM3J2L0ZIUytxdDV1?= =?utf-8?B?K0svaytaZjlIYjVzZVdSaTMrNXR5a0xFN3c2Tmkvb3E2WWM5UU1Pc2pLQkls?= =?utf-8?B?cEIvbWZJRFNvb0UvU29GMTFxdEdxaWQ1aUhnajFCWW5XODdzSW80NTRnb3JZ?= =?utf-8?B?eFJyRXdJd282UDI4WUdrRncyclZSUU9rbCtrcHU4MUxsakVObTdkQTBpVFlR?= =?utf-8?B?aVE2bEFseGtiMHJTYnJUY3lUbzlUU0FtRlZnU05PdnBRU0R2aWNNb2dnNTQz?= =?utf-8?B?bDRzbmZmMk9EbXh3REtUczFHRGVkZ2JFdFk0MTNrQUtiTEljbTRSa3dPOWs2?= =?utf-8?B?b1BWMTBNSGp2ekRMRVN1dEtNSTRYcnUrdmE0Q3JiQWE4RHlJc2tENFZjV05I?= =?utf-8?B?Z3lIcjh6dmIwcGlzcDlFOUw3RE5kazlsc0dTSHV1YUtUczlTbXpHUmJFc3hZ?= =?utf-8?B?L1hML1VSRXh1emRLbnlGSHJzdlpXZUcwWE5VbmFhdGZtS053aHAyenM2dUQ5?= =?utf-8?B?OGhKN0FZQmdjZUVFTXdTM2ZmejFXQVFyN1FNcm1Cck1WbG5STGJ6TnVKcEVL?= =?utf-8?B?TTE5MktoS1dOUkZvc1Q5TVlYbldYMHFHemlaSnpuMVBYMU50VEVzQ3Z3d2dU?= =?utf-8?B?cWxHY1NWUkdvTnVmTlBTTWZYRGFLWGFDb1BtNzUzWW1xbGVWYU1CL21yaDBQ?= =?utf-8?B?Uis4RGlwWDNYUnJVbUQxcmc1Vm00K1hmSitQYlpoOWpPcUUyMmovSGZRODc0?= =?utf-8?B?eTdhY3IwT1ZERjcrQmlCSFlzNWE4OXhPS1BxM3o3K3FGVFNCNzdSYmZGK2lP?= =?utf-8?B?WURPWld4VzFzSXRoSEpMRURmN1hCdktqSkp5bFY0eUZFM1oyeHMzM1FRbGJG?= =?utf-8?B?dFg2bzV2em9iOWUyZU13TmxBY29GL2RZUjNzWGpVSVF5bGlyQTY3b25kK241?= =?utf-8?B?a0gvYi84ZkYrL1VNVVIwME5ydG9rSVVDcGVGZGNMRm4vMFMvMzZ0T3diRzZJ?= =?utf-8?B?QUU2YU02MG0yM2lkWk5EYW9FNS8rSDNUWlFYcGVVcWFqSEx0Rkptdk14S2My?= =?utf-8?Q?X3gFMm8u6T5/9d08WlPKhNjPN?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ffc06cc4-9299-47d2-b060-08da6f20cb56 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6551.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 16:06:26.8220 (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: eQItRQ7G+e4e9//94ccpNgfjnAHoR+tll4DEBw9hZLjeir019nKJA1CVEcH/CDu3CD3e4maqVBparkYtKSrPkA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7772 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1658851626708100001 Content-Type: text/plain; charset="utf-8" Now that we're not building multi.c anymore for 2 and 3 guest levels when !HVM, there's no point in having these conditionals anymore. (As somewhat a special case, the last of the removed conditionals really builds on shadow_mode_external() always returning false when !HVM.) This way the code becomes a tiny bit more readable. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -3228,7 +3228,7 @@ static void cf_check sh_update_cr3(struc { struct domain *d =3D v->domain; mfn_t gmfn; -#if GUEST_PAGING_LEVELS =3D=3D 3 && defined(CONFIG_HVM) +#if GUEST_PAGING_LEVELS =3D=3D 3 const guest_l3e_t *gl3e; unsigned int i, guest_idx; #endif @@ -3279,7 +3279,7 @@ static void cf_check sh_update_cr3(struc #endif gmfn =3D pagetable_get_mfn(v->arch.guest_table); =20 -#if GUEST_PAGING_LEVELS =3D=3D 3 && defined(CONFIG_HVM) +#if GUEST_PAGING_LEVELS =3D=3D 3 /* * On PAE guests we don't use a mapping of the guest's own top-level * table. We cache the current state of that table and shadow that, @@ -3321,8 +3321,6 @@ static void cf_check sh_update_cr3(struc !VM_ASSIST(d, m2p_strict) ) fill_ro_mpt(smfn); } -#elif !defined(CONFIG_HVM) - ASSERT_UNREACHABLE(); #elif GUEST_PAGING_LEVELS =3D=3D 3 /* PAE guests have four shadow_table entries, based on the * current values of the guest's four l3es. */ @@ -3373,8 +3371,6 @@ static void cf_check sh_update_cr3(struc #error This should never happen #endif =20 - -#ifdef CONFIG_HVM /// /// v->arch.paging.shadow.l3table /// @@ -3400,7 +3396,6 @@ static void cf_check sh_update_cr3(struc } } #endif /* SHADOW_PAGING_LEVELS =3D=3D 3 */ -#endif /* CONFIG_HVM */ =20 /// /// v->arch.cr3 @@ -3419,8 +3414,6 @@ static void cf_check sh_update_cr3(struc } #endif =20 - -#ifdef CONFIG_HVM /// /// v->arch.hvm.hw_cr[3] /// @@ -3437,7 +3430,6 @@ static void cf_check sh_update_cr3(struc #endif hvm_update_guest_cr3(v, noflush); } -#endif /* CONFIG_HVM */ =20 /* Fix up the linear pagetable mappings */ sh_update_linear_entries(v); From nobody Wed May 1 03:42:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1658851636; cv=pass; d=zohomail.com; s=zohoarc; b=DfrC2Vix/bKz97GDEjF7Ce88qIH+nTJswyW7AKbqfuVPU5/dBSdRHUPyn/sEUKYklQ4GCrWx5UWYvC3GXLAvMxY0xWih0EsT9tYnVY7PNW09hpiztDZSbKEq0FvNKKi/8/n+YUynLg3FcPhupnALRP39AA6MxD9MR0gSCP2hUoo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658851636; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qiM5Ep+GIGxc9iGqIuErdW/YkbCSwfcFyzej4dHa1nU=; b=QbFQ5ctsoVs+0animnO6j/Gruilbv+I5QesgFXdyDXCLfebAeWDILqWWYoHBAJLaPM0taF2I5FO9qKE5r4Vqw4BRwbzobmxZciQAp3s9w6yZ+Hg0C1ZyB6FHWHWrprl6/bLG9ssWexCCzUI767yBxx3Q9DVwxDM3bP68qnbUJyo= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1658851636051293.78614404799725; Tue, 26 Jul 2022 09:07:16 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.375527.607978 (Exim 4.92) (envelope-from ) id 1oGN58-0007uY-Im; Tue, 26 Jul 2022 16:06:50 +0000 Received: by outflank-mailman (output) from mailman id 375527.607978; Tue, 26 Jul 2022 16:06:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGN58-0007uR-FL; Tue, 26 Jul 2022 16:06:50 +0000 Received: by outflank-mailman (input) for mailman id 375527; Tue, 26 Jul 2022 16:06:50 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGN57-0007rh-UX for xen-devel@lists.xenproject.org; Tue, 26 Jul 2022 16:06:49 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2058.outbound.protection.outlook.com [40.107.22.58]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id f44b3d0b-0cfc-11ed-924f-1f966e50362f; Tue, 26 Jul 2022 18:06:49 +0200 (CEST) Received: from AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) by DBBPR04MB7772.eurprd04.prod.outlook.com (2603:10a6:10:1e3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.25; Tue, 26 Jul 2022 16:06:47 +0000 Received: from AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::dd30:2cbc:361d:2d1e]) by AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::dd30:2cbc:361d:2d1e%6]) with mapi id 15.20.5438.023; Tue, 26 Jul 2022 16:06:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: f44b3d0b-0cfc-11ed-924f-1f966e50362f ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IhNPEsT0LgljoV7L82WarQM96DOb/sgRxWn4swUtd3UEXavXmfBgj61v0wq4R8Vd1s0HOXhqTIwL5/+8My5MqlhWaEcV/GzwS79jDlPjdwtdmldlPko40YhFhBuBJ/GC+w5uooDsJLqMC5F9iFDeUt2fFWyGMzK9BjpDdX76SJjje9LaGh3wf9mxreaD2HLYpnCQCuHlDLbIk0RsndX+XXOSvYO2obV1Y1EThyC+aEkLQp4ApBkELVqsR96awgTO2o0OdQqsiPAkN4Ea8E8tToO0P3LX74uYdjo3IIDveE1u1rXsfjoMWtVBvF+X+CcW56HNneNeMISXCrfGBnVpCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qiM5Ep+GIGxc9iGqIuErdW/YkbCSwfcFyzej4dHa1nU=; b=gSmfItKeTbY2YEHkO2k0nanqGRuZ5jY6XIN15HakqnhJaqPbCEMb/+H+J63/Zt6PO5j0oWH3mXp9/3sXfiWNBe6EG1vOnwfWas6cKA7JwqnwniBhxGhObV3YDPEnNfLn45PtAf97mnG+dFpWCOhodePfwfaejYS/jQ68w8MbAedR100J7MuNvX91yh7tdHUAfYCFz+Y+APSzq2SCJt2LGu+6RjLEy2nFk2HPI9KYRgYTr/Zn4aHlJBrQAB9C/iMqvMVyRIJGIB4bhEdLkyknv8KQ6xlINvs3y4LRAiPPDn9PGRUg6aE8mb4yx/ZgTwBziCIWxkpKimASFe9xBJ4wZQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qiM5Ep+GIGxc9iGqIuErdW/YkbCSwfcFyzej4dHa1nU=; b=HFU1uTKC1lzquHMpuCUhAoa6J6wr1Ld1Ih+RPYRQhbPsFE+s134VvO5/EFAhOUipihbJHrtW9HYOp81tn1WBQQ9d0S5yLIktKdw54Dp+P1c4vDC2Q3twqsdJFffnh47M7PHj7Vuc7RMQnJlRqtEBV3a0vL3en7bb4KCA683IhkR9gfaqnbiXCDbpxX0utj3zmJhKApaw7+3aMu57z3sep80i3TanfbecTZyQhmGPDePzzhvV0XKtNykvzcxvp9U3dEOQX2KHHzg5CrQ0UkTvSE6AnyInbzgLIWrBI7vE2q4w62a2FJ4r3gSiTZEsbTh0bRCn48ZwFsG2SaGImWVOBg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <40042c40-a2ba-e491-d16a-4bacbfc6154e@suse.com> Date: Tue, 26 Jul 2022 18:06:44 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH 7/8] x86/mm: adjust type check around _get_page_type()'s TLB flush Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , George Dunlap , Tim Deegan References: <3fdfad2a-7891-0b08-5541-3b226e0555e1@suse.com> In-Reply-To: <3fdfad2a-7891-0b08-5541-3b226e0555e1@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR0P281CA0095.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a9::12) To AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1cdd2baa-d08a-48b0-fd75-08da6f20d7e1 X-MS-TrafficTypeDiagnostic: DBBPR04MB7772:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wghQfK+DMVXn1DNLhpAJTqoETZwwBydw5sXL3W37g6OZWzKgJgiUlITY8uv6sihGJlp5tPTLlAE5yoO5ZmyIZB6tgwXRFtBwkSLgUUbBwk2rCav0p+6vZvPDg5+2SmKMGZsVgO1xLw2Bj4XVvSed8Jmc6rvnfOOAGjlvpvNlMLMdHrWH/hxpY18ON3Gzh3WsoGgR9bP1reHUQ4Dzera6OhVFrDEtzgMhyJ2nGWnH4btkJvYvXQsERk7/XQQuQmPLbWo5q1TWemFmslklsfd1wrPPmpbDOnFARQq+8FKvFHxhd7MC/ygW3EF5FvyYmu/7Vc6QSj4neR9ZkygCxBzjLLaGvfgJoqfTRAbqf1WrC2GZXbw0fVm2XgI/I2XAZUBdit7A0Dq1zljXsrTtotHWI/yws7EZXqtsVBkEgAkIiP1HJyuNLGRC2bU0K4XS0iHYhWNiLjsIuc81LGZJcBFVmLNjpD9DNWlu5Nb0kKzFZMwPEmY6uTEsa7D1OBnelKm/UmUDmyHdj8FnyoE+/l//GN8ogpDpasXIYlJUEXyVXFdt09Pt0OVCp/9Fwx5eJJFcjHvyEiI29FoRW3mVKFpeqLQJ3SXgIugj0dOtLOQK6rseNtU5DM81233pm59EWp8mSsF33MH3nGoVmuDeRZxnm0mTe9MTtX9uD7voEF0/w84PeTgXu4SwQIIR0Z0+/6bvKpJmrMN0Bkqlex9fBktJWw7rtGmA0m8DyW3M3lTfFAm1cmV50NhidgXWYLgygJpN8XQiOuH7RU1BR5Hk9PBMnPsjLhQE/niY64sdISk48AamRa3KfOTJA7HerumPScQJuBVRleYap/hFJ2h2F8Awzw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB6551.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(396003)(39860400002)(346002)(366004)(136003)(376002)(41300700001)(186003)(6666004)(2906002)(6506007)(6512007)(26005)(5660300002)(86362001)(4744005)(6486002)(31696002)(478600001)(2616005)(8936002)(6916009)(31686004)(36756003)(316002)(54906003)(38100700002)(66946007)(66556008)(4326008)(8676002)(66476007)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dkdkNG5YL1NoWS9FelpqYXZqWGllTGszMklyZXdHdnA4M0NpMWNMOUJ5WDdp?= =?utf-8?B?eTJ1eFU4L2NQWUYyZGp0dGNURFJzVFl5VEp1RksrRGNPelBVTW9ibzVjWnBY?= =?utf-8?B?bU5xQWxmKzF5cndHMnBxek1NUEV6SVVyRE1TOUlGTDd2WkZPUHNpRFBLdlB5?= =?utf-8?B?ZmpqOWNrYSt0ek82dEJtbWpPc3NJcVo5b242WHpnTTEvc0VwSWdMSml0eHNk?= =?utf-8?B?NjR6YVpDNDU0UFZoZHNVa2JiNEh6TDY4MWE4ZGQxZ3pOMERhSnhoWEhQaCto?= =?utf-8?B?Yk1BcDZaNTV4djk3djJFcVNPN2JycHlQb1BPcEZ3aFltbVFWMzlaRVRKSmdR?= =?utf-8?B?SGl6aHB1ZDR5OXlBc3hva1NFOUE3Z2xzRWV5aXVqS3loblFpL3Z0MFd1eVM1?= =?utf-8?B?V2FIY1lROTJEcWlrT0xjYVBKejh2OFUvZGt2WlRiQ2xVZ2FGQmpBUDZpaXhZ?= =?utf-8?B?WVV6NkJTRmcrZDQwWTl2bXR1UUY2RWU2UGtySS9BUW9TVGtweE1QVEFlbG1D?= =?utf-8?B?MnZQY09PdS9UdDZwTVJLeWI1ZkVIaXROWjEyOFFJK2pvc0FQNVlYd0RJa21D?= =?utf-8?B?V0FYZ3A1Q0VsTEM5R2pxU05VRzhERnBKUEtkZVl3a3drdkRFaVN6QVl6Z2R4?= =?utf-8?B?Y1NNN3IwSW1Ob3JST3JMR215Sk94R2MwT2sydXBOT3ptdnQzcDNzZXhhbmVj?= =?utf-8?B?aFQ5a1ZZY3J0c0FLNUpzQTlkdXhROHVXVkRPU3Z1NDk4NTdhaTM3YW5KQ1hv?= =?utf-8?B?ZkJQSWtpNklYdWJvZDVKeDhMaHg1aUpraFBLeWh0Yi9aSlprT0xNYnl3TGQz?= =?utf-8?B?L1MvSWdWNVJWYy9MUThtbkVFVlJvY1dSSDVwUEdmOWt3QUxwUit2TU0zTnpz?= =?utf-8?B?N1Ira2tkc0kxL3hnZmhOSUZieGlzK3RHYnNac1VJc3JHTDNyWHgwS3RINThz?= =?utf-8?B?VkZWUzFtLytyM3RaY2NKTHpxdkNTZTlLamxVTE1EUXV3WnprYUJrVC8vemlu?= =?utf-8?B?SDZZK21oU0RidFg1c2ZNcHpjUzJGTmxZQUp1TUdJeEJLUU94TkZ2WjV4bndm?= =?utf-8?B?VHJuNE9HT3cyWjFGQXp0UzI0c3l6ZnlOTjFPZHd4bkVPc0dMeklUMTNyS05w?= =?utf-8?B?VVBKS2JLVzNiL00zVUZSMU03NlkxVThxSjNWNUlSRFB5QjM2eHdDckJJVFd3?= =?utf-8?B?UW9GSEFUaXRDNWk4aFdGZExlNHIwaFd6ZkhwUWl1WmFQek8yMldYL2pQUWpC?= =?utf-8?B?OGovejRWb0pyNGN6VjdWYkRzZXI4VnFSMnR1UERXR0UydHlGQ2ZlQXFWWS9O?= =?utf-8?B?OVExQ1ZIMlV6YVZoSElnUUdmaGN4TzF5blFyUzljQXFiL3VxanJzTHE0dUtp?= =?utf-8?B?UHJVcmxDRHA4S1FicXZkT3VEQi9NaXZ1QVkrMWk0MjRiMUNwK0cxZDMrWXJ4?= =?utf-8?B?SWFOUnI1bnJ1dVZ0NUQyaDFjdE1iVFMyRjRUenNrdEdISUdIRzRDTzVYRUxZ?= =?utf-8?B?U0pPMlpBNnpoSFJnSko4c2REcE1xdXpkMXVRZERkSG1Ld0hCbytmakQ4dldu?= =?utf-8?B?QUdkWGhnSFIvalU5VnA2R0duT0ExdUUwMlJMRmNsS1krK1dWbmFmMDVLVndT?= =?utf-8?B?M01LK1JTZ0hTalFpMm9HQ1RvNWpwc3ZodmI5MmtLazFRdmdxdUI5YXZ2QjlT?= =?utf-8?B?clVhems1VWwvSFZLQVhzc1EzQnlVcVAySk1aSERRd3cwcVFKRjdXOSt1aEZn?= =?utf-8?B?MEtud21wWVBJa0ZkTG5IZUw3MFhiVlJhd3FJUGFFZzFaaEh1RXgzWU8wc0JC?= =?utf-8?B?STJRb0ZLSWFDN2J5ZjhueGV3K3NiMUVvSFBJelN2OWJzTkxsYnV5Z0ttQ2o2?= =?utf-8?B?TUl1Zit6K2xHN3RsT1VhTlNyeGlndVUvTmpNb1VLT2lLYzNtUTZtM0Y5dEY3?= =?utf-8?B?dGFteXRnRWtHVXRZeXdTbnJwMElGNzRma3dlQVpqMW9yMWN4QmVsZ0hMdkNj?= =?utf-8?B?c0VocXRUYUIwcGcvT0NIUXVYN1RhOFRieEdFeVYrOE5HSjU1cEd0NTgzbG9k?= =?utf-8?B?MjdFOFk1clFZZmx0TXE2cTFocG1EeENYSUZ4a3hwVlgvN0tlOEo5eDBvMXhT?= =?utf-8?Q?gX603axYp4HLVgxeJxkUrEi3r?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1cdd2baa-d08a-48b0-fd75-08da6f20d7e1 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6551.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 16:06:47.8832 (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: 7zkxIyuKLu3vR0xiks8dxE597UsSDjv9p+UthVbE21RZbaQiOX4rEMnQEzjNv5L2/iDdxmJFTBW8ojuxxMESrg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7772 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1658851636568100001 Content-Type: text/plain; charset="utf-8" While "type" can include PGT_pae_xen_l2, "x" can't, as the bit is cleared upon de-validation (see also the respective assertion earlier in the function). Signed-off-by: Jan Beulich --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3020,7 +3020,7 @@ static int _get_page_type(struct page_in if ( d && shadow_mode_enabled(d) ) shadow_prepare_page_type_change(d, page); =20 - if ( (x & PGT_type_mask) !=3D type ) + if ( (x ^ type) & PGT_type_mask ) { /* * On type change we check to flush stale TLB entries. It is From nobody Wed May 1 03:42:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1658851658; cv=pass; d=zohomail.com; s=zohoarc; b=nSgQh6Tk9AYH26QgWkP3PvJZJwqv0DXQlePQP7Qx+/2WWt0KgwFy3GgSXU89oUgyFfdvVfmF2qHUle5Yd9aLTtWlugZgklfkTolVEa8Gv1fWaWsqZumTbG1rK9L98BlrpzHJOQ3ujoSdt+vYJvJmCpxq79G5gPXClV/xdj62k+U= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658851658; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HL14tmU18Cp4BQe+e29MGYjb1FaYInGq5siSnr2Mod8=; b=Jd2yfdZl+VqGf0EERZlCqinLcZsmAbzqtehGxi7IBiuA1nExMG7Oe+ZwLIrQO5VUHBKgdfQnUv3G0F3KZ+WeDBRPX8Pj/ktfjwmXFhNeqZE6xgwX/X/l2F57J+LcUovx5KoqhEkpHgiw5EihB0ZbB9wFzCmNO/zNlDCk6iSTaV4= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1658851658678532.5427195746707; Tue, 26 Jul 2022 09:07:38 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.375533.607989 (Exim 4.92) (envelope-from ) id 1oGN5c-00007T-0U; Tue, 26 Jul 2022 16:07:20 +0000 Received: by outflank-mailman (output) from mailman id 375533.607989; Tue, 26 Jul 2022 16:07:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGN5b-00007M-SG; Tue, 26 Jul 2022 16:07:19 +0000 Received: by outflank-mailman (input) for mailman id 375533; Tue, 26 Jul 2022 16:07:18 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGN5a-0008Mo-2k for xen-devel@lists.xenproject.org; Tue, 26 Jul 2022 16:07:18 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2053.outbound.protection.outlook.com [40.107.22.53]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 0507d35a-0cfd-11ed-bd2d-47488cf2e6aa; Tue, 26 Jul 2022 18:07:17 +0200 (CEST) Received: from AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) by DBBPR04MB7772.eurprd04.prod.outlook.com (2603:10a6:10:1e3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.25; Tue, 26 Jul 2022 16:07:16 +0000 Received: from AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::dd30:2cbc:361d:2d1e]) by AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::dd30:2cbc:361d:2d1e%6]) with mapi id 15.20.5438.023; Tue, 26 Jul 2022 16:07:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 0507d35a-0cfd-11ed-bd2d-47488cf2e6aa ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ktA7nN6zAq3AbE/KoNY5DyGI/cFOI3j9W01sKmpKyZnnbmK3MsBWetaWpAY3JcSfpoRRBAbuxK0AOhLeAPgbsYG8VcgABGzpHA75+Afb4dYZ9VpZP794ichuy3vTEJ61ETHFffW6Yt7qLxpPG5CzLz2EUU1mnjyvziEMfXYQKdvvk5bBNFpA1NZezgHAhHfjY1UIKtzLfiH7hEgFJaI1BSrKlWRoDHr0CFsZS/hEG5i/d8OzS3n/VQ5kf3e0XtopLVRjU3yaP28YIllUK7EdH6ZC3cGe+bJiTI1cH4RREJ9Yj0FWVB2h6HUZDY06NL9Soxz87lAsr7Zc5pmWwUO6dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HL14tmU18Cp4BQe+e29MGYjb1FaYInGq5siSnr2Mod8=; b=e5EzArV5hs+bs9alpdeSnIT3UBGaljOZScU80EqjLPSwv6Cwgw1565vzTAyg3LszDjPswjDbcmqDdcJ02G2oLt0WrcDM8AFg9KqIJM70InhX27BXdGcXK49R6mPwOJoV4QUkGrYMhcMrFzSdYiBnmzqUZ8CeI6GqxLjgIzvG4QL0v1j2QNUMfBIWS4Gg578gUEzDcHClylGeLAKiArf1fE/EN7y4uvLWvLQLgd04NM64FZ1ThOanwE/SyIivw4HKPXS8eT6tvBkiZSwgJ4scGP/LSobkcB1aDzmIeOJfG8r4Iwj/bSirOlKAUZPEFM27+7f5pdniqyYFFYgyhER6xQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HL14tmU18Cp4BQe+e29MGYjb1FaYInGq5siSnr2Mod8=; b=1RP9IRPEu0sGKc2jeJcgcP75xp4XaAGrfVyBSqznNo4ZEpGAXtfsBa7WvPyZmh85yj2UFFItWpvTkIHLsP3FbXFRYJII42a0ABejipRsBJsJU4O488WCNeyX31o6PDnLurs4pXBvKH2OO7LzWBGtb+71nRsUOxjrhWS8sNq9qiQzybWV8Uwm86VzDxfG4xK+mQyXlAnsxbxuyCYWaMJh5+aWwLXHnGZ2fp4ICn87dLbIkh1x/o/uKD+pAitFaXzF1eYRjcPrCfVW13z4n2MGmR6ESjJGDD+V7mwjKhn5r2mMQDf2HPxRZnVTpqvD8ZN7sSPf7ha3BWwHF5W2xR3BEQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Tue, 26 Jul 2022 18:07:14 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH 8/8] x86/mm: re-arrange type check around _get_page_type()'s TLB flush Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , George Dunlap , Tim Deegan References: <3fdfad2a-7891-0b08-5541-3b226e0555e1@suse.com> In-Reply-To: <3fdfad2a-7891-0b08-5541-3b226e0555e1@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR0P281CA0050.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::13) To AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 02585d12-4562-4112-7e35-08da6f20e8a0 X-MS-TrafficTypeDiagnostic: DBBPR04MB7772:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AEm64qTKRLumjDJ+ucK02p7g+pZezDTZ2RP7QbEuW0e54AWKo+OJWG9wC5rY03dpg9f/EN6OYhihtHyeRlh86zudoQBLFFi9H+GLTWmhvga6O6KikRBGz4wXK/RVdG3qfLPrAzfCNN+8DIYIGPlvoCD0xmlABbmCdzotrqkEuXnKQQobFq1U090zN5uZ0/acLdDUlSgHkANjirtkNmwqcGh5yQpM3+tmlZ1Tz/OclR+gzOXuLMi3ZvxQmLwLoFnadn0nHtgbcvy8JSWMiT5LRYI+1Rmjz5uV8NAHu95n70RSXkc7lPoZ4n4HeorFN6TaE3pwBGUelwYbTcR+rakh0hzCdIGA6+d+h3dd84iJe38Xf7br4gzgSX3n0lbOsRqIsCj3+g50SS8nvhNgKR6V9BWVvEGFquAa9OL8+43828GAbZIZ+NX6ybW3/1JwgdnyltkFcwM97rvU7RY1JmtEWZzhUw33GjwrDiZKHV4WqAz4sSbdgUTTJamL/piiNXjOOVEIG440SMBHylLgVQoX7ig73zs5jzS6JpjjmXhF5BIykxwc4FjOTjfvvKeJCZhZgyuYQEPoQp595cQCqHtVamBrQzowODUWd3pE+l57K1o9s2Wc+92dMpEU71qXmpYS4H2iUoPbSO6SeCrT1Rv/34is1qOU9ludAvLL4/Q3LkrvC4Uy1D2aF2ab5htS6oNH/F+A5mKiDaBIJVJZIP7S8k44jZLJwCH62W/GG002MwBZ7hbe/A+OrjMFAJcPEzv+Hid7e3n0ROuTZRxAvTGb27aJNwszO8O1bCnlPgwtELZXfrBfNf9k+Ut3bu8VZKON0QeOMRTK7ETDPsFGCPwDEA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB6551.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(396003)(39860400002)(346002)(366004)(136003)(376002)(41300700001)(186003)(2906002)(6506007)(6512007)(26005)(5660300002)(86362001)(6486002)(31696002)(478600001)(2616005)(8936002)(6916009)(31686004)(36756003)(316002)(54906003)(38100700002)(66946007)(66556008)(4326008)(8676002)(66476007)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cjhvMGtOMU4xc3BZbU8xaHFveU1zVWtOWW5VUnFxeFJaOEgyUkVwM25ZdDg3?= =?utf-8?B?WVMrK01vL21jRGM1OVBzL0FnZmhGTmV2S1V1eUx0cDl0MU84cVJyK0tSRWMv?= =?utf-8?B?a0RkdHpOMzJBWitHdTlqRkFjR3Z4cEJUZTd4Z0sxSDhwOVJvdTdsTGNJQ1VV?= =?utf-8?B?VTF1N1QzLy9UMDcyTnBhbUhzb0hkKzNtL2xrOFppbjZJT0VLZTRyZGFZOUtX?= =?utf-8?B?T3dvT2lnRGRib0kzdGw3N2x1clFBM0xldmZvWWovMHl5c2RKTTBWMlFjQUdS?= =?utf-8?B?d1FmZW96QzZMdDk5Sjl3TjFzR01LNVpsWHFRdFdZR3NudCtSUnBsS2RMR1ox?= =?utf-8?B?R3BWQXl3NlBzbmhDTzB6RmR2RjlRNHIzSkxLUzJvcENEOG12WXB6OE84YlpT?= =?utf-8?B?ZWJobUlVZkZxMXAvNUZONXFRa005bVJESDZoV2FVZ0dpMjdqSzFRMmZUeS94?= =?utf-8?B?ZFVuZ0xtRGlad3FVdWExODhRU2xBNnc0U0xCQjRFTjc4UjBIM1dCZWRmWmw4?= =?utf-8?B?aGhXNHRFYWdQWDl3MmE1SllkMi9rK3J4dGU5YmtSSXhTME9VbEtPRW83dXJO?= =?utf-8?B?bllFVE9UVFhuQ1dFd3BBb2lhdVpVbVRYVXRlM0NiMlhlczIrU2xYSUw3RHpH?= =?utf-8?B?ZGd4ejI0QzFUTUxOSXprakx2RkdNUmc5WFduZ1FYamowTzBjTXlyRGZDWFdW?= =?utf-8?B?UDUwVjNGdEp4L205SFlHbUt3RWhjMUpJNTltMDJRSGdqcFhZTWt6OW1DdTYz?= =?utf-8?B?UVdrWm1wV1hDbmRVQkVCWC9yelBRU1o0UUU1S0UwTDRIcWdaVW5tWVZNRzhQ?= =?utf-8?B?M200dmhaRThFZVJwb3dJUGhiOFN2Z3Vtb1RPVmdCYWEyaHZoQVRxYmYrVkIy?= =?utf-8?B?QmphWGM0bjNFZlVvdGxRajFVeE5PZ2JxQVcvc09XL3FGT0dadG5vK3V5amxR?= =?utf-8?B?TXV6bDZDWUlPcXJNUjJsRk9VV1dERFFQcU90dWRGRU56U2JISTZjNE9KMS9y?= =?utf-8?B?TGt1L2hjcnhYL3RRdjBmby9kdXpNd0JPdDdkWkJyQzNlcHQrS3dNTnEvUjgv?= =?utf-8?B?K2RHWWZib3VlUnRNZmx4QSs1elo1Q0tJd00vc2JaNzdtMEFUbE5ROHhLdGNP?= =?utf-8?B?VGI1VlNlbllBY2VnS1lGeEsrQjg5RlYxTG9ZRTNXMkNBUFZIVXRlbWN1Ujk1?= =?utf-8?B?dlFaL0RkcmpVQVlXcFRSejFSTERhNk9SVVIxdjVEZ0U3ZEFSNVpHQ0NRK2Fq?= =?utf-8?B?OUFJSkN0OVFxT1lHS0NHTmt3bkVxMERNTjlhSzBJWUVnWWt1dSsyMW5kVWhr?= =?utf-8?B?MFF5NGR5YkxkQ3pGQnNzZ2swVHVndHYzUVhYa3hNa1g4amdVZkxQaFpyMzdC?= =?utf-8?B?OGtQcld3d1NZUlBDUDFmUExlRUphZDA3QlRIblA3cm15NmkzbFNjak9sQW5W?= =?utf-8?B?N1AxVVRBeTgxdWdnNVp5Zk12bGlyVjgrY252SlJma3dNcGRhWituU1pvdUp4?= =?utf-8?B?VWRzZ0F6TzA2aGtkWW1SbDVPZUhkODFlTlk5MXdHSHk5d3FFc2R6Q05Fa2tZ?= =?utf-8?B?WmFwMWtjNlVoQ2VKdnZoS1lWbndzRk1ram5haHBUL3NBSlhwc0VvOGlOejVE?= =?utf-8?B?VXJNSEpTUTZUaXNGSDVUOXpkaVVTMGpaZG5RclloUWpSRmJMM3NFaTdVQjZ5?= =?utf-8?B?bGVCa1Z4VlVwdUdPaS9qU0ZBeGptQkRVTFp4SFFXMitmR0txNGRrNWxPcUph?= =?utf-8?B?M3I0dk5KbXROeUUrVmQ5aWdzVUlJMmRERS95bjI0NHMzM2VaVFdoUUtPeS9k?= =?utf-8?B?Mzl1NXY4WmhwTzFoRFkrTEJueUt4Q0dkdTkzR0RjdGd0QUlhVENzRktFSTh4?= =?utf-8?B?dWhMeVFxSmc2V3RzVkV2WlhNeTZud3BranJKZWdpTHUva2Y3THdsR0tyOXpa?= =?utf-8?B?S3Q3WGIzd0tvQUswL2tyTEI3cWZtM2tHc0VSQUJjQ0I4QVlQM3c3emx1eUZn?= =?utf-8?B?Q0FCRmpqVjFPMlZ4ejJNcUtDWGQySHVQQU1iVnVaKzM2eFQrcWNJYWJpTEla?= =?utf-8?B?NFpSTWNSbWptZ09aOVlZV2pvQ2g5L215RHR2dnRCM1UrLzdqMGd2UVNVTkJp?= =?utf-8?Q?Thz2Yo4iHXiyNnOzFMWJa78rI?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02585d12-4562-4112-7e35-08da6f20e8a0 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6551.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 16:07:16.0065 (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: 2RAwXEg+VBe2dvUhRn8P4KhIOD6Wx6vlAzPCvE/pHmR7lmRq2t+frp0eeMrxQC51zGhg9tSMOnwHX/zxvTo4hw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7772 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1658851660646100001 Content-Type: text/plain; charset="utf-8" Checks dependent on only d and x can be pulled out, thus allowing to skip the flush mask calculation. Signed-off-by: Jan Beulich --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3020,7 +3020,10 @@ static int _get_page_type(struct page_in if ( d && shadow_mode_enabled(d) ) shadow_prepare_page_type_change(d, page); =20 - if ( (x ^ type) & PGT_type_mask ) + if ( ((x ^ type) & PGT_type_mask) && + /* Shadow mode: track only writable pages. */ + (!shadow_mode_enabled(d) || + ((x & PGT_type_mask) =3D=3D PGT_writable_page)) ) { /* * On type change we check to flush stale TLB entries. It is @@ -3035,10 +3038,7 @@ static int _get_page_type(struct page_in /* Don't flush if the timestamp is old enough */ tlbflush_filter(mask, page->tlbflush_timestamp); =20 - if ( unlikely(!cpumask_empty(mask)) && - /* Shadow mode: track only writable pages. */ - (!shadow_mode_enabled(d) || - ((x & PGT_type_mask) =3D=3D PGT_writable_page)) ) + if ( unlikely(!cpumask_empty(mask)) ) { perfc_incr(need_flush_tlb_flush); /*