From nobody Sun Dec 14 08:05:17 2025 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=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1765578076; cv=none; d=zohomail.com; s=zohoarc; b=i5JghVN5UNnh9axsqGlhAG+qUIhY8b4+gdLSLeXOnSIMhLIdhrpSKTLvW8GNLFVlGToKzISKXrHLVqWQrKHNqZrxKKGJXtj2ls3wIMlT7X4MWwgRSDn42DzzwZYN+nkWKK6rmTk1ImOS2pFMpQe6Ss9gVpnZq7Sykf+eIFIaGf8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765578076; 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=lk1vumcas+/1y9PUhtuUtgDptTJz0Re2iVdDmKM7JLI=; b=DPPjMZfnebVbVt2gUvUozifIHSQol9+BFB8bMR6GfWuJXGojl5zLaEoaOnIE1zSSegKgWXZpj0z0SEFmVgeSETr60RhiRNPV60J7SmjU2ZmXkr32tw0xB2MATuFXwzLPaF29kzgxjfskQCKs/4y5vSEc5m+WG4jCd0miVM7fNp4= 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=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1765578076842553.9861417786284; Fri, 12 Dec 2025 14:21:16 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1185896.1507831 (Exim 4.92) (envelope-from ) id 1vUBV9-0004OT-ST; Fri, 12 Dec 2025 22:20:39 +0000 Received: by outflank-mailman (output) from mailman id 1185896.1507831; Fri, 12 Dec 2025 22:20:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vUBV9-0004OM-Ok; Fri, 12 Dec 2025 22:20:39 +0000 Received: by outflank-mailman (input) for mailman id 1185896; Fri, 12 Dec 2025 22:20:38 +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 1vUBV8-0004B7-U8 for xen-devel@lists.xenproject.org; Fri, 12 Dec 2025 22:20:38 +0000 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [2a00:1450:4864:20::332]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id c88f7c69-d7a8-11f0-9cce-f158ae23cfc8; Fri, 12 Dec 2025 23:20:36 +0100 (CET) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-477619f8ae5so13255675e9.3 for ; Fri, 12 Dec 2025 14:20:36 -0800 (PST) Received: from localhost.localdomain (host-92-26-102-188.as13285.net. [92.26.102.188]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42fb38a977esm6314350f8f.12.2025.12.12.14.20.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Dec 2025 14:20:35 -0800 (PST) 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: c88f7c69-d7a8-11f0-9cce-f158ae23cfc8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1765578036; x=1766182836; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lk1vumcas+/1y9PUhtuUtgDptTJz0Re2iVdDmKM7JLI=; b=IrjQIX+y9N6iCmPqQyOMBTsT+t+qkmIQDEGVrqdDOGXuCJzhEyz8TH/80dZh3lKwe2 Foqt8maa90hqS54Yiq6B0/jiFnG6u3oCkC+3vYzTTa88WUUpfkTFi4KYTZP+Cw50puWw H4rs37U58dsqkchc3+durPA6Yrk/BbV7lmcTg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765578036; x=1766182836; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=lk1vumcas+/1y9PUhtuUtgDptTJz0Re2iVdDmKM7JLI=; b=cwlpxCk02kdZiFySXDyU/W5AqxhWQufZ3GDE2dKk14mZ/e7O65V0W1u9Io+Oegm6C/ Y2WIrRanxKThbEGMxWCz3tExfTOgCUj8FMXqwvT/w0BbCWvy3tko31XQA11g0HCKNVvr YawLMd03Obp3AUIxoGOQoI8g8t5wBkHAFTOf3vDZzIOcDhkJebgbfRd/Jx9ZWboOJ8UT 1+zGmAaBUIoLVzow+PAH1WL9OBbcVbe3IvDhMYgVEFtfv3/GDypPIw9ZLRFj+kR0JvQN deDjURYZQHAPQv85MtMrX0Ngo+0waZyqQYdnSTLPcAJ6DNDVQPNlheMZJRr11SW+S5hd ElZg== X-Gm-Message-State: AOJu0YzYR/NwO6/p7xA8F5oijrzEeUHaeINOn0+1fFtxTyJYtXtaMNcj GUBDCJYgd+e9Sh65h0r1zoFN++AosH/DqvmHBdbZfWluBVDCYz0c6cUCtcCgQjv3A0gRdhBBcGZ PfVBS X-Gm-Gg: AY/fxX6wCt5c4dmFqLw6fKnyz1q8yAVbv/yhp1UTyao85fIBlODIl198QcaOovAjyKL FnJ5FFwCJw+908vHhg8RJZPhPoH2IbqRYallHqz1XzKfmlBmo148bCZSfDQR2y/1ITryFntN2nO V06/CTOfmcyezkUvnKPKLAkDq/UcMWi+Kqlx3NJZXffHh749vccz0Ld1icSqgXUM9VrnfteMD6r QBePYFdW+n8vRka2YrRbaVAuOWLLDDVoZzYHDMT74gFYjX5vygD5aESc4Cb5flHWDrU3TaouOc+ Vr8OxRLA8N6Qw+DSdyiy0FGYkQKCl6wzII8JVBLQ4JBZ4EMQASdO1hfIN1SWz/VUVgAYCk6kAac 0MyJ23b/VX5Q1/qZZgpn5shnWhWptzDfER3eOp58zurE1VabVlWPWycPIfIHx8zMmRyzgHOc50L OyuaTwKsfoAaxkjG47Y24E+ItMEdmdVi9AbcbaS89z6HZKtsHO+aOyCBYMWqEgFyP5APJ3BYpc X-Google-Smtp-Source: AGHT+IHALu6Z7/VnodTlATGTGQ18GFcE3sMMz9/GJ9gae0SF9SorA1BzU5rp+fHqfAF+ylxPSIeSxA== X-Received: by 2002:a05:600c:444a:b0:479:3876:22a8 with SMTP id 5b1f17b1804b1-47a8f8c2e5cmr41340905e9.16.1765578035380; Fri, 12 Dec 2025 14:20:35 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , "consulting @ bugseng . com" , Nicola Vetrini Subject: [PATCH 1/5] x86/pv: Address MISRA C:2012 Rule 4.1 Date: Fri, 12 Dec 2025 22:20:28 +0000 Message-Id: <20251212222032.2640580-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251212222032.2640580-1-andrew.cooper3@citrix.com> References: <20251212222032.2640580-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1765578078047158500 MISRA doesn't like mixing hexadecimal escape sequences with ASCII text. Use the same workaround as in commit cd5048353725 ("xen: address MISRA C:2012 R= ule 4.1"). No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Nicola Vetrini --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: consulting@bugseng.com CC: Nicola Vetrini --- xen/arch/x86/pv/emul-inv-op.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/pv/emul-inv-op.c b/xen/arch/x86/pv/emul-inv-op.c index 314ebd01cb34..346ac1124d7b 100644 --- a/xen/arch/x86/pv/emul-inv-op.c +++ b/xen/arch/x86/pv/emul-inv-op.c @@ -26,7 +26,7 @@ static int emulate_forced_invalid_op(struct cpu_user_regs= *regs) pv_inject_page_fault(0, eip + sizeof(sig) - rc); return EXCRET_fault_fixed; } - if ( memcmp(sig, "\xf\xbxen", sizeof(sig)) ) + if ( memcmp(sig, "\xf\xb" "xen", sizeof(sig)) ) return 0; eip +=3D sizeof(sig); =20 --=20 2.39.5 From nobody Sun Dec 14 08:05:17 2025 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=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1765578062; cv=none; d=zohomail.com; s=zohoarc; b=T57INxK85ybNqPLq6IvVDxBcYsSYKiTRN2GYUObGXrHYp+mUxUlR1j2XL8snBVADUjto2EhLT05EjO43Kbx9UuXoDISAphnOXMJDumtUHSSEG1rtD4VfU2CcgTW3oDA5Sbe/VBi6Nj85nfq7DU3+pfCg+eo/r67JxKwWeXuiqCs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765578062; 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=F3V4XDxkbSr0Ri1dePMHKcN9nqU1osBYWUXVUX5x7JY=; b=UdqApmNfpI7efCTpjaFkj209nW/UC84rX+FOYxxlpZtm3dNEv1NLBbhefJLJNLe0WNH/r2NhA5VcNaMRvvZRbcwy+3x0S/9v3rPac/m0j1g91Sby7pgVXMJgGMpX9w639nXzrOXQLzxpUUI154MN8gLouNWF4rER8V41CVotUtA= 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=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1765578062761309.39761592421235; Fri, 12 Dec 2025 14:21:02 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1185895.1507822 (Exim 4.92) (envelope-from ) id 1vUBV8-0004B4-Lm; Fri, 12 Dec 2025 22:20:38 +0000 Received: by outflank-mailman (output) from mailman id 1185895.1507822; Fri, 12 Dec 2025 22:20:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vUBV8-0004Ax-IM; Fri, 12 Dec 2025 22:20:38 +0000 Received: by outflank-mailman (input) for mailman id 1185895; Fri, 12 Dec 2025 22:20:38 +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 1vUBV8-0004Ar-80 for xen-devel@lists.xenproject.org; Fri, 12 Dec 2025 22:20:38 +0000 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [2a00:1450:4864:20::32c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id c8a54e1b-d7a8-11f0-b15b-2bf370ae4941; Fri, 12 Dec 2025 23:20:37 +0100 (CET) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4777771ed1aso13726785e9.2 for ; Fri, 12 Dec 2025 14:20:37 -0800 (PST) Received: from localhost.localdomain (host-92-26-102-188.as13285.net. [92.26.102.188]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42fb38a977esm6314350f8f.12.2025.12.12.14.20.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Dec 2025 14:20:35 -0800 (PST) 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: c8a54e1b-d7a8-11f0-b15b-2bf370ae4941 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1765578036; x=1766182836; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=F3V4XDxkbSr0Ri1dePMHKcN9nqU1osBYWUXVUX5x7JY=; b=VwqSdAFF8r/XsSv8x9La1UigKqTwKVtAo3RBoX4XUkYLZXEAnq1WW4I0pkSsBxQbEP GivZDn12ktjteTtu2goG4l0eTYwcrfOtYivn2cRhzcPWxg1DOCR8i9jfALjRneNDRz5X 9MhdWVzNskhzdd50xZrNoqbeIU+3/HCct1O5A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765578036; x=1766182836; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=F3V4XDxkbSr0Ri1dePMHKcN9nqU1osBYWUXVUX5x7JY=; b=d8DlOjfOgOJWu27OsHGSqNRt57rbWh31zZUEOO8GJ/kSfI5VY8RBGK3kxztN5p6XN5 2JYlns8rNB8gg9H46cjfI5G4553bj8aNUo/Pt0m89P3OYjL4z9o/zgR/LJnNBi0EMvsD 1RpEF5QYa+rh7Mbgl1GMOFjlKNorZbbiqgxPXniNObI7bG1X5c1ENgBJVJlcIk511aDt Q+DnrTqnjspL2K0+4/8jGK6sb9CBnObu7d++q4zqCiGws/j9eUKZUaWdfyHttNeGtvAi iLPBnnv3+QnMg6R581XDNEsiwX/xOQBTZznIZ8tnMo3krCF0Mrqtxdo66wWTOkFygA/l En0Q== X-Gm-Message-State: AOJu0YyMGQImAAtpera07aVmEQzq8QZtNyfJrL1xZw7OWu9d/rE5AlOE s6hpurugg4ylshyGeQOO9VMGt8ECZLLaDx5O479kgz/tUo9elnLXvzKIpWUx/GSc4W40njxbVlB JD4VL X-Gm-Gg: AY/fxX4iN4aeKGM8Y2Z5S0b90SPUf0Qshxg7u2eTzZR20DMWk6IDokd+lsslA7ifyiP M7Ba9nort8ziK0mavVKelOfKonWOpMiA9d9Pwk8DemT6aWkRWCExGFEbif1BYw8falw8fpw2bsA lm39RARdYoDPa3jn66T2cYrVfAhOpMJbHVnOGaNlT0WJ0Y2V3LjoEneHwW9+3ayrun5SnoOwCu2 bvBYotrkzcJsMzhR161lPkS+3QRs4cQ5BnQ86Aws5PyHKkW/mUWwZGkw0SM61ljYvIUp88ZCCLH xhdr/PqaxZEEwHLYgwERcJ/eYQNvNOSgW33Pm2ogfifVS/wg2gCsOA+KaH3En1sRmxBcFccLq7M ceqGot1rm/0UzxKc7EawpYYM/qIeyDFXJSW0M2jofBdjYyttP+0It24Wie9F3H49ccV43CM5stB 49voY4NXzQv7m+h9ZA056HfLD6rW2apta8e6BrV4tweAtsKXeT8RPqQjlzwjy6Bw== X-Google-Smtp-Source: AGHT+IGy3sxQvwG5V1weoi6H6NHr3oODD+Ye2meubDsh3LN/IRVDmCJMkKKdO37X3muwaN49CuEqjw== X-Received: by 2002:a05:6000:2f81:b0:42b:3062:c647 with SMTP id ffacd0b85a97d-42fb44b7718mr3433452f8f.21.1765578036153; Fri, 12 Dec 2025 14:20:36 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , "consulting @ bugseng . com" , Nicola Vetrini Subject: [PATCH 2/5] x86/pv: Change type of do_update_descriptor()'s desc parameter Date: Fri, 12 Dec 2025 22:20:29 +0000 Message-Id: <20251212222032.2640580-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251212222032.2640580-1-andrew.cooper3@citrix.com> References: <20251212222032.2640580-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1765578064481158500 The automatically generated hypercall dispatch logic looks like: case __HYPERVISOR_update_descriptor: \ ret =3D do_update_descriptor((uint64_t)(a1), (seg_desc_t)(a2)); \ break; \ but seg_desc_t is a union and Eclair considers this to be a violation of MI= SRA Rule 1.1. There's also a Rule 8.3 violation for the parameter name mismatc= h. Instead of playing games trying to change seg_desc_t to be a struct, or to alter the AWK generator to know that seg_desc_t is magic and needs braces rather than brackets, just switch the type to be a plain uint64_t. The size is fixed by the x86 architecture, so it is never going to change. This even lets us simplify compat_update_descriptor() a little. No functional change. Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: consulting@bugseng.com CC: Nicola Vetrini --- xen/arch/x86/pv/descriptor-tables.c | 10 ++++------ xen/include/hypercall-defs.c | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/pv/descriptor-tables.c b/xen/arch/x86/pv/descript= or-tables.c index 26f7d18b11b5..8a32b9ae5ced 100644 --- a/xen/arch/x86/pv/descriptor-tables.c +++ b/xen/arch/x86/pv/descriptor-tables.c @@ -179,11 +179,8 @@ int compat_set_gdt( int compat_update_descriptor( uint32_t pa_lo, uint32_t pa_hi, uint32_t desc_lo, uint32_t desc_hi) { - seg_desc_t d; - - d.raw =3D ((uint64_t)desc_hi << 32) | desc_lo; - - return do_update_descriptor(pa_lo | ((uint64_t)pa_hi << 32), d); + return do_update_descriptor(pa_lo | ((uint64_t)pa_hi << 32), + desc_lo | ((uint64_t)desc_hi << 32)); } =20 #endif /* CONFIG_PV32 */ @@ -288,9 +285,10 @@ int validate_segdesc_page(struct page_info *page) return i =3D=3D 512 ? 0 : -EINVAL; } =20 -long do_update_descriptor(uint64_t gaddr, seg_desc_t d) +long do_update_descriptor(uint64_t gaddr, uint64_t desc) { struct domain *currd =3D current->domain; + seg_desc_t d =3D { .raw =3D desc }; gfn_t gfn =3D gaddr_to_gfn(gaddr); mfn_t mfn; seg_desc_t *entry; diff --git a/xen/include/hypercall-defs.c b/xen/include/hypercall-defs.c index cef08eeec1b8..5782cdfd1496 100644 --- a/xen/include/hypercall-defs.c +++ b/xen/include/hypercall-defs.c @@ -184,7 +184,7 @@ mca(xen_mc_t *u_xen_mc) set_trap_table(const_trap_info_t *traps) set_gdt(xen_ulong_t *frame_list, unsigned int entries) set_callbacks(unsigned long event_address, unsigned long failsafe_address,= unsigned long syscall_address) -update_descriptor(uint64_t gaddr, seg_desc_t desc) +update_descriptor(uint64_t gaddr, uint64_t desc) update_va_mapping(unsigned long va, uint64_t val64, unsigned long flags) update_va_mapping_otherdomain(unsigned long va, uint64_t val64, unsigned l= ong flags, domid_t domid) #endif --=20 2.39.5 From nobody Sun Dec 14 08:05:17 2025 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=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1765578068; cv=none; d=zohomail.com; s=zohoarc; b=hf36lqMKB+3OpmVUyR8tKF04YWJN8xl486O7u+a1hA+Fl544HbNn4WagtPEPQlV7LtxrWwHF6PhOkTrgoVWfaE4RLVBa7XpCXkuVDOHSvZLWC6uDYTY/XB4daB8/SK4XPlerJ4+WhBbjfZoxinFp1FgyjU9CQqtP6K6keHIMJb0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765578068; 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=UtChIVPu0BlsEPgndceh88YwfrCdmpi/AIn67jRojGc=; b=ZSxMxbqu9yK2sceifTRb9MkJpk0g6oDlObV8Qr1Wq2qoNdbE07loUGjKlLyar47m3KLcPFbn6N4HfqfM/h8ckUyJHrlEGtjg1IqD6z29Em1qtywUGvW+hfSsn0ZTBtPpowQUpovYZY39Ymncfvq8MMXSR7Gllh8I/yQxKdD1JEM= 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=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1765578068666313.9851998039326; Fri, 12 Dec 2025 14:21:08 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1185897.1507837 (Exim 4.92) (envelope-from ) id 1vUBVA-0004RB-50; Fri, 12 Dec 2025 22:20:40 +0000 Received: by outflank-mailman (output) from mailman id 1185897.1507837; Fri, 12 Dec 2025 22:20:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vUBVA-0004Qr-0j; Fri, 12 Dec 2025 22:20:40 +0000 Received: by outflank-mailman (input) for mailman id 1185897; Fri, 12 Dec 2025 22:20:39 +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 1vUBV9-0004Ar-3i for xen-devel@lists.xenproject.org; Fri, 12 Dec 2025 22:20:39 +0000 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [2a00:1450:4864:20::32b]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id c97c5cb0-d7a8-11f0-b15b-2bf370ae4941; Fri, 12 Dec 2025 23:20:38 +0100 (CET) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4779adb38d3so13644855e9.2 for ; Fri, 12 Dec 2025 14:20:38 -0800 (PST) Received: from localhost.localdomain (host-92-26-102-188.as13285.net. [92.26.102.188]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42fb38a977esm6314350f8f.12.2025.12.12.14.20.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Dec 2025 14:20:36 -0800 (PST) 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: c97c5cb0-d7a8-11f0-b15b-2bf370ae4941 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1765578038; x=1766182838; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UtChIVPu0BlsEPgndceh88YwfrCdmpi/AIn67jRojGc=; b=ZeLVW29nqfNc0g+8SmI+MvE2OTKMfYqyEm2ijOS3d70zG0A8a6etKYlqWLIOoE/2ur ZoC/AaTf0+lk4B4CxT5jghPil8U1k+NrlnyNSJTVEa5rHJnZdIJqTTTfIZtKDPpOtmob y7VJxOCg7kMCsO5lUbO7tyB5AtntewqGu6EuM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765578038; x=1766182838; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=UtChIVPu0BlsEPgndceh88YwfrCdmpi/AIn67jRojGc=; b=MhyJoMQZIai/i3U+gRu576cx9nqGjY3pJTcVaFqV+MXcVPHPt3ogrcirnEPHFFxQKq GtP4CFpcRRtnt446nuFnfolfPtxjB/YVElXDZrBj/Qk3rZebZTBCbxa9n0xXs5FXgmrP 4LRFU+IbYtZ/ZJ/4NoUaTgQKVHBKFyOV7oHXgNutD96BXyKAEw7Raw1djKjGvaSrh0il O801uQK7KawvGa1I8+6W+xpexWfh5o+oGDFXBluCfpiSh8zQAOhx5ZkEe2Em2MSacbIS 4QCdu7yWe/ham2nqQ81nZy06mZ7q6tuWRf8q/vJh8FdJLDhXC/gBz5YkIqsjLv9ERBDU xaQw== X-Gm-Message-State: AOJu0YxTxoJtwlurUOjsCoMWKf8h8le+Gq7CVN3ppAq3CsgsX668FTNZ pad/vtRYC7j0GaQL86v+E5g98ABEuTSdp0rPnOMndAuKnhnT5MDGVX0V8yAJjF930bihOHI4V20 bpHFs X-Gm-Gg: AY/fxX7omZbKMwTj56+mQ8kD4VtZQAL6wL7a7ytnNLP4SF4BRppN4VPk96vN3u2z5b3 ekuIpgI4wxwNp5INjoh4XV3kal0LBKKIevv9UtEIVkik0/Jo55VzD+5g3JaE/2Af1XIYZ0YlbAT GdUIjLoJJ7iZqDxyTMkE1cquIN77dKVzOAis5AcEwcU1aKhECMGxXTnThGD7WLGquReWiI/v5DL BcGSTqqPukZ9Abczk2i4NgDD/+XJsU5Cd49IE09/mOHCBXl9eELC7ONghIdLZuHdVv7kgPO0lSQ ygL10g1DdabrKgvjU+ns5Y+R11o/0jeROp3RQtps8CV/s6Bmu7wj/kzO4XLcwZClUCO+AryDqhu EjEFZNfsEzfnAUKW51TkwmLs3wTlKRcRdT28dZKb0/QYqvFxnxonyXpoRRGLQronXDOI+P2C3Mj hAGm5MPkXJYMzB47eCXRp1EyoecUqFJB7rSbkWd1gLOPUflZlcyKxSX4UPg2JPmw== X-Google-Smtp-Source: AGHT+IEEhwGOvC1NWFj0FHtn2MKgrphtOCvdtqOghBBeK7Hvaw39jEigq6qqiNLqGTLTDh/euTzATA== X-Received: by 2002:a05:600c:8115:b0:47a:7fd0:9eea with SMTP id 5b1f17b1804b1-47a8f8a9c1bmr38046705e9.3.1765578037115; Fri, 12 Dec 2025 14:20:37 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , "consulting @ bugseng . com" , Nicola Vetrini Subject: [PATCH 3/5] x86: Address MIRSA R8.3 (declaration/definition mismatch) issues Date: Fri, 12 Dec 2025 22:20:30 +0000 Message-Id: <20251212222032.2640580-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251212222032.2640580-1-andrew.cooper3@citrix.com> References: <20251212222032.2640580-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1765578070114158500 These are mostly name mismatches, but a couple have type alias mismatches t= oo. For shadow_put_top_level() and is_patch(), the declaration name is the bett= er choice so change the name in the function. No functional change. Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: consulting@bugseng.com CC: Nicola Vetrini --- xen/arch/x86/include/asm/hypercall.h | 4 ++-- xen/arch/x86/include/asm/pv/mm.h | 4 ++-- xen/arch/x86/include/asm/shadow.h | 2 +- xen/arch/x86/mm.c | 4 ++-- xen/arch/x86/mm/shadow/common.c | 8 ++++---- xen/arch/x86/mm/shadow/multi.h | 4 ++-- xen/arch/x86/mm/shadow/private.h | 10 +++++----- xen/common/kimage.c | 2 +- xen/common/livepatch.c | 14 +++++++------- xen/include/xen/livepatch.h | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/xen/arch/x86/include/asm/hypercall.h b/xen/arch/x86/include/as= m/hypercall.h index f6e9e2313b3c..bf2f0e169aef 100644 --- a/xen/arch/x86/include/asm/hypercall.h +++ b/xen/arch/x86/include/asm/hypercall.h @@ -22,8 +22,8 @@ void pv_hypercall(struct cpu_user_regs *regs); #endif =20 -void pv_ring1_init_hypercall_page(void *ptr); -void pv_ring3_init_hypercall_page(void *ptr); +void pv_ring1_init_hypercall_page(void *p); +void pv_ring3_init_hypercall_page(void *p); =20 /* * Both do_mmuext_op() and do_mmu_update(): diff --git a/xen/arch/x86/include/asm/pv/mm.h b/xen/arch/x86/include/asm/pv= /mm.h index 182764542c1f..a5745908206a 100644 --- a/xen/arch/x86/include/asm/pv/mm.h +++ b/xen/arch/x86/include/asm/pv/mm.h @@ -18,7 +18,7 @@ int pv_set_gdt(struct vcpu *v, const unsigned long frames= [], unsigned int entries); void pv_destroy_gdt(struct vcpu *v); =20 -bool pv_map_ldt_shadow_page(unsigned int off); +bool pv_map_ldt_shadow_page(unsigned int offset); bool pv_destroy_ldt(struct vcpu *v); =20 int validate_segdesc_page(struct page_info *page); @@ -40,7 +40,7 @@ static inline int pv_set_gdt(struct vcpu *v, const unsign= ed long frames[], { ASSERT_UNREACHABLE(); return -EINVAL; } static inline void pv_destroy_gdt(struct vcpu *v) { ASSERT_UNREACHABLE(); } =20 -static inline bool pv_map_ldt_shadow_page(unsigned int off) { return false= ; } +static inline bool pv_map_ldt_shadow_page(unsigned int offset) { return fa= lse; } static inline bool pv_destroy_ldt(struct vcpu *v) { ASSERT_UNREACHABLE(); return false; } =20 diff --git a/xen/arch/x86/include/asm/shadow.h b/xen/arch/x86/include/asm/s= hadow.h index 9a8d1b8353cd..60589c3cacee 100644 --- a/xen/arch/x86/include/asm/shadow.h +++ b/xen/arch/x86/include/asm/shadow.h @@ -63,7 +63,7 @@ int shadow_enable(struct domain *d, u32 mode); =20 /* Enable VRAM dirty bit tracking. */ int shadow_track_dirty_vram(struct domain *d, - unsigned long first_pfn, + unsigned long begin_pfn, unsigned int nr_frames, XEN_GUEST_HANDLE(void) guest_dirty_bitmap); =20 diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index b929d15d0050..0d0d5292953b 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4566,7 +4566,7 @@ static int __do_update_va_mapping( } =20 long do_update_va_mapping( - unsigned long va, u64 val64, unsigned long flags) + unsigned long va, uint64_t val64, unsigned long flags) { int rc =3D __do_update_va_mapping(va, val64, flags, current->domain); =20 @@ -4578,7 +4578,7 @@ long do_update_va_mapping( } =20 long do_update_va_mapping_otherdomain( - unsigned long va, u64 val64, unsigned long flags, domid_t domid) + unsigned long va, uint64_t val64, unsigned long flags, domid_t domid) { struct domain *pg_owner; int rc; diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/commo= n.c index f2aee5be46a7..f9310d008de6 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -751,7 +751,7 @@ void shadow_promote(struct domain *d, mfn_t gmfn, unsig= ned int type) TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_PROMOTE); } =20 -void shadow_demote(struct domain *d, mfn_t gmfn, u32 type) +void shadow_demote(struct domain *d, mfn_t gmfn, unsigned int type) { struct page_info *page =3D mfn_to_page(gmfn); =20 @@ -2615,11 +2615,11 @@ pagetable_t sh_set_toplevel_shadow(struct vcpu *v, * Helper invoked when releasing of a top-level shadow's reference was * deferred in sh_set_toplevel_shadow() above. */ -void shadow_put_top_level(struct domain *d, pagetable_t old_entry) +void shadow_put_top_level(struct domain *d, pagetable_t old) { - ASSERT(!pagetable_is_null(old_entry)); + ASSERT(!pagetable_is_null(old)); paging_lock(d); - sh_put_ref(d, pagetable_get_mfn(old_entry), 0); + sh_put_ref(d, pagetable_get_mfn(old), 0); paging_unlock(d); } =20 diff --git a/xen/arch/x86/mm/shadow/multi.h b/xen/arch/x86/mm/shadow/multi.h index 0e938594345a..fc86d7a8d9cd 100644 --- a/xen/arch/x86/mm/shadow/multi.h +++ b/xen/arch/x86/mm/shadow/multi.h @@ -89,11 +89,11 @@ SHADOW_INTERNAL_NAME(sh_paging_mode, GUEST_LEVELS); #if SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC extern void SHADOW_INTERNAL_NAME(sh_resync_l1, GUEST_LEVELS) - (struct vcpu *v, mfn_t gmfn, mfn_t snpmfn); + (struct vcpu *v, mfn_t gl1mfn, mfn_t snpmfn); =20 extern int SHADOW_INTERNAL_NAME(sh_safe_not_to_sync, GUEST_LEVELS) - (struct vcpu*v, mfn_t gmfn); + (struct vcpu*v, mfn_t gl1mfn); =20 extern int SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p, GUEST_LEVELS) diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/priv= ate.h index bc99e00100f7..12cfb52f095b 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -364,11 +364,11 @@ bool shadow_hash_delete(struct domain *d, unsigned long n, unsigned int t, mfn_t smfn); =20 /* shadow promotion */ -void shadow_promote(struct domain *d, mfn_t gmfn, u32 type); -void shadow_demote(struct domain *d, mfn_t gmfn, u32 type); +void shadow_promote(struct domain *d, mfn_t gmfn, unsigned int type); +void shadow_demote(struct domain *d, mfn_t gmfn, unsigned int type); =20 /* Shadow page allocation functions */ -bool __must_check shadow_prealloc(struct domain *d, unsigned int shadow_ty= pe, +bool __must_check shadow_prealloc(struct domain *d, unsigned int type, unsigned int count); mfn_t shadow_alloc(struct domain *d, u32 shadow_type, @@ -392,11 +392,11 @@ int sh_validate_guest_entry(struct vcpu *v, mfn_t gmf= n, void *entry, u32 size); * Returns non-zero if we need to flush TLBs. * level and fault_addr desribe how we found this to be a pagetable; * level=3D=3D0 means we have some other reason for revoking write access.= */ -extern int sh_remove_write_access(struct domain *d, mfn_t readonly_mfn, +extern int sh_remove_write_access(struct domain *d, mfn_t gmfn, unsigned int level, unsigned long fault_addr); #else -static inline int sh_remove_write_access(struct domain *d, mfn_t readonly_= mfn, +static inline int sh_remove_write_access(struct domain *d, mfn_t gmfn, unsigned int level, unsigned long fault_addr) { diff --git a/xen/common/kimage.c b/xen/common/kimage.c index 9961eac187e9..e1aec5a18a54 100644 --- a/xen/common/kimage.c +++ b/xen/common/kimage.c @@ -66,7 +66,7 @@ static int kimage_is_destination_range(struct kexec_image *image, paddr_t start, paddr_t end); static struct page_info *kimage_alloc_page(struct kexec_image *image, - paddr_t dest); + paddr_t destination); =20 static struct page_info *kimage_alloc_zeroed_page(unsigned memflags) { diff --git a/xen/common/livepatch.c b/xen/common/livepatch.c index d0da2aa28132..7446533c8cfb 100644 --- a/xen/common/livepatch.c +++ b/xen/common/livepatch.c @@ -107,7 +107,7 @@ static int verify_payload(const struct xen_sysctl_livep= atch_upload *upload, char return 0; } =20 -bool is_patch(const void *ptr) +bool is_patch(const void *addr) { const struct payload *data; bool r =3D false; @@ -115,12 +115,12 @@ bool is_patch(const void *ptr) rcu_read_lock(&rcu_payload_lock); list_for_each_entry_rcu ( data, &payload_list, list ) { - if ( (ptr >=3D data->rw_addr && - ptr < (data->rw_addr + data->rw_size)) || - (ptr >=3D data->ro_addr && - ptr < (data->ro_addr + data->ro_size)) || - (ptr >=3D data->text_addr && - ptr < (data->text_addr + data->text_size)) ) + if ( (addr >=3D data->rw_addr && + addr < (data->rw_addr + data->rw_size)) || + (addr >=3D data->ro_addr && + addr < (data->ro_addr + data->ro_size)) || + (addr >=3D data->text_addr && + addr < (data->text_addr + data->text_size)) ) { r =3D 1; break; diff --git a/xen/include/xen/livepatch.h b/xen/include/xen/livepatch.h index 3f5ad01f1bdd..45c8924f3412 100644 --- a/xen/include/xen/livepatch.h +++ b/xen/include/xen/livepatch.h @@ -89,7 +89,7 @@ enum va_type { * Function to secure the allocate pages (from arch_livepatch_alloc_payloa= d) * with the right page permissions. */ -int arch_livepatch_secure(const void *va, unsigned int pages, enum va_type= types); +int arch_livepatch_secure(const void *va, unsigned int pages, enum va_type= type); =20 void arch_livepatch_init(void); =20 --=20 2.39.5 From nobody Sun Dec 14 08:05:17 2025 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=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1765578067; cv=none; d=zohomail.com; s=zohoarc; b=DXO4YHfUKKa1m7P40RcJvq/MeR9+t9BzWrtcfx0DXFNPivVptsO4tMBjotKsunNUJ3LwPl8sr9SjFiNAa+fbrgD3MF7gSLS0xX6opw7V7MPYHiDlkLVahX/yJ955HtfASrssWwHsehwlIWN7oupuUS+ZAZStELLPOpwnWYuLeyQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765578067; 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=OyZGG1ygUMUNjDL5OLP0NhL/jpu/4gZZc2fwoRc5MXU=; b=DF4XbWXBbuzxa8GSWYo5QPKrvnPUAaMSIf5dIMq72Q+dV2gInYlSnck63v2e+sgyMxSJXwVZ2A2DwcF1z301u9b6ipAHdiTtk9+9MBTGIybvbwgFKYb4MFJkai/ygZq0yVtYvs4MpoDS6hAwgCSG8tFUHmuPF76KySIP+Ezx8uw= 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=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1765578067585201.97792787253843; Fri, 12 Dec 2025 14:21:07 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1185898.1507852 (Exim 4.92) (envelope-from ) id 1vUBVB-0004pv-I6; Fri, 12 Dec 2025 22:20:41 +0000 Received: by outflank-mailman (output) from mailman id 1185898.1507852; Fri, 12 Dec 2025 22:20:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vUBVB-0004pn-ER; Fri, 12 Dec 2025 22:20:41 +0000 Received: by outflank-mailman (input) for mailman id 1185898; Fri, 12 Dec 2025 22:20:39 +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 1vUBV9-0004Ar-T6 for xen-devel@lists.xenproject.org; Fri, 12 Dec 2025 22:20:39 +0000 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [2a00:1450:4864:20::42e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id c994d10b-d7a8-11f0-b15b-2bf370ae4941; Fri, 12 Dec 2025 23:20:38 +0100 (CET) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-42b47f662a0so944756f8f.0 for ; Fri, 12 Dec 2025 14:20:38 -0800 (PST) Received: from localhost.localdomain (host-92-26-102-188.as13285.net. [92.26.102.188]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42fb38a977esm6314350f8f.12.2025.12.12.14.20.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Dec 2025 14:20:37 -0800 (PST) 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: c994d10b-d7a8-11f0-b15b-2bf370ae4941 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1765578038; x=1766182838; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OyZGG1ygUMUNjDL5OLP0NhL/jpu/4gZZc2fwoRc5MXU=; b=u1mps+EnvP7auSoNtrTmBX76G4QcGPBLsxbSDde9BQC3JJ3kxBiHxUHGFQVoZ1c3m9 rU8XkZj5/mHHzyjuALzcsBHp2z3/43pFSmq/Po3I+dJD59FsTEuwfCRwXTf5ZhiIBFL5 Flm5jNW3ES5C9LExzBizYK0YZgQfON/0W2L8s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765578038; x=1766182838; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=OyZGG1ygUMUNjDL5OLP0NhL/jpu/4gZZc2fwoRc5MXU=; b=LL3tPG1453s2cvJI1/UFRKNN6n2u41Zv71JrBeDXtg8iUGqNJwQ3lsdDjTCDewpA4z cRCJD9cPj6DXvza4SF3ITz9pNjGU5ej2ezn/Gzq1iW2KGoQhEoOylS1FmQXwE1a6rO4C Qj0TtAClKsb9tWtZeZBoWWTy4hBD29LE3CNgZN+hm3Hb0uK8/WBHdkXdqz2Psh6CG3+o yiRBDT5kagr8PScTYmdVtgetyyKcozac12nFuZOU0Oto+q44n+hiR46CklmrOU/zCmPz k7JQYBrikExVX8/EFIY5m08m3Y9KVFoq/c8aQeNUHtF7yhnmc7BjCv0qpwUsCPzcCXAL mMdQ== X-Gm-Message-State: AOJu0Yx8YWZgBozPSwi+JTdGdquzRn7c1oekFHyIGc3mgY0c24bMBPoy cjA6YmAkZiRrP1z1GteMk2XCFPOgAQ/FlxZYnwwLkOoImgYSDl8MHsn3vlh5YTnmagW70+eEev4 M9C+/ X-Gm-Gg: AY/fxX7CHElMNz04rhxsllb6t3uQLsJXHLGeMsNK4SKCme8jqoRzLLVpu2P9micfyda 7g5Cw/EBZXeltH5pMANKQKKPJb6QApqYZRP+/FX7Yxgg/PW7557X9uQ6lM4kevrVG+ndrlveaCi LM0/Eev9vrH7rUBYhPqN6cFuK2TzpnQOshh0xJzCifh0cBeJw8SOJTU3rJgDbpydvu8oYuzYPaS N3atoIYHh/64gcoq6koo3cejxtFb7NVIYT4PFDBLQp2H0wpTxYXJpKu4sOCpCZ542vnqN5p/UnI Yri+mdWnACCBMtE5obsgnjRMWdrA/+GKqxfCDvGPH7UZJa7I5vojopQ954y41/BP3Xtmt+aqDbU i7Z2P61ZxpMJlbPZTtB9xwSB4jW7YZq9Py07kWD1tikwuvFQIrMHNYEbzXoLN+rSyFyQq8zuHoj huTNgWn9WzQ+z99hC8YTy50jMFGlNmhnMab6d2Tnm23wqNL6KLgSM9yx2ddD0J9g== X-Google-Smtp-Source: AGHT+IEZaNzPYFn3TDq7ikgSgUJ4bznYDpM+vmENe+1Wa9S5DEc+y3RDl3/Lc8P+ud530mgQw3Zj+Q== X-Received: by 2002:a5d:64c3:0:b0:429:eb80:11f5 with SMTP id ffacd0b85a97d-42fab27d472mr7902693f8f.26.1765578037746; Fri, 12 Dec 2025 14:20:37 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , "consulting @ bugseng . com" , Nicola Vetrini Subject: [PATCH 4/5] x86: Address MIRSA R8.4 (declaration visibility) issues Date: Fri, 12 Dec 2025 22:20:31 +0000 Message-Id: <20251212222032.2640580-5-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251212222032.2640580-1-andrew.cooper3@citrix.com> References: <20251212222032.2640580-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1765578068243158500 set_guest_*_trapbounce() are only called from assembly so gain asmlinkage to identify them. xen_msr_s_cet_value() is called by assembly and C, so asmlinkage isn't appropriate. Make the declaration unconditional, which silences the complaint. No functional change. Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: consulting@bugseng.com CC: Nicola Vetrini --- xen/arch/x86/pv/traps.c | 4 ++-- xen/arch/x86/setup.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/pv/traps.c b/xen/arch/x86/pv/traps.c index c3c0976c440f..26a468108a77 100644 --- a/xen/arch/x86/pv/traps.c +++ b/xen/arch/x86/pv/traps.c @@ -99,7 +99,7 @@ void pv_inject_event(const struct x86_event *event) * Called from asm to set up the MCE trapbounce info. * Returns false no callback is set up, else true. */ -bool set_guest_machinecheck_trapbounce(void) +bool asmlinkage set_guest_machinecheck_trapbounce(void) { struct vcpu *curr =3D current; struct trap_bounce *tb =3D &curr->arch.pv.trap_bounce; @@ -114,7 +114,7 @@ bool set_guest_machinecheck_trapbounce(void) * Called from asm to set up the NMI trapbounce info. * Returns false if no callback is set up, else true. */ -bool set_guest_nmi_trapbounce(void) +bool asmlinkage set_guest_nmi_trapbounce(void) { struct vcpu *curr =3D current; struct trap_bounce *tb =3D &curr->arch.pv.trap_bounce; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 44da5efa1d20..27c63d1d97c9 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -877,6 +877,8 @@ static void noreturn init_done(void) startup_cpu_idle_loop(); } =20 +unsigned int xen_msr_s_cet_value(void); /* To avoid ifdefary, and placate = MISRA */ + #if defined(CONFIG_XEN_SHSTK) || defined(CONFIG_XEN_IBT) /* * Used by AP and S3 asm code to calcualte the appropriate MSR_S_CET setti= ng. @@ -888,8 +890,6 @@ unsigned int xen_msr_s_cet_value(void) return ((cpu_has_xen_shstk ? CET_SHSTK_EN | CET_WRSS_EN : 0) | (cpu_has_xen_ibt ? CET_ENDBR_EN : 0)); } -#else -unsigned int xen_msr_s_cet_value(void); /* To avoid ifdefary */ #endif =20 /* Reinitalise all state referring to the old virtual address of the stack= . */ --=20 2.39.5 From nobody Sun Dec 14 08:05:17 2025 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=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1765578069; cv=none; d=zohomail.com; s=zohoarc; b=OsTwLFNKqLZld+mDzJ4DSIY36O0hzKY8tIIoF1+CvuFsWS4fbS6RR0kaXIqfY4oDpi7hx/CrAL7wHjnDWMSWVFTXPVvxvMxi8+X/HiCDHB6pHUk8ljN5C3N6PnkwFPSFozXS2XLce1Q+VbyHOrqK6dl0xIbDruT0ahr8aNRN1IU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765578069; 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=tfkvTJmyvWd8Ib+Znwac2Y3alEgJkpaVp966xVhqbZ8=; b=E0s7Tz135SLdqmKicCHBo/ogksqzt8hMpXphatvEP8VxAe5fwCQAcezCaI5pnn8K0AyVc2JBAiN2NcRcPttzRQxyjRh7PrlWmY+IEf/vUONsuHYfELb4t743OSqxmYN3LXIakBkxj0CqIq0X0kcrbnzPqTmQj+bLKDP8eH9dgmY= 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=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1765578069529327.1868539374967; Fri, 12 Dec 2025 14:21:09 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1185900.1507866 (Exim 4.92) (envelope-from ) id 1vUBVD-00057y-4l; Fri, 12 Dec 2025 22:20:43 +0000 Received: by outflank-mailman (output) from mailman id 1185900.1507866; Fri, 12 Dec 2025 22:20:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vUBVC-000574-WF; Fri, 12 Dec 2025 22:20:43 +0000 Received: by outflank-mailman (input) for mailman id 1185900; Fri, 12 Dec 2025 22:20:41 +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 1vUBVB-0004B7-9A for xen-devel@lists.xenproject.org; Fri, 12 Dec 2025 22:20:41 +0000 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [2a00:1450:4864:20::32a]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id ca0a9fd6-d7a8-11f0-9cce-f158ae23cfc8; Fri, 12 Dec 2025 23:20:39 +0100 (CET) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-477770019e4so16863965e9.3 for ; Fri, 12 Dec 2025 14:20:39 -0800 (PST) Received: from localhost.localdomain (host-92-26-102-188.as13285.net. [92.26.102.188]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42fb38a977esm6314350f8f.12.2025.12.12.14.20.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Dec 2025 14:20:38 -0800 (PST) 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: ca0a9fd6-d7a8-11f0-9cce-f158ae23cfc8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1765578039; x=1766182839; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tfkvTJmyvWd8Ib+Znwac2Y3alEgJkpaVp966xVhqbZ8=; b=pge0gbyCPLoRblFKpyNGnKUO5Z3hD0UMKep1KgtwH6U1SPSSVodKO2hqMlQdXokUal crtVMYacsSoKrvxWp0yGgQVSxV65sT5En84f/hxCup0FaVIztU+UTlDreoPpED5hyGr7 yAZykkXpdFmZe+JcLQyIy29hxB2K/+TVm/28k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765578039; x=1766182839; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=tfkvTJmyvWd8Ib+Znwac2Y3alEgJkpaVp966xVhqbZ8=; b=F2Q7wJa7eBTlIr5vEbOFVVPjKLjCJvtvzuSp2TtKg+0Qd1nw6orT6o6xk8XKleED/n W3UHWmy4pJ2Mq7Y7T431c3YvRANhrCJj9C42FFU4O/lDKu7Psas4QrNpZOJbrIpwougk jD5PUSzgl0HBzw6BxQb7JA+fa8g8b6XZYS2RQgY/gcIl2aX27hVnbnbFsDKSMhpBEpHY s6b0/wW2zaNfkpXQyZSGSuri6CBvUMKKQangmFz6NhPHV7k3ysMp7De0mQ5avmrTvMyi cEoclUICMOL+RSGD4gkw1tgpkKIPMdYo6u9slsSFd8p1doMPUp/UVaTcKxpzp+2/jnHk 2LtQ== X-Gm-Message-State: AOJu0Yx/3WvS3EDIeKa6KrDzh2x90gt3Y+4HILYJhDz6ebW+aZfzJhrJ vvEtnPzlj/M0XiexmJqo4BIrDA2UL7V6+HoEmsmjfdU+DFbodZaZE1B7NMLcXm4IB8CipUW0Oq9 MYgts X-Gm-Gg: AY/fxX7ZDWS5uqsBHvpu2ZBhCSXXeErT3De5AIWDw+tppQnfeRtYYdox7sb6dDd3Lfm UVTBq2WPHyJPPy3xoVkcsqKN5S6whXbxu578KBs99FNMlTSVXf0JHhClD8f8sLsvpMKidlXCN/K yWlzNVc5evYIoiJm2/8BOB9+Qf1ZFClRWyeiR9DQPKqamlJdMAFPxmeT7IODFi2xr//Qw/2wo0P VxIq1eVvWHR5ZVqgizow7aSSCt96LAlGE9YcBFjwexReHoApSRlRMpxzzEm6hBCbefxn0ri/5/E c0rmha9S9f1EfKVfFMkyqMaNx3pTWMoKBN/N4TwIY2cXWdXmn3AzlWMl1XBY39/0JFId7xDKojE rAOZ6xAjKU7ZIypnhmZQWpuBbWV2CB8bfWurR0JzWwBZQ6Ry1b2uifiQkYo2V/2KKXqrdvQ+Y72 DTsasxIqC3ANdZi//HyVaowxf6p3EtahXlV9Z7kUK7jfOf3CMnBd1vqPfMd90Hmw== X-Google-Smtp-Source: AGHT+IHdF9m62eD1Ikz/kZO9MXFgP9h75erp/0VVpujT6Tox93FPGCENjkQEcOL6RQPreOyqY88KTg== X-Received: by 2002:a05:600c:468c:b0:477:7f4a:44b0 with SMTP id 5b1f17b1804b1-47a8f9142bcmr38481295e9.33.1765578038633; Fri, 12 Dec 2025 14:20:38 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , "consulting @ bugseng . com" , Nicola Vetrini Subject: [PATCH RFC 5/5] x86/shadow: Deviate multi.h as being included multiple times Date: Fri, 12 Dec 2025 22:20:32 +0000 Message-Id: <20251212222032.2640580-6-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251212222032.2640580-1-andrew.cooper3@citrix.com> References: <20251212222032.2640580-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1765578070090158500 This resolves the Eclair complaint about a MISRA D4.10 violation. Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: consulting@bugseng.com CC: Nicola Vetrini RFC - this doesn't actually squash the violation, despite being the requisi= te magic string. I suspect the Eclair config needs tweaking to allow the magic anchor string to be after the SDPX tag. --- xen/arch/x86/mm/shadow/multi.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/x86/mm/shadow/multi.h b/xen/arch/x86/mm/shadow/multi.h index fc86d7a8d9cd..b4a6cf1362a6 100644 --- a/xen/arch/x86/mm/shadow/multi.h +++ b/xen/arch/x86/mm/shadow/multi.h @@ -2,6 +2,8 @@ /*************************************************************************= ***** * arch/x86/mm/shadow/multi.h * + * This file is intended to be included multiple times. + * * Shadow declarations which will be multiply compiled. * Parts of this code are Copyright (c) 2006 by XenSource Inc. * Parts of this code are Copyright (c) 2006 by Michael A Fetterman --=20 2.39.5