From patchwork Thu Nov 30 15:48:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Federico Serafini X-Patchwork-Id: 13474646 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 87485C4167B for ; Thu, 30 Nov 2023 15:48:57 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.645011.1006733 (Exim 4.92) (envelope-from ) id 1r8jHK-0006bl-Hc; Thu, 30 Nov 2023 15:48:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 645011.1006733; Thu, 30 Nov 2023 15:48: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 1r8jHK-0006be-F0; Thu, 30 Nov 2023 15:48:38 +0000 Received: by outflank-mailman (input) for mailman id 645011; Thu, 30 Nov 2023 15:48:36 +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 1r8jHI-0006a5-Sc for xen-devel@lists.xenproject.org; Thu, 30 Nov 2023 15:48:36 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ebb3c753-8f97-11ee-98e4-6d05b1d4d9a1; Thu, 30 Nov 2023 16:48:35 +0100 (CET) Received: from Dell.homenet.telecomitalia.it (host-82-59-158-146.retail.telecomitalia.it [82.59.158.146]) by support.bugseng.com (Postfix) with ESMTPSA id 085594EE073C; Thu, 30 Nov 2023 16:48:35 +0100 (CET) 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: ebb3c753-8f97-11ee-98e4-6d05b1d4d9a1 From: Federico Serafini To: xen-devel@lists.xenproject.org Cc: consulting@bugseng.com, Federico Serafini Subject: [XEN PATCH 1/2] x86/p2m: preparation work for xenmem_add_to_physmap_one() Date: Thu, 30 Nov 2023 16:48:21 +0100 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 The objective is to use parameter name "gfn" for xenmem_add_to_physmap_one(). Since the name "gfn" is currently used as identifier for a local variable, bad things could happen if new uses of such variable are committed while a renaming patch is waiting for the approval. To avoid such danger, as first thing rename the local variable from "gfn" to "gmfn". No functional change. Signed-off-by: Federico Serafini Reviewed-by: Jan Beulich --- xen/arch/x86/mm/p2m.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index fe9ccabb87..42508e1e7e 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -2417,7 +2417,7 @@ int xenmem_add_to_physmap_one( gfn_t gpfn) { struct page_info *page = NULL; - unsigned long gfn = 0 /* gcc ... */, old_gpfn; + unsigned long gmfn = 0 /* gcc ... */, old_gpfn; mfn_t prev_mfn; int rc = 0; mfn_t mfn = INVALID_MFN; @@ -2440,12 +2440,12 @@ int xenmem_add_to_physmap_one( case XENMAPSPACE_gmfn: { - gfn = idx; - mfn = get_gfn_unshare(d, gfn, &p2mt); + gmfn = idx; + mfn = get_gfn_unshare(d, gmfn, &p2mt); /* If the page is still shared, exit early */ if ( p2m_is_shared(p2mt) ) { - put_gfn(d, gfn); + put_gfn(d, gmfn); return -ENOMEM; } page = get_page_from_mfn(mfn, d); @@ -2480,7 +2480,7 @@ int xenmem_add_to_physmap_one( /* XENMAPSPACE_gmfn: Check if the MFN is associated with another GFN. */ old_gpfn = get_gpfn_from_mfn(mfn_x(mfn)); ASSERT(!SHARED_M2P(old_gpfn)); - if ( space == XENMAPSPACE_gmfn && old_gpfn != gfn ) + if ( space == XENMAPSPACE_gmfn && old_gpfn != gmfn ) { rc = -EXDEV; goto put_all; @@ -2518,7 +2518,7 @@ int xenmem_add_to_physmap_one( */ if ( space == XENMAPSPACE_gmfn ) { - put_gfn(d, gfn); + put_gfn(d, gmfn); if ( !rc && extra.ppage ) { *extra.ppage = page; From patchwork Thu Nov 30 15:48:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Federico Serafini X-Patchwork-Id: 13474645 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 D58F6C07CA9 for ; Thu, 30 Nov 2023 15:48:55 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.645013.1006754 (Exim 4.92) (envelope-from ) id 1r8jHM-000751-0q; Thu, 30 Nov 2023 15:48:40 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 645013.1006754; Thu, 30 Nov 2023 15:48: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 1r8jHL-00074u-U2; Thu, 30 Nov 2023 15:48:39 +0000 Received: by outflank-mailman (input) for mailman id 645013; Thu, 30 Nov 2023 15:48:37 +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 1r8jHJ-0006bT-Ry for xen-devel@lists.xenproject.org; Thu, 30 Nov 2023 15:48:37 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id ebd2b1a0-8f97-11ee-9b0f-b553b5be7939; Thu, 30 Nov 2023 16:48:35 +0100 (CET) Received: from Dell.homenet.telecomitalia.it (host-82-59-158-146.retail.telecomitalia.it [82.59.158.146]) by support.bugseng.com (Postfix) with ESMTPSA id 3AEF04EE073E; Thu, 30 Nov 2023 16:48:35 +0100 (CET) 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: ebd2b1a0-8f97-11ee-9b0f-b553b5be7939 From: Federico Serafini To: xen-devel@lists.xenproject.org Cc: consulting@bugseng.com, Federico Serafini Subject: [XEN PATCH 2/2] x86/p2m: address a violation of MISRA C:2012 Rule 8.3 Date: Thu, 30 Nov 2023 16:48:22 +0100 Message-Id: <0faaa66465367a9e4c4da5749bc123b832e02103.1701344917.git.federico.serafini@bugseng.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Make function declaration and definition consistent changing parameter name from "gpfn" to "gfn". For consistency, rename also "old_gpfn" to "old_gfn". No functional change. Signed-off-by: Federico Serafini Reviewed-by: Jan Beulich --- This patch depends on patch 1/2 of the same series. --- xen/arch/x86/mm/p2m.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 42508e1e7e..6eb446e437 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -2414,10 +2414,10 @@ int xenmem_add_to_physmap_one( unsigned int space, union add_to_physmap_extra extra, unsigned long idx, - gfn_t gpfn) + gfn_t gfn) { struct page_info *page = NULL; - unsigned long gmfn = 0 /* gcc ... */, old_gpfn; + unsigned long gmfn = 0 /* gcc ... */, old_gfn; mfn_t prev_mfn; int rc = 0; mfn_t mfn = INVALID_MFN; @@ -2431,7 +2431,7 @@ int xenmem_add_to_physmap_one( break; case XENMAPSPACE_grant_table: - rc = gnttab_map_frame(d, idx, gpfn, &mfn); + rc = gnttab_map_frame(d, idx, gfn, &mfn); if ( rc ) return rc; /* Need to take care of the reference obtained in gnttab_map_frame(). */ @@ -2455,7 +2455,7 @@ int xenmem_add_to_physmap_one( } case XENMAPSPACE_gmfn_foreign: - return p2m_add_foreign(d, idx, gfn_x(gpfn), extra.foreign_domid); + return p2m_add_foreign(d, idx, gfn_x(gfn), extra.foreign_domid); } if ( mfn_eq(mfn, INVALID_MFN) ) @@ -2475,12 +2475,12 @@ int xenmem_add_to_physmap_one( * Upon freeing we wouldn't be able to find other mappings in the P2M * (unless we did a brute force search). */ - prev_mfn = get_gfn(d, gfn_x(gpfn), &p2mt); + prev_mfn = get_gfn(d, gfn_x(gfn), &p2mt); /* XENMAPSPACE_gmfn: Check if the MFN is associated with another GFN. */ - old_gpfn = get_gpfn_from_mfn(mfn_x(mfn)); - ASSERT(!SHARED_M2P(old_gpfn)); - if ( space == XENMAPSPACE_gmfn && old_gpfn != gmfn ) + old_gfn = get_gpfn_from_mfn(mfn_x(mfn)); + ASSERT(!SHARED_M2P(old_gfn)); + if ( space == XENMAPSPACE_gmfn && old_gfn != gmfn ) { rc = -EXDEV; goto put_all; @@ -2493,22 +2493,22 @@ int xenmem_add_to_physmap_one( { if ( is_special_page(mfn_to_page(prev_mfn)) ) /* Special pages are simply unhooked from this phys slot. */ - rc = p2m_remove_page(d, gpfn, prev_mfn, PAGE_ORDER_4K); + rc = p2m_remove_page(d, gfn, prev_mfn, PAGE_ORDER_4K); else if ( !mfn_eq(mfn, prev_mfn) ) /* Normal domain memory is freed, to avoid leaking memory. */ - rc = guest_remove_page(d, gfn_x(gpfn)); + rc = guest_remove_page(d, gfn_x(gfn)); } /* Unmap from old location, if any. */ - if ( !rc && old_gpfn != INVALID_M2P_ENTRY && !gfn_eq(_gfn(old_gpfn), gpfn) ) - rc = p2m_remove_page(d, _gfn(old_gpfn), mfn, PAGE_ORDER_4K); + if ( !rc && old_gfn != INVALID_M2P_ENTRY && !gfn_eq(_gfn(old_gfn), gfn) ) + rc = p2m_remove_page(d, _gfn(old_gfn), mfn, PAGE_ORDER_4K); /* Map at new location. */ if ( !rc ) - rc = p2m_add_page(d, gpfn, mfn, PAGE_ORDER_4K, p2m_ram_rw); + rc = p2m_add_page(d, gfn, mfn, PAGE_ORDER_4K, p2m_ram_rw); put_all: - put_gfn(d, gfn_x(gpfn)); + put_gfn(d, gfn_x(gfn)); put_both: /*