From nobody Fri May 17 10:34:22 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; 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 Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1691497417852912.9001691885668; Tue, 8 Aug 2023 05:23:37 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.579747.907844 (Exim 4.92) (envelope-from ) id 1qTLk0-0004sx-LA; Tue, 08 Aug 2023 12:23:12 +0000 Received: by outflank-mailman (output) from mailman id 579747.907844; Tue, 08 Aug 2023 12:23:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qTLk0-0004sq-IL; Tue, 08 Aug 2023 12:23:12 +0000 Received: by outflank-mailman (input) for mailman id 579747; Tue, 08 Aug 2023 12:23:11 +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 1qTLjz-0004sj-ML for xen-devel@lists.xenproject.org; Tue, 08 Aug 2023 12:23:11 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 566fc8bb-35e6-11ee-b280-6b7b168915f2; Tue, 08 Aug 2023 14:23:10 +0200 (CEST) Received: from nico.bugseng.com (unknown [147.123.100.131]) by support.bugseng.com (Postfix) with ESMTPSA id A4AE04EE0740; Tue, 8 Aug 2023 14:23:09 +0200 (CEST) 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: 566fc8bb-35e6-11ee-b280-6b7b168915f2 From: Nicola Vetrini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, michal.orzel@amd.com, xenia.ragiadakou@amd.com, ayan.kumar.halder@amd.com, consulting@bugseng.com, Nicola Vetrini , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [XEN PATCH v3 1/2] x86/vmsi: rename variables to address MISRA C:2012 Rule 5.3 Date: Tue, 8 Aug 2023 14:22:50 +0200 Message-Id: <605687eff99db7181ef6c05bce671e20f194b46b.1691488505.git.nicola.vetrini@bugseng.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1691497533498100001 Content-Type: text/plain; charset="utf-8" The local variables 'irq_desc' shadow the homonymous global variable, declared in 'xen/arch/x86/include/asm/irq.h', therefore they are renamed 'irqd' for consistency with ARM code. Other variables of the same type in the file are also renamed 'irqd' for consistency. Signed-off-by: Nicola Vetrini --- Changes in v2: - Renamed the local variables instead of the global. - Edited subject from x86/irq to x86/vmsi Renaming everything to 'desc' would have been the most obvious choice, but given that there's also 'msi_desc' used in the same functions, 'irqd' is less error-prone in my opinion. --- xen/arch/x86/hvm/vmsi.c | 46 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 3cd4923060..55d5e26a04 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -281,7 +281,7 @@ static int msixtbl_write(struct vcpu *v, unsigned long = address, unsigned int nr_entry, index; int r =3D X86EMUL_UNHANDLEABLE; unsigned long flags; - struct irq_desc *desc; + struct irq_desc *irqd; =20 if ( (len !=3D 4 && len !=3D 8) || (address & (len - 1)) ) return r; @@ -330,21 +330,21 @@ static int msixtbl_write(struct vcpu *v, unsigned lon= g address, if ( !msi_desc || msi_desc->irq < 0 ) goto out; =20 - desc =3D irq_to_desc(msi_desc->irq); - if ( !desc ) + irqd =3D irq_to_desc(msi_desc->irq); + if ( !irqd ) goto out; =20 - spin_lock_irqsave(&desc->lock, flags); + spin_lock_irqsave(&irqd->lock, flags); =20 - if ( !desc->msi_desc ) + if ( !irqd->msi_desc ) goto unlock; =20 - ASSERT(msi_desc =3D=3D desc->msi_desc); + ASSERT(msi_desc =3D=3D irqd->msi_desc); =20 - guest_mask_msi_irq(desc, !!(val & PCI_MSIX_VECTOR_BITMASK)); + guest_mask_msi_irq(irqd, !!(val & PCI_MSIX_VECTOR_BITMASK)); =20 unlock: - spin_unlock_irqrestore(&desc->lock, flags); + spin_unlock_irqrestore(&irqd->lock, flags); if ( len =3D=3D 4 ) r =3D X86EMUL_OKAY; =20 @@ -462,7 +462,7 @@ static void del_msixtbl_entry(struct msixtbl_entry *ent= ry) =20 int msixtbl_pt_register(struct domain *d, struct pirq *pirq, uint64_t gtab= le) { - struct irq_desc *irq_desc; + struct irq_desc *irqd; struct msi_desc *msi_desc; struct pci_dev *pdev; struct msixtbl_entry *entry, *new_entry; @@ -482,14 +482,14 @@ int msixtbl_pt_register(struct domain *d, struct pirq= *pirq, uint64_t gtable) if ( !new_entry ) return -ENOMEM; =20 - irq_desc =3D pirq_spin_lock_irq_desc(pirq, NULL); - if ( !irq_desc ) + irqd =3D pirq_spin_lock_irq_desc(pirq, NULL); + if ( !irqd ) { xfree(new_entry); return r; } =20 - msi_desc =3D irq_desc->msi_desc; + msi_desc =3D irqd->msi_desc; if ( !msi_desc ) goto out; =20 @@ -508,7 +508,7 @@ found: r =3D 0; =20 out: - spin_unlock_irq(&irq_desc->lock); + spin_unlock_irq(&irqd->lock); xfree(new_entry); =20 if ( !r ) @@ -533,7 +533,7 @@ out: =20 void msixtbl_pt_unregister(struct domain *d, struct pirq *pirq) { - struct irq_desc *irq_desc; + struct irq_desc *irqd; struct msi_desc *msi_desc; struct pci_dev *pdev; struct msixtbl_entry *entry; @@ -544,11 +544,11 @@ void msixtbl_pt_unregister(struct domain *d, struct p= irq *pirq) if ( !msixtbl_initialised(d) ) return; =20 - irq_desc =3D pirq_spin_lock_irq_desc(pirq, NULL); - if ( !irq_desc ) + irqd =3D pirq_spin_lock_irq_desc(pirq, NULL); + if ( !irqd ) return; =20 - msi_desc =3D irq_desc->msi_desc; + msi_desc =3D irqd->msi_desc; if ( !msi_desc ) goto out; =20 @@ -559,14 +559,14 @@ void msixtbl_pt_unregister(struct domain *d, struct p= irq *pirq) goto found; =20 out: - spin_unlock_irq(&irq_desc->lock); + spin_unlock_irq(&irqd->lock); return; =20 found: if ( !atomic_dec_and_test(&entry->refcnt) ) del_msixtbl_entry(entry); =20 - spin_unlock_irq(&irq_desc->lock); + spin_unlock_irq(&irqd->lock); } =20 void msixtbl_init(struct domain *d) @@ -664,12 +664,12 @@ static unsigned int msi_gflags(uint16_t data, uint64_= t addr, bool masked) static void vpci_mask_pirq(struct domain *d, int pirq, bool mask) { unsigned long flags; - struct irq_desc *desc =3D domain_spin_lock_irq_desc(d, pirq, &flags); + struct irq_desc *irqd =3D domain_spin_lock_irq_desc(d, pirq, &flags); =20 - if ( !desc ) + if ( !irqd ) return; - guest_mask_msi_irq(desc, mask); - spin_unlock_irqrestore(&desc->lock, flags); + guest_mask_msi_irq(irqd, mask); + spin_unlock_irqrestore(&irqd->lock, flags); } =20 void vpci_msi_arch_mask(struct vpci_msi *msi, const struct pci_dev *pdev, --=20 2.34.1 From nobody Fri May 17 10:34:22 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; 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 Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1691497414993934.6451000775196; Tue, 8 Aug 2023 05:23:34 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.579749.907865 (Exim 4.92) (envelope-from ) id 1qTLk3-0005N1-2y; Tue, 08 Aug 2023 12:23:15 +0000 Received: by outflank-mailman (output) from mailman id 579749.907865; Tue, 08 Aug 2023 12:23:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qTLk3-0005Mt-0B; Tue, 08 Aug 2023 12:23:15 +0000 Received: by outflank-mailman (input) for mailman id 579749; Tue, 08 Aug 2023 12:23:13 +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 1qTLk1-0004sp-HW for xen-devel@lists.xenproject.org; Tue, 08 Aug 2023 12:23:13 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 56e016a6-35e6-11ee-8613-37d641c3527e; Tue, 08 Aug 2023 14:23:11 +0200 (CEST) Received: from nico.bugseng.com (unknown [147.123.100.131]) by support.bugseng.com (Postfix) with ESMTPSA id 649EF4EE0741; Tue, 8 Aug 2023 14:23:10 +0200 (CEST) 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: 56e016a6-35e6-11ee-8613-37d641c3527e From: Nicola Vetrini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, michal.orzel@amd.com, xenia.ragiadakou@amd.com, ayan.kumar.halder@amd.com, consulting@bugseng.com, Nicola Vetrini , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [XEN PATCH v3 2/2] x86/setup: address MISRA C:2012 Rule 5.3 and 8.3 Date: Tue, 8 Aug 2023 14:22:51 +0200 Message-Id: <05ff36ef9e1838ac782201998f49f6f56f78332a.1691488505.git.nicola.vetrini@bugseng.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1691497416286100002 Content-Type: text/plain; charset="utf-8" The parameters in the function declaration 'construct_dom0' violate Rule 8.3: "All declarations of an object or function shall use the same names and type qualifiers", but also cause shadowing inside the declaration scope with the variable "static struct file __initdata kernel;" in 'xen/common/efi/boot.c'. Renaming the parameters in the declaration resolves both issues The local variable 'mask' is removed because it shadows the homonymous variable defined in an outer scope. There's no change to the semantics since the last use of this variable is in the scope touched by this commit. No functional changes. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- Changes in v2: - Clarified commit message As mentioned in the preivious iteration's thread: the declaration itself is a scope and shadowing can happen, as in: int x; void f(int x, int arr[x]); Now, the example is a bit contrived, but the fact that the rule does not li= st any exception motivates the declaration of 'construct_dom0' being considered a violation. --- xen/arch/x86/include/asm/setup.h | 2 +- xen/arch/x86/setup.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/include/asm/setup.h b/xen/arch/x86/include/asm/se= tup.h index 51fce66607..b0e6a39e23 100644 --- a/xen/arch/x86/include/asm/setup.h +++ b/xen/arch/x86/include/asm/setup.h @@ -33,7 +33,7 @@ static inline void vesa_init(void) {}; =20 int construct_dom0( struct domain *d, - const module_t *kernel, unsigned long kernel_headroom, + const module_t *image, unsigned long image_headroom, module_t *initrd, const char *cmdline); void setup_io_bitmap(struct domain *d); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 2dbe9857aa..80ae973d64 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1577,8 +1577,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) s =3D map_s; if ( s < map_e ) { - uint64_t mask =3D (1UL << L2_PAGETABLE_SHIFT) - 1; - + mask =3D (1UL << L2_PAGETABLE_SHIFT) - 1; map_s =3D (s + mask) & ~mask; map_e &=3D ~mask; init_boot_pages(map_s, map_e); --=20 2.34.1