From nobody Sat May 30 11:15:08 2026 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; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1778681183; cv=none; d=zohomail.com; s=zohoarc; b=YEoupWMD8qTSAnPlxPknHC8Fx6dm+ad9DMfprFl/2oc3em5wIGTPkMW8LDiYUOZZnDjr/tVg+eiAm10DnwvCjivt11B0ZUmAc1f/4/3ZAC8+tHwtDsiG1kuGrOc2dW5JA5uRwRpEFeonbatH6RHueC5VIih4rRCTtjrciuZkaAE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778681183; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LGLDB1oLz7dytXJNDddp3ZiftmqYBvYmdivYW9ydtQI=; b=NK73BsYe8jajnZT7xpWyjIQ660br8hvyh4sXA/UPA2HxrU9PnozgOYPemILU/HAOGSukTM03yCNRG/GSDxBvkNbsc71fzMbLgIQzyLhD8KpXeROzGdopQFHu8Zm+maLupgZe5vm9MS3KOIQx6Pre/N7XCXabCZS2oeMRp0reWjU= ARC-Authentication-Results: i=1; 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; 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 1778681183061331.7513123138368; Wed, 13 May 2026 07:06:23 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1308078.1579621 (Exim 4.92) (envelope-from ) id 1wNADo-00015S-NW; Wed, 13 May 2026 14:06:00 +0000 Received: by outflank-mailman (output) from mailman id 1308078.1579621; Wed, 13 May 2026 14:06:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wNADo-00015L-KM; Wed, 13 May 2026 14:06:00 +0000 Received: by outflank-mailman (input) for mailman id 1308078; Wed, 13 May 2026 14:05:59 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wNADn-00015F-8l for xen-devel@lists.xenproject.org; Wed, 13 May 2026 14:05:59 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wNADl-00CJAv-3v for xen-devel@lists.xenproject.org; Wed, 13 May 2026 16:05:58 +0200 Received: from [10.42.69.10] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a048541-5cb7-0a2a0a5109dd-0a2a450aad26-12 for ; Wed, 13 May 2026 16:05:58 +0200 Received: from [209.85.221.50] (helo=mail-wr1-f50.google.com) by tlsNG-4011c0.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a048546-56b3-0a2a450a0019-d155dd32ac9b-3 for ; Wed, 13 May 2026 16:05:58 +0200 Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-44e1860558fso4404839f8f.0 for ; Wed, 13 May 2026 07:05:58 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-454913049ecsm39703682f8f.19.2026.05.13.07.05.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 May 2026 07:05:56 -0700 (PDT) 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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=suse.com header.i="@suse.com" header.h="Content-Transfer-Encoding:In-Reply-To:Autocrypt:Content-Language:References:Cc:To:From:Subject:User-Agent:MIME-Version:Date:Message-ID" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1778681158; x=1779285958; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=LGLDB1oLz7dytXJNDddp3ZiftmqYBvYmdivYW9ydtQI=; b=e1E79wOtISn7omuHm+TCiG2rFYn091hAQdWdXcikykJjdTPVmuEhhwT+fdyMV3ymJc CBj1AAcnjJERqmyGpBEnpHAzGUU6CwHotZ92C/oXrp4zBgrlwlO4/RzWS90v+ppJYo/1 firjWvPU52WdcpFj7uHVmky519Jnd1Vgy+ds/jbiP3gpAM+fjyjE6vd0tBfWWatu9DgN hx4wODLMiWZ7kXFwbTdHZIgHpiyALJ8rqU4aarftx77nJq5ds72r86I+4ldh7G2Rtx9N /CmSVbjgppI2hEaasVN+cgT1sn7wWTf/20Yz8dthW6tiXcEPfwacwwwkp7hrtEcwYKa0 j8PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778681158; x=1779285958; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=LGLDB1oLz7dytXJNDddp3ZiftmqYBvYmdivYW9ydtQI=; b=PuyE6+GashqrGawofs9xf6FU0mBOD+qB1zpc4FRO1oMSLumxlsf1yrCWCDgJs4Sbmi ElIvqBKU7eb9PEB4WnnDU5N1komrvlnA0Z9iDIlaDgXhajE3GtBXdZsJNEUwB7GVIpu1 4I7acaIlVS4YaWK6fb61i1n8gVnz23wyuUO5PCGhGuM5f2l7KdFFjSgtFhUA+Qf9MW71 6gqsRBLaKQoRfrbkYXJBvHAy1DuxZtDHgNOKKlE/ASd5ObKfxYiiEtM0nchXQwFW4uOK Nvm+A7rRr61w6KwxMAaGOP845zKjDK/o2/SU7+iSD7Ymy8h78Fwxz6SVumHDxKnMW5eI 3WRQ== X-Gm-Message-State: AOJu0YwiXiHph83VkgEVm0aSJADCPrcM5zaFiVrMEQxULyw4FDNE569b 8Z9QghlM0ojHd2bX+CIqvgY7iA0TX4KsJkw2n5Pu3XV/GuAJbLQ+gmXLtcd2KVvs2FVW/fpZ2qW tJuQ= X-Gm-Gg: Acq92OHcs2rf6PnLTI6wf9zawDIRhHEhSFWzddwt8v580xh2KGj8Yn6Q34KFN/1YcR+ xdaDd7eJPFW95nV8D73xfpPVGGRghDiXA+ShZZvf4Wkjh+65AokVhcmjShMdmE+66WZ9lIbBzV/ RO6QrX/RelNjE961f+MX2gyniTMzjlX8UkeRusi2sjbXEqBVn9cQBtLh5T/ZmSM0stg+NoyzENb gNlr7A8JB/H9seFxS6v/5mDDQPlYzNbisPbVpShQm3btQXZxjlDgIm03c8hz1tiLUDIB6zqS5/1 LXgZnYArU4+wllKX81dJRXRwghYxLMcoVIFmJqtnRZfyGuu1XRke9TghL2Snp/CrQaFbzp8ZSHU gAdgbh1Q1CGwSnOHFIzSXR7PhSOIqc5HXL4VNgUuGaxAcpDeJRlGFK5NeRT0bZLTIVqjo85gY3v obnggxmcZbZ7hIIcKya7g14EbRsN3CyP5ou8QU7FC33h04ffRRRC2GwuFSXoBPNENu56L0hdqrb Ys6Sa7muaxv280= X-Received: by 2002:a05:6000:18a5:b0:43d:50c:6f18 with SMTP id ffacd0b85a97d-45c58696122mr5641842f8f.11.1778681156869; Wed, 13 May 2026 07:05:56 -0700 (PDT) Message-ID: Date: Wed, 13 May 2026 16:05:55 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 1/2] x86/mm: address Misra C:2012 rule 16.2 From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Teddy Astie References: Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-4011c0/1778681158-731728B7-668B4DC0/0/0 X-purgate-type: clean X-purgate-size: 1228 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1778681184898158500 Content-Type: text/plain; charset="utf-8" ... ("A switch label shall only be used when the most closely-enclosing compound statement is the body of a `switch' statement"). Use a form of fall-through instead. No difference in generated code, except for some line number changes. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2663,15 +2663,17 @@ static int validate_page(struct page_inf get_gpfn_from_mfn(mfn_x(page_to_mfn(page))), type, page->count_info, page->u.inuse.type_info); if ( page !=3D current->arch.old_guest_table ) - page->u.inuse.type_info =3D 0; - else { - ASSERT((page->u.inuse.type_info & - (PGT_count_mask | PGT_validated)) =3D=3D 1); - case -ERESTART: - get_page_light(page); - page->u.inuse.type_info |=3D PGT_partial; + page->u.inuse.type_info =3D 0; + break; } + + ASSERT((page->u.inuse.type_info & + (PGT_count_mask | PGT_validated)) =3D=3D 1); + fallthrough; + case -ERESTART: + get_page_light(page); + page->u.inuse.type_info |=3D PGT_partial; break; } From nobody Sat May 30 11:15:08 2026 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; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1778681200; cv=none; d=zohomail.com; s=zohoarc; b=LS+Hn6+Kzarop8aAU5f6mN5nrV8MWJgzXBGhmujw6rensdvYfPbIV/Oqn4XJP00S3Pu316BahWc2XR8mivIH4EKAnvhyV39ApsHRP/VddpFRBQfq57YtQPzq4ByLT3LWxamolKbptrmby0WygLSDmoNXK8pBnB6byA7N/pXTELo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778681200; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wy+UKfr0jpUKnUnHywACAxAHzw2WJmvRPSq5Ydx2cgA=; b=D5hIEQ3jp+9v/d8E903xqhMZV8OgYRfPCrD6DnNLxBD/QSuvYDa66vzFQDNHChBXCWB34PJbirNVcLSPHBWGejI2QpFVJo3qBibRlQxGS3wVIaTqrOHkjBN9uUCCNcG4jY/HXfeqGNVOO/7yvH+G0I90pwgnAMV+rY2oQ6MGhRE= ARC-Authentication-Results: i=1; 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; 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 1778681200278831.1047250922811; Wed, 13 May 2026 07:06:40 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1308083.1579629 (Exim 4.92) (envelope-from ) id 1wNAEC-0001Tp-12; Wed, 13 May 2026 14:06:24 +0000 Received: by outflank-mailman (output) from mailman id 1308083.1579629; Wed, 13 May 2026 14:06:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wNAEB-0001Ti-Uf; Wed, 13 May 2026 14:06:23 +0000 Received: by outflank-mailman (input) for mailman id 1308083; Wed, 13 May 2026 14:06:22 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wNAEA-0001TM-IT for xen-devel@lists.xenproject.org; Wed, 13 May 2026 14:06:22 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wNAE8-00CJHY-DX for xen-devel@lists.xenproject.org; Wed, 13 May 2026 16:06:21 +0200 Received: from [10.42.69.2] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a04855b-5cb7-0a2a0a5109dd-0a2a45029b4a-14 for ; Wed, 13 May 2026 16:06:21 +0200 Received: from [209.85.128.52] (helo=mail-wm1-f52.google.com) by tlsNG-720697.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a04855d-af86-0a2a45020019-d1558034e582-3 for ; Wed, 13 May 2026 16:06:21 +0200 Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-48e8132c6d0so30464545e9.1 for ; Wed, 13 May 2026 07:06:21 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45491f8d4c3sm41175703f8f.34.2026.05.13.07.06.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 May 2026 07:06:21 -0700 (PDT) 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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=suse.com header.i="@suse.com" header.h="Content-Transfer-Encoding:In-Reply-To:Autocrypt:Content-Language:References:Cc:To:From:Subject:User-Agent:MIME-Version:Date:Message-ID" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1778681181; x=1779285981; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=wy+UKfr0jpUKnUnHywACAxAHzw2WJmvRPSq5Ydx2cgA=; b=LTqa4d4CptUL/o1ZQ1dz+3eY4yOhYFzHJcz4/s/67tlwjEBGYgJl3NVZfCNqeZfAGY itPxzMVAQouhngLeDDmV4BQBfS5LGjmKQr6r6WmvJfFmn8pEuIhMTqLEOnzY9PYOw+4E JQkwhKlrC5ggKZz8ZPv71ZzV3EY303G+m7dPwrK4dpCPKHEZ4FOWZoRw+9pk9tsAjz3b LC/t99+TuU3g7fm3C15VE7DYimBX5f+RIgcJL+kRgyzJLJ4ZiBcPDeaImZQ7lLoI1XUi ixRRproB/qgfInNeShzHNSG8WiH7vKmvQzMRYPC9sAwEG+aSWVXZcwApcNiEsQQ8d+/u e3+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778681181; x=1779285981; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=wy+UKfr0jpUKnUnHywACAxAHzw2WJmvRPSq5Ydx2cgA=; b=mrYc4voN9bUvwKWSkKEo7SyqfeeCMu1VtBQ+fNJnLKTwnc0Ud5bQQO5+9ZiRIbxUKs zGaOUL9OWFmp+0JJAb5jkUH84LrxsftFOg4qCwhv9K3Ve7Q3N/ZiMp3lKgRqMbmch9+l IGGUzb7zXkkrp1rGUE3QkNc8RTG6hghZP4bXKZ6Q15cIwqQdJUmnyK+tYmIapRDJZfyd zLa5s2bHKYbH8k3/hw5kBCj87O7j6eyuUWwts7USVorvhzpE5vn0OYXZCA1uDXiwsEp9 y9Erkost9jLfvghmzKFy3OSFHRDZjp4dwpgCygZ+4JrTNPNsr3RmsSYIkPqPupy82WYD aM2w== X-Gm-Message-State: AOJu0YwKTByDRiTxdq6WEEFvZBAp2M42FCLosVWxdry8601pGwG/zajU vFn6pcY7kyCUdrfRCYRhdiwkqm4aOw9tvc7M+IZ8uNKYmrUtcIpwbPBnZTfa9XTMVSX61U25qrZ k8zY= X-Gm-Gg: Acq92OG5nWc4mwsQ6/pBBnKCvk67DjlAQlGFo7M56Hsqf5myHtrNWSqqh3OX8uK0orG LtKyLZjZ7R/C6jQiaSKw0xX0Hmi/pbCbJ9gsO0idgJBNynfyYNIkeXJ8qglcNZpYk6loRg2hnU9 KDZ6xNrombL3wggYd5fN9FTjRkG++O0rp+k7cCiYMxIGENKf54FWSsOoVae/H+uhiGgQCbqxV75 OUfq+13HtwIGdB4YYw4dR8HUWepVfEakr4ath5ZLcRmosesxcFoLZFTLnAC5Ae7r7l2ojJVTkRu WZ+ge6lIs2NTu5pu3TKkbJ/81oZbyojx2YS+em0oCwKjZobYQoIwWsKTQzZQv0uG7Ui86K9Bi6D SDI4X9vh5vi0hGspjF0Psw0rvmdBdm90ERJ9ek3MCdcceAKSYVhHwB09IF5HbUwb7ha8NhXDN1x ny9wxps83hRibQONBt61njQEYquSDVy9IRTbtumw9QpSE9t6UGdY7p1At1R0El/suun8V9yEAJm u9eJhHsWNHqkZ0= X-Received: by 2002:a05:600d:18:b0:48a:5574:3a5d with SMTP id 5b1f17b1804b1-48fce9bd5d1mr35850885e9.7.1778681181303; Wed, 13 May 2026 07:06:21 -0700 (PDT) Message-ID: Date: Wed, 13 May 2026 16:06:20 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 2/2] x86/PV: address Misra C:2012 rule 16.2 From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Teddy Astie References: Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-720697/1778681181-AB36C161-C8707750/0/0 X-purgate-type: clean X-purgate-size: 3535 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1778681202360158500 Content-Type: text/plain; charset="utf-8" ... ("A switch label shall only be used when the most closely-enclosing compound statement is the body of a `switch' statement"). While I don't really like doing so, use a few "goto" instead. No change in generated code (somewhat to my surprise). Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -897,7 +897,7 @@ static int cf_check read_msr( struct vcpu *curr =3D current; const struct domain *currd =3D curr->domain; const struct cpu_policy *cp =3D currd->arch.cpu_policy; - bool vpmu_msr =3D false, warn =3D false; + bool warn =3D false; uint64_t tmp; int ret; =20 @@ -996,21 +996,21 @@ static int cf_check read_msr( case MSR_CORE_PERF_FIXED_CTR0 ... MSR_CORE_PERF_FIXED_CTR2: case MSR_CORE_PERF_FIXED_CTR_CTRL ... MSR_CORE_PERF_GLOBAL_OVF_CTRL: if ( boot_cpu_data.vendor =3D=3D X86_VENDOR_INTEL ) - { - vpmu_msr =3D true; - /* fall through */ + goto vpmu; + goto check_relaxed; + case MSR_AMD_FAM15H_EVNTSEL0 ... MSR_AMD_FAM15H_PERFCTR5: case MSR_K7_EVNTSEL0 ... MSR_K7_PERFCTR3: - if ( vpmu_msr || (boot_cpu_data.vendor & - (X86_VENDOR_AMD | X86_VENDOR_HYGON)) ) - { - if ( vpmu_do_rdmsr(reg, val) ) - break; - return X86EMUL_OKAY; - } + if ( boot_cpu_data.vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON) ) + { + vpmu: + if ( vpmu_do_rdmsr(reg, val) ) + break; + return X86EMUL_OKAY; } /* fall through */ default: + check_relaxed: if ( currd->arch.msr_relaxed && !rdmsr_safe(reg, &tmp) ) { *val =3D 0; @@ -1049,7 +1049,6 @@ static int cf_check write_msr( const struct domain *currd =3D curr->domain; const struct cpu_policy *cp =3D currd->arch.cpu_policy; uint64_t temp =3D 0; - bool vpmu_msr =3D false; int ret; =20 if ( (ret =3D guest_wrmsr(curr, reg, val)) !=3D X86EMUL_UNHANDLEABLE ) @@ -1179,24 +1178,25 @@ static int cf_check write_msr( case MSR_CORE_PERF_FIXED_CTR0 ... MSR_CORE_PERF_FIXED_CTR2: case MSR_CORE_PERF_FIXED_CTR_CTRL ... MSR_CORE_PERF_GLOBAL_OVF_CTRL: if ( boot_cpu_data.vendor =3D=3D X86_VENDOR_INTEL ) - { - vpmu_msr =3D true; + goto vpmu; + goto check_relaxed; + case MSR_AMD_FAM15H_EVNTSEL0 ... MSR_AMD_FAM15H_PERFCTR5: case MSR_K7_EVNTSEL0 ... MSR_K7_PERFCTR3: - if ( vpmu_msr || (boot_cpu_data.vendor & - (X86_VENDOR_AMD | X86_VENDOR_HYGON)) ) - { - if ( (vpmu_mode & XENPMU_MODE_ALL) && - !is_hardware_domain(currd) ) - return X86EMUL_OKAY; - - if ( vpmu_do_wrmsr(reg, val) ) - break; + if ( boot_cpu_data.vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON) ) + { + vpmu: + if ( (vpmu_mode & XENPMU_MODE_ALL) && + !is_hardware_domain(currd) ) return X86EMUL_OKAY; - } + + if ( vpmu_do_wrmsr(reg, val) ) + break; + return X86EMUL_OKAY; } /* fall through */ default: + check_relaxed: if ( currd->arch.msr_relaxed && !rdmsr_safe(reg, &val) ) return X86EMUL_OKAY;