From nobody Wed May 15 05:01:41 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=1695884555; cv=pass; d=zohomail.com; s=zohoarc; b=Yu4o3nBxFc4eFmUasGSEwas+tIvYi1EM/UNwyPZIBDr5j0RARteLBzIgYvLH1fP9M8UifxMfeiXLGBI7TDBqIo2i+HNCXEylhsqk7U6FTeFW0cajkKfPxB5b5A+IYtXdjFMviUsObaWUCAMk2Um8ydPDhYhLe3NV30LtSCrfVBo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695884555; 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=oufazdANeZ9w0vDBuU2Z3ztqUcCD/UC60JbgAsH595s=; b=hhM+9wDrlRakUngn9ZSA4SE9ElmU2wp91MrpuKCnSh7AycKyWiFtHR5JEC5ZesGWZ3s4lpYHscE7ZdC4FZmlwJwFgwXSWRWTBw3DwLDUN7AQtUfo/F2oLviDCgq292CL5pktTKV/36nrX2MaTEVrFdCykLJkWsXvyIft5hu4iJI= 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 169588455558730.413104692813818; Thu, 28 Sep 2023 00:02:35 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.609295.948292 (Exim 4.92) (envelope-from ) id 1qll2A-0003qx-U4; Thu, 28 Sep 2023 07:02:02 +0000 Received: by outflank-mailman (output) from mailman id 609295.948292; Thu, 28 Sep 2023 07:02:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qll2A-0003qq-RZ; Thu, 28 Sep 2023 07:02:02 +0000 Received: by outflank-mailman (input) for mailman id 609295; Thu, 28 Sep 2023 07:02:01 +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 1qll29-0003qa-C3 for xen-devel@lists.xenproject.org; Thu, 28 Sep 2023 07:02:01 +0000 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on060f.outbound.protection.outlook.com [2a01:111:f400:fe02::60f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id eb772a1b-5dcc-11ee-878a-cb3800f73035; Thu, 28 Sep 2023 09:02:00 +0200 (CEST) Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by AS8PR04MB8055.eurprd04.prod.outlook.com (2603:10a6:20b:2a4::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Thu, 28 Sep 2023 07:01:56 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::9f5d:8bed:7a5b:e75a]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::9f5d:8bed:7a5b:e75a%6]) with mapi id 15.20.6838.016; Thu, 28 Sep 2023 07:01:56 +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: eb772a1b-5dcc-11ee-878a-cb3800f73035 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F8OP2uujbZjt2hEsXLa1W7apm8GJO4oJtqTVfK+aZycEEMZ8CkGKN8lYfbds6ONfng1eyRbsNPt+bCEU3M5Bf5k5eb8B5MqEbx+ifr9JGuRKiXupWZiY+dO157MkRYMsNws9jzIpspO+Sz99mVPoKyBkUgn+L6cB0uO4HSVZgsrl5NMDV6rJJY5rHBRbb1xJ1Dk/A8kU5QsHCF2OHY597PuIAmnReNfir7qeLBllbtSvMcDWz7RTzrQP1GT9qpKySqzjXcR0cTxgrdJH+0YwI+Wmu0Vsr8B5U4IMQT0j2JcT5CGanumJ/8p/HgpiBvt0AjZJiQL6yarUTWITTMdyoQ== 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=oufazdANeZ9w0vDBuU2Z3ztqUcCD/UC60JbgAsH595s=; b=fnQEwAcdIkG/EshODfg5GrHITaUesvJiyX7YeVFq2mRziu/3KfZ3d4TCMbydFqbiYN9m8DSfHqFwqtnIjYH+wH6PAUyuBHCWY7eKXi0aMiKHxDMPRoylW5CLOzs0/mZFXQAhiFvVkTMYz5PesJhPJKOgu2vZUVKK1JqNjJfmhJnvG2WNpi72vbaRvzm4RgwnaZs+OZObQfV18icoXo5AgQur2GgVAO7wZ8DA0S1IU1eY2+RxwGiF8rMpRpAQb0Ljg9FBEmqNTaJaQ+x92tLCozPOpggr4YSh+Z6zU/icFUk2ES3CwmZRTrml0xLA9ADUf/XvD8f4g3s41VBxfR6A7g== 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=oufazdANeZ9w0vDBuU2Z3ztqUcCD/UC60JbgAsH595s=; b=IpV/id5KLZYwoYKkNSQ4Ip9Y2u6eRuDZ8xZGSKz0dZxv2nD31t26Y5rUdvyMtStTAGJZ6/W2Y4xHBQbNdbe5IKvuZXj+aOo8o5Oe1s+FdKSathp5O3C6s7JJdQRGzfOlBg/Gzb71ZfqRhV+kDGr6ycjBI5QNRzwuw5o2Ak7JhMKrTtbmPOLK+u/7M48SPfIgAPYBK48FVlfeF6g+JIVUxqr71lmNSdMfiBZRKW/X21PsiDehyDA49/3Gqq4GZF4bH7RdwaL1AwuaPZ6LZLq0BQfKK7CpkpFXku8RMRephKC+TiBI/JbYdVxA82tI9aJ5Dy5aXqNDKOU/92vs/URdKA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <91db0bae-5485-680c-ef95-7316328583a2@suse.com> Date: Thu, 28 Sep 2023 09:01:53 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: [PATCH v4 1/9] x86/shim: zap runstate and time area handles during shutdown Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Henry Wang References: <3ba59868-101d-b68a-d8b7-767ee94910ec@suse.com> In-Reply-To: <3ba59868-101d-b68a-d8b7-767ee94910ec@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR3P281CA0002.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::12) To DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|AS8PR04MB8055:EE_ X-MS-Office365-Filtering-Correlation-Id: f4e029f9-ed97-408c-69a5-08dbbff0cd32 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RYqK8H6rY6EzbPVxVvqpyqnyHuSytJvO4Mir0baMGr6All2k0KTFc5nxAzDcqEcxK75vCcqa+bGWbDuttcibrwL39+ZUr8FEhZuNl5/FQ7GT+15gAhGwyWLziZDCZPwwBA0Q75vWUH6zI43orgYdzfIVFtA2Ty0zmblee7IWbV22RhCzPE+/bI1slTqFlMug554Qh2Besn4mdFmPQnTtSAlF7qZWBUWPz6CsEquHFPCvX8TsmqbnedhSdbIES2s/Damk7/icFCLFCmcIMOenf8nvJdjyUjg4NDoL70p2r70fUhGYaRxVc3iQB9KZxl5rU6+JbSdJ1GvN1WCtwN5+K6df7Nnv/VGzkJnpTO8TJ4RDcE4kXvIt9ux4Ahhm7sdssOTLv/IH8p+im1y8iC/O9cY911kJIHO5a/MXw9y3eLUiKGyM0z8Jk+zge7+Ozezm93VUoJsiakeNkSGTQ1hlGr5s9U2VdNmTxY6+GTTvG4mbYrdL9iY51eKAIwehK1j1lTxUUFaRlTu+c5lGFXMvsfToJpLi151A+R2pt9i4l1X07eUVfXg3v72cM1/UNd27T+KnBoSj4X3DW7umPCneX/8Uz2zS+jDLcqXlW/97ZyjVi9SUoxeTivPneLRA0THj0lk7z0Njb+c4qzKSlfhDVg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(376002)(366004)(396003)(39860400002)(136003)(230922051799003)(1800799009)(186009)(64100799003)(451199024)(6512007)(8676002)(5660300002)(4744005)(83380400001)(36756003)(6666004)(38100700002)(8936002)(66946007)(66556008)(41300700001)(6916009)(54906003)(316002)(86362001)(31696002)(6506007)(6486002)(478600001)(66476007)(4326008)(31686004)(2906002)(26005)(2616005)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?U3ZJU081MVlIS250YkxwZjJLU1BKWUFBSktqV3RTeXphM3NDd1JYclpHOU8y?= =?utf-8?B?NzNxSXcyMTlnS1NGNDQrTmVtTDg4MWp3SlpvOFVCdDRwbXA2ZUJjaGVFM1pF?= =?utf-8?B?NmFBdzVkUW5yZ3h1ZFd4TkdNZ0xNRnlMWFczZGF6aGJseXpuTW82YUlIaGtq?= =?utf-8?B?NmxNRGV6RU1qeGxlN2doNHMzcGYxNEFuMVhMQnhsYWM1OGNQczdaaXVqVGpT?= =?utf-8?B?WE5zdTZnSUhGZlJRditTeG1LbmZDamQxSC9KRFgzVkFva09nODUwb3k0UkRw?= =?utf-8?B?NnM5d3IvKytJb3FQTVlLRzBDclMwelVzZmRtUGlNUWR3ZElpRmFOMysyamhj?= =?utf-8?B?VEJMQVZTMU5PeXMvcnZsZ29KS3FPRGNPZnhXNU5rK3NLYzgvb3JWZUZBQmpZ?= =?utf-8?B?amtSZktGcDZNd1RUQTJvSmdJZEgyRkRDblBuZWp3M0t4SVR6V2hQL3NtNmNu?= =?utf-8?B?R1BVSjl6V3NXaXJaKzZNL1lrWjJTbEcwbDhvdWpGeHRQbFdNUWNRWm8rOXpo?= =?utf-8?B?US9IVmxTNnpuUG1ZdDIzYmcxYUs2QmlLTHAzUVlRamdod3BZWmhSUGtBemx4?= =?utf-8?B?alhQemYramVzb1BzMS9Ua0tVeFlYSkprbzNzanJCWlFLajNzU1JqKy9qUlBt?= =?utf-8?B?WExveWdGODFSZEowaFlrSkh0VWhKOVI1MzJLV1I5WE1hTlJYc0JOa285dDl4?= =?utf-8?B?dXpwdU1ZYzZmUVVxWWFqcXlSNDF6eUg3ZWFsOW9xajR4Q0lURXpKNFNzRjNH?= =?utf-8?B?M2FSRmpnYUZpSWMyY01BcnFjTzJRekVZcW9VK2k5RjU5ME81VkhjZkNlZWU5?= =?utf-8?B?dXorL04ySThTMDRQaEVCOVk0Y0FhWHZlQkVmSGVKSHdKOXkvSGNlZ2Noc3pU?= =?utf-8?B?a2RQaG5RWS9iKzFLbWdVd3VWaTllWGt2c2lYS3hveDM1MllHajFSME9walBV?= =?utf-8?B?eUR5Z1RTdjgrSjVOdFJHMjgrRFVKZ09FMzlaYk5jRHA2ZnRRQ256UVNLblJM?= =?utf-8?B?UUxKaUFjSTlRTXRWNURSeUZrWDMwT1h1UnN2dXozWi9OL1Q2NVE4UGUvNFJi?= =?utf-8?B?enlEckRKeHhPUVlYbVhWeGpOUWFwMlFQdGxubllsWjA4T1NKYlF4MUVCMEtS?= =?utf-8?B?VWxaSU1xdTJESy9yTmlGdEF1Y2RobXREdnM4T2trRjJ6QVZoOFJtc1lQKzd1?= =?utf-8?B?VExSZ3ZibFo1aEVUdlJoUEdTUGR3clFYc0dKc0V6L2VlYi93bDI2dm51ZlA4?= =?utf-8?B?TzN5T0JXV0ZwTXFrY1BSYTI4QXlQT1c4dDhYWmsrRVJYR0lVVm5DQnhwaXVC?= =?utf-8?B?aEUxQXJZclB2bGN0Q3pYSUxaazJZR1ZUa1VrZDM3M1lxMk13dURiYkhJQlp6?= =?utf-8?B?cUpUMnV4SUNMNC9oWFZJUWllSzNFcUJNbVZYNnhzSlp3RENtYkJqMzdROU5i?= =?utf-8?B?ejh0WW43Y0s5bDVDWllnWmVCd1JlL0F0bzlHNGQzbmoySmd6a2hodTFtdFRl?= =?utf-8?B?eWNNTmlUMnlMWXlrb2RBRWhacGJRRGhTSTJUdUM0SUM5djB0bmhRWnNUcHNM?= =?utf-8?B?RUFyc0tMdkF0S0ZrSVpubUc1YUlXVWJrd3FJQVJoWndaaTRZQ3Jpd091aUFz?= =?utf-8?B?eVZBOGF0SG1YYnF2QW9URXlUYUdLODN5TFA3Mnlna0RuRXBaL2M4TFJ0STNX?= =?utf-8?B?WGc3d1VTQksvczFZdjZxbEgyNyt6TGxLcDNDZ3FMT3d6Y0Z3K3pBQk5GNmpU?= =?utf-8?B?SjJPelgxMjJRRURDOVd5ZVdzUXBrNTNXM3J1Smc3VWllRGptakNFTHN0dFlm?= =?utf-8?B?K3Nudmo1Zk51Y3NWUGxiV2FvbHZoYlB2WVc5Q1BhNSt5SnZKTDZZdFI4aHBY?= =?utf-8?B?VFdTYnFNb04rSWR6SXFvemhNclJqNFV2STZIbG44UU84L21vdzNMc2JLT3Qw?= =?utf-8?B?WnpRNThHZWM5MUNOUldyVnRRcFZDNHdBdjcxYzk0NDRlQmZUZzVLaS9xSzd2?= =?utf-8?B?RUxxMFJKOFVwTi9iWW5Oek1qUVN6OFFENnR0amNVU3krbDVxdk5iRXdSaG5q?= =?utf-8?B?akRnMWtpKzlCSkhNQXhnRitmV2RLS2FYZEVPb3d6SnplbDk2OHdGN01MOGJo?= =?utf-8?Q?pTwGS3wyNmuAtq4dguDp5b18z?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f4e029f9-ed97-408c-69a5-08dbbff0cd32 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 07:01:55.9954 (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: Vla3gW6qXsUybVXOSVathxtW092U7TdCTTC0XvghvES5JMaRzMSMGj0wyqlad+J71Dx0DMnGdVqRRoslHg+tnA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8055 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1695884556310100001 Content-Type: text/plain; charset="utf-8" While likely the guest would just re-register the same areas after a possible resume, let's not take this for granted and avoid the risk of otherwise corrupting guest memory. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 --- v4: New. --- a/xen/arch/x86/pv/shim.c +++ b/xen/arch/x86/pv/shim.c @@ -385,6 +385,10 @@ int pv_shim_shutdown(uint8_t reason) /* Unmap guest vcpu_info pages. */ unmap_vcpu_info(v); =20 + /* Zap runstate and time area handles. */ + set_xen_guest_handle(runstate_guest(v), NULL); + set_xen_guest_handle(v->arch.time_info_guest, NULL); + /* Reset the periodic timer to the default value. */ vcpu_set_periodic_timer(v, MILLISECS(10)); /* Stop the singleshot timer. */ From nobody Wed May 15 05:01:41 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=1695885330; cv=pass; d=zohomail.com; s=zohoarc; b=WwVAJAN0vbUxXyQeyLj7QEZMHA2dSR5QDGx4l9DiVJAo8H+EUEj51U3YPbOlX9wOWS0uWESGqV6MhyaUF2n0LxF9xct8N73g9euT7BgbKSj1kCXLps3qu2T+SktK8ubStI/9t4a7xgv6iJM9dM4qVKCLat0C4Pmxn4z22lUbIE8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695885330; 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=INAcouYCwzSE0qAgMcfbHm4G+IYIvkxnPJ/SO/FIaKw=; b=TOGwqzorCTP2abHh/TRpIFQ3w46qVI77Oe0/ISiH210FpkC7OffOq9Xkb0zR9V2Li10yLI94XY/tDvjQwQCTNgKjsuJ/Tw53iwB4lW0qb9Fn1TehgjdonVMLSSgr7n7p6QkV4XQo1zC+blVw1WcqcyPqz+g9zgLgdlCFRKrMtJg= 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 1695885330334451.31858963730735; Thu, 28 Sep 2023 00:15:30 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.609301.948302 (Exim 4.92) (envelope-from ) id 1qllEi-0005tY-0I; Thu, 28 Sep 2023 07:15:00 +0000 Received: by outflank-mailman (output) from mailman id 609301.948302; Thu, 28 Sep 2023 07:14:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qllEh-0005tR-Tx; Thu, 28 Sep 2023 07:14:59 +0000 Received: by outflank-mailman (input) for mailman id 609301; Thu, 28 Sep 2023 07:14:58 +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 1qllEg-0005tI-Ag for xen-devel@lists.xenproject.org; Thu, 28 Sep 2023 07:14:58 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20613.outbound.protection.outlook.com [2a01:111:f400:7d00::613]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id b925a907-5dce-11ee-9b0d-b553b5be7939; Thu, 28 Sep 2023 09:14:54 +0200 (CEST) Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by AM8PR04MB7811.eurprd04.prod.outlook.com (2603:10a6:20b:236::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25; Thu, 28 Sep 2023 07:14:53 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::9f5d:8bed:7a5b:e75a]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::9f5d:8bed:7a5b:e75a%6]) with mapi id 15.20.6838.016; Thu, 28 Sep 2023 07:14:53 +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: b925a907-5dce-11ee-9b0d-b553b5be7939 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XncfQc0sIzeHxi+64sRriMtsouf4h/fYcmpMckmZdPL10dfHqwhGShMnvoGaEWz5sETszq5daV+UltXJoBtfSo5YaVMHAL3VhEj8NOgcOJ5OZNBbIvVUzezH+gt6tgOhRcCg+rqogAxQwkPoWklZOOk/aGzxOhOnfPSjk1dHZ/fGIWWmoxop/SwQGBABeEErOT0NBg48JjZknm87BXPMi3ykbAWQC8faoemC7tUUTNycoL6u7yMgFmDTjkhzaoJNHEUK7fhSzSTifrxnBG3D6fLKfVlV13GHnCWQbalwWVvZT/ud4i/bw02FRbZW2suW3ccCakVNztRx6nVxE9/RwQ== 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=INAcouYCwzSE0qAgMcfbHm4G+IYIvkxnPJ/SO/FIaKw=; b=S6eEd8eVwE9QNavKmcg3jn+G1qd+otdGxFUCqA0njVNLRc1TWC9aJTiOBjq128G9QG4L/t81EQXh7rChKwL26gedZydD2xt2Z0O0ZFgHxj/2ypUx8tMnLQZBKF8lU4ytsY/p/rdwsuzWm4TueqP23rTAcrhwOfCRBuezRa4uzzvCJbFVjfYvhwlKPi/rh5dQPZ/32sOf2PPiF9ZGwaQ7YQpCwDTmtXMzxWrVC1GgAvFXv505HR6NhVqKymvNY/jkU1bzB2cm3hWzmQQXsMsNiu6zeFvksQz0BTM2pIEUC25xH48GXxgTvXryKg58UQmGcE5t93APOa8921VXfx9Lhg== 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=INAcouYCwzSE0qAgMcfbHm4G+IYIvkxnPJ/SO/FIaKw=; b=zAdYvV1esiUOdqVmqfP71NVuZ+EHT0buBkBhIe1mNJ7Y6EBiwIl9LMDLVrGmHiJvIvT3P4OLsxrZB0dvSWVr5ns+ksVcaCZYWOZhmzQZWsnA7OtKhIauLxG/mYUpW5LcHffyGCHF5MWUJ0wPKuxp/UeD8iIXiwsPWvR2NvgmkPrNQs2IJrlgrP0dTWezOSYLfJ6Tc4sky0eDX5GGARn0y2gmL/1l9QF67xKqgzliymiTq93cJew0dN7hvWc17Rmt8SA3oRgVZOQd6elNyjRkycNEBHyvH1HeiPRJQIIvwT8bYbu3EoKR23d/5rnsdOIjJG0+16eCQrf8kErhfMrg9Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <298c3470-643c-5f73-ceb0-4b0fc2441952@suse.com> Date: Thu, 28 Sep 2023 09:14:50 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: [PATCH v4 2/9] domain: GADDR based shared guest area registration alternative - teardown Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Henry Wang References: <3ba59868-101d-b68a-d8b7-767ee94910ec@suse.com> In-Reply-To: <3ba59868-101d-b68a-d8b7-767ee94910ec@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0002.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a::12) To DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|AM8PR04MB7811:EE_ X-MS-Office365-Filtering-Correlation-Id: d7dde82e-15e3-4663-599f-08dbbff29c79 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7uNXY13Zzk0PNbxDT05wIo/eyG7s+4xY2whxeWqYE0RZdsruVNZJyngvxCnIt0NRMIDYIRnlnIC9Sxm5hAxsaGRwcJYcXMzKvMpqDlChVA+Gadvlg7yO0xXpIoDRGVX3BwFhK/1ufZVd0kDSbD+tkJ12igoJUdZjiZrjhwizeQbyx5+Yw5SsgVd+eUrKWgyVECFl64Mw81hDJ5cePZBd7XlYYK4PFSDwvipzU/OrlDlLZEblIl7/2jYnW8uBYlFpQqZqwdNthkc7AxMKJ8xpVxcm9p1nDLz9M3Dtx2GqySjvv81c8FdmFl2HFlCQNlcVue5J3ZLvQAaLLecC3KHuLo4RE5SeKkw8NKCgLhnU537YoxC07/Ggl07vWMel3y5QUYeSY3PlxEmDraqbmAK9ofrVghw+WeJbI4IyZgz5UUtUMS+wR7YEn/DrZz3XILW5/Ri4/NSKrC3swW+j5cusi1yCvIMsKvz4mGeN1McNNeUs3EtlX+fu+n5JhyJhgPqWKUVeciNW8UNtr6RTUgiPcatYaOtivKRSY0/bmeHB6wF2qBaevLCtPWN2MA4N4UzsgRvRKRP3rPXfdQyOX47neIfSxcRx8sJ6K2UufG0+M4RALYp/FYvwrT52e0h68A86dIMSnB4z4QbwSJ5a1Or7Kw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(396003)(376002)(39860400002)(136003)(366004)(230922051799003)(451199024)(186009)(64100799003)(1800799009)(26005)(6512007)(6486002)(6506007)(478600001)(2616005)(2906002)(316002)(6916009)(66556008)(54906003)(66476007)(66946007)(8936002)(41300700001)(8676002)(5660300002)(4326008)(36756003)(38100700002)(31696002)(86362001)(31686004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MGhUanloVGhYc0pUcTlGQTVPMi92ZzJmT1hacUNCcUhyZkxqSXlmcUljOFNl?= =?utf-8?B?N0RoRWhINXlsZW9HKzFaMVpoOHkwc0pGQ054NzA0ZEpyVEEveTdwUUVpN21p?= =?utf-8?B?L2t0QjFxRk00VGlsQy9mN0FnaVRPWDE4OFpIT25GcG5RTEJCZEYvVFkrVnY2?= =?utf-8?B?VEVFRHRjTVdGcGIraXhvbW0vU2NwMEJtYVdmZmpRWmw0bkhva256UG5aWHJI?= =?utf-8?B?NmdvelVmaUduZW1heWRmbHNZeElXWkJobnhTRTFmR0xTUE8vWHYvQUJFeHpO?= =?utf-8?B?UEowYk9uRDNEMnlhVzdpOWh1R2NxNnQwbW9zbDB3Zm5Zalg1SGo3TnJYRE5R?= =?utf-8?B?SEpoRGVNMm9hZ1c1TFhXOCtsVm5YOG1Ra1RzMXFiMDJsM00rV3lZYmpDT1ZL?= =?utf-8?B?VlRTRENmNkxBVFNyakxPM0pGcTJjZ2d0eDBEMlllU1NVS2d5RzBWK2kvT1FB?= =?utf-8?B?elVhbENRYkxFZmJUMWgrUVNCbHpIQUpwSWhLaW92RUI5ZmxuYy9vUjdCSzdV?= =?utf-8?B?VnhZbjQ1SEdVRHIwYlhrTHcyZmxiNUhIa3lmNkE3QXpaVzNTZWdtQmVMTitM?= =?utf-8?B?cDRteVlEcHZJN0l1ZWRoSi9pT0JCRE9EWlN0cjhIYU10VlFkQWVobjZ2bDNq?= =?utf-8?B?TVNXenB1SmE1SWtpTkZYaXdkOHdCbG9OSlp3MUhjY0FWbUp3Z09xU0lKQVRq?= =?utf-8?B?L21KU1lPSjA3QXJab2VGeFYvaEkrb1ZuOGNBNFNya2U3QXEwZmUzRnd3WUZO?= =?utf-8?B?K1BiV0lmcTlOSVFsSWcwdU1XZVEydll5SUZnbElJRCtyajM0NC9Gd3dYcS90?= =?utf-8?B?S0dzZyt5Qmt3QW5xc0tLdGk5b25ieUVTdXdLV0ZVNFdxbVRrbkZZdzljV1Rr?= =?utf-8?B?WkRKWnBIWjV2d2N3K3lGWVRvUFAyZGdKNDExTitWU014UXdJY2pjUGJuWFk5?= =?utf-8?B?dDJJZzZKTVRQdWdsTmErMmdsSUlIeWtlMmFHZ2loNUg0QXFxakFzTEl0NlJE?= =?utf-8?B?eWlJNG8vc1kxUUhKd3F2c2lidnNneUtmdUVnMVdCdVJVUFhrRWJLcklPTkEz?= =?utf-8?B?NmZJQ0p5WnJqRUFFcmtMa3JvNWUzU2RvczhzYTBnRmF6N0xGN0wyL3AwWWRU?= =?utf-8?B?SkYyOXliaDV5cEg1N1kyUDQ5NFR3NWxlVnJmR1VodkcrWkV4RHJUeGlUSndv?= =?utf-8?B?RTlsamk2b1NNbmpzT0lGMUZlaEt5TWhJWXcwWUJ5dkZKbXZ2VmRZMWxvMHhW?= =?utf-8?B?UHJsL0pLM09iL1d5Rmw1QmdJSUhZeWVLUThES2hEdjRTN3AxSmcwVHJ4U2E5?= =?utf-8?B?cGNVZUwxTUVLbTdFN2k2N2M3WTZCdkZWUnZQcjgvMTQwNkVMdnAzR2tQOXho?= =?utf-8?B?dk1TN0xMSTRKQldFcm4wVGluQVo5VitFNHBnb29VNmcrTjZuNTY2anlkMGtU?= =?utf-8?B?N2UyMERiTWFUVmFGbEkyT3YwRG1vOVZKRWs3KzhaSDF4MklHQzZDWXBXZUs2?= =?utf-8?B?TXJReVNhcmtGUkY4YisrZXJYMU1RZ1paUkI4QU5UR3VYcmJVK0NGV0ZyUVZs?= =?utf-8?B?ZWhvcnpESHFFbk91RkUvaGVQcTNmRnB5R2c1M2FpMk1vS3o4ZEtjenF6dnhE?= =?utf-8?B?eGUvYUlhcmQ1Snh0VUdKUmtRa0d4SDVYLzBZNm5pc1EwckZnOC8yWkwxWjB2?= =?utf-8?B?L3kyN21KWm02TjhVU25Bb2V6REtudUJvbG5Uc2JKWVY3MGV5dDg4dE01YWRu?= =?utf-8?B?MGpzUThnZ0x2SkJXVGw3SWVlK21remJIcUdVK0laL29hQ283VlFNZjZvUmVF?= =?utf-8?B?TXpPWEpieGFDR0x5cjhWN0dBTUM5dEpVdTRocCtxUWhZWThGMWJIUmxiRWVl?= =?utf-8?B?MG9Fc2xhcG9JaGQ3Q1dJTW1hQ2RwZ2dKcFN4emkyK3pqV3MzdmY0eXJqK2NO?= =?utf-8?B?SXZpOEZCZ0lSNHZHN0xNdzZ0Um93UTFjVHpMMzh3ejZob2ZZNlJiSnlaVGc5?= =?utf-8?B?M3RWN1g1cHJzd1NkSVJabHE1TVlPTjJmUyt4SERJL3JiVTExbVhVa3o2NjJN?= =?utf-8?B?cTByajVvaVZieWNGWGxFaTNHek9HUnIzTFVkeFhYNXBBb0N3Q0E4QjgrSlUv?= =?utf-8?Q?pi4PmRnP6A6S5s4aXf67qw/YP?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d7dde82e-15e3-4663-599f-08dbbff29c79 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 07:14:53.2770 (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: yrrNK5DkDPLi0kbA3ws+huJTiC35quKfi8mjyvT0ijM2904QdPXSecx3HxMZTd3WO9RPu3a29/4NbZRBWfiipQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7811 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1695885331331100001 Content-Type: text/plain; charset="utf-8" In preparation of the introduction of new vCPU operations allowing to register the respective areas (one of the two is x86-specific) by guest-physical address, add the necessary domain cleanup hooks. Signed-off-by: Jan Beulich Reviewed-by: Julien Grall --- v4: Re-base. v2: Add assertion in unmap_guest_area(). --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1024,7 +1024,10 @@ int arch_domain_soft_reset(struct domain } =20 for_each_vcpu ( d, v ) + { set_xen_guest_handle(v->arch.time_info_guest, NULL); + unmap_guest_area(v, &v->arch.time_guest_area); + } =20 exit_put_gfn: put_gfn(d, gfn_x(gfn)); @@ -2381,6 +2384,8 @@ int domain_relinquish_resources(struct d if ( ret ) return ret; =20 + unmap_guest_area(v, &v->arch.time_guest_area); + vpmu_destroy(v); } =20 --- a/xen/arch/x86/include/asm/domain.h +++ b/xen/arch/x86/include/asm/domain.h @@ -669,6 +669,7 @@ struct arch_vcpu =20 /* A secondary copy of the vcpu time info. */ XEN_GUEST_HANDLE(vcpu_time_info_t) time_info_guest; + struct guest_area time_guest_area; =20 struct arch_vm_event *vm_event; =20 --- a/xen/arch/x86/pv/shim.c +++ b/xen/arch/x86/pv/shim.c @@ -382,8 +382,10 @@ int pv_shim_shutdown(uint8_t reason) =20 for_each_vcpu ( d, v ) { - /* Unmap guest vcpu_info pages. */ + /* Unmap guest vcpu_info page and runstate/time areas. */ unmap_vcpu_info(v); + unmap_guest_area(v, &v->runstate_guest_area); + unmap_guest_area(v, &v->arch.time_guest_area); =20 /* Zap runstate and time area handles. */ set_xen_guest_handle(runstate_guest(v), NULL); --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -992,7 +992,10 @@ int domain_kill(struct domain *d) if ( cpupool_move_domain(d, cpupool0) ) return -ERESTART; for_each_vcpu ( d, v ) + { unmap_vcpu_info(v); + unmap_guest_area(v, &v->runstate_guest_area); + } d->is_dying =3D DOMDYING_dead; /* Mem event cleanup has to go here because the rings=20 * have to be put before we call put_domain. */ @@ -1446,6 +1449,7 @@ int domain_soft_reset(struct domain *d, { set_xen_guest_handle(runstate_guest(v), NULL); unmap_vcpu_info(v); + unmap_guest_area(v, &v->runstate_guest_area); } =20 rc =3D arch_domain_soft_reset(d); @@ -1597,6 +1601,19 @@ void unmap_vcpu_info(struct vcpu *v) put_page_and_type(mfn_to_page(mfn)); } =20 +/* + * This is only intended to be used for domain cleanup (or more generally = only + * with at least the respective vCPU, if it's not the current one, reliably + * paused). + */ +void unmap_guest_area(struct vcpu *v, struct guest_area *area) +{ + struct domain *d =3D v->domain; + + if ( v !=3D current ) + ASSERT(atomic_read(&v->pause_count) | atomic_read(&d->pause_count)= ); +} + int default_initialise_vcpu(struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) a= rg) { struct vcpu_guest_context *ctxt; --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -5,6 +5,12 @@ #include =20 #include + +struct guest_area { + struct page_info *pg; + void *map; +}; + #include #include =20 @@ -77,6 +83,11 @@ void arch_vcpu_destroy(struct vcpu *v); int map_vcpu_info(struct vcpu *v, unsigned long gfn, unsigned int offset); void unmap_vcpu_info(struct vcpu *v); =20 +int map_guest_area(struct vcpu *v, paddr_t gaddr, unsigned int size, + struct guest_area *area, + void (*populate)(void *dst, struct vcpu *v)); +void unmap_guest_area(struct vcpu *v, struct guest_area *area); + struct xen_domctl_createdomain; int arch_domain_create(struct domain *d, struct xen_domctl_createdomain *config, --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -203,6 +203,7 @@ struct vcpu XEN_GUEST_HANDLE(vcpu_runstate_info_compat_t) compat; } runstate_guest; /* guest address */ #endif + struct guest_area runstate_guest_area; unsigned int new_state; =20 /* Has the FPU been initialised? */ From nobody Wed May 15 05:01:41 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=1695885349; cv=pass; d=zohomail.com; s=zohoarc; b=keE7aky63vUXCxT7vTXPLA92d9cQEdNR9s6T/X7fCSJFRZM2WGmmNBcp/GwkEGww2EK8Drs10s3roUfFvQSGFcU6om4egV9Ort1KLF7Q86CEyEgj96VOfbFOx3DCFhO46hjwBWIFiBQyJzkt82nAbbNpa94/ykkpnAARk60l5kQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695885349; 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=nDhjKzeHPCvDjdSeahyLl9mEZAFQA0ykwX0ENFaYkNo=; b=aFzEfrks+gKZC/TSv/yuy0T6pXgmazMCYtB4nBJ6vR1PUwtpoXqMPRgoXLsWEJFP3tDRneVEZFWlR8h6YcG1IvUPdi1LZ3bg/TrY/jqhveVULL3mQoVGvrU6vdu8nEdGSIzf+4mQTWnLIHlhFen4r2oKTzC/5JqEeds7swn+cio= 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 1695885349755506.2246639741693; Thu, 28 Sep 2023 00:15:49 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.609304.948312 (Exim 4.92) (envelope-from ) id 1qllFC-0006K3-A1; Thu, 28 Sep 2023 07:15:30 +0000 Received: by outflank-mailman (output) from mailman id 609304.948312; Thu, 28 Sep 2023 07:15: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 1qllFC-0006Jw-7F; Thu, 28 Sep 2023 07:15:30 +0000 Received: by outflank-mailman (input) for mailman id 609304; Thu, 28 Sep 2023 07:15:28 +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 1qllFA-0005tI-6R for xen-devel@lists.xenproject.org; Thu, 28 Sep 2023 07:15:28 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20606.outbound.protection.outlook.com [2a01:111:f400:7d00::606]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id cb1fc30e-5dce-11ee-9b0d-b553b5be7939; Thu, 28 Sep 2023 09:15:25 +0200 (CEST) Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by AM8PR04MB7811.eurprd04.prod.outlook.com (2603:10a6:20b:236::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25; Thu, 28 Sep 2023 07:15:24 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::9f5d:8bed:7a5b:e75a]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::9f5d:8bed:7a5b:e75a%6]) with mapi id 15.20.6838.016; Thu, 28 Sep 2023 07:15:23 +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: cb1fc30e-5dce-11ee-9b0d-b553b5be7939 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VbFPiYwOhifIbt1NM1mxTVIVbqPV564zTdle3GTgCkVgU0nZCvYU2HA0PMfbCF9baKqMAY8BnMke/o2ZAJR5m3tbGPKOO51EaOZkxdTx4wNZXlZkeztdXwqYjJnSe0/28Qs00GuBg3r7BwIZqWVTMk47As+oo32b70g0HSwUVW/t1xGOyPj5Br3grw/miIVsAUqZoBUfrsz7U4fA/qtnHRvLIEKHqJkTiEJi+r7MEzVeppuso8YZYz5pI7K5kOTJ8/GhyPYlKWi6NJT9LordX+/2aKPOQHfwqk7ISd7ot08SDmjBCurfRt+c9ojls9xEfK7yCu59JiPPRWYpOuTSkg== 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=nDhjKzeHPCvDjdSeahyLl9mEZAFQA0ykwX0ENFaYkNo=; b=Cxfqu6SS2JvIR3NbA7R7/NOpK593g54EuZWe/waNav6pyCHp4kheHcbLJ7yeMR9JlE/1pJ/054x+sKTqDIchP9iiSpfpu389J8SLyUEqROcnDqT0d+8RHh5eWqSd454taSLUgE9loPgGx8NF389P4SKj6IystqnUq2Rnrf9Naz5gIUwOmliISuX8+zB4+0EMcWUMT4avl1rqm7by86CS782mnMBYuReZLuFL+FPmtgG9sM+oPx1JDqrTGWKm5DvFsfp4XNKrzIvUdb+uXSGPM2C0NN0n+EYYvnnQJm486+Ob1rG2dslcW9E2mM3ApSfM+DfZavpOP3Dl/LNLjTUhzQ== 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=nDhjKzeHPCvDjdSeahyLl9mEZAFQA0ykwX0ENFaYkNo=; b=pTBEjckrWHD8y5a4iKJwF3dZEg6coFR5XVHWBqTxZB0CPkA5kqm84SDeKC6ozIxA26xXjYL26P9FFVjvbczwuCO6bqmfADhr+URs6IklN223MNCQv5LI5sEcSEJTo5OTtx858qJFpAX0QgO8g+4gwD2z+FKP+U34X0HrTRXVNy8dOI+m2SsyNaLvNe8lJAtEmyo2tbmBM9mVtYB1EbPzLBIYHdlQnm8H5sB0gZTj0C/EuByWH3uRjTluxCsNx/cg22A8+Rt8JUXE3WQz9TGVdewR1AL8pOPARbPtQ7c1OMSGZIbS340xzNNt0is8pMzrXAHsqoGcu20Ghh3lkfUQ2A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Thu, 28 Sep 2023 09:15:21 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: [PATCH v4 3/9] domain: update GADDR based runstate guest area Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Henry Wang References: <3ba59868-101d-b68a-d8b7-767ee94910ec@suse.com> In-Reply-To: <3ba59868-101d-b68a-d8b7-767ee94910ec@suse.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0016.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a::26) To DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|AM8PR04MB7811:EE_ X-MS-Office365-Filtering-Correlation-Id: 838047bd-c25e-44fd-be17-08dbbff2aeb4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9BVXjzIc2LxQVKyzzFgSelRPBXdrqMLRb4emBmmANbpCh3ksbsZ16QoHm4VZ0497VapLb8IvVirgT4xcEPwSRBBPvEchHFJv6pCOLfQTgs8C1GScZXYZqIiPUD8E9Ypa0ahzcf51Mb2dJix/JP+OVcPAAnUI6ESA2+5t9xXuPMBJ7jUYxanPa3nDFwLdvLkg+JSTVGPvv6VCUcf7CDqQLnzYaPorHBlQVAQXT8wb+cLb3H1auqiVzWJM20nWP5g9/4Tb4q6OscYyZwKXMkIa9hpaOnMnkPqQEePrYaNkHSnAiKvGFU5z4PbP6XLNSDCSc5Ve1g0kETILuweS5W1e0whq6x1tyOLs582cCKViYUr8G5ZY69VqssVAfPWsfVgSZ77hcngG5p1MU0FeG7nKPvnVD7zSNuhxRyZRqzCJ6mKfAocVhTjR1Ht61FVd3iGdPDRRZtgVZiO5Ny1eM0HkgoeS3V/BvkTsnN0OD3AzWneJ7YRVWb4H9dbuy3LCXlOZ28SBrotpSUihxcM6AtHSaLirclpKZ86kqo9p2W+evJNv5FfSsk9ytwh84Ok9+xk3uH4NPsa/rfanwKcd6qZzs40wEQDA9Kn4MsLN9tZ3cyAx9ogiVE/FUFdp8rQT5bdbOc4Z2CyPMr01nWh+DJZjjQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(396003)(376002)(39860400002)(136003)(366004)(230922051799003)(451199024)(186009)(64100799003)(1800799009)(26005)(6512007)(6486002)(6506007)(478600001)(83380400001)(2616005)(2906002)(15650500001)(316002)(6916009)(66556008)(54906003)(66476007)(66946007)(8936002)(41300700001)(8676002)(5660300002)(4326008)(36756003)(38100700002)(31696002)(86362001)(31686004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YmRkUm9MU1RIQUlNL2hDUXJsbm5iL1ppbFhnR09ueUtxNVJ0UEpMLzNhM0t0?= =?utf-8?B?VVYzS3ZlZWNTdllCRmZBSjVTQldXNDlOejh0dzlLUVVpR2xpRUxPUDdIL3li?= =?utf-8?B?aWRRODl5UEcybWE2TUlGZlhUUkF2UnRsdDVJZDlwM3Y4NS9EZ3c4R1U3U0Uz?= =?utf-8?B?WW1mazIwQmhMa2MvUU1PVWhyRzVnWG01Unh6SFFjd05jWGJ1OVZtbXUwdGFZ?= =?utf-8?B?UVJxOWxzdnZ4MkhwMDYveDEzODRadTE0T2JUM2psWjNDNUxQVG9jT1B1c21H?= =?utf-8?B?b0I5V0p0UVVRc1dMa1A2TXNNbmE0b2l1TFRidTlQUHd3THl5T0w5cDlmT3ZZ?= =?utf-8?B?bnpPeVhwSXBkcUZVUDZNaCt6VU84YmxRZnlpM2pIVmVXVklKcTVSOUROU2Vz?= =?utf-8?B?bmFQdU5UcHBDYUxnTTF0WCtaSW52Z3hkajZlcGJ2dmpGbTNicnRDL0ZLWjVZ?= =?utf-8?B?RlZXWHl1cjNmNWZiZ2lXSGlGc2hlc3Q0V1FBMENmd1dIdXZ5OXg1T053VkJG?= =?utf-8?B?MVc3RHI0STd4Rk1LL3lkTkRGRWFMZHBWZlArVkdYeWloZnJvOVM0RWlUczlC?= =?utf-8?B?UEJFdmJPSC8vVklCSXpCakZYOTFHRnFsVTBqNEpaczdrTnlkSUQrQVFCd2xF?= =?utf-8?B?N2V5ekxoWmwwcE03L2lvMHM0NUljeUtiaVBjRmt1NDRocHpINXIwTmZ3TFNo?= =?utf-8?B?VVpJakVIeitCdWlwMTBSbmFOZ2hXemY0RHhTZ0NBeGoyQk9SYVFFdTBURG92?= =?utf-8?B?VHorN2xsRmkzcHpqcXRNSlhuK1lyQm5XdXA1bGxwZG81WkRQRmZtaSs3c2pt?= =?utf-8?B?UnNwWk8zWVM4b0JOS2xVdzVoK3haYkhsdGxNSFk1SFJWcUUzWnRPM1d0TzhW?= =?utf-8?B?TmNzUWhWUmpvVnAxVFF4bEpKODhENC9IdGZkMlBNazZINnFkUWZ2VFJoMFZO?= =?utf-8?B?R0JldUNTSmgxRDBSQ0NIYW5OY3pEeCtqejR2czVSUGIrWm04YWpJcTF1UDJi?= =?utf-8?B?MzBLT3Z3VzMwQmNPUEY0QjlFaXdtbWNxbGdsbXQ5RWtGZlIwOWhjNjMxcTIx?= =?utf-8?B?WFNpYnNVYjV1SVpFbGFFU0orR1NzcEIyT2lGbUpwcjdaRE9LVmk5ZTVHeG1Y?= =?utf-8?B?QzIwT2NlUURQNC9LVXlzS0MwNEVGOWhjN2p4dVZUS252eHBTanR5MFoyM2sw?= =?utf-8?B?ZlZNVG1UWXV4N2FaQWtTWUVYY1d3Nk11bEJ6a1YxQjJXYW1ESGlaNTdqNXJ4?= =?utf-8?B?TDNwWGtDejFTYjNocnIvTDVablg5ZmpRNkR6ZVllanVQVWpGaS9vQW5mREF6?= =?utf-8?B?N0hVRlU3WFZlTHJzNGxhdkF5NEVMc3lrMUxha0pBaHNPZ1ZMVmR3cER5VUxJ?= =?utf-8?B?UGt1MDVLLzkzRXgrM2xvY3lQTUMxVjUvMEF6WkZoeUcwWHhvaHF4cHluOVFY?= =?utf-8?B?Z1VFTkJINy9nSEpuTEZ6K3RFcWNTNnVrK2hVT09vNXpKZ1huaGpxSlI2VkJD?= =?utf-8?B?bFd6MmZjdVZHbkNxcDNuM3RoQUgwSFBQSW9qY1c2aEJYdldnV3cxdGlmbVZL?= =?utf-8?B?S25nTEs3NDgxbDQ4YUFCUjBYTU5ienFmTkNVQVA3cE10ajVkVGpTZGJJYndN?= =?utf-8?B?Sng5bS9lMnlzRlI2STFvbGcwTkRqUUFRR3Vpb3ltL1hMZzNHOE9zY2RaNUxI?= =?utf-8?B?SmRrVVhLUzZUaWNWeU5Dbkxla0VuTlpKc1VGRHJHWTZrOUZ3ZnFQUHA3eENs?= =?utf-8?B?bTdoMDdHbjF2RW8xMDFnSm9wa1l5bWtOQjlOalJwM3Mwd3NZSU5xbW1Fc3dF?= =?utf-8?B?V1g2UlBIZXI5SUhVVUNrVTdjZUI2SDR2U0FDd2ZRcndLM0RNbkJSbHFEV1ZD?= =?utf-8?B?Q0RHK0o2K3JXUnNad2tLMzl5ck1xZURiVWNMQVU2TGMxeEJNWWFoUStOU1N1?= =?utf-8?B?VlBRenFPb0pjeFpVVGFkclcvOWZ2QzM4VndUc3hYdmV3bU5icTFDb3VSRkZw?= =?utf-8?B?a2RCcFJIeXpsb1dpSndyQUdoTHpTMFhqWGVsbEpZSFNzTTByc25heHE1d2xt?= =?utf-8?B?bEFEYnBOMm13dE5zL2l5RU9KTThVbEoxWHZJeEVwcUEzcDUrVTZhd3Y4blJh?= =?utf-8?Q?oVu6WkIDdOfCL/82LQFviB1DE?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 838047bd-c25e-44fd-be17-08dbbff2aeb4 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 07:15:23.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: NNEER+3DpGt6wAojgTSRaD4UAu57IMTtOgV+nN7JzMY3Set5DM3ac+Xo8FvzHjYGBC/EikupuihNyqAGOUR/dw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7811 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1695885351367100001 Before adding a new vCPU operation to register the runstate area by guest-physical address, add code to actually keep such areas up-to-date. Note that updating of the area will be done exclusively following the model enabled by VMASST_TYPE_runstate_update_flag for virtual-address based registered areas. Note further that pages aren't marked dirty when written to (matching the handling of space mapped by map_vcpu_info()), on the basis that the registrations are lost anyway across migration (or would need re- populating at the target for transparent migration). Plus the contents of the areas in question have to be deemed volatile in the first place (so saving a "most recent" value is pretty meaningless even for e.g. snapshotting). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monn=C3=A9 Reviewed-by: Julien Grall --- RFC: HVM guests (on x86) can change bitness and hence layout (and size! and alignment) of the runstate area. I don't think it is an option to require 32-bit code to pass a range such that even the 64-bit layout wouldn't cross a page boundary (and be suitably aligned). I also don't see any other good solution, so for now a crude approach with an extra boolean is used (using has_32bit_shinfo() isn't race free and could hence lead to overrunning the mapped space). --- v3: Use assignment instead of memcpy(). v2: Drop VM-assist conditionals. --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1644,15 +1644,52 @@ bool update_runstate_area(struct vcpu *v bool rc; struct guest_memory_policy policy =3D { }; void __user *guest_handle =3D NULL; - struct vcpu_runstate_info runstate; + struct vcpu_runstate_info runstate =3D v->runstate; + struct vcpu_runstate_info *map =3D v->runstate_guest_area.map; + + if ( map ) + { + uint64_t *pset; +#ifdef CONFIG_COMPAT + struct compat_vcpu_runstate_info *cmap =3D NULL; + + if ( v->runstate_guest_area_compat ) + cmap =3D (void *)map; +#endif + + /* + * NB: No VM_ASSIST(v->domain, runstate_update_flag) check here. + * Always using that updating model. + */ +#ifdef CONFIG_COMPAT + if ( cmap ) + pset =3D &cmap->state_entry_time; + else +#endif + pset =3D &map->state_entry_time; + runstate.state_entry_time |=3D XEN_RUNSTATE_UPDATE; + write_atomic(pset, runstate.state_entry_time); + smp_wmb(); + +#ifdef CONFIG_COMPAT + if ( cmap ) + XLAT_vcpu_runstate_info(cmap, &runstate); + else +#endif + *map =3D runstate; + + smp_wmb(); + runstate.state_entry_time &=3D ~XEN_RUNSTATE_UPDATE; + write_atomic(pset, runstate.state_entry_time); + + return true; + } =20 if ( guest_handle_is_null(runstate_guest(v)) ) return true; =20 update_guest_memory_policy(v, &policy); =20 - memcpy(&runstate, &v->runstate, sizeof(runstate)); - if ( VM_ASSIST(v->domain, runstate_update_flag) ) { #ifdef CONFIG_COMPAT --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -232,6 +232,8 @@ struct vcpu #ifdef CONFIG_COMPAT /* A hypercall is using the compat ABI? */ bool hcall_compat; + /* Physical runstate area registered via compat ABI? */ + bool runstate_guest_area_compat; #endif =20 #ifdef CONFIG_IOREQ_SERVER From nobody Wed May 15 05:01:41 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=1695885373; cv=pass; d=zohomail.com; s=zohoarc; b=Uu4O9S1qeNhWyiqjZV6D8QqVOeOLO28brQ1r/6W9dFn5Bkq5skWlIgqNcg33I1KyW3wpLFKLU0C0V2rtQWTeWGa+0Y1XmiuNVjBMfiUKI2l4igVAcx8nTIGGw1gBbOc6YgpVeDLS/og0P7pDA3iuCoEA8CdVNmnLqo4NiFLXe1A= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695885373; 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=+s4DsrfFOHtuNkr1T98TjoML0TVrNHd1UjKvdCbUR0U=; b=DtCPJ8rK4X+k1tVx9TWI5OdkEfV+/ZlBBT53pOQqlb/wuIDX3ZFi1LRX9w6O3ZNkfOF/szMhMnrZC1Ikcs49SzS/lowBbOqKQnXng6+BCY1grxnn/38pAmvpmaUbJJbAXuPgI/FASzc/g1daWvAOHWG97D9rO/462e1n0JAOZK8= 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 1695885373864954.5496232454069; Thu, 28 Sep 2023 00:16:13 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.609308.948321 (Exim 4.92) (envelope-from ) id 1qllFc-0006uG-LW; Thu, 28 Sep 2023 07:15:56 +0000 Received: by outflank-mailman (output) from mailman id 609308.948321; Thu, 28 Sep 2023 07:15:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qllFc-0006u9-Iv; Thu, 28 Sep 2023 07:15:56 +0000 Received: by outflank-mailman (input) for mailman id 609308; Thu, 28 Sep 2023 07:15:56 +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 1qllFc-0005tI-4r for xen-devel@lists.xenproject.org; Thu, 28 Sep 2023 07:15:56 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2062f.outbound.protection.outlook.com [2a01:111:f400:7d00::62f]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id dc5530f7-5dce-11ee-9b0d-b553b5be7939; Thu, 28 Sep 2023 09:15:53 +0200 (CEST) Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by AM8PR04MB7811.eurprd04.prod.outlook.com (2603:10a6:20b:236::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25; Thu, 28 Sep 2023 07:15:53 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::9f5d:8bed:7a5b:e75a]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::9f5d:8bed:7a5b:e75a%6]) with mapi id 15.20.6838.016; Thu, 28 Sep 2023 07:15:53 +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: dc5530f7-5dce-11ee-9b0d-b553b5be7939 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ak/6LZXoGblaIYV1cb9K7e4Cjj7CbkKgr+dJxzx4e4bnDmAmRrZxJJ/5g3B+oZ7KQw/OTku7OO2l48MdWM2L/bhd8zV7oE/XhA7ljKFQSk3d1MBwuSz5iz2CJaWuhqEUwP1GywiuMUCW5ceSQBPT3zgZF5LPEeevkX5eEyzrLUnrL6sRcWKmQUCojbqgoYPyPHRlWPwNfKHiRbNvVAN6YHAz9Lt1YJWfnYFyKcXHiHwCmqAURgWPq1vYVRCOeaCYF2dZOoeZ3pfuY2nNefZEUTklQ9bSiYO7TWKzAIuF9qAW7rNbYDkNuH7e/MXfscdDyYZZpyhdegGILfxaQV8UnQ== 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=+s4DsrfFOHtuNkr1T98TjoML0TVrNHd1UjKvdCbUR0U=; b=bMSubdvkgcWfmCe9chRcwCNNKuVDfwi11y23lgtZKaWK6vZ7wcNCMnOkM4k7jZjgT6dAyB0DQi7YDlTAv5BJTfEYvw4Xtw4VDRi4V+KDX1nHe5d6Ipa9zEEwxOnwiC5ArrKjwnE+gGa984rb8ODGaR8snt6y+52+wbbRzjlbQPGy3M0g90Euy9XZTRDgG67/gL2pBW539EcF9zT/8zotT3n/NBsj8iztwLHuV6jmqBwednAfnyi8EZEdA4W5Y572JsqiKbwNWsCCPn/HQMN6IM1a3OjXeUeXAhCuj7Cv6QSQzzE5yUDDuYz5tDuoxqpUaxZNYmiqGUg3P1y/sKtkeQ== 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=+s4DsrfFOHtuNkr1T98TjoML0TVrNHd1UjKvdCbUR0U=; b=SKXXc2drqLOCEIf0MRa6CIRJ+nTtaQN6aolcerelsiNFPcgqrbGSY1N41z5l9s1eHI2W/mXUowUq0LVBqVYYK2lLwT8+GpQVYIJjkkzKNLe7NVJIERWM6o/L0/aloogmjnOe1mKZhilhhkt+aDdU5dWXglNYR2y1/sD1/r6EElnOVSMyS8ToeAxmil8hhCFk5JMDCR3CtrwPgQQvQ88A56fbn1nVhqrIX7CzUD0k/9FV9TrtI/2wETLDxS9CSDPy/l06T1ydBqzR3I56iy4TzDZn4lIRVWtfH1DLX/sp6XWbWPa+9VTC62zVJ4LkRY9qvRgUnOHIivnOiseDm9myng== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Thu, 28 Sep 2023 09:15:51 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: [PATCH v4 4/9] x86: update GADDR based secondary time area Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Henry Wang References: <3ba59868-101d-b68a-d8b7-767ee94910ec@suse.com> In-Reply-To: <3ba59868-101d-b68a-d8b7-767ee94910ec@suse.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR4P281CA0098.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cb::15) To DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|AM8PR04MB7811:EE_ X-MS-Office365-Filtering-Correlation-Id: 5d5b67e4-77d0-4c18-2d55-08dbbff2c074 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XWdqj1YJTXyQU+plhk3Ibcidbb8+7f1pfuqtwLiduD1x5ZTHYOxs5GWQk5+gWilHhvhIAnzQDiq2qRF6MZYc9WmRVJweWEGjdpRKBSDKLNYWJ59mfH4LDabq9FGGbuP5g910i4Ov/Dz1hN4W8saBYhTH3EJcB1QgX5gqwZToWlIToh0O/f/ff4JZC5Y+YTGKxt6VcboIWMTMCQG+HWzuCeTsCNmtJN25Ul2LL31mpJXhVbU7ZfD8Jgar7zmAL5OgnkzucNWiZpDQRHo6Gz0mMSUsyiZUyHASksOEYplFrD0nI/70LDTb8AYRhL70S6nBuOw4QVHrzmpTp1I8VVXwUKPVq5uc51BLu1wobzbwrnICVxu39twFeH+AbtAUFdqZRDeRuP2jGG9zb3+Ad78iXFX0NTI0DQYdreqPziKTUcyWnq6NrlhwAhTAGyz0/wYoPBVrIzf/ekz6FyL4mc2ac4FK1eSMarShNSYyhdl4FQtgl2XBRMVYFDmUadtWGBMLtGHXIB50OHVqgmyWjDrd1JABDr2mHTLEyNRejedKBLI7kprZ6yH/79V0qPzRk45BY3COf35vOT4NPZEBUoR/EqniHuRWLnWt2wKQmfs4iWB0ru7p4pmKXtGByUNbnc+6QVSbXVFfC7wKyrglONFDNA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(396003)(376002)(39860400002)(136003)(366004)(230922051799003)(451199024)(186009)(64100799003)(1800799009)(26005)(6512007)(6486002)(6506007)(478600001)(83380400001)(2616005)(2906002)(15650500001)(316002)(6916009)(66556008)(54906003)(66476007)(66946007)(8936002)(41300700001)(8676002)(5660300002)(4326008)(36756003)(38100700002)(31696002)(86362001)(31686004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZFdkYmRtWjhVQ09NUnBadDVzNmd5bmpHT2d0SXhBTmhlcEI0bDdJcDB3L2gz?= =?utf-8?B?WGpQbklmS05sOGxZdGsyL3FwTXNiNG5PVURtOXkrSGJjMWpSN1pjWWJ3bEJ0?= =?utf-8?B?SW1JS2MvN0duWHJOU1NMUHhWVVlGZ0s2V0JJenlQV2duQUJhNlROMUtEOGg2?= =?utf-8?B?T1VoYUVYUTJNY3V5L0dQMnd6T0Nta1Z1bFhicG5RM0dzbTRxcG1qaFg0UzFJ?= =?utf-8?B?NFM4SGQweU9EQUZ5K0pxNXp2Rm03VGd4UlEySDhNbCtEZFk1aUhOeUxLb0lI?= =?utf-8?B?UDBRc3M3eWlKSnQyaE5ud1Q4cWFnR3F0UCszTTNzMHNjS2RuaExoNm5yQm9n?= =?utf-8?B?dE5tT1U2elpEVWxjL0RYOUI0cm16blEwYkM2c2h3bHdTR2xQMCtOR21XbGRE?= =?utf-8?B?VVYwUnZBSnJydHZsU1cyWStiRzdDQ0VZeFowWk5VNVpvWTFFd1RHNjBvQjVk?= =?utf-8?B?NFZIam1YY2ZFanlURC9aUW41WXN4SkdJQmRxN2ZjcjJTZ2RIRGxhVEJiTGdU?= =?utf-8?B?dTNranlIZ0VJajdXL1V6YlkvQno2UWdKQXJtMkJGaXM1M2VET2VBU3VFajZG?= =?utf-8?B?OWJnbWlYcFNXS3V2VXBUdE5HdFFpam53QldnUk5VOHJsRVZLUWQ5NUkxT1ls?= =?utf-8?B?Wlo5d1hoSWRTYnZ4U0E1TXF2UCtrREN1VE9uT095WlZ0S1lIWXhBNHRKZ05w?= =?utf-8?B?eUhrQ0IrUUZNQ3lFeVdUYXMwWHgwL3hLYTJOcUFSL2hSck5ZQS9sT0lOT0J5?= =?utf-8?B?U252ek9qNGN4bjYycmNVREFWM2ZTd3BBSlo4Z2VJY3FxNE90enJXMmxwbUMv?= =?utf-8?B?M3pQU1M3TERwNFdPcjFNZGsrTC96Qk5xMHhJei9rYm9rYXk2Rk1xc1JrK05B?= =?utf-8?B?T1d5OTV5a0dpSk14S2FwcXdxMXl2b1ltMDNBQXgvZDgxT2FEVGJ2Q2doZHUy?= =?utf-8?B?N1g5WCtLYllyRGdsUTdjeXhXNUhQSGQ4OFRiM2gybDlNb2N6aXEwRE5VYzl1?= =?utf-8?B?c1hDTFhQRjJXV1h6SHlHUkhKYUVwY2VpdnFTVHRLTGd1R3J3bzVuWmpSb25k?= =?utf-8?B?TTJBSjNWQUozQ2JaZkZLQ2hDVTh3VFpsUElEd1dEckwzQzNjbno4c2Yxd1Jn?= =?utf-8?B?eDZKeWtUTGtZbGRUUEpYMlJCOFBRNlo4RTdzT3dTcFVCdG9oOW8vayt0ZjI3?= =?utf-8?B?ZFJ2dWlROFpIOU41cTd0eExuOFFFYUw3djd3MmhHc0pmZnVRakFyd2lqZkZu?= =?utf-8?B?cFMwL09HUmRhazlPMGs2dWFQVFJaUGppclNEWFZNd1B5dEJvQ0EwdlBYWUov?= =?utf-8?B?eFhSVCsxa2ZJT21SU0xhZzVZUFVrS2lhWmcyK1k5RlpoUWRQOXk2cWhKUXRh?= =?utf-8?B?dVN3cFo0bVF6NlVCZEVTQVJDYzdxTDRGc05sNkZXSTh0Z2tPdGhvZjdhY0g0?= =?utf-8?B?MWEyUEdqRTdOaXFOOFZBaEY1aU90ekJ4RTJ1T2Q3M3RIMk5TbXh0ZEZGMGhR?= =?utf-8?B?cjBSYldOdGZrUFcwZmV3QlBrWDZtS3BwQWVwSStBcWJYT0kzNXY0UkxNdGFB?= =?utf-8?B?WlJBN1NuRlJWQjFGblNJbzZGMUJ2SERQelg5WlpIek1nbGZiU2VkQktjUFVv?= =?utf-8?B?Y3VtbHBadEt3L2pKMDdQM3JLQXY4c09rbHBncjFNUHJBbkphMWw0Umt1YStm?= =?utf-8?B?eDZFQ1BDSHVtY0h2UnpxaDVodmNDZGJ0TU1tcnB5aVRISnRyL1pUZVQ2dHAx?= =?utf-8?B?UXMwV3cvdFNlVlFjd3hyNlVVcDdOZ3FrM3RyVUxsMVZHZG5xeTU2OWthUzRJ?= =?utf-8?B?MzJvNVM4Wk0zc1RBQXdNVk05Uk9ZN0VIcjZDZkpQV1dtdCswd1pmMytqb1Ft?= =?utf-8?B?a3pTZUpmazJ1VlUzM1Q0cHhNT2taZk5JUHBYcUFNd05sRmE4K2RkdFRZMkZt?= =?utf-8?B?OXkxVnhlR3VydkFqK3EzWDc4NjRwZnZLMlVBdDNIUDMwK3RIcWZnT2NiWlJS?= =?utf-8?B?MGU4MjBDaTIxRUpFT0hjVDJsWjhjcXZqT3NoaWFlcHYrVlIwUit5dkE1aTFD?= =?utf-8?B?NGE2NmFyWGlqMTMxVlVFdk0vdFJFc0h5M3F2aXRuZno0cVZOV3JPTE1EeTc1?= =?utf-8?Q?mfhRrpGix1fgq7NrDeXgEXDQb?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d5b67e4-77d0-4c18-2d55-08dbbff2c074 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 07:15:53.5863 (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: GYmXnp8Xua0tmrZz+wnjNR5Da1Riso1lvfEcMRGM+zcanixt6eEqcJhSzE+UPT0ne/YDNU4rw2un/PK04Fo9YA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7811 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1695885375701100001 Before adding a new vCPU operation to register the secondary time area by guest-physical address, add code to actually keep such areas up-to- date. Note that pages aren't marked dirty when written to (matching the handling of space mapped by map_vcpu_info()), on the basis that the registrations are lost anyway across migration (or would need re- populating at the target for transparent migration). Plus the contents of the areas in question have to be deemed volatile in the first place (so saving a "most recent" value is pretty meaningless even for e.g. snapshotting). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monn=C3=A9 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1566,12 +1566,34 @@ static void __update_vcpu_system_time(st v->arch.pv.pending_system_time =3D _u; } =20 +static void write_time_guest_area(struct vcpu_time_info *map, + const struct vcpu_time_info *src) +{ + /* 1. Update userspace version. */ + write_atomic(&map->version, src->version); + smp_wmb(); + + /* 2. Update all other userspace fields. */ + *map =3D *src; + + /* 3. Update userspace version again. */ + smp_wmb(); + write_atomic(&map->version, version_update_end(src->version)); +} + bool update_secondary_system_time(struct vcpu *v, struct vcpu_time_info *u) { XEN_GUEST_HANDLE(vcpu_time_info_t) user_u =3D v->arch.time_info_guest; + struct vcpu_time_info *map =3D v->arch.time_guest_area.map; struct guest_memory_policy policy =3D { .nested_guest_mode =3D false }; =20 + if ( map ) + { + write_time_guest_area(map, u); + return true; + } + if ( guest_handle_is_null(user_u) ) return true; =20 From nobody Wed May 15 05:01:41 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=1695885405; cv=pass; d=zohomail.com; s=zohoarc; b=ZuW3tWQNRfoEZT21950FTnKuQjX6yXUB4BoYhL5Ja+i6vM6t/6rEo5UmmYI03Gnyi2o62li6prLR8PW23v4n3ijNXlNj12LDN/EhfMfGUs2laruCeFHm8/ata+pMtAPJ1jiZKuoy/D+6OZaW76ecltx7PEU4wSRS825BZi1zazI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695885405; 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=hFNzhnlZYLwd/kWq59whthOZS8He4sxkxz1sCnsgnuY=; b=DJ8nqR8EM8Cl1q19scTe/Lpchyo/9rwXj3iVDsVL0RCIc6zry/xaxFkP9P1mKkttMIlO6sfLmHFD5VLIRlTRlcOaMJHxfBMy7fLsJWRpm9n0WdCguXmJSgvHTSv6GfT99wHrtR6evjwAkEMt3Jimzh1KoK4to8Q2F3yojIehKa4= 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 1695885405079869.2278810998479; Thu, 28 Sep 2023 00:16:45 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.609313.948332 (Exim 4.92) (envelope-from ) id 1qllG5-0007V4-Tf; Thu, 28 Sep 2023 07:16:25 +0000 Received: by outflank-mailman (output) from mailman id 609313.948332; Thu, 28 Sep 2023 07:16:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qllG5-0007Ux-Qk; Thu, 28 Sep 2023 07:16:25 +0000 Received: by outflank-mailman (input) for mailman id 609313; Thu, 28 Sep 2023 07:16:24 +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 1qllG4-0006Ef-U4 for xen-devel@lists.xenproject.org; Thu, 28 Sep 2023 07:16:24 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0608.outbound.protection.outlook.com [2a01:111:f400:fe0e::608]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ee869f12-5dce-11ee-878a-cb3800f73035; Thu, 28 Sep 2023 09:16:24 +0200 (CEST) Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by AM8PR04MB7811.eurprd04.prod.outlook.com (2603:10a6:20b:236::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25; Thu, 28 Sep 2023 07:16:22 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::9f5d:8bed:7a5b:e75a]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::9f5d:8bed:7a5b:e75a%6]) with mapi id 15.20.6838.016; Thu, 28 Sep 2023 07:16:22 +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: ee869f12-5dce-11ee-878a-cb3800f73035 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ik1Z6SGZniPoadUy6Y0iWT4IO0fJ1XKLeQiEnbqV3rjvfjheCFhjBC+k91SFFBBzIDV7hzsC4KN25flVa0X/augInjT77x6AW3eLxsCjrUQ3MMG2W6ZSIpZca7xfXkDXgVPxKW2mupA+YcWSb8/fVXPI1jUBED6GowTxsEV4CYZCersute0eQLp1eyvtVP82BFG+gaGVZ5z/k0OTzFcyztHD/LAIUk5ypVKJbcFiuZx6+JzK9r8ezVCjpnOKk3GKIFpOIhQMnwM6Rclv88QFCmSr7RHTa+mVJFJK/HW62v/5ZlwhAjHQDRhxm+5OaIifKBYMIVs2CtSBOFW1e3J2Lw== 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=hFNzhnlZYLwd/kWq59whthOZS8He4sxkxz1sCnsgnuY=; b=FGPrfC9tV4zDrLJL6INjalDVWRRx2OQ+eG1Xqv+/4UZnd3UAwwhgt2/rfTo49x0mrsPAQUUJwZUpNUiufexaoTg+AtxBClEOMvzWGiijrXonFK1MYWOaaNAXHqz2HWxzVQzhlKvwlbSvs0VcRuE76zFk0MJdYbVh0O4crm2iHIHVx5PpiK37bu7utJx3YYpQxueIZ0ahFW9NYAeBOc3uqXqIsDAhthKSZ0rahfNhPUtcHjz+2PQcwhMB+buWCLI1D/SXPXhNepvwKHOBBtE6kWuQW0YX4DKIoWJobZk1dqIBv9yKTqTnYIsxmAlhOBYGJyf1vKQBt1SZF91kOG/uHA== 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=hFNzhnlZYLwd/kWq59whthOZS8He4sxkxz1sCnsgnuY=; b=lbo+5WCqr4bx1tvr4RZC0s8w+6nKwwDCnlGX3duH8aAW9Z8/bQEvqsBwjLVj2k3XVJ1XN+2dfej9+12HjA1ZGHpMFwYfdkYxvZQnb555BmkLAAHPeo7SCikoMoiTwSP5Ko3/FQJXI5y7fPlnp1xIKXz3BqTnu7kNS/Y9F+s2M7Llz56zh6mTB+5aq88i0JW12eVFVL4pONqQA077QKEqYlTlAhWHk0kQTY0KRrV9eahdSKLj5R4a13r0xiX9kHiD7HW6IknBR8DwVXGHYZxOS/L4UxHHlLRZwrYXHW3Z91z3oTrIs82SIMVgdeXPWxBbt5oi5Iyjo8x/SWgR1xasUw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <6047c192-0f37-e4ff-5980-fd137b3f1869@suse.com> Date: Thu, 28 Sep 2023 09:16:20 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: [PATCH v4 5/9] x86/mem-sharing: copy GADDR based shared guest areas Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Henry Wang , Tamas K Lengyel References: <3ba59868-101d-b68a-d8b7-767ee94910ec@suse.com> In-Reply-To: <3ba59868-101d-b68a-d8b7-767ee94910ec@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR4P281CA0086.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cd::13) To DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|AM8PR04MB7811:EE_ X-MS-Office365-Filtering-Correlation-Id: e5f8ad04-a696-43e7-6917-08dbbff2d1db X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7p0C3hssJFP850737gbIlelIBFP0p0NUm31GL6kYHINl+i6jDv+25PwdehQAwyKYBMFzO3rX3wHg/bAIUU3bqvinbGuef6PDYb5UUVSdoH/hi+OYYKmAdHDKwEo6mV/FrSw461L/MBYtvVyWyOqowWyQML4tHCgarBocTKEBE7oZhovYb6vRgmRkKSuWD4pamq/iArh1J5NUx2/hEfNhuiFoyMjpWVCcFjh34m+19lRWrmPoppdNkM6sLpmLXjyPS8fOVuzrPhWlI9il+FsDJlVe6Ng8TjQqabhQAghkznYbd6wKlTsAcoB8PW6zgHQ2wB3NdCFVcWZ1p6SHa6+L2jC7HoEO2bCh/wui+1Sz7DQixcDXuLIyEMlr/N8AlZw9oxh1eURi2xXrF+YkfF0q34NWO86tsGQJZY8smRXb4HWJJmZj5qFfIBjKNuNjP1AvB6pjBW/G2b8QtIXbcAV8Y1mUi8jyBqcbFhwCetezFgYElbVJzkeI+8C+CLV6BqC+//IE99C5O3d+QUJLM4IKrm0z80sfD/20wvq/4SeAyucFwyLZ8CEZ6yyuFMDOyhPLSkpl/Eb4wije0/77StQ4WtRCJMkxujw+P5NB35cqBzOT7d3MVKD7xWYSOWcj+5E4JmFYlHpZYy3jy1byg3Hqnw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(396003)(376002)(39860400002)(136003)(366004)(230922051799003)(451199024)(186009)(64100799003)(1800799009)(26005)(6512007)(6486002)(6506007)(478600001)(83380400001)(2616005)(2906002)(316002)(6916009)(66556008)(54906003)(66476007)(66946007)(8936002)(41300700001)(8676002)(5660300002)(4326008)(36756003)(38100700002)(31696002)(86362001)(31686004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bEROS2pFRUEwZlV1MzFXZkh0NnNoQjNnd3dHckUrWmtKN0JPMTRVOG9iZUZ0?= =?utf-8?B?MDBGWW9vS3IzeHZoNWVCYWt3NCswenliQWxzVmRiQmZHbDRIU2JPMTJaMjc3?= =?utf-8?B?bHZwc1Zib3RPWnFCaDZGMm5ISGs5a1NXQW9aL0diSnhLUFAxQmtMdTB1TEVX?= =?utf-8?B?K205Z09mbTNSdlpsVFU1dHlNNFVNSXVRZmlPMG03N1gxOFBpN1Z4TGd6TGc1?= =?utf-8?B?QW9HM3RIUFRLTkkxTlp3M0E2WE1zT1MzMVBGeDRQQ1dTbWdOZkVXdU4zVFh3?= =?utf-8?B?aE9xRStSVFhIYzhJbUlDWTVZVm4rYmJFWVU3NkRoMzJpN2w0d2NGVDYyYStj?= =?utf-8?B?Q3p5aGpJVGNOaWI5cG1kQjg0dVhmQ1N0V3QyREtRR09LajNqamtlYk9zQ3Er?= =?utf-8?B?eVloa3VBY3N2MXc2aDNMMU5JVVNNQzFodGZhbVRNdzNqWjhiL2w5SUlseE1O?= =?utf-8?B?c2F5MzlxbC8wSjVnSGZWaWx2L2NpV2tTWnRHWXpIVm0vYzF0ajVqQnJLbDF5?= =?utf-8?B?M2V3N0daYUZBT0VCM0RuQ21vU29VOCtzZURzVkZQOUUrQmZ3WCtEMm9hVHlX?= =?utf-8?B?SnB0clZWdENCcVJxcWI0UzFJdjFEUXE1MW1hYlFYRkFRRFF3VEdBdDBWZUk1?= =?utf-8?B?anE2V3BqdmlpNUVqT2RSd3UxZmtnbEVidENYV3lHOFlSak9hUDUrcXVtUjQy?= =?utf-8?B?dDRNUDZyaEh3b005MzhLUnl2Tms0Z2l2MVp4TmcwWjNFQy9FbkVlNlFDSjU0?= =?utf-8?B?N2lLVWdqMmNiVjVrTzZJQndqWHRIRUFjYXJ4eGVkbml2QzhjSzdZeTJsUndv?= =?utf-8?B?dzh4N3hMb3ZXbHR5MXJxTm9ySU0yUThJRlNUZ1NwVjN3elB1RDFUTnJRNUZH?= =?utf-8?B?MGxWYU8ycUxVNEtUcDRzaVNhRmRQU2dZNlg4emtVRE9BL0FvTHZMLzlIR2tP?= =?utf-8?B?R2YzVmZWT1NLRk5lOFBrQWI5TElXVGpuekhLK0tWOEhCWklIa3VzNUprSzRR?= =?utf-8?B?aUxQcWIrTEdPZVRqcnNSRExnTDllWmxrcmZGNEhpWE5oWEZGNXp3TGJkMGgw?= =?utf-8?B?NktXallCUU8yWDJMQlh1YnlFdDhvTXl6VU40K3RJZXE0dkpDNDVPL0JONnBN?= =?utf-8?B?TTRNMnd3QS9BanlxNHo5U3Fobmc1ZDY4UlgramE1SDBUYy9lWUxPcm50TFo3?= =?utf-8?B?Yy9Xd291WFJRaWtFKzhlRFkrV2RlYlMwa0xCbUN3Um1CM1R4enBQTjhNSTZ5?= =?utf-8?B?d2ZTTTA2eTJUSHVPbjJXSGlPYWRBQW9kRDBOZE9FTkh3ZEJvYlRyejJrMk5i?= =?utf-8?B?WEpiSmowcTNHRlYwNUdiQ2lMK0c2ODR0dVpsdEVPNGhrQ2Y1MEFuNkZ5Wi9i?= =?utf-8?B?N1daVWc2WlY3cGZPaHQ2RlJIRDNEOEVORFlETkZiKzR3MXpNWG1la05jRmdR?= =?utf-8?B?V2NQcmdEN05IRU0xTWF3VjRxRWlmK3g5TkxWQWlkdjZyd0M0QXIxcUExam9H?= =?utf-8?B?aHhkemNVSjFhblNBcXNYbU1oUldWRUZmM1Vydm11UUdGY25weWhlazlBQ1NP?= =?utf-8?B?WlM2VjFSRkZYeUp1T3pCbWpzV2VUMVo4SGx1YzlnbjJranB5VHdkcVEzNFc0?= =?utf-8?B?L2p2ZFZWRjFDQzdsZy9hTXhhZHZLSmFzSFhqdUpSVjBGMmdlazRWY3hIMHU0?= =?utf-8?B?NFpnWjRpekkwYjN5UmNGdkJCVU5YK0RRYnp2VVFFSGlJUnhzRldiMFptV2px?= =?utf-8?B?UEdHYVZ5WENFcTcwYU9FVDI4T0Exd29PL1FOVWxpUGk2elRqSkdzeGg3dEsr?= =?utf-8?B?aGEySW44T0VqaHFDNTRwS1RsRG9LcW1NRFRTTTdJTUlRNzJtK2NxM0MrS2Fy?= =?utf-8?B?NlVNM1kwanJVcDdHc1JrQUdVTTlCU0Z4cno4TmlZRUFCZ3hNQ3RNVTFUN21X?= =?utf-8?B?N3NSdS9waVRxK1huZ3g4SWtLVXFiR09aZWN5aHZYVXhEdEE2VmNrWm00VHBW?= =?utf-8?B?cEtQSEl6OE9MTGNJT0lCL2JRZkRIeVJzblZnRVFCSDEzK3R6MC9MM0wvbmt5?= =?utf-8?B?Q1FmOVE4dHhuc1htTkttTlU5WW8rKzJESlpxVUFNWUt2WnBjQWZPVk1uSllt?= =?utf-8?Q?VPQlD9R5SDaxwB+10zekcW+ok?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5f8ad04-a696-43e7-6917-08dbbff2d1db X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 07:16:22.7935 (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: AjGjRS0/cBXs0oO7XXpCO/PCxNz5XcYsTOtkwV5FEpgoXJvIwwMarxJjSLNmsLs5zX3L8yhKgLxC1DdXPS5kdQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7811 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1695885406242100001 Content-Type: text/plain; charset="utf-8" In preparation of the introduction of new vCPU operations allowing to register the respective areas (one of the two is x86-specific) by guest-physical address, add the necessary fork handling (with the backing function yet to be filled in). Signed-off-by: Jan Beulich --- v3: Extend comment. --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1641,6 +1641,68 @@ static void copy_vcpu_nonreg_state(struc hvm_set_nonreg_state(cd_vcpu, &nrs); } =20 +static int copy_guest_area(struct guest_area *cd_area, + const struct guest_area *d_area, + struct vcpu *cd_vcpu, + const struct domain *d) +{ + mfn_t d_mfn, cd_mfn; + + if ( !d_area->pg ) + return 0; + + d_mfn =3D page_to_mfn(d_area->pg); + + /* Allocate & map a page for the area if it hasn't been already. */ + if ( !cd_area->pg ) + { + gfn_t gfn =3D mfn_to_gfn(d, d_mfn); + struct p2m_domain *p2m =3D p2m_get_hostp2m(cd_vcpu->domain); + p2m_type_t p2mt; + p2m_access_t p2ma; + unsigned int offset; + int ret; + + cd_mfn =3D p2m->get_entry(p2m, gfn, &p2mt, &p2ma, 0, NULL, NULL); + if ( mfn_eq(cd_mfn, INVALID_MFN) ) + { + struct page_info *pg =3D alloc_domheap_page(cd_vcpu->domain, 0= ); + + if ( !pg ) + return -ENOMEM; + + cd_mfn =3D page_to_mfn(pg); + set_gpfn_from_mfn(mfn_x(cd_mfn), gfn_x(gfn)); + + ret =3D p2m->set_entry(p2m, gfn, cd_mfn, PAGE_ORDER_4K, p2m_ra= m_rw, + p2m->default_access, -1); + if ( ret ) + return ret; + } + else if ( p2mt !=3D p2m_ram_rw ) + return -EBUSY; + + /* + * Map the area into the guest. For simplicity specify the entire = range + * up to the end of the page: All the function uses it for is to c= heck + * that the range doesn't cross page boundaries. Having the area m= apped + * in the original domain implies that it fits there and therefore= will + * also fit in the clone. + */ + offset =3D PAGE_OFFSET(d_area->map); + ret =3D map_guest_area(cd_vcpu, gfn_to_gaddr(gfn) + offset, + PAGE_SIZE - offset, cd_area, NULL); + if ( ret ) + return ret; + } + else + cd_mfn =3D page_to_mfn(cd_area->pg); + + copy_domain_page(cd_mfn, d_mfn); + + return 0; +} + static int copy_vpmu(struct vcpu *d_vcpu, struct vcpu *cd_vcpu) { struct vpmu_struct *d_vpmu =3D vcpu_vpmu(d_vcpu); @@ -1733,6 +1795,16 @@ static int copy_vcpu_settings(struct dom copy_domain_page(new_vcpu_info_mfn, vcpu_info_mfn); } =20 + /* Same for the (physically registered) runstate and time info are= as. */ + ret =3D copy_guest_area(&cd_vcpu->runstate_guest_area, + &d_vcpu->runstate_guest_area, cd_vcpu, d); + if ( ret ) + return ret; + ret =3D copy_guest_area(&cd_vcpu->arch.time_guest_area, + &d_vcpu->arch.time_guest_area, cd_vcpu, d); + if ( ret ) + return ret; + ret =3D copy_vpmu(d_vcpu, cd_vcpu); if ( ret ) return ret; @@ -1974,7 +2046,10 @@ int mem_sharing_fork_reset(struct domain =20 state: if ( reset_state ) + { rc =3D copy_settings(d, pd); + /* TBD: What to do here with -ERESTART? */ + } =20 domain_unpause(d); =20 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1601,6 +1601,13 @@ void unmap_vcpu_info(struct vcpu *v) put_page_and_type(mfn_to_page(mfn)); } =20 +int map_guest_area(struct vcpu *v, paddr_t gaddr, unsigned int size, + struct guest_area *area, + void (*populate)(void *dst, struct vcpu *v)) +{ + return -EOPNOTSUPP; +} + /* * This is only intended to be used for domain cleanup (or more generally = only * with at least the respective vCPU, if it's not the current one, reliably From nobody Wed May 15 05:01:41 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=1695885432; cv=pass; d=zohomail.com; s=zohoarc; b=Rg39ig1082xazmzpDMrkLQfEzsESHSRk9O4//OcTSWZD2+E/oNOXWnE6ZDpl6tuNmASk3RQMF4f9Z1RzVp/TwFbrs8IvFJqp4ZSvgAW8BvpoTpRic7nTC0MAfM/cDywVCJxMkL+BrTYM1g75MRskv+T93fMAx2EFtYQ5PnGOL+g= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695885432; 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=OdVm0Th937N+vCPEHX+Fu1YV+tgza1dfXYx9xJHohDc=; b=QyEd4mAUR73NotTyl2JySEhG5bvqEZs5aWEIaEH85iidgYwxbQjcXWuqcD4VB/V/JiyFu11O1Ci8vvkCgw++VrZWugc8cN8DBmPPmSw8K2XA/CA7H+06hOBg9qvhdAOY3jA5uEiza9YVeyHcb869rNa4yEFDjouYCHxASvFPZj8= 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 1695885432655371.6734402248687; Thu, 28 Sep 2023 00:17:12 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.609317.948342 (Exim 4.92) (envelope-from ) id 1qllGZ-00082o-5M; Thu, 28 Sep 2023 07:16:55 +0000 Received: by outflank-mailman (output) from mailman id 609317.948342; Thu, 28 Sep 2023 07:16: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 1qllGZ-00082h-2m; Thu, 28 Sep 2023 07:16:55 +0000 Received: by outflank-mailman (input) for mailman id 609317; Thu, 28 Sep 2023 07:16:53 +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 1qllGX-0006Ef-Ka for xen-devel@lists.xenproject.org; Thu, 28 Sep 2023 07:16:53 +0000 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0630.outbound.protection.outlook.com [2a01:111:f400:fe02::630]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ff87a13e-5dce-11ee-878a-cb3800f73035; Thu, 28 Sep 2023 09:16:53 +0200 (CEST) Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by AS8PR04MB8884.eurprd04.prod.outlook.com (2603:10a6:20b:42f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.21; Thu, 28 Sep 2023 07:16:50 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::9f5d:8bed:7a5b:e75a]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::9f5d:8bed:7a5b:e75a%6]) with mapi id 15.20.6838.016; Thu, 28 Sep 2023 07:16:50 +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: ff87a13e-5dce-11ee-878a-cb3800f73035 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IRdCXcFMZD/dDg2QepxbmOXYN383dBovQj7Qf2G2B+Yr3w/vRoTXgd+Bg4fHclfW7zfkB13XYbvTvVGBfzZ1RWRA/DXLiMFaPL4u5O4w/wGAPHedSzA0ofUhUf+yhobqosd+Pc5LBV0vulx6MiAR7E2LQPkASNXYMMlMQqbA6x0KI9ML3x+WWfvgfFluDNs4rlQ4rm3MO8UHpnIUC0uFDW/28Sr4pYsK/5wzuE2FuVQaaEvM8naM8ZvF78qGAhYvjzIwv0vrDwaVVPSTmumW6QEOPcZrJbyVQLqSVHJidk3WZ0cNa7MMZqt17kHYj/a41UNvL8kLK9t9ioOor7XXqQ== 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=OdVm0Th937N+vCPEHX+Fu1YV+tgza1dfXYx9xJHohDc=; b=Vc0c6IlTEEWGFNwmGAmgRWOG8lxHlxqo6Fdw/W2K4ptxYPFiNNI6rp8vkuhGHJSdAEscfCbIWXW0c/HuhrKk45vDLkUGaFwMT9nqUdLnRgcjFxbuXPiBlj+RA0fldk7X2+i5mXeqeMO9jZMghUMJeLpJaEG/pNgua8wx8Yexr4JX9M0D+3Q/GNhjKXA21j7XnW03x0CGRYp9xP5F9QNq6091R/ggGzobCOIrejB4EtFvaWYqQCTOVwRvAe618ZjFCfRz2ucDzQucGYkM1Zxp3WApVMErmBSKvl/f3vvYk5Cohgr7CTlpNGk6h8AUZVzZyZaiRFkF7WozB4f8Uzq1Tw== 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=OdVm0Th937N+vCPEHX+Fu1YV+tgza1dfXYx9xJHohDc=; b=vvK/cUQW5B84WIIKvJ0Vu/0pZpjuTBvczb1JL97KLnUWO7Qc3azK+GUtEoKSHLDoD5L28urNOfXGnK/I88uWZL/94awiWqBFV1ZEGzW/EgPLfWPlcusH59W33x/Rb78LMQGAaCfPmSs3g1eY9T0t7aECLNSE9+nt2e0HxWtS3dPL8byhtF5PV8e043ni4CUiIeTLn6MyDp3rvcX5CWMDv5K5JbYGOeN0Qh20RiIO0EeJ58uFqw72wPBv8l7suZqhnznp92H61JSDH2P4O2R+FgRJKcpxWxM2D0CCDTkYHmyoJDUtIlh53pey639fTsozrdZiU+ZTTU1QcobSGkBJ7Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Thu, 28 Sep 2023 09:16:48 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: [PATCH v4 6/9] domain: map/unmap GADDR based shared guest areas Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Henry Wang References: <3ba59868-101d-b68a-d8b7-767ee94910ec@suse.com> In-Reply-To: <3ba59868-101d-b68a-d8b7-767ee94910ec@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR4P281CA0174.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::20) To DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|AS8PR04MB8884:EE_ X-MS-Office365-Filtering-Correlation-Id: 27b1300c-26e7-422e-445a-08dbbff2e254 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PmZ41yt+6DG856FdpwT8OaP3ILcSwVYtrwbmb4kXDTjqk68qKFQPyxxe2BqyGZDRJ9ToMwJ1kd+NrhAOVK7EDTA7rIQyfWhCM+pujl13VKRwLv+KUkWvR6JEDsm3TR8uZV+zpC9YXosaiT9Uc5hhkv2CLqT2VKUqAS3u/Eex54ETdSTlQqjSYSDJ96fUR2ah2yM5HOPkKgdklrB8W+A1EyTu9vXJYer2HdkS3v/o3C6Q6PSNURlkluvbKUGIuIW85g01digsSL0ZTnU1vxrJqjW5zuPZTlZKNmhdFscUnDifd3Fz82xLNwGhF5NtN2bNvzhVhGWQtZ+f/syty96X9etGzd4r3sDQdsVgoUW0ob2iDDfAfV5ZGGHjkikqgHgDnBxSM+fhUqNrGl5cVre8TT+IdKtj7/br0xRnJEFo8QQJe+UIGOhK9Hodni4TwcZ+UzD/RSCDcBFbiOioNUgKQl3dL02WuNNtv7Hbteoss8YH4qZ/thN20G6trM/X37O/Ax8aqjXXRk3C4FZOxRf1icjnaQTR3fXd7wkr9RTJdZeGAB8/u9Jnzj7/hvxhuPsHYEiwTMJMau20qXvC6gueiOkQXxM/LpK1v+EHWp3ojpqWi39nV5QxKoYUAXhMC+41ETF+DmGIcmBn95W1t/qDjw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(366004)(346002)(376002)(396003)(136003)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(2616005)(83380400001)(26005)(31686004)(478600001)(36756003)(6512007)(6506007)(6486002)(66946007)(66476007)(316002)(66556008)(54906003)(6916009)(8676002)(41300700001)(8936002)(4326008)(86362001)(5660300002)(31696002)(38100700002)(2906002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VUg4Z3VvakdtZ0tlOVRRM0pKdjNYeXJzRGtiU05vVTBDcnR0MmJEWXdIbjI1?= =?utf-8?B?Wit2aG91U2FyVlczNDBtMW83ZmlDWXI0V3VaWDN3MmxZb1JKZ0wvcjJsZlFt?= =?utf-8?B?aFp3dVgzdWV2TGJLMitZRVc4dmUvcERtNEpXTk50SDBJbWRPRmVXWHBId0Q3?= =?utf-8?B?TkpySnBrVWJjR2ErMFMyS0RuVERWSXRtalplcVZBS0xKRlhmbDIzdkpiWTQ0?= =?utf-8?B?SWV4bDFlRHVlMGhuaVFPTitaUVNoYWgrRTFzSEp6Z0NGeFJZekdjdWhNemxy?= =?utf-8?B?dkl4T3g4WEk2NlRsSkRYSnJCY1ZWKzlKRVR4VmJSR3pYenZUSm9SdnNWaXFu?= =?utf-8?B?QTZWc3RYdFNxaGlIRlFoVFhKdGl6Nk9jVm8vWk5uNXVuWnJzckhabUZEbi9O?= =?utf-8?B?Vys2WGw2NzBVOUxFM013emx3dzVhc3RvY2Nod25UY0Y2RjNNRGxDZkJVKy8x?= =?utf-8?B?QjcvRTIwMlNaMWhSME1NbFZTNGU2R3lwcWFIQzdzOTZPRjJDSGdvcEhvR1BR?= =?utf-8?B?Y0E4ZTF3NlpZVGxBM21qL1EwZyt2aWQxOEljZHVlRTBkWVlhNlRZbGZCUlBL?= =?utf-8?B?QTlsNm5ZYzdacDVkRnJEdm1yTEtud2xvaTdqdWxPYksraE8ydTdlN1MxRGNH?= =?utf-8?B?bUFYY2l2Q1Y1TjR3U25XcnRKS3pBRHE4WVM4MkN5cUpYcHg5NVIralhRQ0lh?= =?utf-8?B?Y1BWK1V6OTdPNGNqRTZMaC9FSFlBOWVFOGdLWmVXdVNwVldseXl1VE0yeURM?= =?utf-8?B?T25hVTVhbG1GVzRLN29RUC85SlpJUXRXSTNFNGZmam9GYWgyenhQV1pRc3ZX?= =?utf-8?B?M2N4M0NxZ3NobERaT0k3am5DZ1JUYnZQR04rQUhnUnJXeXU3WGRkZXh4YjFH?= =?utf-8?B?YWc3dGVIeUh5N3JwUWVQZ1BJS1RoOTBEdmlkRzFKSGpzMGFLYU5GQ01SMTdJ?= =?utf-8?B?eE5Ndjk4SC9DRkN5UkVEOElWaU96Rkd1eklDNVRTdGQyWHN0SXVXUU50cjdx?= =?utf-8?B?V2pmbDh2UzFZN0FJRDV5ckhXS2twSVJRZXF6Rnl5T0RmUW9ET1k5elBtSjJu?= =?utf-8?B?RjNnMUtrN1JsdGxaOWZycFFQc3M5UXFnTExXUGsyMlZ6d3ZVUTM3dzY3L3lL?= =?utf-8?B?aFhjMm5WdGdkUnIyN2VzckwwY0d4cmM3TFZuQzdkdXhzNXBCWXByTllJTGNB?= =?utf-8?B?UWIxMDBrM2RyaGZNN25ZQjVTditoZHVKQ0lRd0ZpTmZBMWdJL2NaK1lLSU1G?= =?utf-8?B?YXF2WmlReWdMK0JQdFJ1dkd2U1l4SFJPdUxRNnFlM1NMUnN2bFlaUHNtaWJi?= =?utf-8?B?dkFmR2dJRUxGRXRTZ2FSUUpKd2w1cG85UVpIdzVXcHF0aXBRYU1EWHVCelB3?= =?utf-8?B?djB1WkxMSDdtU095bTBMR1krR2V6S2dPazNCb0dZK2ovM0xybWJXUWdsVFlM?= =?utf-8?B?TWliY3l5TlUzd2NrVWlWQzRzM1dOc3R5ekc1c2RiRW0rOENha3lWMkF4ZFV5?= =?utf-8?B?RjlqVTRMR2dTR2ZNbUhwSnpNVlZXSWNpK3gvQXBicmNYaEs5djh6TUkyeFc0?= =?utf-8?B?cGNrWVJsQWNYNk16YTBuRkpma1VHLzNGWDRzVkJGM0o3M1NHWTBQZjNuM2Mv?= =?utf-8?B?aDFIR2hrMGRxSmNVeStkc2V5RzcyZHZKdko0VHFGM0lzZ2cxTUZtc0NrNE1K?= =?utf-8?B?U0Q4eE84cjhhUGJ1UzlwRnB1cURSaUc0Z0pPY0hUZDlOTGNMSW5YNXVUWUl2?= =?utf-8?B?TlNzNENSM1NNNGJ6UVdmOHh2N2NzOTVLOFRsWHVmaitxUVUrNlpxa3NBakNQ?= =?utf-8?B?T0RtMENONnhuY1V0ZldiRW9zSDMwQ3drUU9rVzVoLy8wNFRaQnFWbG50d2Rh?= =?utf-8?B?SlBNQUtnTnN6SVdwd0pDb2RadG9hL0ZScjU0MnFRVmhxNVQ1d1hzU2RFRnVw?= =?utf-8?B?UkZiZXkxWXpYOXUyUExleEVSamxWUWkrZ3VtN2hNb3V4NXpoM2xmbEhzb2t6?= =?utf-8?B?TlRWb3lnR2FwVWgzQ0VTalBUUUIrMC9jREpPWStYMGZIK281NlhFVzRGNUFY?= =?utf-8?B?dEQxN3pZN1pmbWJ4OU1tNC9HMS94WHBmMFlLbmdGUStmc0I1K1JxQzkxT3lo?= =?utf-8?Q?/NESz3i3iKqbuXo8P6VPgQ2HA?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 27b1300c-26e7-422e-445a-08dbbff2e254 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 07:16:50.4452 (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: m2N6kSdbpwh4Rp0vk+49qovBzPiq/Gu1xyKIaWk4qyliFiRkt1Nlr1WL8QlfPRiabOHh1+CNBqh3aX5DdLmTaQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8884 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1695885434506100001 Content-Type: text/plain; charset="utf-8" The registration by virtual/linear address has downsides: At least on x86 the access is expensive for HVM/PVH domains. Furthermore for 64-bit PV domains the areas are inaccessible (and hence cannot be updated by Xen) when in guest-user mode, and for HVM guests they may be inaccessible when Meltdown mitigations are in place. (There are yet more issues.) In preparation of the introduction of new vCPU operations allowing to register the respective areas (one of the two is x86-specific) by guest-physical address, flesh out the map/unmap functions. Noteworthy differences from map_vcpu_info(): - areas can be registered more than once (and de-registered), - remote vCPU-s are paused rather than checked for being down (which in principle can change right after the check), - the domain lock is taken for a much smaller region. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 Reviewed-by: Roger Pau Monn=C3=A9 --- RFC: By using global domain page mappings the demand on the underlying VA range may increase significantly. I did consider to use per- domain mappings instead, but they exist for x86 only. Of course we could have arch_{,un}map_guest_area() aliasing global domain page mapping functions on Arm and using per-domain mappings on x86. Yet then again map_vcpu_info() doesn't (and can't) do so. RFC: In map_guest_area() I'm not checking the P2M type, instead - just like map_vcpu_info() - solely relying on the type ref acquisition. Checking for p2m_ram_rw alone would be wrong, as at least p2m_ram_logdirty ought to also be okay to use here (and in similar cases, e.g. in Argo's find_ring_mfn()). p2m_is_pageable() could be used here (like altp2m_vcpu_enable_ve() does) as well as in map_vcpu_info(), yet then again the P2M type is stale by the time it is being looked at anyway without the P2M lock held. --- v4: Add another comment. Use IS_ALIGNED(). Add another NULL check. v2: currd -> d, to cover mem-sharing's copy_guest_area(). Re-base over change(s) earlier in the series. Use ~0 as "unmap" request indicator. --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1605,7 +1605,82 @@ int map_guest_area(struct vcpu *v, paddr struct guest_area *area, void (*populate)(void *dst, struct vcpu *v)) { - return -EOPNOTSUPP; + struct domain *d =3D v->domain; + void *map =3D NULL; + struct page_info *pg =3D NULL; + int rc =3D 0; + + if ( ~gaddr ) /* Map (i.e. not just unmap)? */ + { + unsigned long gfn =3D PFN_DOWN(gaddr); + unsigned int align; + p2m_type_t p2mt; + + if ( gfn !=3D PFN_DOWN(gaddr + size - 1) ) + return -ENXIO; + +#ifdef CONFIG_COMPAT + if ( has_32bit_shinfo(d) ) + align =3D alignof(compat_ulong_t); + else +#endif + align =3D alignof(xen_ulong_t); + if ( !IS_ALIGNED(gaddr, align) ) + return -ENXIO; + + rc =3D check_get_page_from_gfn(d, _gfn(gfn), false, &p2mt, &pg); + if ( rc ) + return rc; + + if ( !get_page_type(pg, PGT_writable_page) ) + { + put_page(pg); + return -EACCES; + } + + map =3D __map_domain_page_global(pg); + if ( !map ) + { + put_page_and_type(pg); + return -ENOMEM; + } + map +=3D PAGE_OFFSET(gaddr); + } + + if ( v !=3D current ) + { + if ( !spin_trylock(&d->hypercall_deadlock_mutex) ) + { + rc =3D -ERESTART; + goto unmap; + } + + vcpu_pause(v); + + spin_unlock(&d->hypercall_deadlock_mutex); + } + + domain_lock(d); + + if ( map && populate ) + populate(map, v); + + SWAP(area->pg, pg); + SWAP(area->map, map); + + domain_unlock(d); + + if ( v !=3D current ) + vcpu_unpause(v); + + unmap: + if ( pg ) + { + unmap_domain_page_global(map); + put_page_and_type(pg); + } + + return rc; } =20 /* @@ -1616,9 +1691,24 @@ int map_guest_area(struct vcpu *v, paddr void unmap_guest_area(struct vcpu *v, struct guest_area *area) { struct domain *d =3D v->domain; + void *map; + struct page_info *pg; =20 if ( v !=3D current ) ASSERT(atomic_read(&v->pause_count) | atomic_read(&d->pause_count)= ); + + domain_lock(d); + map =3D area->map; + area->map =3D NULL; + pg =3D area->pg; + area->pg =3D NULL; + domain_unlock(d); + + if ( pg ) + { + unmap_domain_page_global(map); + put_page_and_type(pg); + } } =20 int default_initialise_vcpu(struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) a= rg) From nobody Wed May 15 05:01:41 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=1695885477; cv=pass; d=zohomail.com; s=zohoarc; b=IPeftWxQGPhXEngeNM6EQHQqVVX9+C/3e0nHRAR1qqbVROvk0pkoxcdMvuy1kGQolFtidW3LzWAYV8W9FHjIZY38ZgMEG8qW0JKJRh/YDwIBEDv9ivapCcaCaROADxS91fwpHKiKrHQ7HMSrX1q6hRYJn9Dm/1/FLMUup6XnxI4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695885477; 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=iHe12jYFCsixkC+lD66ZJrCoQJgG2Et89o2kOEOZydg=; b=fz2iug+koJNsi1kSCoN+R/ZuUD8g1jkqZCunbsfynOKw71Je0IS7usQDgOPRFaXb9M1/eqgQcspXYqlSYGcQNDIyj1BvCpO4gd+WSioylbG5mJAzRGGEnv32DWD2Ed7W5FTm2AbGjflhalI9IRtcb0rCMQZVCzBl9YbqwhbnQag= 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 1695885477673374.2655747620249; Thu, 28 Sep 2023 00:17:57 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.609323.948352 (Exim 4.92) (envelope-from ) id 1qllHF-0000IV-Gx; Thu, 28 Sep 2023 07:17:37 +0000 Received: by outflank-mailman (output) from mailman id 609323.948352; Thu, 28 Sep 2023 07:17:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qllHF-0000IK-EG; Thu, 28 Sep 2023 07:17:37 +0000 Received: by outflank-mailman (input) for mailman id 609323; Thu, 28 Sep 2023 07:17:36 +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 1qllHE-0007vD-DA for xen-devel@lists.xenproject.org; Thu, 28 Sep 2023 07:17:36 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0605.outbound.protection.outlook.com [2a01:111:f400:fe0e::605]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 1804ff52-5dcf-11ee-9b0d-b553b5be7939; Thu, 28 Sep 2023 09:17:34 +0200 (CEST) Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by AS8PR04MB8884.eurprd04.prod.outlook.com (2603:10a6:20b:42f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.21; Thu, 28 Sep 2023 07:17:32 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::9f5d:8bed:7a5b:e75a]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::9f5d:8bed:7a5b:e75a%6]) with mapi id 15.20.6838.016; Thu, 28 Sep 2023 07:17:32 +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: 1804ff52-5dcf-11ee-9b0d-b553b5be7939 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gBH63qH2I2T1kLmiH0qUjmap+t0DXcgR0/Gke2lrwyxN7P9CEt3kig/Wn6wio1R08Grgjpln/+7+io/Tn70jayxGXF6CM7LPCMaWRRxH3Z9OSO14GrJynwZigbkCT4peXcvfEVpJreH+WetEcW4AqoXn2z6DXBRg0MX+IjyN+Me+oiJS6Q4VLJPpO31+RX9RKB0j9AdLhthe4iW1XshFFxmjiY7zKf51m+cM2I6DRvooJMaEg0F93jCmzjEMIYZ74IyGDF708luzUYv7MpiXFXI7Q49u1V5XiEvzlwPoVaNKBSXUkQofc3nzAirOKR0SzshgWph1fuIlnHG6jkVzFQ== 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=iHe12jYFCsixkC+lD66ZJrCoQJgG2Et89o2kOEOZydg=; b=VpJyExhxKzCC6rUcM0D0xGEMdMNIGXhkOFOLzmreoRDT6HyNGiGLB+6nZP1IeSeSl+/ZR+MJdEfCyolo4c4RsqRfX8yg+4BcR5jb+gzBNiOfdjqonfAY2pHGMiIomkNpoo6ReZTGhXIjTDHEZHVUmITovklisR9Hf7yuuWtt0hirxD5hHiLNGy5AnetZbKf/+pXvPVZ7A9su3z3ei66S5npeCUbWM0VVMWodylBoKS83mpKrUUmTmRV48WEDZkHdChLxVHCyuuQaS6EZNvJj7TMN/90YrD5bU19V4w77nQMFFu3VC5DOYIpLMjIRhXhGdnsER1B/cCKuHVpgml7DWQ== 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=iHe12jYFCsixkC+lD66ZJrCoQJgG2Et89o2kOEOZydg=; b=xFMu8r8JuEU2YjKCWjdIKRzeWtqXG7RFR6oDic0x0/Lxk1o824jCSL/Wp3tvoSbfi+d1yQD0BVAg2DXtQE3cdSzGc3MGl3QCWmGanvwxlbeh+JC3zj1+RPP3sdRgvA7eaGVC/YfqQTeU8gDWN+aO5wkP6+PdGvfL+K+7u8T3Q/M9dgbWikpioM4vIqGurfKGvXbNCHTOeBr363R158XAu68cX5kVo5zeJa0kR2Wl0tztgOPlFV62WXIkXNiTXXBRAFSHHi8vXb1A2dso9/0bj7Mk6JsYsI2SRaHiMmIoFXu+G3GC6rhRr1EncxWcz83D5RqodoKyWVomNctMcevA4w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <00736f1f-6a0e-f368-194c-edca196ec577@suse.com> Date: Thu, 28 Sep 2023 09:17:30 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: [PATCH v4 7/9] domain: introduce GADDR based runstate area registration alternative Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Henry Wang References: <3ba59868-101d-b68a-d8b7-767ee94910ec@suse.com> In-Reply-To: <3ba59868-101d-b68a-d8b7-767ee94910ec@suse.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR4P281CA0177.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::14) To DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|AS8PR04MB8884:EE_ X-MS-Office365-Filtering-Correlation-Id: 4c8b28f6-3851-4203-ffa3-08dbbff2fb94 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mM5aKLELW8bAnciazI5LknkegWzpP6f4wYSpqcqQ/TF5LwllXCOmkEeRdVvP7XaXnMWtxe08yWdHUO3O0jAR9hpFI8rPzCHblKu0WDb8aFVhvPIZWSYmb/Y3zNOSlyUODb2i0fajShQif9QIP1R5MFEMA3KuAUdPEbDXALmcr42Vbi+AJ90EojVilTyyxu4H4+0g4hK62clSDNjbYa2J8nKo6b1hB/kLZAVPyocKDBWQupSnRNcPnQJUfwWd+U5bsVeFQUacKDvq7Awc2bVA5cKJs3xpStCcv1fVeIHdHsv+e/hRB0UfBIVMoOP38SGnePGHP822qk51pcq55g8eEYxQC1Fqd+sWgBrH3c15XUzCKm/ESroEG8AA0l1pQqpL4wyKgQi1R6/qP6KBayu55Uh/NruRTy0O414rQNmF5/HPnHXQq+Y3ksqRCALV5fh1bogjx3ABtsqtyjdPr21ebl8Is3q3JMyphAxDqTzMCbJrCWppYLRiqwwy+MXsOWIUcwrELMA5OQ2VkCClWxlFXOjzqJbyFcxfsnWKMQ3Nb/+g82QApxaGnjW56Biz9c67iMTvprUQTzdczFOL0hwJncbEmntkURC2nzFrSE3s9Z1lTvzvpaDDvP1h7H7VTp4QuFdBZXj9UCEMcl+qwhBEPQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(366004)(346002)(376002)(396003)(136003)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(2616005)(83380400001)(26005)(31686004)(478600001)(36756003)(6512007)(6506007)(6486002)(66946007)(66476007)(316002)(66556008)(54906003)(6916009)(8676002)(41300700001)(8936002)(4326008)(86362001)(5660300002)(31696002)(38100700002)(2906002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?blhiSnNwN0oreFFzR0h5NUpySTd4S0pQTUx2cURBTkJIZlE2RkVIMXc2dVNo?= =?utf-8?B?c3JaSUZFeStBbmdnM0pyYjZqcUF5SUY5UkVYVEFzdWhqdERnY0RQbVBXeGRS?= =?utf-8?B?bjRNSTZjVkg3eHc4OGN5cUVXUDR2R2JCSWpSUlB6SHNiL3ltY2kvblNyeEMz?= =?utf-8?B?dTdJcG9TdHpaeTQzLzJOM0dTTHJiWG9QeHYwZG9LSGZQYzk5b2tIMXNtamZa?= =?utf-8?B?WFhGVHZpdGViUDcyZi9qMEMzbEV0eVY3Y1FCT1ZXMTZDb2gwR24wZmVhRHRu?= =?utf-8?B?VHpKOHZmQjVqaTBsNFBFSmRHVFg3NFpHYjdMU1JVMlVYMUpYWVY3ZHcxc1N0?= =?utf-8?B?OWg2aGxUNUNpWmNEQ3RSUVpvc3NiS3grUmVSUG5TRjBrWkJPQmR5NHlVNzV0?= =?utf-8?B?R0MvSm1wUW1FdDBLaVozelozTTZ1eXViTHlld1BHRVlRdldhVmpveWJERU9t?= =?utf-8?B?VVZyLzdNek54SkcyTWRnWnZiam4vQS8vKzFhWmZxOVhwTndHa2lpd2RTSmhw?= =?utf-8?B?OS94MVJmVEEydzRLSDE0VG8xTHFnMldnc1FJOXp5MjhHUURjTDN5cGxGUDZW?= =?utf-8?B?UVE5ZHRRdlFMdUpGeXZyRVQ2NG1CczB4ZTJaSTdreUlvcEp3M3BPNWNDOWpC?= =?utf-8?B?U0QvZm5TSGNHOW5tazNkLzBHbnRjeWZ3VnVvUDNkZEhWWHB1MmtqMEovK25u?= =?utf-8?B?TnU5R3JOZ3pKT0lqYmxTUXorWlVkY2FiNXBlQ1Q3dWRteW9UMGRIL09Wdmhq?= =?utf-8?B?NVk5dm9YakJNNVNCdWFRdUFheU5Qbm95YnRBK3BzcGNWN0RNSkljeDZHVEJU?= =?utf-8?B?NVlzVFpuVlh3S1JLOFJRM0V0NzYvd0hBRXIyTktvYjN1UGVoZHN5R3RiTDVr?= =?utf-8?B?Mi9RLzRoUHEzNDNpZlRXdk0yVWJtZDdkaDBuU3ZKZXpaVWJRNGI3Rk1VSlIy?= =?utf-8?B?a2lWcitSYjdHTEkzcHpWdUFiR3JHSVlBMkZGZFU1amVjdTMxdmsxcUhXbEpJ?= =?utf-8?B?U1NlSkl2dVBtVVEwMUkrRlFDN1BxSXBnRlhyYnV6WnpyOVRGUTBUZTYyVEJK?= =?utf-8?B?UkxhdDZiWnk2Ym9VYm5WT2w1TUNDM25NcmFENWppWERyTHB0K2V5eC9EVkM4?= =?utf-8?B?d20rUjBFL3RPWDJyUHhNNHV0S0hZdFo4RG9abDVoZzFad3ZNM1R3Y3FDK0U0?= =?utf-8?B?dmNXcDZMS09td3FnY2dlc0FaaHVhaVJPeDlITVpoNndMSEk2ZGlCZnFxQk56?= =?utf-8?B?Rmk1SytsWDIrUXpFRnE0dW5JaHhTQ28yRHlSQVhZUHh1cEVBT2lUWW1za1Z2?= =?utf-8?B?Z2lPd1VoUmdFdFZTUWdGVmdzMmlaREIrRVJHaXk4RGRCa3J4UkhKd0RFQ3k5?= =?utf-8?B?aC9QYjkyU0p3bFVzYmZXUzYxRVljSi83eGVPaWZHMFR0ZEp2UGoxL0ZMb0x5?= =?utf-8?B?Y1I0VEx2TC82N0ljR3R3R2tHM245RkJBR1NVOFRPRFoyZkRESGlKeWx2L3Vx?= =?utf-8?B?a05pejFvNGlLaUVjTzhsbGJkeVVKdFN0ak9WcGhkVXc1T3paR3Z4RVhVN0Q1?= =?utf-8?B?UUtIZVFuNGtjZFUxRkJXV2dnd1FQSmJUWWxIRWREWlEwemtJMU1MOTlCUHlE?= =?utf-8?B?bHN4QzcwelFVVkJtTkdWN1JZaGdYbng3dlU0VVcvb2R6VGJMTXlOS3Vyd0Zn?= =?utf-8?B?M0k5alZDVkZpTFR5dXRDekRGdm5Nb3dZSXJGalg2MGFqNGtRdXl3b0Fwd2VI?= =?utf-8?B?Z2dFdS9YNHk0SXJaOXB2K2lFYXJEUjJHZmhLLzliQnk3YzdLM2p2UHViNzhC?= =?utf-8?B?QXhvS0xuWk16Uyt3ZFI0V3IyYlMvMTQ2RUwzK283N1YvNDVORlNPMmhNM3hp?= =?utf-8?B?RnRtbWx0NFZwd0dhSVJlaFlTdGZsd1d0RExEeU1OcGl0bWZva2tVaVJhK1Zh?= =?utf-8?B?L3ZnK0FqbW91TVFkaWgzR3dvbDNpV1JwYWNscFhad0d4Tndxa2x0WTVINCs4?= =?utf-8?B?Nm9vYnVuWlVHUDkyL2FqZU9mNHVhQ3lzZEEwL3AzMm1WVmdXMk5BcE81bUZt?= =?utf-8?B?bmQwWndyVmk0VTAzWWN5MzB2aXJzZHQ3d25UTklmSEZOanNSRkM5eXlqR2xi?= =?utf-8?Q?YRTs8bV6u+i2JiZr9cBCRLYtn?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c8b28f6-3851-4203-ffa3-08dbbff2fb94 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 07:17:32.7990 (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: nlRg5ig4Xhl20PRt6+MguBjWK/7mIxaqEzfUVvwN9mu9HpjgqU9X9pTou3BHPlTgwYbHFmbjiPQWvDavD6bo1w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8884 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1695885480209100001 The registration by virtual/linear address has downsides: At least on x86 the access is expensive for HVM/PVH domains. Furthermore for 64-bit PV domains the area is inaccessible (and hence cannot be updated by Xen) when in guest-user mode. Introduce a new vCPU operation allowing to register the runstate area by guest-physical address. An at least theoretical downside to using physically registered areas is that PV then won't see dirty (and perhaps also accessed) bits set in its respective page table entries. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monn=C3=A9 --- v4: Add xref in public header. v2: Extend comment in public header. --- a/xen/arch/x86/x86_64/domain.c +++ b/xen/arch/x86/x86_64/domain.c @@ -12,6 +12,22 @@ CHECK_vcpu_get_physid; #undef xen_vcpu_get_physid =20 +static void cf_check +runstate_area_populate(void *map, struct vcpu *v) +{ + if ( is_pv_vcpu(v) ) + v->arch.pv.need_update_runstate_area =3D false; + + v->runstate_guest_area_compat =3D true; + + if ( v =3D=3D current ) + { + struct compat_vcpu_runstate_info *info =3D map; + + XLAT_vcpu_runstate_info(info, &v->runstate); + } +} + int compat_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) = arg) { @@ -57,6 +73,25 @@ compat_vcpu_op(int cmd, unsigned int vcp =20 break; } + + case VCPUOP_register_runstate_phys_area: + { + struct compat_vcpu_register_runstate_memory_area area; + + rc =3D -EFAULT; + if ( copy_from_guest(&area.addr.p, arg, 1) ) + break; + + rc =3D map_guest_area(v, area.addr.p, + sizeof(struct compat_vcpu_runstate_info), + &v->runstate_guest_area, + runstate_area_populate); + if ( rc =3D=3D -ERESTART ) + rc =3D hypercall_create_continuation(__HYPERVISOR_vcpu_op, "ii= h", + cmd, vcpuid, arg); + + break; + } =20 case VCPUOP_register_vcpu_time_memory_area: { --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1830,6 +1830,26 @@ bool update_runstate_area(struct vcpu *v return rc; } =20 +static void cf_check +runstate_area_populate(void *map, struct vcpu *v) +{ +#ifdef CONFIG_PV + if ( is_pv_vcpu(v) ) + v->arch.pv.need_update_runstate_area =3D false; +#endif + +#ifdef CONFIG_COMPAT + v->runstate_guest_area_compat =3D false; +#endif + + if ( v =3D=3D current ) + { + struct vcpu_runstate_info *info =3D map; + + *info =3D v->runstate; + } +} + long common_vcpu_op(int cmd, struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) = arg) { long rc =3D 0; @@ -2011,6 +2031,25 @@ long common_vcpu_op(int cmd, struct vcpu =20 break; } + + case VCPUOP_register_runstate_phys_area: + { + struct vcpu_register_runstate_memory_area area; + + rc =3D -EFAULT; + if ( copy_from_guest(&area.addr.p, arg, 1) ) + break; + + rc =3D map_guest_area(v, area.addr.p, + sizeof(struct vcpu_runstate_info), + &v->runstate_guest_area, + runstate_area_populate); + if ( rc =3D=3D -ERESTART ) + rc =3D hypercall_create_continuation(__HYPERVISOR_vcpu_op, "ii= h", + cmd, vcpuid, arg); + + break; + } =20 default: rc =3D -ENOSYS; --- a/xen/include/public/vcpu.h +++ b/xen/include/public/vcpu.h @@ -110,6 +110,8 @@ DEFINE_XEN_GUEST_HANDLE(vcpu_runstate_in * runstate.state will always be RUNSTATE_running and * runstate.state_entry_time will indicate the system time at which the * VCPU was last scheduled to run. + * 3. New code wants to prefer VCPUOP_register_runstate_phys_area, and on= ly + * fall back to the operation here for backwards compatibility. * @extra_arg =3D=3D pointer to vcpu_register_runstate_memory_area structu= re. */ #define VCPUOP_register_runstate_memory_area 5 @@ -221,6 +223,19 @@ struct vcpu_register_time_memory_area { typedef struct vcpu_register_time_memory_area vcpu_register_time_memory_ar= ea_t; DEFINE_XEN_GUEST_HANDLE(vcpu_register_time_memory_area_t); =20 +/* + * Like the respective VCPUOP_register_*_memory_area, just using the "addr= .p" + * field of the supplied struct as a guest physical address (i.e. in GFN s= pace). + * The respective area may not cross a page boundary. Pass ~0 to unregist= er an + * area. Note that as long as an area is registered by physical address, = the + * linear address based area will not be serviced (updated) by the hypervi= sor. + * + * Note that the area registered via VCPUOP_register_runstate_memory_area = will + * be updated in the same manner as the one registered via virtual address= PLUS + * VMASST_TYPE_runstate_update_flag engaged by the domain. + */ +#define VCPUOP_register_runstate_phys_area 14 + #endif /* __XEN_PUBLIC_VCPU_H__ */ =20 /* From nobody Wed May 15 05:01:41 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=1695885501; cv=pass; d=zohomail.com; s=zohoarc; b=TmmGigx/E0P3HukArVwoHEYqXRyNMLBRMxSN13RDqRMwZpV+YynvSaBH33rgL40i/Brctt/tT5zkx/CX4Ki2PMQwjcGFDMS8ApYixibGDy2N64W3cRe7pnFJboGuuD5qT4y4GCUHdWkQS6u5HHc7R086Hm0yGa62otS2NwriEVE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695885501; 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=I+OV0nhX0WwhrZMdhQwtKb70aws/RhTWdhHwFYCofOM=; b=TtYQ8iv58iLmJBosxcbShoLu0aEHa/to/isjX46timjmp8sUUqMCFtYTj5zWRptRlfYBUvVtvRdorz64+CA8L2/l0/ccyzi5udHdgKSaCbfEzma2LpxTE2bWVn+winSmZVB1HWpaTk3ZcjkItHS5svmL0ddGh9Kfl0Ss5P1Q09A= 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 1695885501138354.56724140560914; Thu, 28 Sep 2023 00:18:21 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.609325.948362 (Exim 4.92) (envelope-from ) id 1qllHe-0000mu-Pi; Thu, 28 Sep 2023 07:18:02 +0000 Received: by outflank-mailman (output) from mailman id 609325.948362; Thu, 28 Sep 2023 07:18:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qllHe-0000mn-Mr; Thu, 28 Sep 2023 07:18:02 +0000 Received: by outflank-mailman (input) for mailman id 609325; Thu, 28 Sep 2023 07:18:02 +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 1qllHe-0007vD-1U for xen-devel@lists.xenproject.org; Thu, 28 Sep 2023 07:18:02 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0614.outbound.protection.outlook.com [2a01:111:f400:fe0e::614]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 27434696-5dcf-11ee-9b0d-b553b5be7939; Thu, 28 Sep 2023 09:17:59 +0200 (CEST) Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by AS8PR04MB8884.eurprd04.prod.outlook.com (2603:10a6:20b:42f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.21; Thu, 28 Sep 2023 07:17:58 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::9f5d:8bed:7a5b:e75a]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::9f5d:8bed:7a5b:e75a%6]) with mapi id 15.20.6838.016; Thu, 28 Sep 2023 07:17:58 +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: 27434696-5dcf-11ee-9b0d-b553b5be7939 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EPkMsnabufSmpbx6QIx/y3RCccc5Paton0OJnj41bAN3dXbHTFSqGkgYG3Qi4+PloxpwDoYGO/dbEF9egUO/C0d1E5IM0lxQE95p69cTcu8P4VjNDOVImzOVVnz5YAnSpLEljluTmQnL3PLZ2j+n7rZ3+kDvNBeo3OfWA52GsTc+DtTyr0SHtbzfa9alblHD3HNMLsZg63uMb8wVxTnTu4rBq9hh25js3Ca1dsxrAK34SSKISKvxTGKlTS5w7GN1sUOxdM6LRI9AYf7Fr5Eap3PPz2GtSAbToolwgwnSp/HQXM6WTWIKG0CYLKaG9CnRu0rET/IPoEpp8PFHydQ/Zw== 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=I+OV0nhX0WwhrZMdhQwtKb70aws/RhTWdhHwFYCofOM=; b=mrhqEjHRXtJUxmNvp9wW1MEkvphEqWFqav8h2IB52p62ZHDI4UW9kSpYAyuVeXqPgaOHJJ8sY/x/kCmc3ZC5/JZruS+BYNTqvRXsKOzOr3XwUVijA8Ho9aK4wVqw/CwZJtUFAm6XXRxAMg4+t8TVse+lbbp1070ad/Wu2ALEvvS/O38TLhZp8UVHWZHXqtIRAOphaOOyvCKSW2LTa7ypAcWGttpOuLnm0+hF5xaoFk7lNoy6zTqmF+Z0HsNoFBjmlEeTorJEF4DOyiSmvCo5dxSFbaYZUoG19r7WdXHdEUQSWSDstG3oTGlibYI/v3tPBiYCDJ29EeLaccysfpS7JA== 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=I+OV0nhX0WwhrZMdhQwtKb70aws/RhTWdhHwFYCofOM=; b=Pmr6EypQ4XsfLWOElSTKZltr/62Zn0TLRMewjFu65Pq2x/s3iJWloW+PjKLCsqPZITw9LO/AR6LeTpX5Vuko8v8pnCJToVd5bOAXLJjU0esbuHBzoKEsDruJSv8+AdaTQQg+xzbdVJj2wAT6hK5UwRRDrDxzOK0lyZTJhhu3TvFsc9PoIQW2T39EFWIU1eb8Askmyib8AHJPd83m/7pmb/WwZZ3YYt2rx1cxG5/pug5I7rsE6jbfCAfknkvasxTOvLiTxFAoyYl32qwCFagQsxSo7Oucc5bqTdoaXKj+jazPhj6YRWKFIMvYij2i701wYjw0OuSXiCbN7bnrQC7WMw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <4f28ae35-031a-461a-4be2-b24a057ea20b@suse.com> Date: Thu, 28 Sep 2023 09:17:55 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: [PATCH v4 8/9] x86: introduce GADDR based secondary time area registration alternative Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Henry Wang References: <3ba59868-101d-b68a-d8b7-767ee94910ec@suse.com> In-Reply-To: <3ba59868-101d-b68a-d8b7-767ee94910ec@suse.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR4P281CA0163.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ba::8) To DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|AS8PR04MB8884:EE_ X-MS-Office365-Filtering-Correlation-Id: 264fa25e-f1c8-4ea0-23aa-08dbbff30ac0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ept45ednt5cbtDXb7ICCfhgIFUH+r7U7YPlm4uROa/5tKfzn/QiurLtb0tSYg3CEs8wyT+EvZm+534IbU+MpixjtbL6vruaKBZzkfs4GRYUI/n3JmGx3sf9sDT7KbH4dgRXyhvxgrL3i58d9ZZM0ggBtGzuo+bM7yjQgnJisIjoQxORzvWKJ4bOLM4Ag7dIOL4+m0OFOhj/DfvDhkb0wlUoYOwIclVD1eO7qpu9noOL9GIHLE/BWhV1gzRdJlVq9h8iTy5W39CHa+66ZjRoDF1RLUu9gj/H8pGSAN2BTnq0gy6lNrLmKS8J+ud3EwV8XuvzZA7TIBLv5BKZugy1vNAavgJ63EXQEQGHWIcBUMNc0LPaSYqy/h43baUeajoSWNmfe/La6QYLIRiW3FyG9/quCG6w58447VWO6iEZHPp8LEW6qNLF22w38QGNbABk+lqQRx2RB/Ntf/KVRnzw4EXv6RpVebLfB7ujK4GKp4vTiUEANYvboZ4SKDNA5hBuf6PKUGsCVGs4cK3KEyy+0izfX7YBGX1Cun0cHhvwOx0ME66TBie2U4JSEmAV+XGFcFKMw7jfcwnEGr0cJTJ20+3sD/psc6NQO/olfunkyG1Ul3toi+7PAE53TtSacNprvFK7eE8CLvy6sjxYXqK/tlg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(366004)(346002)(376002)(396003)(136003)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(2616005)(83380400001)(26005)(31686004)(478600001)(36756003)(6666004)(6512007)(6506007)(6486002)(66946007)(66476007)(316002)(66556008)(54906003)(6916009)(8676002)(41300700001)(8936002)(4326008)(86362001)(5660300002)(31696002)(38100700002)(2906002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RkVBeWhuS1dDUEhZYUs5cWorWkJ3YW8rc2pVMC93Qkl2V1F5Mmlac09ZSldn?= =?utf-8?B?R2xpQW4rRTZRNWJtYkNoZGRpOC9BMi9FWUd2amlhNlJCK1JEeHZHUk9vRTE3?= =?utf-8?B?T1dkS1hMd1VxMzczYWtrVnlMKzNkQ2VsTER1RzdBTEVIL3g4TEtTSTBUYVRM?= =?utf-8?B?YUJaRXdqLzFMWHRFdkVVbnVyM0lCM3hwU0ZNTjVQMStFS0JIYjJHTXdqdDZo?= =?utf-8?B?RVZZNDQ2Sk9RRWx5T1ZCUGpENnVNQ1lqOGlPZ0xuN1pUbkxTazRZdVZidFZm?= =?utf-8?B?NWZPMkltWE5HUTZrVkxmVDVtdm1paVRObnhBY3JKWlYzTlRuK3U5LzYxWTJq?= =?utf-8?B?Mm5wc0VWTG1iSjIxbElxVVhFSHRVQWNBb0VrMDZPakxXNndHNFJ1THRYU0tB?= =?utf-8?B?dStac0hkTjFLckRjOUpPSkhTWjE4YnNhdGVZQjBFelI0ZWJkWXFMRW1xbHd5?= =?utf-8?B?c3pGRnVCWVhqcXRLL3hoVkd4WnMzSU8wYXpDcUlCaEFtaStCRDJ0a3hsRWZx?= =?utf-8?B?cGhqZ2RQVFJ6bXRabWVFYko3WEJIUDI3ZnZQUHY2OWhHSTlSWFFwTDJOVlNF?= =?utf-8?B?Tmp0YXhRMzIxc0xteWluN2E5cVhNQ1Q5U2QwZE9kNVEvNEx5QTdlTnVLaDVy?= =?utf-8?B?NkUxRnJnUWI4aS9ZYzduSjZvTjNGUm1oeXVKTU5UZnN4WFp1MloxZ1NMdVZ6?= =?utf-8?B?akFJSTF4bkl0SURvSnp1eUY0MTNRbDlrZ1R6U2V1WDFZM0xVenMrS3JJaXg3?= =?utf-8?B?S2J1TE5LMlZPRlRRT2tjek9zaEVyNEtWL3FOeFV3dE9wdHpqRURwUlRoM1F2?= =?utf-8?B?cHBWbTJKTFRDejNGUlpHcWRaMDlkaFJkNkRJQ2VvZ214VlVRZE9yTGVva3Fm?= =?utf-8?B?Rk5GRThCaUJFOTUwUVBxZ3gramlCN2gvRjVXSVNFaXNzNnBWWFR1SFVtQVNi?= =?utf-8?B?clVseEJxeDBZenE0WS9xTSszbDAvWk50aThpMHhYaS9JR21pZlQ2UUZPM29V?= =?utf-8?B?eExTZjgydEFGTVJ5S29vYXpreHNhbXdNVGNCU3dBSGVZWlZyVU1JQTJDeDRZ?= =?utf-8?B?TFVGTGF2VWlNUVBkcXd2am1Iajc5Z2U2NjNmNitnSng3bGpHVytYSlZxZDZN?= =?utf-8?B?ZWlWYWZicUJVYzlwK0ZIcWJyNUFURHBzYjE4Tk1ZbXduRk5FQSthUVhFRjJE?= =?utf-8?B?S3ptdlA0cVRabXlUL1N4SjFBOE1pREJ0YndQdlZqSmVwd0JyKytldEFlZHFY?= =?utf-8?B?N2VWV0xmTTdXQmdZbThLazEzOG9mbkhRZFV0VitJb2ZzSjhHWG5wMGtxK2pm?= =?utf-8?B?bEhqZ2JXVzNGM3VWa2FQMk5qVkUrZk15RllBSjY1SnJOT3ZERnc3cDVQdDZZ?= =?utf-8?B?MGowQmFpYmcybVFsQkpkeHphQW9nWm9zK2hWVi93b2ZuR3pKOU9HeHhIVXNB?= =?utf-8?B?OXhGaVZ5UmpETHpQSmNyKytMMzE4bmk1YnhBbWpVYmg4SnJEZ1doNUgrazZv?= =?utf-8?B?Tnc4R1RSMXM0aWxFYysya3ZEUWRxMjJDeEZTeTMvRzFxdjBuVGViQXo1bjlQ?= =?utf-8?B?Q1kyQTg2UEZndVZJTzVwUW54eUlUU3B3cjNsaFNRSWJRSjZ0R3E5VmtLdGlp?= =?utf-8?B?M3h2NUxxbG9QQzdIaEdhNENwWkhNNllqR09LT0JpdFg3bEI5VFYrTEJEbHdm?= =?utf-8?B?WnNsYmhNS24vT2tSend6NGdzc25sS1RlZStrQ1E4R29BNmw5WWJDTEY0ZEVr?= =?utf-8?B?RjR4WjBxK1YvQ290OXc2VGNQR2lmK0NHQ25mTlV2Mk1HMWRlMTNkOUx1ZWlK?= =?utf-8?B?cFpFUHk2Q0RMMlJOcm9VUzFGNUIrWXJubmNOdTNwM2dhYSsraHRHM1hFSUZ1?= =?utf-8?B?Z1MrczVFelRzeGRsa2d3V3VnM1MrODFPUnY0NE1WYk1jM2U1TFJmQm9BK1Rk?= =?utf-8?B?MjNsbldFbkM3Q09JUXBoRXpZRFVhR056SklicTZocXN4TkRYd2RDak55TjZO?= =?utf-8?B?ZkxkVndqS09nNTRVeGhoc1lDdTluUXhCNzIxdG9pUEFaT0JqWldHcko0TEhr?= =?utf-8?B?SFh6YmlyL0V6aXZxcFl1aUY3WXFlTVVpQW9qOXhOTVBtT1FZZ2ZBQWZoam1V?= =?utf-8?Q?nAFyjuRJ3gEnHSmBLxB08sQ+k?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 264fa25e-f1c8-4ea0-23aa-08dbbff30ac0 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 07:17:58.2340 (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: zE0Oa4A0aBCKJbQ/T7En8QNEbcdI/pLyRESvOf5uR7byHXgr9WLhlZZBvr6avDMSYPT6X0yDfjU03E+HPBWRlw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8884 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1695885501778100001 The registration by virtual/linear address has downsides: The access is expensive for HVM/PVH domains. Furthermore for 64-bit PV domains the area is inaccessible (and hence cannot be updated by Xen) when in guest-user mode. Introduce a new vCPU operation allowing to register the secondary time area by guest-physical address. An at least theoretical downside to using physically registered areas is that PV then won't see dirty (and perhaps also accessed) bits set in its respective page table entries. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monn=C3=A9 --- v4: Add xref in public header. v3: Re-base. v2: Forge version in force_update_secondary_system_time(). --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1529,6 +1529,15 @@ int arch_vcpu_reset(struct vcpu *v) return 0; } =20 +static void cf_check +time_area_populate(void *map, struct vcpu *v) +{ + if ( is_pv_vcpu(v) ) + v->arch.pv.pending_system_time.version =3D 0; + + force_update_secondary_system_time(v, map); +} + long do_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void)= arg) { long rc =3D 0; @@ -1566,6 +1575,25 @@ long do_vcpu_op(int cmd, unsigned int vc =20 break; } + + case VCPUOP_register_vcpu_time_phys_area: + { + struct vcpu_register_time_memory_area area; + + rc =3D -EFAULT; + if ( copy_from_guest(&area.addr.p, arg, 1) ) + break; + + rc =3D map_guest_area(v, area.addr.p, + sizeof(vcpu_time_info_t), + &v->arch.time_guest_area, + time_area_populate); + if ( rc =3D=3D -ERESTART ) + rc =3D hypercall_create_continuation(__HYPERVISOR_vcpu_op, "ii= h", + cmd, vcpuid, arg); + + break; + } =20 case VCPUOP_get_physid: { --- a/xen/arch/x86/include/asm/domain.h +++ b/xen/arch/x86/include/asm/domain.h @@ -692,6 +692,8 @@ void domain_cpu_policy_changed(struct do =20 bool update_secondary_system_time(struct vcpu *, struct vcpu_time_info *); +void force_update_secondary_system_time(struct vcpu *, + struct vcpu_time_info *); =20 void vcpu_show_registers(const struct vcpu *); =20 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1628,6 +1628,16 @@ void force_update_vcpu_system_time(struc __update_vcpu_system_time(v, 1); } =20 +void force_update_secondary_system_time(struct vcpu *v, + struct vcpu_time_info *map) +{ + struct vcpu_time_info u; + + collect_time_info(v, &u); + u.version =3D -1; /* Compensate for version_update_end(). */ + write_time_guest_area(map, &u); +} + static void update_domain_rtc(void) { struct domain *d; --- a/xen/arch/x86/x86_64/domain.c +++ b/xen/arch/x86/x86_64/domain.c @@ -115,6 +115,7 @@ compat_vcpu_op(int cmd, unsigned int vcp =20 case VCPUOP_send_nmi: case VCPUOP_get_physid: + case VCPUOP_register_vcpu_time_phys_area: rc =3D do_vcpu_op(cmd, vcpuid, arg); break; =20 --- a/xen/include/public/vcpu.h +++ b/xen/include/public/vcpu.h @@ -209,6 +209,9 @@ DEFINE_XEN_GUEST_HANDLE(vcpu_get_physid_ * segment limit). It can then apply the normal algorithm to compute * system time from the tsc. * + * New code wants to prefer VCPUOP_register_vcpu_time_phys_area, and only + * fall back to the operation here for backwards compatibility. + * * @extra_arg =3D=3D pointer to vcpu_register_time_info_memory_area struct= ure. */ #define VCPUOP_register_vcpu_time_memory_area 13 @@ -235,6 +238,7 @@ DEFINE_XEN_GUEST_HANDLE(vcpu_register_ti * VMASST_TYPE_runstate_update_flag engaged by the domain. */ #define VCPUOP_register_runstate_phys_area 14 +#define VCPUOP_register_vcpu_time_phys_area 15 =20 #endif /* __XEN_PUBLIC_VCPU_H__ */ =20 From nobody Wed May 15 05:01:41 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=1695885752; cv=pass; d=zohomail.com; s=zohoarc; b=Z5/q+myNhPqyKedikopPml+1xirhZ3izBQ6Bc9O8Kucd4aXG9uhXx73Njz1YIPKQt1KTvTqid+O0IwW+P6t6kyTZPETTY6xA06UicJpnv8rLK+s9+XOC6H4QQWaHuTexqKicCpJL4lsHCT5r+CIJDzqEPnDAHbtdr21HlRKVUm4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695885752; 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=Q6heSYFw3PZWXqBzIsXffgtlNiPmiim8ZkFs/SFPCFs=; b=THCoxFC3iRwyEBT/XHruLH5vIDm+tWx11BUY4/QIu4FSOXnC1dw20QPEWWhhdambOZYyPgh7xzRhiWkI1zVKZt31V7WTZUZ2p4AbOd09vVAMvJumpRw3ZNaQrhCSBoSM6My1qFFzJUiCJoNhiLc/s4LX6zfcmojcVddBDlcL/T4= 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 1695885752466979.9614204406606; Thu, 28 Sep 2023 00:22:32 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.609330.948371 (Exim 4.92) (envelope-from ) id 1qllLX-0002hO-9z; Thu, 28 Sep 2023 07:22:03 +0000 Received: by outflank-mailman (output) from mailman id 609330.948371; Thu, 28 Sep 2023 07:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qllLX-0002hH-7K; Thu, 28 Sep 2023 07:22:03 +0000 Received: by outflank-mailman (input) for mailman id 609330; Thu, 28 Sep 2023 07:22:02 +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 1qllI0-0006Ef-EX for xen-devel@lists.xenproject.org; Thu, 28 Sep 2023 07:18:24 +0000 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on062a.outbound.protection.outlook.com [2a01:111:f400:fe02::62a]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 3579f611-5dcf-11ee-878a-cb3800f73035; Thu, 28 Sep 2023 09:18:23 +0200 (CEST) Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by AS8PR04MB8884.eurprd04.prod.outlook.com (2603:10a6:20b:42f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.21; Thu, 28 Sep 2023 07:18:22 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::9f5d:8bed:7a5b:e75a]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::9f5d:8bed:7a5b:e75a%6]) with mapi id 15.20.6838.016; Thu, 28 Sep 2023 07:18:22 +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: 3579f611-5dcf-11ee-878a-cb3800f73035 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SSW9KEgqBO+SWH32jJ4Eccxs48NNvf1VhDfFCnezm2+Io+UmO4FOLuLDfCWT2jqm+NsQXZtd2XKIEnpzjaBdNqLw7jkmO3ah0ekzetrW9dGzGpcVEKp7rf/5YfoOGZK+/VQlgF6kKvPNV+onET44tt9Kp1qaOBrtRW/YWicmFErgNff7fr/U3lXgvabFu3YrjM0HiPP7LWoz8oIqKQ9TPwI5OYPOCFYTqhEVuT5VpZjrkVzawohPR1O1wnhrlwAHwzZbiNlMWhyUQFN2LVyIYZapFRCakwo6nTDdUpuloFn2Fmsx9bIyjoP1lO6YWeUycAo21fxQkA0Zyl/GNbionQ== 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=Q6heSYFw3PZWXqBzIsXffgtlNiPmiim8ZkFs/SFPCFs=; b=gysA0cNKlbKivDWhRxGfOYCmbiXbd/m4xj+b7KyKyZTS52XuT7uAKFtPRDX/elURjGqHFe2pIb8Fo7o6NRbTt5Q80BAg2inVhrhVR8TL9EVQuZOoCKYXaqUwJQdsPLNHbpKgfsMLUjk961dIO5F8aQcEUKucNDp2HuYsX0yvXerw/eVMfbTK4qidlhxu2ay83aL20NBAIpWSi2QJaeDHxbYO9kbPaDqq0ZGambpAClLP2g6Q02JWCw2MGgxWK27/00XJbEbcVvCrcC7gYn0TtlV6mve6Q0MtT6vz1RED8Jr77GvMUfffla50yEQPxSOQOqyZMP3kodD7SA2MFXDonA== 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=Q6heSYFw3PZWXqBzIsXffgtlNiPmiim8ZkFs/SFPCFs=; b=o5bf5PNj6onGkKiC+FYf2tLtKGhOBDmw2s+1wUKLA84o3VqJn1dl7k88xopnuMvHz/1RnmIK1mKuKqf95haRvKXp01FqWmMJL8Vefr1ZhH5SB7AwcyXSIFurCCpGTfI+nwqrI1I5i7cFj3WhBC2MGky1MRb4JDV59Q7vMxxQPBukFLlzajkKN12bwsN4eQbsrkxnN3Mg0HFddvyBYPVGW2xbdUchOoKZcODDxsxadUSv/NXx0fLnauGloJqv6PxO1hkCl22APngZY749olXqPXnDHyvmx3heORSwIB7wxu9bn5eWQpEFru82+5JERoxr7F+44QodB3wQdu8helaP2w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <3e8c1577-783b-ece2-3302-b1a85a2f53fb@suse.com> Date: Thu, 28 Sep 2023 09:18:19 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: [PATCH v4 9/9] common: convert vCPU info area registration Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Henry Wang References: <3ba59868-101d-b68a-d8b7-767ee94910ec@suse.com> In-Reply-To: <3ba59868-101d-b68a-d8b7-767ee94910ec@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR0P281CA0164.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b3::6) To DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|AS8PR04MB8884:EE_ X-MS-Office365-Filtering-Correlation-Id: bfda5261-4595-48f0-0a90-08dbbff318e5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nDxN0hqlgVbkRULRYvsnh/lYwr16uuYUcxKyN4xFQ6pvfun8UJIu3a4UlEl3+lPxamp9xuzrX+AakXkZNoPyKrS4Lcdluy14P91eAzTZUfy9h1Hsl0NV+CxZUJvbQxDHuKmHzwT52sS/K/Xza4XThp0H3Mkmf0wwGYRbwJ28Mjj8YKwkJbCJg/Q5ZQcBny4RCpw2oe5VK9pHH/0HhyQUgMRFKqaCt3CtWbR6srX1i/m9+ucHqGe770RABRF74DYMI24N1U3Mlv7fWIdqG9mKa4H0qXIm35vZ7Va4hpQogze9Z93TnrFFW5m/5d7Pz/x4bvMHEm0cj0kV0yRrqDR0LHN0HqxzotmxfSNCh6b+MFszppGEC0R6puphoETws9jF0cWb4UyTB+Bwkke5ikzd0u1f05MOESYSiwe4hdHtTkW6dOdPXtKJ1lqrQsPzKu6zs104u3vLyAtYGzc8wIU7yn/TsqJ9Nx4fMILeD9sugHT9H6FIYm2k7JJe8K4oJENs9v+7vwDc+XzqNRtxXOjyM3p6cunLoQm8Ho8/ygFTTt+rAm7AfkM3geeS7gF6AyzYqP1aAKpQHDOYy9dqw+2JPKaviMcFaRoAt3YaucV9oy7W/ACP8zk6LzDt2+aDflrST3hwXCW/ULiINg2YD9z/nLlVmi3vYPSkVhi+vtz12Y1Jtro9UlEQVkW2dExBC946 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(366004)(346002)(376002)(396003)(136003)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(2616005)(83380400001)(26005)(31686004)(478600001)(36756003)(6666004)(6512007)(6506007)(6486002)(66946007)(66476007)(316002)(66556008)(54906003)(6916009)(8676002)(41300700001)(8936002)(4326008)(86362001)(5660300002)(31696002)(38100700002)(2906002)(30864003)(45980500001)(43740500002)(309714004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TnhaTmpDK3g0OURjZ01FVTBYRnVSN2NZWG9kVUMrVUlHNGhNN0xBVHI1dEZK?= =?utf-8?B?WEJpSHFxMmN4OGNDYW9EeUhITEdFQUkvUEQvT3p3S1V4WkdmTmZVNXp6Mk15?= =?utf-8?B?dXJMd2pKbjZFRlFiK2lmMkdmaWRUNlAvQ1o0YnNUQ1c4YnloSFExc1ZFVm1V?= =?utf-8?B?ZjlIZEdLMG12cXEvZ3p3RHpWSzJ5R3RLUzlsTW92c3pBeGdWUDBHSitHeHZF?= =?utf-8?B?Q2EzU0JQMlFIY1dFdWEzclZCaUV5bms3SnFKcXVjN0hrcGxoTlRKMnZHZUcy?= =?utf-8?B?NUlQUGNac2M1eUpFc3BXV2YxKzRvdlBoaXNxQnpRMmpmZXY0SllxZ1RLMWov?= =?utf-8?B?bUlpWU1NbDFvci82KzJLd1JCY1ZjTE11Q0h6WU0wbE1CaFE5MENYcy94WmUv?= =?utf-8?B?aTQxRklVRkJQNURoeVNHa0lvaFY2czVqSnd0Wm1KZE5mUEVUTTZXY1c4aW9q?= =?utf-8?B?UDl0UVQzd21OVWtGNjRndU9rTG4zTlNubUdoSTNWNUJPTXk3aUhYaS9JVFpi?= =?utf-8?B?ZTRSamNmT29iRnlBVlFBTmRjRnZWRlgvaDFaQnRZSUVWZnJQQzFZK3N6dHVJ?= =?utf-8?B?TmdWakQrWkNhVXF6NEZOaGVyWnBlOHR2aURxUTRDcjBIMVhESFdMMjVIeHU0?= =?utf-8?B?a1poSm9xYW1pS3ZvYVJ4Qm9acUN4TzdGZWZtd1ZNV2docjYvMTB3Z2VTcS90?= =?utf-8?B?MHArQWZlaVZVd0ZySy93dk8vUWJhK0k2clF0c1lkV01iZ3B6Zk9ydUZIRFBW?= =?utf-8?B?bmhGZ1oyWnl3ZXBQazdUMkJkNzlpMlA1bUxTeUF6eGlPRDJJZ0FmQWRIcm9i?= =?utf-8?B?ZXhQdG5zZ0RCRzcyOGc5UnpZRDJWWnFmbkJRM3M3enlUUjNzUy9raHMvbE1h?= =?utf-8?B?MmlJazd1aXIwS3hUUmpTZUhPUW8vWUNPalFlUFR6Z2hlSnNFZFhrQWE2WW5V?= =?utf-8?B?VVhYNm5PbGFFTDZPbDBOaWltdmNLeFVwUEVDcmN4elBCem9INFljMWtaT1RM?= =?utf-8?B?cFlkei95SFF6RFBQTEpHTlpOSUtxSDBlYytoVXpodDE0NW9GUWVucVdIVXBw?= =?utf-8?B?ZUJZSkZ3enlxRE1nYWRvNEVjeDZhZ04xTmdEeWNTTXhIMGFDY0NmUjFEWExx?= =?utf-8?B?QzJ6c0s4bWZuT3ZjMUdpa3RlaHZWeWw2NVd1VjU3QThtRDM2SEFtbzdRTG9K?= =?utf-8?B?MlYvSjNCNkhacHVHNTdvNWVpZ0VKeWp3aVVVQ29IdEhuekJ3NmRjL2tPZzc2?= =?utf-8?B?RnBFV3pHS0hMN3FVMitUMndCemhyaVEyN2VVQUNYVjc5dUNMdTNJcHl3Qmww?= =?utf-8?B?WW94M0pPTEx2S3o3QjNkRUV1TE5EUjhuV09pSkxLd1IwWkZMK0pRWUwvSXRP?= =?utf-8?B?MFZGWHpYalpVcGxUSU52ekZlcWVVR2pmblh1dHE2RlZzRjNzSCsydmxCK1du?= =?utf-8?B?T0pUbW9KMy9mZUU0OVhGdENpVWVvS3BWUGlqRmpYQjJEbWFwU3RTRGtzZjg1?= =?utf-8?B?UnRoN3kyNk1OZE9KNmI0eVhqWTFIL3djOGhmeEFVQjJQeEdFZFVqcHdtR1dh?= =?utf-8?B?UXlESlQ1Tnk3eUNsQkNzV1FuSklpY01DK1JQV1V2OE9GdTRISzVVUUwxaTBG?= =?utf-8?B?b29YRWpBYms2NjJBekREVEk3M0lYeFZpSXkvQ1d5bU9BdlNFTFlVRUZqMU5a?= =?utf-8?B?M3g2WElhSWt4SE1UT1Z5emZkSEtYcEFtSWRyT1Uwa1BUMzZ5M2h1NWV5bi9a?= =?utf-8?B?ZlVlT0x2di83K0pHSU9JNUR2LzNtRVNMaFFWVzUrRWRQZTRPOThmQTBDck5v?= =?utf-8?B?VjZWSmxLOEZZN0h4eDY3ZEZsa1hjc1kzQVFhT2VWUlZZOU8yRUdvMmlicTlk?= =?utf-8?B?bHI1Y2pnU1MvdGNwOFlKMHhPdUJ0N0Z0dVhPRnl6cWNuWXFPT24zMkNyaU1i?= =?utf-8?B?NW1uSDVxVEo0NGV3SUYwSlhGVG1MZW5yWmV6Y3ppN0lUN3dDZTRBUm8xWUFs?= =?utf-8?B?VjgrWE1UUGZtNVUxNC9oRW0zaThGN0kvejBNcEo1anNpNkRteDJrYmdlajEv?= =?utf-8?B?ZElLV0M1T1pIOEw1aFcrOFRrcU5ZUzhpMnFNaXdMaW00bng1c2JpUmc3VVdx?= =?utf-8?Q?McrH/bV0RXIfnFOXKeWPPiTKu?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: bfda5261-4595-48f0-0a90-08dbbff318e5 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 07:18:22.0098 (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: k0oxxg3k/dNKwDq0kzhsXNJF99TL+zfgCP4tLJDeQsm6mv1bfDASCdw8PWZol43DzwLGGZHBYq9f2KgZ5TDbkw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8884 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1695885753239100001 Content-Type: text/plain; charset="utf-8" Switch to using map_guest_area(). Noteworthy differences from map_vcpu_info(): - remote vCPU-s are paused rather than checked for being down (which in principle can change right after the check), - the domain lock is taken for a much smaller region, - the error code for an attempt to re-register the area is now -EBUSY, - we could in principle permit de-registration when no area was previously registered (which would permit "probing", if necessary for anything). Note that this eliminates a bug in copy_vcpu_settings(): The function did allocate a new page regardless of the GFN already having a mapping, thus in particular breaking the case of two vCPU-s having their info areas on the same page. Signed-off-by: Jan Beulich --- RFC: I'm not really certain whether the preliminary check (ahead of calling map_guest_area()) is worthwhile to have. --- v4: Re-base over changes earlier in the series. v2: Re-base over changes earlier in the series. Properly enforce no re- registration. Avoid several casts by introducing local variables. --- a/xen/arch/x86/include/asm/shared.h +++ b/xen/arch/x86/include/asm/shared.h @@ -26,17 +26,20 @@ static inline void arch_set_##field(stru #define GET_SET_VCPU(type, field) \ static inline type arch_get_##field(const struct vcpu *v) \ { \ + const vcpu_info_t *vi =3D v->vcpu_info_area.map; \ + \ return !has_32bit_shinfo(v->domain) ? \ - v->vcpu_info->native.arch.field : \ - v->vcpu_info->compat.arch.field; \ + vi->native.arch.field : vi->compat.arch.field; \ } \ static inline void arch_set_##field(struct vcpu *v, \ type val) \ { \ + vcpu_info_t *vi =3D v->vcpu_info_area.map; \ + \ if ( !has_32bit_shinfo(v->domain) ) \ - v->vcpu_info->native.arch.field =3D val; \ + vi->native.arch.field =3D val; \ else \ - v->vcpu_info->compat.arch.field =3D val; \ + vi->compat.arch.field =3D val; \ } =20 #else @@ -57,12 +60,16 @@ static inline void arch_set_##field(stru #define GET_SET_VCPU(type, field) \ static inline type arch_get_##field(const struct vcpu *v) \ { \ - return v->vcpu_info->arch.field; \ + const vcpu_info_t *vi =3D v->vcpu_info_area.map; \ + \ + return vi->arch.field; \ } \ static inline void arch_set_##field(struct vcpu *v, \ type val) \ { \ - v->vcpu_info->arch.field =3D val; \ + vcpu_info_t *vi =3D v->vcpu_info_area.map; \ + \ + vi->arch.field =3D val; \ } =20 #endif --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1749,53 +1749,24 @@ static int copy_vpmu(struct vcpu *d_vcpu static int copy_vcpu_settings(struct domain *cd, const struct domain *d) { unsigned int i; - struct p2m_domain *p2m =3D p2m_get_hostp2m(cd); int ret =3D -EINVAL; =20 for ( i =3D 0; i < cd->max_vcpus; i++ ) { struct vcpu *d_vcpu =3D d->vcpu[i]; struct vcpu *cd_vcpu =3D cd->vcpu[i]; - mfn_t vcpu_info_mfn; =20 if ( !d_vcpu || !cd_vcpu ) continue; =20 - /* Copy & map in the vcpu_info page if the guest uses one */ - vcpu_info_mfn =3D d_vcpu->vcpu_info_mfn; - if ( !mfn_eq(vcpu_info_mfn, INVALID_MFN) ) - { - mfn_t new_vcpu_info_mfn =3D cd_vcpu->vcpu_info_mfn; - - /* Allocate & map the page for it if it hasn't been already */ - if ( mfn_eq(new_vcpu_info_mfn, INVALID_MFN) ) - { - gfn_t gfn =3D mfn_to_gfn(d, vcpu_info_mfn); - unsigned long gfn_l =3D gfn_x(gfn); - struct page_info *page; - - if ( !(page =3D alloc_domheap_page(cd, 0)) ) - return -ENOMEM; - - new_vcpu_info_mfn =3D page_to_mfn(page); - set_gpfn_from_mfn(mfn_x(new_vcpu_info_mfn), gfn_l); - - ret =3D p2m->set_entry(p2m, gfn, new_vcpu_info_mfn, - PAGE_ORDER_4K, p2m_ram_rw, - p2m->default_access, -1); - if ( ret ) - return ret; - - ret =3D map_vcpu_info(cd_vcpu, gfn_l, - PAGE_OFFSET(d_vcpu->vcpu_info)); - if ( ret ) - return ret; - } - - copy_domain_page(new_vcpu_info_mfn, vcpu_info_mfn); - } - - /* Same for the (physically registered) runstate and time info are= as. */ + /* + * Copy and map the vcpu_info page and the (physically registered) + * runstate and time info areas. + */ + ret =3D copy_guest_area(&cd_vcpu->vcpu_info_area, + &d_vcpu->vcpu_info_area, cd_vcpu, d); + if ( ret ) + return ret; ret =3D copy_guest_area(&cd_vcpu->runstate_guest_area, &d_vcpu->runstate_guest_area, cd_vcpu, d); if ( ret ) --- a/xen/arch/x86/pv/shim.c +++ b/xen/arch/x86/pv/shim.c @@ -383,7 +383,7 @@ int pv_shim_shutdown(uint8_t reason) for_each_vcpu ( d, v ) { /* Unmap guest vcpu_info page and runstate/time areas. */ - unmap_vcpu_info(v); + unmap_guest_area(v, &v->vcpu_info_area); unmap_guest_area(v, &v->runstate_guest_area); unmap_guest_area(v, &v->arch.time_guest_area); =20 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1542,7 +1542,7 @@ static void __update_vcpu_system_time(st struct vcpu_time_info *u =3D &vcpu_info(v, time), _u; const struct domain *d =3D v->domain; =20 - if ( v->vcpu_info =3D=3D NULL ) + if ( !v->vcpu_info_area.map ) return; =20 collect_time_info(v, &_u); --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -53,7 +53,7 @@ void __dummy__(void) =20 OFFSET(VCPU_processor, struct vcpu, processor); OFFSET(VCPU_domain, struct vcpu, domain); - OFFSET(VCPU_vcpu_info, struct vcpu, vcpu_info); + OFFSET(VCPU_vcpu_info, struct vcpu, vcpu_info_area.map); OFFSET(VCPU_trap_bounce, struct vcpu, arch.pv.trap_bounce); OFFSET(VCPU_thread_flags, struct vcpu, arch.flags); OFFSET(VCPU_event_addr, struct vcpu, arch.pv.event_callback_eip); --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -96,7 +96,7 @@ static void _show_registers( if ( context =3D=3D CTXT_hypervisor ) printk(" %pS", _p(regs->rip)); printk("\nRFLAGS: %016lx ", regs->rflags); - if ( (context =3D=3D CTXT_pv_guest) && v && v->vcpu_info ) + if ( (context =3D=3D CTXT_pv_guest) && v && v->vcpu_info_area.map ) printk("EM: %d ", !!vcpu_info(v, evtchn_upcall_mask)); printk("CONTEXT: %s", context_names[context]); if ( v && !is_idle_vcpu(v) ) --- a/xen/common/compat/domain.c +++ b/xen/common/compat/domain.c @@ -49,7 +49,7 @@ int compat_common_vcpu_op(int cmd, struc { case VCPUOP_initialise: { - if ( v->vcpu_info =3D=3D &dummy_vcpu_info ) + if ( v->vcpu_info_area.map =3D=3D &dummy_vcpu_info ) return -EINVAL; =20 #ifdef CONFIG_HVM --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -127,10 +127,10 @@ static void vcpu_info_reset(struct vcpu { struct domain *d =3D v->domain; =20 - v->vcpu_info =3D ((v->vcpu_id < XEN_LEGACY_MAX_VCPUS) - ? (vcpu_info_t *)&shared_info(d, vcpu_info[v->vcpu_id]) - : &dummy_vcpu_info); - v->vcpu_info_mfn =3D INVALID_MFN; + v->vcpu_info_area.map =3D + ((v->vcpu_id < XEN_LEGACY_MAX_VCPUS) + ? (vcpu_info_t *)&shared_info(d, vcpu_info[v->vcpu_id]) + : &dummy_vcpu_info); } =20 static void vmtrace_free_buffer(struct vcpu *v) @@ -993,7 +993,7 @@ int domain_kill(struct domain *d) return -ERESTART; for_each_vcpu ( d, v ) { - unmap_vcpu_info(v); + unmap_guest_area(v, &v->vcpu_info_area); unmap_guest_area(v, &v->runstate_guest_area); } d->is_dying =3D DOMDYING_dead; @@ -1448,7 +1448,7 @@ int domain_soft_reset(struct domain *d, for_each_vcpu ( d, v ) { set_xen_guest_handle(runstate_guest(v), NULL); - unmap_vcpu_info(v); + unmap_guest_area(v, &v->vcpu_info_area); unmap_guest_area(v, &v->runstate_guest_area); } =20 @@ -1496,111 +1496,6 @@ int vcpu_reset(struct vcpu *v) return rc; } =20 -/* - * Map a guest page in and point the vcpu_info pointer at it. This - * makes sure that the vcpu_info is always pointing at a valid piece - * of memory, and it sets a pending event to make sure that a pending - * event doesn't get missed. - */ -int map_vcpu_info(struct vcpu *v, unsigned long gfn, unsigned int offset) -{ - struct domain *d =3D v->domain; - void *mapping; - vcpu_info_t *new_info; - struct page_info *page; - unsigned int align; - - if ( offset > (PAGE_SIZE - sizeof(*new_info)) ) - return -ENXIO; - -#ifdef CONFIG_COMPAT - BUILD_BUG_ON(sizeof(*new_info) !=3D sizeof(new_info->compat)); - if ( has_32bit_shinfo(d) ) - align =3D alignof(new_info->compat); - else -#endif - align =3D alignof(*new_info); - if ( offset & (align - 1) ) - return -ENXIO; - - if ( !mfn_eq(v->vcpu_info_mfn, INVALID_MFN) ) - return -EINVAL; - - /* Run this command on yourself or on other offline VCPUS. */ - if ( (v !=3D current) && !(v->pause_flags & VPF_down) ) - return -EINVAL; - - page =3D get_page_from_gfn(d, gfn, NULL, P2M_UNSHARE); - if ( !page ) - return -EINVAL; - - if ( !get_page_type(page, PGT_writable_page) ) - { - put_page(page); - return -EINVAL; - } - - mapping =3D __map_domain_page_global(page); - if ( mapping =3D=3D NULL ) - { - put_page_and_type(page); - return -ENOMEM; - } - - new_info =3D (vcpu_info_t *)(mapping + offset); - - if ( v->vcpu_info =3D=3D &dummy_vcpu_info ) - { - memset(new_info, 0, sizeof(*new_info)); -#ifdef XEN_HAVE_PV_UPCALL_MASK - __vcpu_info(v, new_info, evtchn_upcall_mask) =3D 1; -#endif - } - else - { - memcpy(new_info, v->vcpu_info, sizeof(*new_info)); - } - - v->vcpu_info =3D new_info; - v->vcpu_info_mfn =3D page_to_mfn(page); - - /* Set new vcpu_info pointer /before/ setting pending flags. */ - smp_wmb(); - - /* - * Mark everything as being pending just to make sure nothing gets - * lost. The domain will get a spurious event, but it can cope. - */ -#ifdef CONFIG_COMPAT - if ( !has_32bit_shinfo(d) ) - write_atomic(&new_info->native.evtchn_pending_sel, ~0); - else -#endif - write_atomic(&vcpu_info(v, evtchn_pending_sel), ~0); - vcpu_mark_events_pending(v); - - return 0; -} - -/* - * Unmap the vcpu info page if the guest decided to place it somewhere - * else. This is used from domain_kill() and domain_soft_reset(). - */ -void unmap_vcpu_info(struct vcpu *v) -{ - mfn_t mfn =3D v->vcpu_info_mfn; - - if ( mfn_eq(mfn, INVALID_MFN) ) - return; - - unmap_domain_page_global((void *) - ((unsigned long)v->vcpu_info & PAGE_MASK)); - - vcpu_info_reset(v); /* NB: Clobbers v->vcpu_info_mfn */ - - put_page_and_type(mfn_to_page(mfn)); -} - int map_guest_area(struct vcpu *v, paddr_t gaddr, unsigned int size, struct guest_area *area, void (*populate)(void *dst, struct vcpu *v)) @@ -1662,14 +1557,44 @@ int map_guest_area(struct vcpu *v, paddr =20 domain_lock(d); =20 - if ( map && populate ) - populate(map, v); + /* No re-registration of the vCPU info area. */ + if ( area !=3D &v->vcpu_info_area || !area->pg ) + { + if ( map && populate ) + populate(map, v); =20 - SWAP(area->pg, pg); - SWAP(area->map, map); + SWAP(area->pg, pg); + SWAP(area->map, map); + } + else + rc =3D -EBUSY; =20 domain_unlock(d); =20 + /* Set pending flags /after/ new vcpu_info pointer was set. */ + if ( area =3D=3D &v->vcpu_info_area && !rc ) + { + /* + * Mark everything as being pending just to make sure nothing gets + * lost. The domain will get a spurious event, but it can cope. + */ +#ifdef CONFIG_COMPAT + if ( !has_32bit_shinfo(d) ) + { + vcpu_info_t *info =3D area->map; + + /* For VCPUOP_register_vcpu_info handling in common_vcpu_op().= */ + BUILD_BUG_ON(sizeof(*info) !=3D sizeof(info->compat)); + write_atomic(&info->native.evtchn_pending_sel, ~0); + } + else +#endif + write_atomic(&vcpu_info(v, evtchn_pending_sel), ~0); + vcpu_mark_events_pending(v); + + force_update_vcpu_system_time(v); + } + if ( v !=3D current ) vcpu_unpause(v); =20 @@ -1699,7 +1624,10 @@ void unmap_guest_area(struct vcpu *v, st =20 domain_lock(d); map =3D area->map; - area->map =3D NULL; + if ( area =3D=3D &v->vcpu_info_area ) + vcpu_info_reset(v); + else + area->map =3D NULL; pg =3D area->pg; area->pg =3D NULL; domain_unlock(d); @@ -1830,6 +1758,27 @@ bool update_runstate_area(struct vcpu *v return rc; } =20 +/* + * This makes sure that the vcpu_info is always pointing at a valid piece = of + * memory, and it sets a pending event to make sure that a pending event + * doesn't get missed. + */ +static void cf_check +vcpu_info_populate(void *map, struct vcpu *v) +{ + vcpu_info_t *info =3D map; + + if ( v->vcpu_info_area.map =3D=3D &dummy_vcpu_info ) + { + memset(info, 0, sizeof(*info)); +#ifdef XEN_HAVE_PV_UPCALL_MASK + __vcpu_info(v, info, evtchn_upcall_mask) =3D 1; +#endif + } + else + memcpy(info, v->vcpu_info_area.map, sizeof(*info)); +} + static void cf_check runstate_area_populate(void *map, struct vcpu *v) { @@ -1859,7 +1808,7 @@ long common_vcpu_op(int cmd, struct vcpu switch ( cmd ) { case VCPUOP_initialise: - if ( v->vcpu_info =3D=3D &dummy_vcpu_info ) + if ( v->vcpu_info_area.map =3D=3D &dummy_vcpu_info ) return -EINVAL; =20 rc =3D arch_initialise_vcpu(v, arg); @@ -1990,16 +1939,29 @@ long common_vcpu_op(int cmd, struct vcpu case VCPUOP_register_vcpu_info: { struct vcpu_register_vcpu_info info; + paddr_t gaddr; =20 rc =3D -EFAULT; if ( copy_from_guest(&info, arg, 1) ) break; =20 - domain_lock(d); - rc =3D map_vcpu_info(v, info.mfn, info.offset); - domain_unlock(d); + rc =3D -EINVAL; + gaddr =3D gfn_to_gaddr(_gfn(info.mfn)) + info.offset; + if ( !~gaddr || + gfn_x(gaddr_to_gfn(gaddr)) !=3D info.mfn ) + break; =20 - force_update_vcpu_system_time(v); + /* Preliminary check only; see map_guest_area(). */ + rc =3D -EBUSY; + if ( v->vcpu_info_area.pg ) + break; + + /* See the BUILD_BUG_ON() in vcpu_info_populate(). */ + rc =3D map_guest_area(v, gaddr, sizeof(vcpu_info_t), + &v->vcpu_info_area, vcpu_info_populate); + if ( rc =3D=3D -ERESTART ) + rc =3D hypercall_create_continuation(__HYPERVISOR_vcpu_op, "ii= h", + cmd, vcpuid, arg); =20 break; } --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -80,9 +80,6 @@ void cf_check free_pirq_struct(void *); int arch_vcpu_create(struct vcpu *v); void arch_vcpu_destroy(struct vcpu *v); =20 -int map_vcpu_info(struct vcpu *v, unsigned long gfn, unsigned int offset); -void unmap_vcpu_info(struct vcpu *v); - int map_guest_area(struct vcpu *v, paddr_t gaddr, unsigned int size, struct guest_area *area, void (*populate)(void *dst, struct vcpu *v)); --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -176,7 +176,7 @@ struct vcpu =20 int processor; =20 - vcpu_info_t *vcpu_info; + struct guest_area vcpu_info_area; =20 struct domain *domain; =20 @@ -289,9 +289,6 @@ struct vcpu =20 struct waitqueue_vcpu *waitqueue_vcpu; =20 - /* Guest-specified relocation of vcpu_info. */ - mfn_t vcpu_info_mfn; - struct evtchn_fifo_vcpu *evtchn_fifo; =20 /* vPCI per-vCPU area, used to store data for long running operations.= */ --- a/xen/include/xen/shared.h +++ b/xen/include/xen/shared.h @@ -44,6 +44,7 @@ typedef struct vcpu_info vcpu_info_t; extern vcpu_info_t dummy_vcpu_info; =20 #define shared_info(d, field) __shared_info(d, (d)->shared_info, fiel= d) -#define vcpu_info(v, field) __vcpu_info(v, (v)->vcpu_info, field) +#define vcpu_info(v, field) \ + __vcpu_info(v, (vcpu_info_t *)(v)->vcpu_info_area.map, field) =20 #endif /* __XEN_SHARED_H__ */