From nobody Thu Apr 25 12:23:43 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=1637241254; cv=pass; d=zohomail.com; s=zohoarc; b=h2OZ8WayN6eBA5QnHezeMVXaSO5Td3kYFjIAxnWZy6bCknaVyQTjl2x1PX1MEtQ9Va/rCa3/tUGhDkxaZ1zUhtp1ilAYTtOuobZ4RXlKhAo74M10CNme+/1emfiN4q2JaQNhxxo6yj58HN0suprhRaeVyZxKmsM7Y2e6Ho1+lOE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637241254; 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=eOVU/IktMNarHrzq1eR850T7kGTI+/Z3sQLri7a16Vs=; b=mIk97DH5DKCFFWWtyJd9PmIm7ZLhn91ETJ2FqgdYJqbYRsBOeumcv/uQWFHE/OolXBp30aSKeVNbY4Dy1lqvrlxP549fuiGYjZC+/DiKklpymNgtMjFfSB/Ck8eHrEK/XTjYD7HZMr7Y7G5Q9DT4+yTQe6F0ugGN9ZZXPYhdLOM= 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 1637241253953279.9399793133341; Thu, 18 Nov 2021 05:14:13 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.227400.393286 (Exim 4.92) (envelope-from ) id 1mnhEa-0008Qd-VT; Thu, 18 Nov 2021 13:13:48 +0000 Received: by outflank-mailman (output) from mailman id 227400.393286; Thu, 18 Nov 2021 13:13:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mnhEa-0008QW-S9; Thu, 18 Nov 2021 13:13:48 +0000 Received: by outflank-mailman (input) for mailman id 227400; Thu, 18 Nov 2021 13:13:47 +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 1mnhEZ-0008QJ-L1 for xen-devel@lists.xenproject.org; Thu, 18 Nov 2021 13:13:47 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5caedfc5-4871-11ec-a9d2-d9f7a1cc8784; Thu, 18 Nov 2021 14:13:46 +0100 (CET) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03lp2056.outbound.protection.outlook.com [104.47.8.56]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-4-uSpZ9odVPXG20505mv0x2w-1; Thu, 18 Nov 2021 14:13:45 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB5165.eurprd04.prod.outlook.com (2603:10a6:803:54::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19; Thu, 18 Nov 2021 13:13:44 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898%3]) with mapi id 15.20.4713.019; Thu, 18 Nov 2021 13:13:44 +0000 Received: from [10.156.60.236] (37.24.206.209) by AS9PR05CA0055.eurprd05.prod.outlook.com (2603:10a6:20b:489::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.21 via Frontend Transport; Thu, 18 Nov 2021 13:13:44 +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: 5caedfc5-4871-11ec-a9d2-d9f7a1cc8784 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1637241226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eOVU/IktMNarHrzq1eR850T7kGTI+/Z3sQLri7a16Vs=; b=L+h+7yNB2Nyebmuo4Ml2YmGAmpkWORuNvUymlF0riosDf0wui+SHmFZeXLZD7H+KBvlDxC 8yeddsGCxfYNRz9W8vogM4eFIrtQR6vU5qABKwyTPhLVHMilG3Nw9m1YiafntxUL3TvKo2 V1RzYwtiMWQ6abZKmLHTvI3vBvhrUUg= X-MC-Unique: uSpZ9odVPXG20505mv0x2w-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hL2b/G1b4jsYWi+4D8AsVEMaiKZgmyaap7qYxrNObjC7FrZpY7E2K8WDWVFVJ2iskLXxEMT9Cw7L04j2LVscS/MZQYOeZdptquudUmhAbnaXUq7YLihqZZjsGThKfflBHq8I8FvkBJXm9YHYdL0477IMhUYe6gy44DJ0owaB3RoWJZSJBNMGW6SdmHDVVgZJh/mgqHWUZX77SoCpCDkih74bPGSeWuGr3PUiC9P+LjbCaMuScVwVyaDrxUav3DZG5Zrqlgp3lyHLBVd391e7HM25cGVVX3dfkyRvjfNbndNAbBpyHOHAKJNIl2yTUFwHURihDfF3YD433WviRNlSng== 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=eOVU/IktMNarHrzq1eR850T7kGTI+/Z3sQLri7a16Vs=; b=Ki9If9sbqdl0YYB0D2FmM5CYq7Oxzz1LoxOe1CugHheonvDGp8t/pY2VCAnE/sx3GC/m4p8dpHxJ7rp8hY5vG+9ssaS/PPYENpO/04vNtqx7A1fdEzI4/oNvkXQndAnjoXxxGJV0G7iTsuk//Y3cnb7sZSNryX/Nf5NSDQxVAvpNg6CLp2YvFDxrNctby1YccckM+F36WI9rpWF1fVcHi5itK/ye1ew4KOlqKxstdCT5JK9kDytHSwyKirday1zxDuf8fPzFFAGTNAwkDR/YbbblLppL6H7IHBrOuR5H13X549SecUR7B97RtMBwSMwOavVeI7HEqZDhwupu/pAGOg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Thu, 18 Nov 2021 14:13:43 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: [PATCH 1/3] x86/Viridian: fix error code use Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Paul Durrant , Wei Liu References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR05CA0055.eurprd05.prod.outlook.com (2603:10a6:20b:489::6) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 21ac61cb-8bb5-4a2d-3b46-08d9aa953fae X-MS-TrafficTypeDiagnostic: VI1PR04MB5165: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2803; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jhXxK4K7FILXhA+kK1jvKynLlUATITXA29cAq2bO8CJym41J57CWbLwisJZcyf9KyKTDmm+Ymi24LctjND8mFudc2xityiayHePPZFV/MV33q1gCxLklgjzwed0C1FNlC3NQKP/qRdaxG+xLnBfEdnUKKKfP7zBfuDbRjk4v7izwFTo2DyPk14dIv8akAqDX3PEmvCOivbfYgZWEao1v7ZHopdoKYmMwZ99gY/XPhEHugkdykpG80xbLBxwep52IxgEQSYtBzIeKALq6cNbQ27bhLbsRVgckRxGmmxgvQ9ce0g82ZzX5ZKdVH8jhK5Qj6ejpXWhpvZUZJR46++Vf47L/uTNCMlK/gvi2q0xaa6+apzQSoJP7nHBCWmQIVvEEcH3E/P4TH05SeJoOM+WArpD5a0fZJqUMTg7YwULAt3GZnOCczuDs80IUWHKJCmYqXRaBm2cOX/+8EVxYt86ngqaZBRt7EZtwyoKwhsprk7niZpPl8DukivWHpc4VBcx1GgMxv9ZEBd4b5FhrtjisIEDbBv2dafXgj3NRUgmcRNKcbZrPfQD8zjHhQRTnrFfeB8gIPe8F7nW+GqptF4uY7WjakEUw6WdSUUQOpFXZTKd24kyyxIbOIZzxQ3s3wh8wneEqh8j6BQN/UybaS1fF6TWBabZy50IGMYcRXLEmtV8KHT64FJ5RNx/xur1Li7aYpVSS08jVmcFHahRQEJmwsgHqittFU6e6qOI89JY53Bw6fFcP+EVrz5/zh4DTRIjX X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(6916009)(38100700002)(83380400001)(54906003)(16576012)(956004)(66946007)(26005)(31686004)(4326008)(316002)(31696002)(2906002)(2616005)(86362001)(186003)(5660300002)(66556008)(66476007)(8676002)(8936002)(6486002)(508600001)(36756003)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RHloekJmOGxlYzFURW9jTUVQNEs5UEZrcEJRTFU3eEQ1WnEweWlsQlZKR2tH?= =?utf-8?B?R1dHcXFpUUt2UHBJU1NrYUV5amcyOVZyajk4UVh3RXdBbnVkOEZsWENDM2tW?= =?utf-8?B?SXhNckExaW11Y3p2ZVp0QU8xL3Z5Wkx1N1JZQmdvSnRKQ0hMbVhEekZLSUxv?= =?utf-8?B?bG5IRytsazJwVWsvREl2VFhGU3d1YlZldDJVNTFOTmF1cklJakd1NEhZSEdD?= =?utf-8?B?MlkvUzhNeUljbEhNUXJsQXdZRENXcW5zTlZuNGZUZ3Z4dzl4bDkwT0Y0QzlW?= =?utf-8?B?WHVIWTgwL2ZqQW4rWURXOTRvUzIzeWNYWVNkZFc5N1Y5RTh3UzB4UGdaUzJB?= =?utf-8?B?WE8vQlZNcDJWdXdlZ1pKLzYyOFdVUmNTM1hPOU4yNkJRM3NKMVhjVDhRY0Nu?= =?utf-8?B?SkRpNzVsR29tZWl3clZOVzRQZnhOczB3eGVaM3NyRk55U3hMZktLanB5bXY5?= =?utf-8?B?bk1NbEVmbUJZT2RXaU1CbFBwWlpNa3RKU2xjNC96OG1qb2JYWHJrVk1ScktS?= =?utf-8?B?VUxVV1d6eHhhS2Vqanp0NFFwOWZGejUvSzNLL0ZOMm5ZaFV0b3g1WGhjTDdU?= =?utf-8?B?bVprVkdUbWhZNnFHZTVxSkhLTE1waXZ0MVdMWS9qazRBazNxemNUSEM3ditU?= =?utf-8?B?ZUQwNThDekNabkVEdkpWNlh5UG5RdE9XZmFFS0p1Y2d5YnFneTBmTXhvb21K?= =?utf-8?B?WXRZMnRjTWhTOXRldC9HTXpWeE5hcUFjOU5FUll4c1FkcnBhQTNhRy9NbUhE?= =?utf-8?B?bHZVQVdFaFQ4V3MxeGtmTVppOUplN3ZwNEh6cjhHbmhtYWNBT1V1dzJRdisx?= =?utf-8?B?ZHJMMVR4V3ZRQ1RWZmNrSEVFRnBvSnJwaGR2L0cvejRoQzR4VWVPZ255WVh6?= =?utf-8?B?TVEvbExHa0hhSXVIVmQ3YUtaOEx2UXRoZFJMZnBPL0N1RmZrenZqQiswc0NN?= =?utf-8?B?UzJZa3BZYXRlNGg3WWJ6aGtPeExncll6MWw2ZUNDTlNpLytPRXlPemgvTWdU?= =?utf-8?B?aVV4YnZFTE1wYWFZSEs0MmFNcTFIMjNnRzFJajdhL2VMK0EyM1BSbnBFNDZh?= =?utf-8?B?TFBQMXM3eDBCSHNwbnhCUTE4aVc5cTh6L2ZUQkJ6bENYbGIxUEJ1TDhDUTQ0?= =?utf-8?B?ck1SeDZYcUtJVk5zRXAvUUtxVHRnMGRLalByb20zaTkvdmNHQ1R1NkcwazU4?= =?utf-8?B?OG91V2I0M1o4d1NjOUQ3NjBybmhSS3hnOEJJZGVqRHJHM1hMRmhmL0Z0UnNa?= =?utf-8?B?bnJyYkpOM201WFRQK1RoQ1hTbFR4WWx4RDcvOWNRNmsraUtYOHBXQng3bzk2?= =?utf-8?B?bTZMQ2VyZ0JyVXA0RTgwbWhlN3JDZ2diR05UdDJyeFBvTDlhV1I4cktTREVZ?= =?utf-8?B?cXIyWU5kaGtHOXF4R0RpZS9UWWJySS83ekIzcWRVNGN1YUhGYUQ0NFNIRzF1?= =?utf-8?B?OUUyeDd0UGtOcHZHU2RJM1kzeWlDTDF2SEhxSTZXN24yREtWZjJCU3dCZU8z?= =?utf-8?B?MEVQS0NKNUpycDJBU3JaZWZJbWZwMjhYMVE5a0h4WGxuWjlwSzM4M1QrdmhB?= =?utf-8?B?ak1MaEtPKzFpU3ZaNmcvekh4VkhMb2hDU0hYeWNLWG9MWUlWeEdzaHB6Z09X?= =?utf-8?B?eGYrK1JSNmZQSUltLzBBbXROcTJLYWtnNG9vTXNZZnhsMnAzOEdvdVUveVgx?= =?utf-8?B?bHExVXg2M1lpU2lOT216b0xnMnJMZzZJSzNGeExuRzJrRDUwZlJJU212K2VU?= =?utf-8?B?S2Nqa05HbDkyNzNkdmQ1a0w0MW1rdjNFU0k4OC9rbFoxSDVraWVTMEpQWGV0?= =?utf-8?B?WFAwM1lqbFZzQldpeDZrZEFFY3N4ZXhsaEZTWmdVdjY4T0tGS3ZwR1daQjdw?= =?utf-8?B?a25CZW94K1ZEdmM2bUJsTnpTSjZmek1YSjArcHlKYnc3STFTaGR5YWFOaVEr?= =?utf-8?B?K0pBQkpPRy9ZTU8veVNLb1dlVFhjNXNoY1dUWTZaZ1JuOTVjQVdPL1JQZFNP?= =?utf-8?B?T2ZWYlNZbEo4ZUJOVTk0TG9QdWI5TUI5U0lHeWJrVEhhK1NEYXRUOXRPa3BJ?= =?utf-8?B?eDNmalJ1UVJYTEpaU0I0eWJLQzlYMnJHVTBCT0VYM1Bod3dvSEhxbDhPTjk2?= =?utf-8?B?YjY1S3B0Z0ZMUmJNdHhYRmlGY3hYUEc4ZTl0NDhlanFPSHVzVFNIQkhLby9i?= =?utf-8?Q?usI0xC0SyVrtuepCXQeihPE=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21ac61cb-8bb5-4a2d-3b46-08d9aa953fae X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2021 13:13:44.6427 (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: psnhVAYenQi/JrSZ3l9PjUjODhKaVZdb1oXHTSVyix4oeNm0R1L+X5Qj7E/U2VoWH1PP7MSJphDUuGjKKMp8Jw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5165 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1637241254993100001 Content-Type: text/plain; charset="utf-8" Both the wrong use of HV_STATUS_* and the return type of hv_vpset_to_vpmask() can lead to viridian_hypercall()'s ASSERT_UNREACHABLE() triggering when translating error codes from Xen to Viridian representation. Fixes: b4124682db6e ("viridian: add ExProcessorMasks variants of the flush = hypercalls") Fixes: 9afa867d42ba ("viridian: add ExProcessorMasks variant of the IPI hyp= ercall") Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- a/xen/arch/x86/hvm/viridian/viridian.c +++ b/xen/arch/x86/hvm/viridian/viridian.c @@ -628,8 +628,8 @@ static unsigned int hv_vpset_nr_banks(st return hweight64(vpset->valid_bank_mask); } =20 -static uint16_t hv_vpset_to_vpmask(const struct hv_vpset *set, - struct hypercall_vpmask *vpmask) +static int hv_vpset_to_vpmask(const struct hv_vpset *set, + struct hypercall_vpmask *vpmask) { #define NR_VPS_PER_BANK (HV_VPSET_BANK_SIZE * 8) =20 @@ -919,10 +919,10 @@ static int hvcall_ipi_ex(const union hyp input_params.reserved_zero[0] || input_params.reserved_zero[1] || input_params.reserved_zero[2] ) - return HV_STATUS_INVALID_PARAMETER; + return -EINVAL; =20 if ( input_params.vector < 0x10 || input_params.vector > 0xff ) - return HV_STATUS_INVALID_PARAMETER; + return -EINVAL; =20 *set =3D input_params.set; if ( set->format =3D=3D HV_GENERIC_SET_SPARSE_4K ) From nobody Thu Apr 25 12:23:43 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=1637241267; cv=pass; d=zohomail.com; s=zohoarc; b=WJAGywNlFsv/doPULFrxPv2L6FqQeMLoJr2wgDrytzCzyPcrh8we/aaZe6ZBHG4aA3ueKjBTf8Oc/vOasCcMM9SGR9R0IYoRa0LwwfjGF+0qoyOvrFHqV3PLKIkpbBVRyLg6Z6ktiJJ62iAtRhHjpHKCLUbZ13bcERxZNW0KE3o= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637241267; 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=a8687ihPanRL+3ac1IjZtotfsNsyk2rdhK4easY+hVg=; b=XKk0zxSeXdDGSTyv7sQbJxzv0yTbjm/69ZHwRKgQUPHdp/rqiNXWSZ6NYpxZKg1/bDvdKgSB6gHgDlC1Idm+zG4hpa/huF2kAAsTqSsEtjV89ZyxYaMfRQc9N06Eo/wx5jcBmIl20smKDgXKzRTkESdX26tkxkEbJtwLl/1jQ8A= 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 1637241267285769.6753468240355; Thu, 18 Nov 2021 05:14:27 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.227404.393297 (Exim 4.92) (envelope-from ) id 1mnhEw-0000TE-8D; Thu, 18 Nov 2021 13:14:10 +0000 Received: by outflank-mailman (output) from mailman id 227404.393297; Thu, 18 Nov 2021 13:14:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mnhEw-0000T4-47; Thu, 18 Nov 2021 13:14:10 +0000 Received: by outflank-mailman (input) for mailman id 227404; Thu, 18 Nov 2021 13:14:08 +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 1mnhEu-0000Rz-M1 for xen-devel@lists.xenproject.org; Thu, 18 Nov 2021 13:14:08 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 695883b9-4871-11ec-9787-a32c541c8605; Thu, 18 Nov 2021 14:14:08 +0100 (CET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2058.outbound.protection.outlook.com [104.47.13.58]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-20-xJvxcdKrMR-nCBxJiEYVOg-1; Thu, 18 Nov 2021 14:14:06 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VE1PR04MB6383.eurprd04.prod.outlook.com (2603:10a6:803:11b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.20; Thu, 18 Nov 2021 13:14:05 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898%3]) with mapi id 15.20.4713.019; Thu, 18 Nov 2021 13:14:05 +0000 Received: from [10.156.60.236] (37.24.206.209) by AS9PR05CA0037.eurprd05.prod.outlook.com (2603:10a6:20b:489::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.25 via Frontend Transport; Thu, 18 Nov 2021 13:14:04 +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: 695883b9-4871-11ec-9787-a32c541c8605 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1637241247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=a8687ihPanRL+3ac1IjZtotfsNsyk2rdhK4easY+hVg=; b=UwTf/oS1YYVXjEuEhfPfC5bJZJVh6JigJicdpJKLi1TLih5HkzIBC1uda0fQ51mrdolQGv SDfM37yzgWuTaaYRyK8pQjasrY+MGpw0DJNfUkwxjgMyTOb8K6TTi4SoTrmbcUu+Sl9K2T sOf8UFN7SAuxfTvRTnGq3mjy8kexAYg= X-MC-Unique: xJvxcdKrMR-nCBxJiEYVOg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Taxmt4IK+K7Z9jpTodVrqmA1byvbF845qHZdtqM/ZE3lTo+JegbsgCtg3esdFdNk1wqrlpZ2M9WYXNBU9rT5h5XrszYPjbPeyX+/K6K20unqepJyIfi9yQohR8QAdLCFaXBK1mlH9z64oTTQjL+zDp7i26uOZSH8FzEuUJqHcrU3LNSfsJYbQh6WJAAm/r6PSQqILL0Szmhvg1hpJ/5lG78GecXmHPuSgIWle6CzCE0OghRmm481ud8JE+ug8cu+mHX51mKIt64q9xDshox519LxEg4B8S6ohd6/Jp7/DHzsyGW1gGKkg7Ei2Z/uqhXGAGVx/jCSlB1rIZ0g0zfAfw== 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=a8687ihPanRL+3ac1IjZtotfsNsyk2rdhK4easY+hVg=; b=BlYCAIEf6SP+s1byNcr41bQ9mijij1LvzRzr9xjhokEhsjJ1unyGAbMBIxq89TiBJjlsCI7I7U9qNoBW8LnasBK5H6tKVZ3NmQEVp1iZZz+Aqi/qOtcEgOsJ/1EQjO9kCip/4d6//sKXwfWvUJ5ayN0faXYqD3vfmjP68OYp808wNgVxW8vpAhR/HTCJoT6T5PPzZ3pv7RSQfamAJ/JEdizBAomgylUdf3P8zbjs/wq0aneyQOzRioXiY5kFImZWKCL/UwPyrUbThmfBkPOgUTdttD7MLloGl5DfIDb0TKyqsaB4T2Be31rh64ImMR7f9Mm+okeeTs2n2QYjkT/zNA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Thu, 18 Nov 2021 14:14:04 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: [PATCH 2/3] x86/Viridian: drop dead variable updates Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Paul Durrant , Wei Liu References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR05CA0037.eurprd05.prod.outlook.com (2603:10a6:20b:489::28) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 51b5f890-ad72-4299-67eb-08d9aa954c02 X-MS-TrafficTypeDiagnostic: VE1PR04MB6383: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1824; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4IawI3xG5ZN7ziZYYC7th0hQYAsllEQ0uAorJ+mNKNKQy7ntRB8Jxfn+FXJunjzLDJ/cvb37Y0eQ1eVxWuB/J762sH1wKRCKqHwWRYGwZLXjpWtxWASzneJ7GLK6U1upf0ZpRA8UluuhFObPZM225EzfqjVh9H8o+E2LonPr96T0XP6XDa+x3twPao/De9UO3CO9xUfOdIHoXeJfOWLRt5+bifjbKnAHcWx4m3KEx/v9Z22gq7csUVNlBimbSM4WrMN2C1WqAKAK2DqdQ3z/IgXx1Z+Vn3gTxZSbVYff/ClMeTJVflxUt1FeUd1NRZreRnzB2i/bPHCTuXvBz1QkKHSsesIi8Zg7QE3B0N5r4D1aCrpdBIxltpJLTcb/svrGUkDG47fQsiIP9LuRk9U/ctDMA/nf/rR9d0eMma6ICR1EIlIlBFvJvYI741cFmiQIe0whtZpvgRj5CjgD80UNv1fFgsJQKw9EyaR/dtpJ87RLfr23R0n/AnxS48zb6k57rjbR901/3TmyZHpser1Cy9rhukQuDsLYg7foaZMrGCmrR0KgrBf/uedT99FcwG4cTipSVtjk4sWwwIzOToRu6EM4c3PLkFWVm937rC2l5BWD/covhEH894tTK5NtTW6RJheNcgTdTVCIKeUBiewKdYLvicN86NDwdXMBKlWeybxoU2Ni8fA8VpgvDZ7HNbStBbjVXDn5N8uNSFTcVJZGSnOujU27gO5cZT70SVQXL6M= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(8676002)(66556008)(2906002)(26005)(5660300002)(31696002)(508600001)(83380400001)(66946007)(38100700002)(186003)(4326008)(66476007)(36756003)(6916009)(86362001)(31686004)(16576012)(54906003)(2616005)(8936002)(15650500001)(956004)(316002)(6486002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eW9DWnRiNG5lQ2xmZFlGb3RIQ000Q3ZLd0E0VXFISkkzUzFVZTRzTUFzaXhk?= =?utf-8?B?d1hOTlNXWG9pZC9rQ1Fla25NZitVbmRXQjltclRXTWRZRTFxbjVhdXVlOFNG?= =?utf-8?B?dndoMXJtb0xlT09USklvNE0yVno2d0VsMDQ0ZzVEc2NkTzA1ZmEwaTVEa2xM?= =?utf-8?B?N2E3dFRpMkxzZG5PcEJkSnpiSnFaUzJpNmdxKzAyMWNJZnBnenV3Ym91THNE?= =?utf-8?B?NW9RZjBabndobE1mNEQ5Vks3aHFSRHc1b25zTDJiRlNDaDhBbW8yYWNDTndu?= =?utf-8?B?dVpYTWhyTnlQNW5GSDF0b0lsb2wyWW9TY01kajRSR3hma1ZzOW1UU04wNGgw?= =?utf-8?B?ejQvUmliTkZEb1doUTlQZGF4a3Y2MmdnVjlsK3Z4K2JtY2NsUmFUUEhDb1VX?= =?utf-8?B?R3MzWGZIUC9lcHRFU25QYXU3dG92R2VWcW9ITGo1SWI2azNtMklENnZWMDQ5?= =?utf-8?B?LzB0b2ZvRktZQm5MUzZza1J5SUdERlhXamtJVHpNc3BKeGYwRFFyN0lubnJ4?= =?utf-8?B?VVk0d3diMk1GSzdjeVN1T1lZTi9pUmN6aG5tREtCSjlYSWNTMTB6MVduK3gz?= =?utf-8?B?M2Q3UFRuZTBxRTQ4aFY4cVVsUUpESDIyaHhTbFA5K0ZjMzcyODB5YnYzREgx?= =?utf-8?B?SmFDM0gyUUs5WUZEV05WOXBFZDBQY2c0VCtTNVNoV2R0dDloVUNYdUpnY2RJ?= =?utf-8?B?YmtLNy9DbUJaeElTa1NtRGNRSDRxamNvWFcvQlN2cTJaRnFnRTZ6c3p2VmFG?= =?utf-8?B?WXlMZDRheWpXUU5lUXhPamltSG1aN0lZQU8rVE9mM2U1TENBLzBkcVdoYnA3?= =?utf-8?B?M242K213a1R6L0Y0MDQ3NlFwQU5zeHVmajI5VjdRQm00UUJTK1RxTFFEalE5?= =?utf-8?B?TEtWbGh5RlByeDFwVTVjNUpUYmFjRDJuRHFiTzM2NlJ1L05FRkJnK1ptb0FL?= =?utf-8?B?ZTBLKzZibDh1eE5sam5tWXZWb09zSmpSMDJIa0krZzRhdWhYQUJMajF1OUJY?= =?utf-8?B?Q0Q3RGVaSkNrdTF3Y2twRStPOVpDMC84NUU4cHlPa3AybWJnYVBKQlZBcTQ4?= =?utf-8?B?VmtVRkZPcTFwc0NBMGUrUkFMZnE4Smt5VXJqM3FPcTNsYlBRZjNDVG5UcHNm?= =?utf-8?B?VlBFbzFoMTFQdHNLYkdXNjhRcE1IM2gxb1V5U0tNM3g0OGhrZVBGeTBhUFJR?= =?utf-8?B?czliT2V2UXhFTHFDK2dudVIvd0tpbmp2Y0ZJdi9RY0ZVSEtZV3RQamN6azQv?= =?utf-8?B?UGRLTW1TYVUvU2VpK3VGQnZvWno1WjFqOTVjS0RYV1RuNjlHMGhlNVdZb3Bo?= =?utf-8?B?ZFFrTm9vTTRabnBPVzFuYXZOLzdtMVM5VHZRejNMRzVyS2NycXlqU2Zvd05I?= =?utf-8?B?UDFZeXZXaVV0cVBaTzhBVmpFNkM5aFRzalF2cGl4VWVySG5FeWFzOTI3RnJM?= =?utf-8?B?TzRQa3RzU2tOaCtpN1QvU3gwOEw2c2VObVpScGR4cU13S21DNUNrOHE4cWtR?= =?utf-8?B?ejg1UW5yT3dBM2FwVVA5RDBTTUw0VFF4dU1CRzdmMjhMcTBacW9Ca0djamty?= =?utf-8?B?YTNxMHVvMllyQTJoaTlrMFI2enNvSXBzOUU2WDdqL3d4Q05CbC9tOHRGVWVH?= =?utf-8?B?WU1IOGk3NXRNaE1OTDlsZ0RDUVU4SHZGSHphUG00QWdFOTY5eVh2V2FVRTQ3?= =?utf-8?B?cmhBM1o5dXdMV2VtNnRFZlB3M2s0V2dpNDlPUXo1TTJmNS9SWjEwbTNjVU9C?= =?utf-8?B?Y0ZHNUFNUGVzMmw5TktuaDNpeEN5T2FUYTMyQ3NaSkxOMGlTcHAvVkRsL2V3?= =?utf-8?B?SVREN1dLbUUyVitsakxHMDZjU2YwMnExQnNUbmhmcU4rRUpkK29EUUhSaGZU?= =?utf-8?B?SFo1M1Y2V1JwOEtLRDJsSFZzSzJlY0FTRTRubVRKdW5TUmxMdVJpY3Y2RWJx?= =?utf-8?B?SXFBbzk3SVIxcDZZTGVYUmlicnFOcUpLQ1E3bFRSckZKM3EzbmR4aDNhM2dB?= =?utf-8?B?N1BmdDdLcE1hRjQ1RUgwSE4xcW94WnBsL2dKcWtNaUZwNlJrYVpxM2JiYjBW?= =?utf-8?B?REhxY3d6ZVZMVmo5aXN4OUI1em44OVgraytvZlRuM3htbVgvejlIRTk5QTZK?= =?utf-8?B?Sm1NTWVUSDRnUDc1QkFlcDRzZlpwRVdhSTdzeW9XWEthUTAraStBVHoySDdz?= =?utf-8?Q?oR7OZuN3lAX+O+/d+6US9Ik=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 51b5f890-ad72-4299-67eb-08d9aa954c02 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2021 13:14:05.2850 (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: 7TbSMx7wJlvvLnGkXUCXP0GWfWUxsvt6cxvHBAx3yhwK9dqd0WBug0pL6DyPyqhDBGEW3Zz5q1ncT6Zbe+AfKw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6383 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1637241268590100001 Content-Type: text/plain; charset="utf-8" Both hvcall_flush_ex() and hvcall_ipi_ex() update "size" without subsequently using the value; future compilers may warn about such. Alongside dropping the updates, shrink the variables' scopes to demonstrate that there are no outer scope uses. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- a/xen/arch/x86/hvm/viridian/viridian.c +++ b/xen/arch/x86/hvm/viridian/viridian.c @@ -776,7 +776,6 @@ static int hvcall_flush_ex(const union h { union hypercall_vpset *vpset =3D &this_cpu(hypercall_vpset); struct hv_vpset *set =3D &vpset->set; - size_t size; int rc; =20 *set =3D input_params.set; @@ -784,8 +783,7 @@ static int hvcall_flush_ex(const union h { unsigned long offset =3D offsetof(typeof(input_params), set.bank_contents); - - size =3D sizeof(*set->bank_contents) * hv_vpset_nr_banks(set); + size_t size =3D sizeof(*set->bank_contents) * hv_vpset_nr_bank= s(set); =20 if ( offsetof(typeof(*vpset), set.bank_contents[0]) + size > sizeof(*vpset) ) @@ -798,11 +796,7 @@ static int hvcall_flush_ex(const union h input_params_gpa + offset, size) !=3D HVMTRANS_okay) return -EINVAL; - - size +=3D sizeof(*set); } - else - size =3D sizeof(*set); =20 rc =3D hv_vpset_to_vpmask(set, vpmask); if ( rc ) @@ -903,7 +897,6 @@ static int hvcall_ipi_ex(const union hyp } input_params; union hypercall_vpset *vpset =3D &this_cpu(hypercall_vpset); struct hv_vpset *set =3D &vpset->set; - size_t size; int rc; =20 /* These hypercalls should never use the fast-call convention. */ @@ -929,8 +922,7 @@ static int hvcall_ipi_ex(const union hyp { unsigned long offset =3D offsetof(typeof(input_params), set.bank_contents); - - size =3D sizeof(*set->bank_contents) * hv_vpset_nr_banks(set); + size_t size =3D sizeof(*set->bank_contents) * hv_vpset_nr_banks(se= t); =20 if ( offsetof(typeof(*vpset), set.bank_contents[0]) + size > sizeof(*vpset) ) @@ -943,11 +935,7 @@ static int hvcall_ipi_ex(const union hyp input_params_gpa + offset, size) !=3D HVMTRANS_okay) return -EINVAL; - - size +=3D sizeof(*set); } - else - size =3D sizeof(*set); =20 rc =3D hv_vpset_to_vpmask(set, vpmask); if ( rc ) From nobody Thu Apr 25 12:23:43 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=1637241306; cv=pass; d=zohomail.com; s=zohoarc; b=K5HlO03Qqc5z28+bQA0ySeJ+hiPdTb3wLReKWOxgbRyGnw6aStADHT+9HQpQzUbNIldmN8gzwbPvezpE5IDSb6Chhhdv6hL7iAhwzyMF+3hd2ISFKXvysviibjfJ8mm2f8RCWsy20Ov8rWSYJpRGsp9uQtFG+9TP58I99Qzja+0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637241306; 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=7NvNnOH5HYnSaIdiD82OvXyiaMKZTo5P7hBpSZhL67A=; b=MKw2MzHZUFNTSxp8RPytRUlcPxPEQ3qLMEFl+aIwChlLuOVAroty8xXzMRFulpdsf4IngaEc/n5hDErQoR3486pWUEi7uR2Bxf2CoHyW+ER3FpF9Bv22IX2nfoFGaNuEj1v9FSZgiJ6cVQLQhZVd7RO4xA7zFFfEX1p0zl1Shmk= 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 16372413067831.6963313370147262; Thu, 18 Nov 2021 05:15:06 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.227409.393308 (Exim 4.92) (envelope-from ) id 1mnhFb-000181-I3; Thu, 18 Nov 2021 13:14:51 +0000 Received: by outflank-mailman (output) from mailman id 227409.393308; Thu, 18 Nov 2021 13:14:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mnhFb-00017r-EB; Thu, 18 Nov 2021 13:14:51 +0000 Received: by outflank-mailman (input) for mailman id 227409; Thu, 18 Nov 2021 13:14:49 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mnhFZ-0008QJ-Ls for xen-devel@lists.xenproject.org; Thu, 18 Nov 2021 13:14:49 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 81c33106-4871-11ec-a9d2-d9f7a1cc8784; Thu, 18 Nov 2021 14:14:48 +0100 (CET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp2056.outbound.protection.outlook.com [104.47.1.56]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-12-Vh5s9ku4Me-GXLzm78DRgA-1; Thu, 18 Nov 2021 14:14:47 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR0402MB2704.eurprd04.prod.outlook.com (2603:10a6:800:b5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.22; Thu, 18 Nov 2021 13:14:46 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898%3]) with mapi id 15.20.4713.019; Thu, 18 Nov 2021 13:14:46 +0000 Received: from [10.156.60.236] (37.24.206.209) by AS9PR06CA0126.eurprd06.prod.outlook.com (2603:10a6:20b:467::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.20 via Frontend Transport; Thu, 18 Nov 2021 13:14:46 +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: 81c33106-4871-11ec-a9d2-d9f7a1cc8784 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1637241288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7NvNnOH5HYnSaIdiD82OvXyiaMKZTo5P7hBpSZhL67A=; b=lk20czgJkMtCrcQFcnsCzYcyJrRJs1Qv7xQhNErJh4b4u4SVcQZcev4VnemPSzKQoBPOqZ C5kTucyFIVmiiyULup+xDtoBxAWIqGvV1ki7zvM+4vUpnQ0UsxOUoOvL+L4tRru/eSMPxB VhenVHOVdKxxrGhRMke40uEYI7CH9fY= X-MC-Unique: Vh5s9ku4Me-GXLzm78DRgA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Cu88c6RUkYKJAvmwn8AWBi3ZKNft5jWXJKWN6sdWkNYu7y7NvFGJbX0pLM21l1aZWNo7mBwJu7FenXzzTkjJ3F3Stz23+ZjT3Ls44nyKJfz4mAYvyMLsLtPoKNde6qw65GQEEXi3mAEgrjYmQKUh/N8PNpPJLq1LAD5m5UmUmyyf+Ua5L/lDBeqLbh9V8QbogFV3iEKpGMo4u2DVcZ+NSCIYlAXM/umFcAJ8K7eY/a5ayZEs3o0yAVyZ+A2CjLfsVJrQkXzANmn6JrDWcdvnHfw+/y0qrspBPHjbCFbUr50a0t4kblAJ7WwUYDwVcj6RJtPZISjOJMhIIqT6UuIliw== 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=7NvNnOH5HYnSaIdiD82OvXyiaMKZTo5P7hBpSZhL67A=; b=imT4AjyuLSkC2LZU7ApAaA3rJYylWfAtaKji1FoQ/9xPaCnz9Q2Kv9kridz7VJ7Gook5iVws2FB1PL4/IyVtAmYahDJkZx8G5BdsZlbEpZADBqIzgLlcGa1Y5LiWpoBe7SOB2Z2ayNxi9UNGReajGavhGGJj3JhtQ1JNcNzKG6xgOho502VS6J2UpDF/BrWlriLK7fKPCCIDljS2TRYUl9ISLtAkZlLOrZzg4LvIyNRqlftwLlPWArwg9QVR5MmJLJytRXUmiAVLnERnxKWEcUHCyuO+3sZjOGwjjOQd9yzSrrBgX2WeLl4ff+z8snDPHgyQJjxRKPwksr14/b1t9w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <4aa6c9b4-dcaf-38e9-0b22-394f22ae898d@suse.com> Date: Thu, 18 Nov 2021 14:14:46 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: [PATCH 3/3] x86/Viridian: fold duplicate vpset retrieval code Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Paul Durrant , Wei Liu References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR06CA0126.eurprd06.prod.outlook.com (2603:10a6:20b:467::25) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aeb108c7-a028-4a22-71e4-08d9aa9564bc X-MS-TrafficTypeDiagnostic: VI1PR0402MB2704: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L+d7unjbeRqO39kucSfK2qyysCfBXMMmnV1dTg8bYemNPSYDEHEcZ/qMV57ZMsXG70+XUX/6q6JM6qwOA8ipQuHZZO8VtK7WxE4Y4+3dAAo9sLWUMH90rQc5KaVvNyZJFt15hoyCmrg28pn+coeEWNG//m03aZRSeHRE7OQXPTF+5akvy8Rwdd4t2M8onq9Wb3IgCFmMD/rSlUgRj201yrHMDKTrMGgJMRonl/fQOM29SS/XOKGlJWyu/UOhNTFPfggtuoA16N49sJgiXtkaVklOhpigmSAQRj+SMxELbo5NTgkvOilIhRW1R0PvUsFd+gPlgXQVJ9Yill3tHdo7q+xbJvOq8hJJE67c+LdIwrEyaWj8LpCFzdh3FQu/SNZK1gMALfSnhA6cgJjSHoDEn18iW6bKlMztEdNbKntDFuZv5liWBmlDfoCALZfN+K5ye7l5RCF7z+KC3/5oRPy9eMaSHlzOHVFWBxZhpKtJrsOAH5L8kdcIOYzmTix4B5y3xhYo0a0gCPE/9FcM0o7QV/y5VosLJVdf57ltl2WC9Izv/sFxDodPLf33w+XtefwvTqRHOCKjnYIA7Gffjfn8oeILBIJEZXeh4L8JZ4iWOsxqgtHFHRUBT4XOm1DxQiRxsKRIA/4mDaQEgBSlrr4VeSW1mkIbHFZdYqIcssAkwJtXK/qWm1jIEbRRWVUD5kbjf32S5LWgLQ45snSUOdVIbuw2wvo2qA9gsOLNG88xruw= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(31696002)(38100700002)(36756003)(2906002)(66556008)(31686004)(66946007)(86362001)(83380400001)(66476007)(4326008)(5660300002)(956004)(2616005)(26005)(6486002)(8936002)(16576012)(316002)(54906003)(6916009)(508600001)(186003)(8676002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ckxhTG5HMTQ4T1J1SWhvdzFOcjRZZEJxbFhKd3dZaGJVcVFyS3o4Tnl1NEZF?= =?utf-8?B?b3Bsa0QvN1o5SGpOWXJpNTFjbkxLSUxpTVFFaHE4eVJENWFVemg1MEhKQ2JH?= =?utf-8?B?eVEzM2tsS2FKSTlodXR4blJKaDQ4SzBwSVdHb0w2ZHFwRW9FWXF2TjdGNlRm?= =?utf-8?B?VUtlMmEyeDZCTmtFMmVoYWVuS0RVbHN3Smt3MnRRZjZ6NTA2YzBPckg5Kzl3?= =?utf-8?B?OGZnaFpJNmdsaS9WRjBIOFpCOEE5RzkvOWdtUlRkTTdMOWcrVkFhQkZrbTNS?= =?utf-8?B?WjVXSFR2NnEwdVVRVUlVRkRTR1ZsaG9lMG9HSitYQkhYUWs5WmFFa2Z1RThx?= =?utf-8?B?eVAybTJaU1JRNUlUV1hreUd0Q0FqYjFoYWR5Ym8zd05vODNINEpXSEhBNzhj?= =?utf-8?B?dFpKVlZjNWhwV1VwcDhBZ3JRYkpteTMwdFJGR0lHd0hWQ3lNY2pKMHBlb3Nu?= =?utf-8?B?cVMyd1hxaXlwcHlqVUxSNTVDbm9CTUJJWjhLVU01KzVScnZrWk1weUVsNGxC?= =?utf-8?B?SWREd284c3BLUmUwc2VMcjlLbEg4a2FBSEo1TXBKL01rdlpsUHZrMUhORkpm?= =?utf-8?B?cWdrbVlNWk9jc0FrK2FnOGxkOUE1TE9EZWJ4cFRDOHhMR213TWtNNTZ2eXR5?= =?utf-8?B?NlFSTWdWS1VkZXgyLzFCY2ExWjExdW92TXBqRG0zblVsWS9VY0J1ZmtDVU51?= =?utf-8?B?Z3RhUG9JYUluU0VmNlJEOU4xNE1vVU5kODRkZEV4aUxwelgyUFlCUDdqM3Ex?= =?utf-8?B?VUd0cUt4YmxkUDJhemt1T2Vta1JHbFdmVnNUazc5bDBzczlyL2ErSlVJMjFB?= =?utf-8?B?RWd6Zy9DZjJQQVdlT0ZGVFcyeVZpTlNTK2hOazRzdzJ0ODNtUi9zbVRtb21s?= =?utf-8?B?bDJoYUwxQjRodG94RVNLU2hqYndCcGcwTDJCL1UyWlJ4Sjh5cHFiZktRbGRE?= =?utf-8?B?QXYrVG90bDVsRWhhZmxvdzhTUk1vYndMa1FRWmRBeWNtcEErY1BMTHJscU5t?= =?utf-8?B?QWZqcGZiV0NJdW8zdzNSaEZQdEk0RElySEpqd216SHpSSDIzZ2hxT2F4ZWNB?= =?utf-8?B?elErZ0hlTklpY3JaaUdtZE9adFFQYVBUbHFQaDlUd1BOaENUVFFQaHJqRlZB?= =?utf-8?B?VzVaTFdtSktTeEIzdkRTMnpJcXA0clpkOUdBZUF6ZkhXR09DSmNYSDBJWngr?= =?utf-8?B?cmYxa3UxNTdiYWh4ZXFGZWVKYnlPaWhHYzJ0VCtQUksyMkFVMTRuQWIrQjhB?= =?utf-8?B?dHVpSm9BNU5kUmh1REdReitZaTFNU1F0NHI1b2ZtV1VDYlV1QmcwbmZndkts?= =?utf-8?B?d3NtRkRhZmF3d2V5cjBVMElBM3I4K3d5NzVLVHlvaU5BTEVFYWlRM1hMb2lC?= =?utf-8?B?dDhQdEw1Q2ZOeUJBTUprdDhRRjd5ZUoxMktKYVZqd0tzZlRpT3lWYkZOdjZr?= =?utf-8?B?dU9sVlFhdEp1ZlRRaGpQWDVFRnV6T0dramp0NGIxN0E5RUZMa3NSMVVxM2Fs?= =?utf-8?B?YlBWNm8vLzRESFJ0cWp0dnlLaFNCSnlmN29LQXF2ZDc4YkdEYXk1SDBwZXM0?= =?utf-8?B?VGJ0eW9hSFU2Skl2d2oxdjNRb0ZVVUF1RkQ1R1dldVNydTVVNnBxN2szUUFK?= =?utf-8?B?RDduQmFlWDVkZVlFNjZGMCt4c2dIWEh4bkZrN3A5SzZFVTI5VGhIL3ZVSzRn?= =?utf-8?B?aVNDNkE5L2d1dXB1elhmY1YvR25RMUlKTWJHRXJkSDhjYWR6MmhEc1hhMmZ3?= =?utf-8?B?ZDZCbUtTb0JwdkMrdHRlQXRqMkxGSjVhbXlIenIxSFZxZlJKcWRKTmJVN3Y4?= =?utf-8?B?WTlzWDg1TStqRmZMTzN5U1o2UW1JdmZkVGhmYXhxOXRnRjdhUmdkQ2NjNnVO?= =?utf-8?B?RGhTaHM0cmJLVCtqcmR3Y0NadGt5ODlyOTNWYk5sb0JmMnJwckh6Mmo4UXJ6?= =?utf-8?B?bERRNkdkV0thQ1pva1pydlV0UWo3anRYVGRuRXhxUEFPYVBGdzFxKzhHM2pp?= =?utf-8?B?TmFwb0NTaTVnUW1SamNWeFE0NGQxa3duL1BpTUU1dzRYcTRsbnQ2NURVK2pU?= =?utf-8?B?K21WODl1MWE1UGt5N2lvdHoxd21yaXhaMi8rUVJzRHAyOTRlbDV1dlk1L3o4?= =?utf-8?B?RENtVjhlSnQ5RG9qVUpUWEtWaUJ2OTJVaEU4ZDU5MFRrOGVrbmxjUlcxMGc3?= =?utf-8?Q?t6ALRW04tzu7eaJfMbREjlQ=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: aeb108c7-a028-4a22-71e4-08d9aa9564bc X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2021 13:14:46.7865 (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: MyRKHAGN8R/tmaL4/Gr8Z6YTFKChhRqPskc3BE/N9DNYLpRl0TCr6Rgmdp/ZAn67HFXLc+HjyQ3rHQ+iayxOXQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2704 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1637241308618100001 Content-Type: text/plain; charset="utf-8" hvcall_{flush,ipi}_ex() use more almost identical code than what was isolated into hv_vpset_to_vpmask(). Move that code there as well, to have just one instance of it. This way all of HV_GENERIC_SET_SPARSE_4K processing now happens in a single place. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- a/xen/arch/x86/hvm/viridian/viridian.c +++ b/xen/arch/x86/hvm/viridian/viridian.c @@ -628,10 +628,14 @@ static unsigned int hv_vpset_nr_banks(st return hweight64(vpset->valid_bank_mask); } =20 -static int hv_vpset_to_vpmask(const struct hv_vpset *set, +static int hv_vpset_to_vpmask(const struct hv_vpset *in, paddr_t bank_gpa, struct hypercall_vpmask *vpmask) { #define NR_VPS_PER_BANK (HV_VPSET_BANK_SIZE * 8) + union hypercall_vpset *vpset =3D &this_cpu(hypercall_vpset); + struct hv_vpset *set =3D &vpset->set; + + *set =3D *in; =20 switch ( set->format ) { @@ -643,6 +647,18 @@ static int hv_vpset_to_vpmask(const stru { uint64_t bank_mask; unsigned int vp, bank =3D 0; + size_t size =3D sizeof(*set->bank_contents) * hv_vpset_nr_banks(se= t); + + if ( offsetof(typeof(*vpset), set.bank_contents[0]) + size > + sizeof(*vpset) ) + { + ASSERT_UNREACHABLE(); + return -EINVAL; + } + + if ( hvm_copy_from_guest_phys(&set->bank_contents, bank_gpa, + size) !=3D HVMTRANS_okay) + return -EINVAL; =20 vpmask_empty(vpmask); for ( vp =3D 0, bank_mask =3D set->valid_bank_mask; @@ -774,31 +790,13 @@ static int hvcall_flush_ex(const union h vpmask_fill(vpmask); else { - union hypercall_vpset *vpset =3D &this_cpu(hypercall_vpset); - struct hv_vpset *set =3D &vpset->set; - int rc; - - *set =3D input_params.set; - if ( set->format =3D=3D HV_GENERIC_SET_SPARSE_4K ) - { - unsigned long offset =3D offsetof(typeof(input_params), + unsigned int bank_offset =3D offsetof(typeof(input_params), set.bank_contents); - size_t size =3D sizeof(*set->bank_contents) * hv_vpset_nr_bank= s(set); - - if ( offsetof(typeof(*vpset), set.bank_contents[0]) + size > - sizeof(*vpset) ) - { - ASSERT_UNREACHABLE(); - return -EINVAL; - } - - if ( hvm_copy_from_guest_phys(&set->bank_contents[0], - input_params_gpa + offset, - size) !=3D HVMTRANS_okay) - return -EINVAL; - } + int rc; =20 - rc =3D hv_vpset_to_vpmask(set, vpmask); + rc =3D hv_vpset_to_vpmask(&input_params.set, + input_params_gpa + bank_offset, + vpmask); if ( rc ) return rc; } @@ -895,8 +893,8 @@ static int hvcall_ipi_ex(const union hyp uint8_t reserved_zero[3]; struct hv_vpset set; } input_params; - union hypercall_vpset *vpset =3D &this_cpu(hypercall_vpset); - struct hv_vpset *set =3D &vpset->set; + unsigned int bank_offset =3D offsetof(typeof(input_params), + set.bank_contents); int rc; =20 /* These hypercalls should never use the fast-call convention. */ @@ -917,27 +915,8 @@ static int hvcall_ipi_ex(const union hyp if ( input_params.vector < 0x10 || input_params.vector > 0xff ) return -EINVAL; =20 - *set =3D input_params.set; - if ( set->format =3D=3D HV_GENERIC_SET_SPARSE_4K ) - { - unsigned long offset =3D offsetof(typeof(input_params), - set.bank_contents); - size_t size =3D sizeof(*set->bank_contents) * hv_vpset_nr_banks(se= t); - - if ( offsetof(typeof(*vpset), set.bank_contents[0]) + size > - sizeof(*vpset) ) - { - ASSERT_UNREACHABLE(); - return -EINVAL; - } - - if ( hvm_copy_from_guest_phys(&set->bank_contents, - input_params_gpa + offset, - size) !=3D HVMTRANS_okay) - return -EINVAL; - } - - rc =3D hv_vpset_to_vpmask(set, vpmask); + rc =3D hv_vpset_to_vpmask(&input_params.set, input_params_gpa + bank_o= ffset, + vpmask); if ( rc ) return rc; =20