From nobody Sat May 30 11:18:25 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=fail; 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=fail(p=quarantine dis=quarantine) header.from=suse.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1778154092353852.156147180311; Thu, 7 May 2026 04:41:32 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1302643.1576501 (Exim 4.92) (envelope-from ) id 1wKx6I-0004p4-Pw; Thu, 07 May 2026 11:41:06 +0000 Received: by outflank-mailman (output) from mailman id 1302643.1576501; Thu, 07 May 2026 11:41:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKx6I-0004ox-N2; Thu, 07 May 2026 11:41:06 +0000 Received: by outflank-mailman (input) for mailman id 1302643; Thu, 07 May 2026 11:41:05 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKx6H-0004or-Qa for xen-devel@lists.xenproject.org; Thu, 07 May 2026 11:41:05 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wKx6H-003YqJ-7C for xen-devel@lists.xenproject.org; Thu, 07 May 2026 13:41:05 +0200 Received: from [10.42.69.5] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 69fc7a46-5cb7-0a2a0a5109dd-0a2a4505e56e-38 for ; Thu, 07 May 2026 13:41:05 +0200 Received: from [209.85.128.54] (helo=mail-wm1-f54.google.com) by tlsNG-c201ff.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 69fc7a50-aaa8-0a2a45050019-d1558036a580-3 for ; Thu, 07 May 2026 13:41:05 +0200 Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-48a3e9862f0so4969055e9.1 for ; Thu, 07 May 2026 04:41:05 -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-48e538a547bsm129664925e9.5.2026.05.07.04.41.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 07 May 2026 04:41:04 -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:Autocrypt:Subject:From:Cc:To:Content-Language:User-Agent:MIME-Version:Date:Message-ID" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1778154064; x=1778758864; darn=lists.xenproject.org; h=content-transfer-encoding:autocrypt:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=l5oqta53Wb2XKEYbeaBofoFNbSWO0qh3k0idBe5tPFE=; b=glULqcjtiactQs2u+MMeXmI3xl1puvI2t9AhOZ1aX0gTpfYA9OURdz4OqM9RN602tp m3JzodjsmosuZgpSPyv0Dpber3Mmd5fVCidcB31Ntkm/cN7g1TGYFKNMtyZ311u7bs8Y v9wRzQxMcN2EedvB/cdmUDIL086ZYHSXFkvNU8FsV5fH+DEUoOteCaohkU/VcTev/mmQ gh656LfQGNMjdWWFBNyjRs124l0Lm8v+S2lxEE2LZU/0dn8CYOYmiFzNgJQLds42emwH AH/AcN2ECdh2jrC7k4/FkxffIX9zGxJIMK+bzRPfGW34XRzXH7J1UJYmQ9zSruHEoY/u tyIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778154064; x=1778758864; h=content-transfer-encoding:autocrypt:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=l5oqta53Wb2XKEYbeaBofoFNbSWO0qh3k0idBe5tPFE=; b=a4sIapeSr7Kriw1sk4J7ucfAa4N5zuQ7bSsxj/hi7BnAsY9K5ruT1GYjsyCohOLsqM ZGxY5Uj5V0H32tU5XS4ov0sQ4RWSYLEY7Wk0y5lSbarVxMpVRGGe11uyi6wknmMZ4Q2r AM4vzT+LsVa2SvCYVFNojiqVyn7yEbc2zlRzvnFZ0r1oYP3y9JCY1YWLWJ5xGtBgCLiC ILyjdjkXVfY68ZrreWvJl350YjsdFKDiCgOmFfHTrcDhATFr6gFltySwhmo92iKSgWZ7 eiQLutaurtg9Yiqs0xzfR+JL4bkG8ySlq/njnoR8n60D8xeWcQHRb2EC4fI0xn4OrOKG N0Ig== X-Gm-Message-State: AOJu0YyNNA6UP49fKz1xmdEBtQYPtoKKyA1cSG84qkxR5N5pj4WbV9By n/owjDHNaodQp+lytWbVLQDI+MbTMg487oSZF8N2vp/Zne6bNzIkTEKS10EQP5t0z9ca0KIbdB5 cMaI= X-Gm-Gg: AeBDievtoT6nd3M/6S+DRfqfzu8adIatl4r6PV3I+lQ+4QD93sQbJx96RDEm3evMyiL KBVzm0Wm0GeVAkoB6wh90T3XRbXnaXkWjLkIl0zHIQUkI0z1DAPbCWeSqGXR8xXRe2H3DPqmGaB mJXvRG3pczMoNG8ko4edyWF7fpKDTGPaSdxCPMmpQqkTTfJeLU9h+nUs7Rm2stZk+tTbox4POjz Gl90RKA1mDbBfTH72KZ3Daz1IH4NCnko8+4HK466laSHPD3vrxyTxftUqlVi7ZTLlJjnA7bpwbH LfV89jdeT2Zvoq6vAa7uU8OH/F3oPoET1pHL2FCjoaq23AQ4o67AuHHDEkVNn/0sffFlBUutmsC wDjShC1NCyF61JLniV7Sr2EGMeEN4fBaovH4tvfMsL/shuXhY9sMINiyA5ZxV1z5a+rc0axYWLT 3fNtnWznB723lFbxKOUO20NiAabOxcJiEJJ/EKCnDJjnya4+rRlY6PWwSEJJJOFKJNOujyG1rRu k9DJEq9Ea1jONcRcNCrz9+/WHm9Oc9r+W0u X-Received: by 2002:a05:600c:444f:b0:489:32b:ac0b with SMTP id 5b1f17b1804b1-48e5dfd6a6amr39113935e9.6.1778154064401; Thu, 07 May 2026 04:41:04 -0700 (PDT) Message-ID: Date: Thu, 7 May 2026 13:41:03 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: "xen-devel@lists.xenproject.org" Cc: Julien Grall , Stefano Stabellini , Volodymyr Babchuk , Bertrand Marquis , Michal Orzel , Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Teddy Astie , Anthony PERARD , Rafal Wojtczuk From: Jan Beulich Subject: [PATCH] gnttab: simplify (replace) gnttab_set_frame_gfn() 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 Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-c201ff/1778154065-E3B8E443-7C6D85E7/0/0 X-purgate-type: clean X-purgate-size: 3448 X-ZohoMail-DKIM: fail (Computed bodyhash is different from the expected one) X-ZM-MESSAGEID: 1778154093613158500 Content-Type: text/plain; charset="utf-8" It's not really doing anything for valid GFNs, which renders its one use site pretty pointless. The other isn't so much about setting anything, but rather about clearing. Rename the macro accordingly. The main point here, however, is about Rafal spotting the double fetching of the GFN (first in gnttab_unpopulate_status_frames(), then again in gnttab_set_frame_gfn()). Re-purpose the macro parameter to pass in the already fetched GFN, while dropping the no longer used parameters. Suggested-by: Rafal Wojtczuk Signed-off-by: Jan Beulich --- Do we even need the hook anymore? It has been expanding the same for Arm and x86. --- a/xen/arch/arm/include/asm/grant_table.h +++ b/xen/arch/arm/include/asm/grant_table.h @@ -50,12 +50,8 @@ int replace_grant_host_mapping(uint64_t #define gnttab_dom0_frames() \ min_t(unsigned int, opt_max_grant_frames, PFN_DOWN(_etext - _stext)) =20 -#define gnttab_set_frame_gfn(gt, st, idx, gfn, mfn) \ - (gfn_eq(gfn, INVALID_GFN) \ - ? guest_physmap_remove_page((gt)->domain, \ - gnttab_get_frame_gfn(gt, st, idx), \ - mfn, 0) \ - : 0) +#define gnttab_clear_frame_gfn(gt, gfn, mfn) \ + guest_physmap_remove_page((gt)->domain, gfn, mfn, 0) =20 #define gnttab_get_frame_gfn(gt, st, idx) ({ \ (st) ? gnttab_status_gfn(NULL, gt, idx) \ --- a/xen/arch/x86/include/asm/grant_table.h +++ b/xen/arch/x86/include/asm/grant_table.h @@ -32,12 +32,8 @@ static inline int replace_grant_host_map return replace_grant_pv_mapping(addr, frame, new_addr, flags); } =20 -#define gnttab_set_frame_gfn(gt, st, idx, gfn, mfn) \ - (gfn_eq(gfn, INVALID_GFN) \ - ? guest_physmap_remove_page((gt)->domain, \ - gnttab_get_frame_gfn(gt, st, idx), \ - mfn, 0) \ - : 0 /* Handled in add_to_physmap_one(). */) +#define gnttab_clear_frame_gfn(gt, gfn, mfn) \ + guest_physmap_remove_page((gt)->domain, gfn, mfn, 0) #define gnttab_get_frame_gfn(gt, st, idx) ({ \ mfn_t mfn_ =3D (st) ? gnttab_status_mfn(gt, idx) = \ : gnttab_shared_mfn(gt, idx); \ --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1844,8 +1844,7 @@ gnttab_unpopulate_status_frames(struct d { int rc =3D gfn_eq(gfn, INVALID_GFN) ? 0 - : gnttab_set_frame_gfn(gt, true, i, INVALID_GFN, - page_to_mfn(pg)); + : gnttab_clear_frame_gfn(gt, gfn, page_to_mfn(pg)); =20 if ( rc ) { @@ -4285,8 +4284,6 @@ int gnttab_map_frame_begin( */ if ( !get_page(pg, d) ) rc =3D -EBUSY; - else if ( (rc =3D gnttab_set_frame_gfn(gt, status, idx, gfn, *mfn)= ) ) - put_page(pg); } =20 if ( rc )