From mboxrd@z Thu Jan 1 00:00:00 1970 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 32F98CD4851 for ; Wed, 13 May 2026 11:47:12 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.1307902.1579473 (Exim 4.92) (envelope-from ) id 1wN83L-0007GU-5z; Wed, 13 May 2026 11:47:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1307902.1579473; Wed, 13 May 2026 11:47:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wN83L-0007GN-2v; Wed, 13 May 2026 11:47:03 +0000 Received: by outflank-mailman (input) for mailman id 1307902; Wed, 13 May 2026 11:47:01 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wN83J-0007GD-Jp for xen-devel@lists.xenproject.org; Wed, 13 May 2026 11:47:01 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wN83J-00A2US-0T for xen-devel@lists.xenproject.org; Wed, 13 May 2026 13:47:01 +0200 Received: from [10.42.69.8] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a0464a0-bab6-0a2a0a5309dd-0a2a450898be-40 for ; Wed, 13 May 2026 13:47:00 +0200 Received: from [209.85.128.53] (helo=mail-wm1-f53.google.com) by tlsNG-c1860d.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a0464b4-63b5-0a2a45080019-d1558035e080-3 for ; Wed, 13 May 2026 13:47:00 +0200 Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-488b0e1b870so112025175e9.2 for ; Wed, 13 May 2026 04:47:00 -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 5b1f17b1804b1-48fce38e42fsm46744745e9.15.2026.05.13.04.46.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 May 2026 04:47:00 -0700 (PDT) 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=1778672820; x=1779277620; 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=5LnypQr9QCdWJIq8PrShfWfOV8zW0x3TsVs9GGSmzQg=; b=J8a0kJaxHNDFCmQ2SkkVqFNSbFK7b9COjP7ZWj58BR4RZclWrXWo3Uuzihb0H03m56 JjckQvXSICynw9HZD4Qkx+bDK1HDjxROkELXfEoDEAVzSVwpDlk1ucnz+Oki3nWXypxq nQGzvRAPawL6mFp534GEzhb2yJE0aDNRvanXWecRpMeVQ0l8EZWN6z4Ka+W2YT/NYezT /k8/EL3GEUIKq1k1Wa5Do01QkkhNJfWJRLm2qhXX1bdwIQy1tuR7sxesWVEZLw8ks93A e1tVbzgIqMEz3dGdztTPw+AVFHZFXxm+iFBs2B1SfhjIoDqsrd0DbXSNcoEQHIV2npuv CodA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778672820; x=1779277620; 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=5LnypQr9QCdWJIq8PrShfWfOV8zW0x3TsVs9GGSmzQg=; b=EPQc8d/0gUn5s7YHTzZvlrMZqPLY0LWtGBVnWgDcVQGCFs0xbTBIBG2RO66Shl8rtZ vLDBwiP3g8EexU9WmHXsNMYU1vbHXZOrKx0cXMCb+IVEyhaEEbbPrmwlFttoSg3niusx xLNuNV/Ndrv3AR9dFUsG45A0gBWKwRcw4AxuzoCAzT8wuW5gjYQuSYMtzjdmN/b1HyG9 f3j0DFMZdqwj2PiGct2F6wFz1fa3pekltvOGInH28ZwizSyibc2hDUxUsWOx73HzSPX6 B3zEITz+fAC31MgKGGo6awo4sok/62x1lcsv+/MmNr76JS0YBFYx+jJwQ+WS5P0Amkll Hy9Q== X-Gm-Message-State: AOJu0Ywf5x5QPsJZeIBrAua7TKaRW1+Ip5XAt0Co0BcliUPVgZjUGj9o fwkqBKz1sIDAXGuaKtPHfH9Le9/rwuQxeFrpq4Fgu4qtw3VYo31VPsmuK952zgsjdY3E8e1gcAq XhFE= X-Gm-Gg: Acq92OHpUvY8Cq2HoZvQ22IpPjlAAuntB7llv/hRKYbJbaW/zaeCpPhDV029vUnBod+ uMGgmcDS83QNf2OMBZpT20EsSLOJb2SzAIhXBaaJM0bE7yS9MUAqSRogtWe2Fmyd1fScz1t9SwP hU1vSgyX4kZ4Sa96dsPedXlLlQlOmg3EsR32X4C1mNQFq1EHak5Hh4o5sc1eN4ezZyXCcqAZhju /fJFHkT4UcOylbIYQWEky7QtkDBEPdtnm9NYk5uDu2uZxwxT9QCZ+VtQRfzzlibR5SHGJ+Sqg5t Fy/3TSCVTHoLRDWVGI45uQ82Xo5HxWDbeXrbzJ1Cr0v/N0x3aDL+CbwRo2UIje5VVxcsZCOftdG i7qFgu8urSuv+7DsxkHk15G1EWJTHnrB93dTW8ml4BZ0G7kKkbLgxRX52xIBMPYJylQsuQPc53Q LbpER1jMMl/4dVPQavOi0jynZEnIowT0R+2WZ9nGlsgPtMy43wxVgnAwcc7W9jpM0G7U5nlAq2F HtM895shsfjtR6f86BzPwP+Dg== X-Received: by 2002:a05:600c:4e54:b0:488:c014:34da with SMTP id 5b1f17b1804b1-48fcea15f3cmr36451015e9.26.1778672820418; Wed, 13 May 2026 04:47:00 -0700 (PDT) Message-ID: <8aca671a-eb6f-475d-87cb-7a738ecd0793@suse.com> Date: Wed, 13 May 2026 13:46:59 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 5/5] x86/shadow: rename a parameter of shadow_l_index() From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Teddy Astie References: <5eaaf72a-850c-4535-9f20-13b4feed38d1@suse.com> 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: <5eaaf72a-850c-4535-9f20-13b4feed38d1@suse.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-purgate-ID: tlsNG-c1860d/1778672820-BC766DB1-D6F222C2/0/0 X-purgate-type: clean X-purgate-size: 2555 ... shadowing a file scope one, thus violating Misra C:2012 rule 5.3 ("An identifier declared in an inner scope shall not hide an identifier declared in an outer scope"). While there, - replace u32 by uint32_t, - reduce the number of cf_check by aliasing shadow_l_index() to shadow_l1_index() for N > 1 and GUEST_PAGING_LEVELS > 2. No difference in generated code, except of course the removal of the duplicate function instances. Signed-off-by: Jan Beulich --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -402,46 +402,39 @@ guest_index(const void *ptr) return (u32)((unsigned long)ptr & ~PAGE_MASK) / sizeof(guest_l1e_t); } -static u32 cf_check shadow_l1_index(mfn_t *smfn, u32 guest_index) +static uint32_t cf_check shadow_l1_index(mfn_t *smfn, uint32_t gidx) { #if (GUEST_PAGING_LEVELS == 2) ASSERT(mfn_to_page(*smfn)->u.sh.head); - if ( guest_index >= SHADOW_L1_PAGETABLE_ENTRIES ) + if ( gidx >= SHADOW_L1_PAGETABLE_ENTRIES ) *smfn = sh_next_page(*smfn); - return (guest_index % SHADOW_L1_PAGETABLE_ENTRIES); + return (gidx % SHADOW_L1_PAGETABLE_ENTRIES); #else - return guest_index; + return gidx; #endif } -static u32 cf_check shadow_l2_index(mfn_t *smfn, u32 guest_index) -{ #if (GUEST_PAGING_LEVELS == 2) +static uint32_t cf_check shadow_l2_index(mfn_t *smfn, uint32_t gidx) +{ int i; ASSERT(mfn_to_page(*smfn)->u.sh.head); // Because we use 2 shadow l2 entries for each guest entry, the number of // guest entries per shadow page is SHADOW_L2_PAGETABLE_ENTRIES/2 - for ( i = 0; i < guest_index / (SHADOW_L2_PAGETABLE_ENTRIES / 2); i++ ) + for ( i = 0; i < gidx / (SHADOW_L2_PAGETABLE_ENTRIES / 2); i++ ) *smfn = sh_next_page(*smfn); // We multiply by two to get the index of the first of the two entries // used to shadow the specified guest entry. - return (guest_index % (SHADOW_L2_PAGETABLE_ENTRIES / 2)) * 2; + return (gidx % (SHADOW_L2_PAGETABLE_ENTRIES / 2)) * 2; +} #else - return guest_index; +#define shadow_l2_index shadow_l1_index #endif -} #if GUEST_PAGING_LEVELS >= 4 -static u32 cf_check shadow_l3_index(mfn_t *smfn, u32 guest_index) -{ - return guest_index; -} - -static u32 cf_check shadow_l4_index(mfn_t *smfn, u32 guest_index) -{ - return guest_index; -} +#define shadow_l3_index shadow_l1_index +#define shadow_l4_index shadow_l1_index #endif // GUEST_PAGING_LEVELS >= 4