From patchwork Thu Oct 13 06:48:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13005674 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3D103C4321E for ; Thu, 13 Oct 2022 06:48:42 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.421703.667259 (Exim 4.92) (envelope-from ) id 1ois15-0000AQ-2j; Thu, 13 Oct 2022 06:48:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 421703.667259; Thu, 13 Oct 2022 06:48:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ois14-0000AJ-W8; Thu, 13 Oct 2022 06:48:26 +0000 Received: by outflank-mailman (input) for mailman id 421703; Thu, 13 Oct 2022 06:48:26 +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 1ois14-0000AC-C5 for xen-devel@lists.xenproject.org; Thu, 13 Oct 2022 06:48:26 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2051.outbound.protection.outlook.com [40.107.22.51]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 08bc8902-4ac3-11ed-91b4-6bf2151ebd3b; Thu, 13 Oct 2022 08:48:24 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by PA4PR04MB7646.eurprd04.prod.outlook.com (2603:10a6:102:f3::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Thu, 13 Oct 2022 06:48:22 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::2459:15ae:e6cb:218a]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::2459:15ae:e6cb:218a%7]) with mapi id 15.20.5723.026; Thu, 13 Oct 2022 06:48:22 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 08bc8902-4ac3-11ed-91b4-6bf2151ebd3b ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L0odZEpW7nICs6RHpA5TnVUOW7lsciLXjdoHAe8BveNll9FhU7mfUf9H5qBGqA6P+xS5rRTUK8U6AK5qS1AHw4yH92MLfLqMRsRwJC+6SqCrj9+4ViwN6/RZtYrCgSkxRXy/itAR5Dq5DmYoMnUcaoXjli4Q7W7+vnWWZ3mrCeq8qTfa4wTfq369IW/7r2HhJAtMBaGFNn2YQUDFiEvj4vHfwiO5MZc5aOfVEDwJAUZxOS48zR+eQ8qfu03FYwM5kp7AIWK1aa0aE4X2EVkFExoEPuZrOuJOg7OsKbVB2JxRLk+2F/pii4Qp1/L0BQMtwsLXeIq82XEl8u2qo29K4A== 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=ezaXX3tuWYuuKtIIcFyc3PbRfsPfDcPpzv/X2sTSW/8=; b=hapT/jNhLdaUYxXO8uuUL2mK3QagCzll0yQQtt8TnZmma6AzjrMUUGs/crl3bMYKZI7lmH4mv2JjlkFN7a3PPxP2M2xP3z7/Mh9/DXuNWIg2I1dkT0ljy55PdnpOTU4qiqLwSsLNxf1hEMdq2ZirvioHw+0fR8cJdPTHx9fa/z3Vd/gDEx5GwRRDIYrMIz737N28fVTOCU9B229WDxiQumWjeBNZomu9Nq44fODlD1Uo0C1FtC6lhtSGYf0uj9yWDjSEeNJQ157LO8lFRoYxH9nZeiG+nKWpmw2a+TUG3D44B00hRfc+QY9TYUtJh1UFCCSAos0/mlkqtAeEwdq3Cw== 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=ezaXX3tuWYuuKtIIcFyc3PbRfsPfDcPpzv/X2sTSW/8=; b=B3YQz2RT+GgKqR1TF2b8zKEMImE71apxzWjXQdRrbJf14RJfRbf+vDrspFoHTHFfZO36vETy6Jiblzs+7Eo8SANgawjW91NyyY1TiLoRU7dKw0GDmh9EEMslM5A2JSNf1xIgE4SrB4whLVWoprnqPtU22LbdCxvFYtoDdxnCaWk60UOmEJI2mUSf8LkO7IM05izEI+ij3CrwGp7XRGFRJOySPnZAlSZlPEUqYJ/Z7cykH7RqV+IQvIQ0arQpFtLrOBGDS+k3whyGUSi02A7K4EjGVvOQTzMdu8Ggfm5rnpfN3/wXjimD5ug90b15QFG64R2DLE9G95lDJm5+Dtx/7g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Thu, 13 Oct 2022 08:48:21 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.3.2 Content-Language: en-US To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Henry Wang From: Jan Beulich Subject: [PATCH][4.17?] x86: also zap secondary time area handles during soft reset X-ClientProxiedBy: FR0P281CA0087.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::12) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|PA4PR04MB7646:EE_ X-MS-Office365-Filtering-Correlation-Id: 17470313-8151-4fa4-d87c-08daace6ebea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QjzX8NnY0KGVfUGLWL50pX/Ksc+2RZCbMqxyiVHFp2TMlabl27Ki5mfg1OhdG/XV1Tw8ZHgTojDy9Mo5JXKAvghDa8oeXFXMiiRcHr2PPNVOPOkQ1DI7w4UPMt4pAMDvD+US2xgoRpgMXrVqsR9x2wkP7ej/JV88V8oThhP+B3qWe8ZVQuZWCzsomFl5UZeVR6V0LEQrI9i2o66J+SlZQ7tQJWRmdfCGmAQJYJfgxj9DpOn4btzSep6sfChMyVsvrzsit7DIdsJuCuhvX0xPRQf3lOWhges5QtT9cEnDClu357oxO5KXiNpXyTs8bSLdw67n/dvLjn7hlQPvpvh8Y3sTxOVLbrDA+d67gX5em2kqnXBahOPF+PzvDMjHsRcm8bLwnTqzkBAvKewGKxqKAm02lgnmz+uxry2A8n/zigvEMZVVPcEWQ7VT6U140ak2Ds64MH2izSVMPTmyA2QX3OsDYBcM23AAZHkvlF6GN1YlFkCpd2g3F8CPg8RiK6BQITyeM75eQ0C+pvI6yIP4zlZJF7+/8qrT6yT9rZMp9+nr6jjwbkQCMKMKKEPBDSnt8GPc9Vdn/AwQrwMBRK55/J8Eby2oGUCYwVA0tEDSjdhE0aCywE1LlsFhD6o04d/4mLPR36U+oweuMAoaYFvnsFvkRecel3R9fL/UP1r2LpiZpT4IaEKtWYklAmLQRvDO1jKJgyDMvZ+IaHqWU8MiCJ5kkT1A9kGO8lXvHzzzXxRimygHga0tiDPfvC99Lt+/1VkklrQNsdwiFBzX20RC353EnmivThugeFUU5j65SP8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(376002)(136003)(366004)(346002)(451199015)(478600001)(6506007)(36756003)(6486002)(31696002)(86362001)(38100700002)(2616005)(6512007)(186003)(4326008)(2906002)(41300700001)(8676002)(316002)(31686004)(54906003)(26005)(66946007)(5660300002)(6916009)(8936002)(66476007)(66556008)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?kA4Jr94fmQe+v6Je+dG/eXdywqcj?= =?utf-8?q?hra4zmfwNeOlHWNXaMa3kbu/YJVr975We7aaAjvu9zxvOME7W4+sbbtviFL5oglcb?= =?utf-8?q?JaU13J8e2Eeg/L5zJTQGXklXVM0tckw42kNrSfsYQYRfHTD4g28TacsLT12gK+tn4?= =?utf-8?q?31Szb4Z4lsoFmiotw9F3/8l01Wqf0kpQ+0BqMb4apUvlqmPNp85jaiA+8KEtWCPUK?= =?utf-8?q?UIEcwz7T7mf66cLKQ39ZGRjLJ5Pw9KfeXCqoKT1h/6bYnq1KpM/nPRxkCcsyZYXSa?= =?utf-8?q?P8E/mBlrjmLHm355RWeNMY7J+0ClMqxtTjS/kD7ZzXizNvtJLN0NW/hIb7Ec8qNoz?= =?utf-8?q?LXoehHMJrVWMseABPlhygisStrOKWhl0H7OeGPegiQ2itgxF/nd9dDD/iKcDRin1O?= =?utf-8?q?WGV9baXu6muWYMCOjuq8zosZ5EN4cITKTaNm4E6T0fwpzNve9ND0DvwFBDICUlul/?= =?utf-8?q?CaAiEk4MaU7QSq0A5bmhGmLDzBi6Xk38hOxWchku3qyai48e/mzDtKNGMIw4prDy4?= =?utf-8?q?7c5o4Z2c+Y+56gRG5Jc4G+jb58lVlfSQnO12VFLQ8aaKfhsZvH+bh/kj6kAbXim06?= =?utf-8?q?1OSveYq2HNNrgf0YUNuGQsHVLLTjlRzsl52dDVHJfeS3vZqKnO+fA2/kJ1nhkw9mP?= =?utf-8?q?ohaA74A9PLO7jNPB29/BF97P316ynQW1z5J1VfA1HIBTT29ZEU0uioS/xez/14Jza?= =?utf-8?q?ekDUKX9hV5OOC12RvD3ROhZw0UtjyeFznxOol29npD0NJD/NuXk9pHw08yPBBN4Fe?= =?utf-8?q?FLdpbi757h2vOoV4nn0XuYY3zgACqA6+qzMjdiKwfjXZcISk76l29FLdxee8l3Fs+?= =?utf-8?q?CoHt5dPoX9QihCBB6KYoGUNwSy2tlpjDc7zphPh021+UoLXdYXHmS1Gc5/c7v5kPH?= =?utf-8?q?pb8xJLbsvQYjYCRIOPxkTan56zU2833b0xHhxifLVTdZLNOI2snx8Ed8d4BxZs1Dd?= =?utf-8?q?nOw/DBqH3p73QbFcKZfYTDVPREbAEhdAgc49db33dZNYcZ5sAbOoojvMuDjaQnTpX?= =?utf-8?q?hnIBkCsfI1eB+g5ll46r6KlDL7UmKUGq+ILT51+jmk3YZigB0qSo9ciHg+6mH/Qh+?= =?utf-8?q?vcciigU3Dd9Qd/IuiAJBWZVPxcUxfP7ofuScJhgGeqZlHAGHFRHudbKs0imv1TNj/?= =?utf-8?q?Mj6DfoaVQ47Hf3H9aj7Y4Dltba/loJhZsp2xm54whZaZ2WnACxdLZjWLPrWzvZQ5r?= =?utf-8?q?sfEYIsjXiENQzHSNHIdc/ByuY5ugGiPJR1vyitCJgmsVoPuGTn3oXdrSkJLqPYczq?= =?utf-8?q?38RiRVnInPhpIVQW+39p+XA9I4AycN7qXUephWqRVrGNwkmPWKYS67FixjGpVCqVU?= =?utf-8?q?+tEaUvJRFDEtxCHBnhPwlFOWyf/fyY/RD0jXMDMrtqQYUFBIKWsJcxktIWLtYpKeP?= =?utf-8?q?emzcJe737s/lO2EUBHo3npTsGRqSjK1mKA/FfW+XW43SLtFA4lWV+RDZ4Qw2hRjme?= =?utf-8?q?PH47LdLIzo3VUui2RWx4P2HzyGwcUuaPur+sH2WQHTw3kG0PTQi+RngVsEdLc8ldX?= =?utf-8?q?hGcuyLLz7fNJ?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 17470313-8151-4fa4-d87c-08daace6ebea X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2022 06:48:22.8088 (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: BrZcOXHF5EWpNkh85KlDr4ynPJkMB/Cz9wIh6G45ACN8XLPg/Af7qWKTCEV4Tn/ZKk+brr8mWsPjxpwpW7zzlg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7646 Just like domain_soft_reset() properly zaps runstate area handles, the secondary time area ones also need discarding to prevent guest memory corruption once the guest is re-started. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- To avoid another for_each_vcpu() here, domain_soft_reset() could also be made call a new arch_vcpu_soft_reset() out of its already present loop. Yet that would make the change less isolated. In domain_soft_reset() I wonder whether, just like done here, the zapping of runstate area handles and vCPU info mappings wouldn't better be done after all operations which can fail. But perhaps for this to matter the domain is left in too inconsistent a state anyway if the function fails ... However, at the very least I wonder whether x86'es restriction to HVM shouldn't leave PV guests undisturbed if a soft-reset was attempted on them. Right now they not only have state partially clobbered, but (if the arch function is reached) they would be crashed unconditionally. --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -951,6 +951,7 @@ int arch_domain_soft_reset(struct domain struct page_info *page = virt_to_page(d->shared_info), *new_page; int ret = 0; struct domain *owner; + struct vcpu *v; mfn_t mfn; gfn_t gfn; p2m_type_t p2mt; @@ -1030,7 +1031,12 @@ int arch_domain_soft_reset(struct domain "Failed to add a page to replace %pd's shared_info frame %"PRI_gfn"\n", d, gfn_x(gfn)); free_domheap_page(new_page); + goto exit_put_gfn; } + + for_each_vcpu ( d, v ) + set_xen_guest_handle(v->arch.time_info_guest, NULL); + exit_put_gfn: put_gfn(d, gfn_x(gfn)); exit_put_page: