From patchwork Mon Jul 5 16:14:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12359401 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9303C07E99 for ; Mon, 5 Jul 2021 16:14:59 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 81380610FB for ; Mon, 5 Jul 2021 16:14:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 81380610FB Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.150517.278291 (Exim 4.92) (envelope-from ) id 1m0RFD-000339-DY; Mon, 05 Jul 2021 16:14:51 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 150517.278291; Mon, 05 Jul 2021 16:14:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1m0RFD-000332-9p; Mon, 05 Jul 2021 16:14:51 +0000 Received: by outflank-mailman (input) for mailman id 150517; Mon, 05 Jul 2021 16:14:49 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1m0RFB-00031a-GZ for xen-devel@lists.xenproject.org; Mon, 05 Jul 2021 16:14:49 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.111.102]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 154712db-250e-44bd-953f-956c64bec38b; Mon, 05 Jul 2021 16:14:48 +0000 (UTC) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2176.outbound.protection.outlook.com [104.47.17.176]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-30-27NWrKgeNzSqBjibl8V9Qg-1; Mon, 05 Jul 2021 18:14:46 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR0402MB2829.eurprd04.prod.outlook.com (2603:10a6:800:bb::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.33; Mon, 5 Jul 2021 16:14:46 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::99d3:99cd:8adf:3eea]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::99d3:99cd:8adf:3eea%5]) with mapi id 15.20.4287.033; Mon, 5 Jul 2021 16:14:46 +0000 Received: from [10.156.60.236] (37.24.206.209) by PR1PR01CA0029.eurprd01.prod.exchangelabs.com (2603:10a6:102::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.21 via Frontend Transport; Mon, 5 Jul 2021 16:14:45 +0000 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: 154712db-250e-44bd-953f-956c64bec38b DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1625501687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RREdxymQaAXQtLLMkVVF928yZA3I7Wa987QcwLYQXxI=; b=YaEByNrtP+F49+6bfEmtqTrswurUj3/WRkt8+uAPRXzWoqu00rln66jOCVBtjuGUAC26aZ 2C85nZ6fxcmmxQ4SSxI+/Y4XjUOjCM7MWmA+XJmv/Y50wUfxVBVDicay7op4tYYWmXvPHY OOO386xCQTQfvcAntu3EGRmrN6OefqI= X-MC-Unique: 27NWrKgeNzSqBjibl8V9Qg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=frSWrQyG0ml5v4VpM9e6S0cXv+ZoMc9QO86XLXlzfFQimL/3X+bv5PCrbhzwNkvJz5nQx/Y4pezHAOlg17/wKsAHvXcsh8PZGYmEyrzyOw45xEKr7HH1QXeBTpj1oGqmwYHIoMqFSGBhm2U7+boLA3xxmhKvTuAYnn2rZLx78E5dm7Bio04XOyBAO27nh2J9MAh8r45NQH121GULhx5O33NNDFwaXIl/wSPdgnhdf1/17UYNMDmL/fGa1tJYoMcKUa7WKMlgrsqK//mUR94OVrrQ5Z0tNgj39HahPxX2XE0iSqkBF+w3efmlJV0JdouPmNBLogyv7f7fRZuXs51xyw== 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-SenderADCheck; bh=RREdxymQaAXQtLLMkVVF928yZA3I7Wa987QcwLYQXxI=; b=DCnJ0ceenuP5NLPNWQSvH8/MfqQlzvroRBlrcRjmYuZd/f+D40tVHSaoAhlABavaX6D7On2gV6ssY04iDZwz0MIJjBt8DhlnEOOmhxsCmiOyqkLsgB9fIy5jzgaxgdKlaqJi6rtiHBdBBFHymZka6KtncJ13Sl61Ykm20wsuLJOoOCrtYeCxa/OUozruFieODExV6i5IfTacR0VWSJAy3azRi6brH8Cg/fza3LKI0qdpSydRRO6JnwYh/xYd421uaX9vlrivfYP5UdRgb1lzNRm11Zh5BOFmegY/O5LbUjbAy9anmElcaPazoBc3fhOcHItQ1mvFxFXLcceig1XrLw== 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 Authentication-Results: citrix.com; dkim=none (message not signed) header.d=none;citrix.com; dmarc=none action=none header.from=suse.com; Subject: [PATCH 15/16] x86/P2M: p2m.c is HVM-only From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , George Dunlap References: Message-ID: <7f868820-20ac-4850-aec7-35bc843cab6e@suse.com> Date: Mon, 5 Jul 2021 18:14:44 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 In-Reply-To: Content-Language: en-US X-Originating-IP: [37.24.206.209] X-ClientProxiedBy: PR1PR01CA0029.eurprd01.prod.exchangelabs.com (2603:10a6:102::42) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f3a01401-d328-4fbe-fd14-08d93fd00163 X-MS-TrafficTypeDiagnostic: VI1PR0402MB2829: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YNulpkveIax6YbT8wNvgY2XNhbgiaBadZzFGMkNMtIdHK2wZlrVL3v6T/jFepeUbh/pnr0I9zjFSAFHxfDwakfrTb0Ijx7oM3M8HZRKY3JkgVNsogpDZLaVPmIhpa2wbTTfUO3kh6Kh6UlhRkgkRFINrPJ0Bh2eUwyf4RhykaGALDBcXwGPzI/F2z0Dw+bZjhoBBQwuSwEeob01ioV2NDUlFwGO6mi2mQiTdCPDPWycNh9X7Jc7lfhZTtnAaqSV18kEiVGeMtbedEPng7yrQxVVtpisT+oB0FqWRhfKczdpuc0KLKNUlfETXd6zg4kG0fxuEYwTXYCwIlvThgHuAWVOPsWewEvXmq7Zj4WI21MrKEY4uIwj12upiBNIn7R5Rb1qAi+zTHwiTl8UZ/ZBZ6lWFqt/yZggxFRts9hP45rxX3+m97l3m6YRqnAh12UqL8RJZeCdjRVFPS0aFE/GAf3LU1FEpV7qNqpV5AIfgoDlKtFgfMkJXnOkU6SH/r5UcZd79aFobmoz34jHbH67CuEICzhs355UyR/uI0BamPGw3otVayZYBKc/EEIQhf7FK7BftgAH3tE7JH0198sEyqL/2ILywgk0u3080uWIhoIZZxLfOd2jRin8321zfVDD5AGsNFc4N2NSt8yQ2S72w2CTsCauxZbrF6GpCKQ/HmaFu47QEhdUfGuuBWDzFU6fi0NXm/ACMR6mcBJudoi1yWw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(39850400004)(366004)(136003)(376002)(346002)(396003)(6486002)(26005)(16576012)(478600001)(2616005)(956004)(86362001)(2906002)(6916009)(316002)(83380400001)(8676002)(16526019)(66556008)(36756003)(8936002)(38100700002)(54906003)(31696002)(4326008)(66476007)(186003)(66946007)(31686004)(5660300002)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?xN6QdCrfFqWiB1dP4PyImrMLcRBY?= =?utf-8?q?Hkxjg+7h7vqRzlSipGGTu2Ov9JUqDvwniJlmos3ykxZ+/F3igHMUuFHKcE/J1BMBo?= =?utf-8?q?mibFTuo0CL8th6c2bZshUucvXbSrcYAMz/pOF79WloHSMc2Dp6m4igBfLSPzXMb63?= =?utf-8?q?oR6OjprO4c18RNB517HXUa7sDSfkNF8JFKb49vASRs+FsENBYFAwYviiMQZYbBKm+?= =?utf-8?q?QgJNmnsBl8U2C6Yu6jnZREZ6VsqzXnfK6VycbMDFivSeieR7v8Qh7iA1as0WV3/Tx?= =?utf-8?q?EII9M3kpczgyyjqhtOLph3FJ9/5dt4kU6Q4mJXFNrlIO10LzHIEX+dQYtgQsL8nXU?= =?utf-8?q?OFh7coXPopcr02+6hR8qtlZ+0+MRGzx6iqNSHzrtXJJGOfKEZnjXd9k6Wtd3DJr9O?= =?utf-8?q?yj0OxA2QFnQ6sfS2M7vOe7k9j+KmP2fk9YoKl2mYIq0fcJAzZDqmWIQwv3ul8iuoR?= =?utf-8?q?gOHtVHXEc0u72aqeg6+U4ygzCSMgt112nnb6RT5ES4YtCZjDoUIkF67CPCnB5RstA?= =?utf-8?q?19Zc6dbv3mSOfwfx3CbYeSpIwST7jBODWubkcVGl073tDNIzqV1VSa7uEn6JiZ4CV?= =?utf-8?q?TpLFhFowAL3ug1cV+Sjwlg3r5Dbx66kauNj2ceNbxAXSD44UnNnARZpqnbAioVH9M?= =?utf-8?q?UNW8ukyLptBgFVFzQyp1x+p7vxVMosrqc/mb9tfbGJc7ap56W1z2R/NP+QcdLiN7G?= =?utf-8?q?F2diRDGj+lGL5De/sDvnmKviQ1Ic88qMf381Q5B9JlQzq/pBnRX60DVoiuOD/ukgE?= =?utf-8?q?Ic1CXeBVsJCf7PzedbIvLWSVJ4g+a/75SzLa/IO2U1v9Vb1CH7AU33Nb7sk7V0IrP?= =?utf-8?q?36bCnt8kc0hXV5fZUU4WhhpLWxE+a7WSAJ730bdZojZsu2bIkPPnvJP4NkcAQL+Qv?= =?utf-8?q?iQvz4qiCso8G32LBhoM+hnARmZGBMxJUxIRUBhZWYS8XqkyKMMTlfMlIGVkLVWriJ?= =?utf-8?q?596DYoQj5yzzJY3by/Fcuw/QHNlkmP6wcNwAUmoZMeHGsbQBKUB4IS5kbE2dtZtuk?= =?utf-8?q?M7i4ibOOe13nq41k/FCrbhkG58xZSaDoDUPxisKDmUAXAsYJUkqavBXKjsaJ7ta0W?= =?utf-8?q?R7xktFV4YMIU1NafYvj2lscPzV0Rm3ls9YCqxOBTFxlR6kcwLvd17VX7vRvsP04M3?= =?utf-8?q?A8itdQ0tNfQoCTVImEiGZ33SJ7yDupxP8iCHEtFUIdXbrxQtoGw8SE9txFN/cYWpL?= =?utf-8?q?AkmrdOLg68eU/yM2zPcyx/UNf/H0himvP2NK1jCTHSrl8jslQeyLfZJusfGX+80CS?= =?utf-8?q?N79iv/Qugnscxw5c?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3a01401-d328-4fbe-fd14-08d93fd00163 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2021 16:14:45.9752 (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: UkKbQegMcQeKKfEvrkK5b2R9DVDKG10lRjqg0o91mK1JBtQv10fNrUdzc4/dcFFHSkA/jIugNnT850fEsYiQCA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2829 This only requires moving p2m_percpu_rwlock elsewhere (ultimately I think all P2M locking should go away as well when !HVM, but this looks to require further code juggling). The two other unguarded functions are already unneeded (by virtue of DCE) when !HVM. Signed-off-by: Jan Beulich Reviewed-by: George Dunlap --- a/xen/arch/x86/mm/Makefile +++ b/xen/arch/x86/mm/Makefile @@ -8,7 +8,7 @@ obj-$(CONFIG_MEM_ACCESS) += mem_access.o obj-$(CONFIG_MEM_PAGING) += mem_paging.o obj-$(CONFIG_MEM_SHARING) += mem_sharing.o obj-$(CONFIG_HVM) += nested.o -obj-y += p2m.o +obj-$(CONFIG_HVM) += p2m.o obj-y += p2m-basic.o obj-$(CONFIG_HVM) += p2m-ept.o p2m-pod.o p2m-pt.o obj-y += paging.o --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -53,10 +53,6 @@ bool_t __initdata opt_hap_1gb = 1, __ini boolean_param("hap_1gb", opt_hap_1gb); boolean_param("hap_2mb", opt_hap_2mb); -DEFINE_PERCPU_RWLOCK_GLOBAL(p2m_percpu_rwlock); - -#ifdef CONFIG_HVM - int p2m_init_logdirty(struct p2m_domain *p2m) { if ( p2m->logdirty_ranges ) @@ -258,8 +254,6 @@ void p2m_flush_hardware_cached_dirty(str } } -#endif /* CONFIG_HVM */ - /* * Force a synchronous P2M TLB flush if a deferred flush is pending. * @@ -286,8 +280,6 @@ void p2m_unlock_and_tlb_flush(struct p2m mm_write_unlock(&p2m->lock); } -#ifdef CONFIG_HVM - mfn_t p2m_get_gfn_type_access(struct p2m_domain *p2m, gfn_t gfn, p2m_type_t *t, p2m_access_t *a, p2m_query_t q, unsigned int *page_order, bool_t locked) @@ -2589,8 +2581,6 @@ int p2m_set_altp2m_view_visibility(struc return rc; } -#endif /* CONFIG_HVM */ - /* * Local variables: * mode: C --- a/xen/arch/x86/mm/p2m-basic.c +++ b/xen/arch/x86/mm/p2m-basic.c @@ -28,6 +28,8 @@ #include "mm-locks.h" #include "p2m.h" +DEFINE_PERCPU_RWLOCK_GLOBAL(p2m_percpu_rwlock); + /* Init the datastructures for later use by the p2m code */ static int p2m_initialise(struct domain *d, struct p2m_domain *p2m) {