From patchwork Tue Dec 6 13:00:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13065752 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 60DEBC47090 for ; Tue, 6 Dec 2022 13:00:37 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.454832.712382 (Exim 4.92) (envelope-from ) id 1p2XYQ-0003dC-Qs; Tue, 06 Dec 2022 13:00:10 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 454832.712382; Tue, 06 Dec 2022 13:00: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 1p2XYQ-0003d5-O1; Tue, 06 Dec 2022 13:00:10 +0000 Received: by outflank-mailman (input) for mailman id 454832; Tue, 06 Dec 2022 13:00:09 +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 1p2XYP-0003cz-Jb for xen-devel@lists.xenproject.org; Tue, 06 Dec 2022 13:00:09 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2061f.outbound.protection.outlook.com [2a01:111:f400:7e1a::61f]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e0380403-7565-11ed-8fd2-01056ac49cbb; Tue, 06 Dec 2022 13:59:53 +0100 (CET) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AS1PR04MB9504.eurprd04.prod.outlook.com (2603:10a6:20b:4d2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.14; Tue, 6 Dec 2022 13:00:05 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::4da2:ea8b:e71e:b8d8]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::4da2:ea8b:e71e:b8d8%4]) with mapi id 15.20.5880.014; Tue, 6 Dec 2022 13:00:05 +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: e0380403-7565-11ed-8fd2-01056ac49cbb ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SPsoZGiqjMT/WL/tNk9X914l0ikxfyNR4rCwaG3Oqch+OcdzUoz7CAZd/BwC19y02mktArfIwoDhNDYIkGtlaBjqb/Rgs/zAY7AQkwo1V8Qrqot4OzQOSYtgl5d0Ym++QezNwPSyzPQrWEOs7sZTwIAMRdUIStgm+AJP8KGX6eWBYoYZt81lJZu0Nc2HU9DY/lYgpxK35kM8/O9KphOraGSLkYE1SGh3y7+5de3y86YR9lkvWQMK5LVqrnPUIeyh7s8EUdQD56CehqCX0blenaPXhNlOqugZFJPtx2bx4Bc+BlU5gBTbklqQdWCbSlTHvefvQG//WlcOH72CRktJ9A== 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=Uo1HI2wxCeGOb4dkJghuzUxBu03Az2/vKx/ZOpRpwB4=; b=Z+Gs+8qg59/QhPH4GJja6VBGY04IlZ7hIqIcOaoiCDt9jOvNIEo28gRRvk8S5Rual4NN69QKkecvckjs65sfuSdR+E9Xd4O51SmTgvb+3dnSNrvaJQ1qmCvsVHZC4rRCdcGaINmwTPOBxUgefJ+aBSc9GJP0wX2J72jWH1s7hw4f5x2tK1zJW6Kr3TjRB3qV9xAr1kCjgStH1BRWop2Wkc/jAqizH7kFOKCFDp6/PGC/pAIcA7YytZ9mxjNismSXyloQwcyP6ZQe7BDGB99JIt/CXjLpeVsqUm+M4zLvSpaK7R58mytTbnz1i9fqzVhFBxxmaBC5fGFSspf1Jqfc3w== 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=Uo1HI2wxCeGOb4dkJghuzUxBu03Az2/vKx/ZOpRpwB4=; b=SgS4RAPl/NZh1F1LTWTCz6SlFbZ+HwCNIscG1sQbncHj47Yip/n50aERyfNH8qd3jcholx5moH4kmP+jLrcmuyY82J11GwuySVEmE84ilu084JckuwV5vx13NmybxCwPXyJ2PyS7UaXCSdqlb0641saq4obOi1OtHbmGDps5R8fBNj8VGnsl2p3mNF8d3PX/kWkQULZup/siKFJF3IaP8k2xdjzHvoX0NeoZwSS1B5HQ1z1juQNdcm/Lt69AeX070pDWjPNlwWy72AAG+HdB0fb7u3NhVkFElF6OdAGCftaw7EuDnTypHnvbefujXfgBKTrxvutw8ca35yiBUo/9Iw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <8462a401-17db-1b34-de7c-d0407ffd92e1@suse.com> Date: Tue, 6 Dec 2022 14:00:04 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.5.1 From: Jan Beulich Subject: [PATCH v2] x86/HVM: drop stale check from hvm_load_cpu_msrs() To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Content-Language: en-US X-ClientProxiedBy: FR0P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::10) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AS1PR04MB9504:EE_ X-MS-Office365-Filtering-Correlation-Id: 51b71944-7f73-48fb-a447-08dad789cbe3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PJR5xsBM14HFCAZH1T5UhlDbFCquWXcj2zNK3QczjoANSZ/Ks3L91vdAwzvn1/PcwgqO81RRgDlkXTMN2LehDeZzQu4ErZLvxuYcvkFuQvvYkPsGkHZOXqA6YqSCsFZ9f0CIWD6Qg+UFErXIp6F3ybIpO2hI+nAFVFRhu13A+377Cc+qIUIXOHkBp19F6E3vulwTLOoGpE7ZlYmK6HM+XlMqNLniQwoFXVAFRQkZovjJNBsUC9DJwLutF7xRbMTi/ljTu8PtDAra1KeZCfXw3nC4tOH8CBocWpGlXhl0H2mWu5soRkGxTJbDwDdOfZxxI/qxwYQgJ/2+bpyFKubWD7n9IjSCP++cYMj0aGwMP0kUHlx84t0+0bBVRY2OqUt4uZrs+6NWfVpZJdr0M7NgZFouijhnbusJWU8+NnglRtAweP/1geMTPfyaEx5ELkUApCLtW4q8VeUSRpepAHFSX4CfaU9JmA7U2h0JGGJiTgO4iRbVqbTCgWElCkYTgZOeFLFayWaZUTKluWoz9wSYr0yx2CiamLGnOPQMXdyNXgGT/jf0wPUSjyZFQDD+JRVHE3MMHP2NnB4E1J6FstH8Gyv3qFhVi6fUyK4iD1xv6znwhAB0Ead0UpsP2itimTRCF5OuqPwnl9mFP3GQRHhDRUx7f6gr+NOm9uGJJKeIUWezqLbjIpfUtQo8IwZ6cfBAdRXqnOKamQ4qF6RUcCcsDt5ypDvMLp4FV5FIQmwFL4w= 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)(376002)(346002)(136003)(366004)(39860400002)(396003)(451199015)(86362001)(41300700001)(31686004)(31696002)(38100700002)(5660300002)(4326008)(8936002)(2906002)(8676002)(6506007)(186003)(26005)(6512007)(6916009)(54906003)(66556008)(2616005)(6486002)(66476007)(478600001)(66946007)(316002)(36756003)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?u0/QOQ96z5IENTQj16cPAbwECGTO?= =?utf-8?q?kTB6b3uTcubFYYtFnXhzQemkLBVln2pVeEqnPrhGh1TACW4ujpJDEy7tzjxZ6i4WP?= =?utf-8?q?sAvbVrDRr3h9cJtJ6NrmpOVE3mbkECt+zKJwbmjTScfNqckRBt7BmMjwjBD/3d2su?= =?utf-8?q?NyLFxD8zpEBilo6gnd0cMc0GgKxsgd9yeGLsyhOGoF7cBaEmzDA3VrVepeqUYRtzs?= =?utf-8?q?PUubVjCBKaLVrN18s/Ap+VYYUwl1HiGLNOpfUWMjeJI+z3WYCTvBGRu8uMZVz6TTf?= =?utf-8?q?ez9KtbKA8Sro+Piz1XQzJ0Oz5WtToJiTcxgYZdOoOb0vXh2w8I/eBMeYE7HlRmyQ+?= =?utf-8?q?H0YSv8ucp1vkHzYB0Y7QuFqV+J3iLtVbBK2jJxM7JWL/Vk3JmlBl1MdJpi57Ogxuz?= =?utf-8?q?0gXJeKV/kjT9AurVcr+jrXlethdIVOVuFKJEJVU0fb6xWc+wyFkY756qLW9+psM4U?= =?utf-8?q?PFFU04ab4A7yBNwUqdoexnimrVsCOjwaubC4SmJCwvOlaqBJxsJEZh/E7zRmiteT6?= =?utf-8?q?2n2koEZJK65iob4NJ/uUuG/XMNyyuTDmGe+SxUWST1zMhvdP1M95uEyn+V9dXEPYP?= =?utf-8?q?2beRuFS6h3EpouXqGqm6cfIr2fAiw7Nj3pyHNokF9aqZodtX/+NsxEAkFOulM+8yD?= =?utf-8?q?CMBBOVvQzgQQVlkhTRtslnBdVb4AEmgCOiqi8Kv+S1H2pAF72H1t2HIL6E8uQMj2A?= =?utf-8?q?+xCPfLA15j7c9ShmpdDU6U1UBAWGhJN3xl98/XZPdU0sYlzGdu6405YiS5P8KIgo5?= =?utf-8?q?mDbH4i7CueVsM8Ot5tc/1J99dsff676aZJq0ItdsRkEQYCt2QAYrVFZxDNTq1t0+J?= =?utf-8?q?/xwl/1bvLTFATPa1JkR1QJY7xBcn3b57SgC9h1XOLJ/IsTEvswElU6CTrf5+7cLn1?= =?utf-8?q?9eZnJC0pyYmD9BW8uOT+U05cPHsVpUuNgo8AkhB1592j3AjB70cBxYnry2R0GdyTo?= =?utf-8?q?kdj/ZSiVezHh36D8VVDDjx0BulctpwsxEAgSOkyYuuIwbJOdOHdT0rhbaqu5a3dKo?= =?utf-8?q?Y0WM/pOT1izyf476MghqMvGuv5B5JBdUVLRKYMwARP+5BBCT/VUr4LWccsqU7aKZh?= =?utf-8?q?xXCZCbCAGd6bfwR3CCh4nQUEEvibsY7s5wUFMF82JPI1LCYAHlFJJR9cDBhCv5RQZ?= =?utf-8?q?9RYLgyOjvqdgkmMOluQCkwVDvupQxmr1KMQsh+K7yLNS4bk6ejeFPmE2sGs/jA3Rs?= =?utf-8?q?tBsTfTNZEbfo1u5dg5wy7E83Apu5CKASNcoPMAVb+3JJnnpn7eUXZnd8htfARPwDx?= =?utf-8?q?WxmGN3A7HfEIEW4Xg3r3agzG/rouzFdx2ZAr9ue3U4g2AY0LvYLo2yexgwuphBeIa?= =?utf-8?q?R6OaUlQiodRBZZTMSxh5vHgKtskaBaelR4alagKb+ECi0L+stcuB4oEjdKdv5qG93?= =?utf-8?q?8u64r7eChWqLllF6S+imoQAWhMVphZzCynaJ4TjxtZbrwodwbF1mB9t10qEqb/k1Z?= =?utf-8?q?RORw0BP1B8mEb0QyqmAotxHB8LS5wzfJ63t/3w1I69c6ZBCYLLU94yaOAL6GTHwnz?= =?utf-8?q?J1UjMPMjWFyk?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 51b71944-7f73-48fb-a447-08dad789cbe3 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2022 13:00:05.8625 (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: TyuPCdJZKQPvY5CjE9ppyCXozTCh/xJ3aZx5PeoTaoEgsVhz2cs3E40GOn1SoxabZGBOUIkGDMAIQ/AZ8Y7Fcg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR04MB9504 Up until f61685a66903 ("x86: remove defunct init/load/save_msr() hvm_funcs") the check of the _rsvd field served as an error check for the earlier hvm_funcs.save_msr() invocation. With that invocation gone the check makes no sense anymore: It is effectively dead code due to the checking of the field in the earlier loop. While dropping the conditional also eliminate the "err" local variable (using a non-standard name anyway), replaced by suitable new/adjusted "return" statements. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- v2: Remove "err". Amend description. --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1428,7 +1428,6 @@ static int cf_check hvm_load_cpu_msrs(st struct vcpu *v; const struct hvm_save_descriptor *desc; struct hvm_msr *ctxt; - int err = 0; if ( vcpuid >= d->max_vcpus || (v = d->vcpu[vcpuid]) == NULL ) { @@ -1479,7 +1478,7 @@ static int cf_check hvm_load_cpu_msrs(st return -EOPNOTSUPP; /* Checking finished */ - for ( i = 0; !err && i < ctxt->count; ++i ) + for ( i = 0; i < ctxt->count; ++i ) { switch ( ctxt->msr[i].index ) { @@ -1495,17 +1494,15 @@ static int cf_check hvm_load_cpu_msrs(st rc = guest_wrmsr(v, ctxt->msr[i].index, ctxt->msr[i].val); if ( rc != X86EMUL_OKAY ) - err = -ENXIO; + return -ENXIO; break; default: - if ( !ctxt->msr[i]._rsvd ) - err = -ENXIO; - break; + return -ENXIO; } } - return err; + return 0; } /* We need variable length data chunks for XSAVE area and MSRs, hence