From nobody Mon Feb 9 05:20:33 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=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=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1770127353; cv=none; d=zohomail.com; s=zohoarc; b=kdbkY8X5WLLOJPbsZn35HSFwUSshcvAJXsxNssFBrCM6aaBGqMXUvuhd1jWlJRk9BUwjojPp4236zLl3gx0qtAoIIPynzscBsf2o7DE/vhYkmWUx748/V2tNuugfF/bmzeUMFuGzuVAcurUeddUh6tMhpq3v3LeCr7K/a0qzoL4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770127353; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=012uemFsGFDcR9WXwhkbQapD4OLf+mRfpXPFB9Btaho=; b=Vt/EguY0hfPUPf+sb0vOeVCxt9huX02M6kuCGBjd/HxxSH6olzF7tKMNMltDSDPfPRIbuohphTMFDZD/EZAjSecHE4ylf1Ng9RGagwey03YL93+BLB7aSR7vz3x+RdbDRbPMRTj6Oy5drCQl4Pd8Vxytu/C6bUNg8cggVfG4Qks= 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=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1770127353140391.4008579124006; Tue, 3 Feb 2026 06:02:33 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1219283.1528183 (Exim 4.92) (envelope-from ) id 1vnGyE-0004X2-2o; Tue, 03 Feb 2026 14:01:34 +0000 Received: by outflank-mailman (output) from mailman id 1219283.1528183; Tue, 03 Feb 2026 14:01:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vnGyD-0004Wv-Ud; Tue, 03 Feb 2026 14:01:33 +0000 Received: by outflank-mailman (input) for mailman id 1219283; Tue, 03 Feb 2026 14:01:32 +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 1vnGyC-0004Wp-9W for xen-devel@lists.xenproject.org; Tue, 03 Feb 2026 14:01:32 +0000 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [2a00:1450:4864:20::32d]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id d6d5df6c-0108-11f1-b161-2bf370ae4941; Tue, 03 Feb 2026 15:01:30 +0100 (CET) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4806b43beb6so41604395e9.3 for ; Tue, 03 Feb 2026 06:01:30 -0800 (PST) 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-482e2e3bf18sm125182925e9.19.2026.02.03.06.01.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 03 Feb 2026 06:01:29 -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: d6d5df6c-0108-11f1-b161-2bf370ae4941 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1770127290; x=1770732090; 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=012uemFsGFDcR9WXwhkbQapD4OLf+mRfpXPFB9Btaho=; b=eF0SDtXl0LyAX/A6k4wNMdK6l74ebN8tIvEy5bOIJ8ar6QmZaFGjxZOTk4zfgHWkFI JRG8Gaj+v24YSfHCBmm3h3mmla+jot+LhQVuvYopUz8r5UPycJrqJSiqPcotouRDyYYq h1gEF9RMCRjsMMKgiZetY5PoaEe45wMXnRPUHZs1j79IBsAC5ZAG9cICODfU0NEIAIiN 2z8NXml4b8zzyRqtXSzFYS1ivUnhpGX2abnlzVoCHfDRdhRfYvduzBxMqvpZof/pQEiZ zduAovYYcB5ANoIBv0go0jm9zCM5RW7O/L/w4tyYU1kF7lgZHTU4dBpVLBcfl453Jqb5 8RuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770127290; x=1770732090; 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=012uemFsGFDcR9WXwhkbQapD4OLf+mRfpXPFB9Btaho=; b=oYJFXszMoJ2+5ac3TSQ0cZ1d1eyalhb3wcBEu0Dqf8NhTBJ8W7Ak0ycLv0IzWAsvon B9naIhh6SIv6ToJLcUDKGeYNsvOKunnpmBORTpPU6mosBdqV/tm+2AZnHQwrLbd9zwCB F+uYsok82y1D7qc3H3ro3cmsZjYP2T63Xa9LnsHEOgehe39utrPN3P/FZFarq2D0fRIL zXu9cUpvsOg8X61cxO9sAbJg6YGm4jl9CGQT/GkoypKt8k3halZMJ4FUc+PDjLHfNJvK R5voXfa0v0LrhQyEIu1LmvUsvsQqIC3thuccbNNXSxV9UVZMBSHtt98G8lEZ6Ziej+It gYjg== X-Gm-Message-State: AOJu0YxQ8imuaKcGN1yKz+tRDtX6Cq14NLcHTXMrxfRW8Op8ej0FXEbh Zh0KmDnsPsCiUhCcwNjhCRq1uzmwaJ/vLYie4IKp5IqpQ8BGVQgoJUrzdtn9FJU1H+9z0LTKU6Q QTXg= X-Gm-Gg: AZuq6aLNAM66+LhLPb2eMWgmK4FYRWHfqmRyAdPTOnpKvsFzAKZaE+nqX7z1aMiCeIi MYuXIeOGyCPD/B73qAhBiJuXELSfJyH5AV0drVjlW2/JrNIbcMykiYRg+fUYBTQIGnvn8ZDkgO+ qQh6TyMgmgrp80Wp2GTcWmilHYiRhpXmmGnASlJ9tWEkMLoyZt47CSEiI0dT8H65HcNZQE7hfMn lfltj1l9Wc1azRmXzlSnp5v59xyQ+Ax8akje2hy2affRahw0iVwBN0FTaC8eXQ71okqQzBq8gU4 8OaqRErUJZvLYUyIgt0oYRq+t24yNNIazqOIMCWPRZNEL1H0pj+hjXBN24aPEzeP+r06788XDFZ 0QoDFJZ7Rc7mKnDpH1Eyv8Afgam/bhSnVKp+g7M642NQZGXGd1AvtS/ECt3Ls7ODV6tpoydns/R SuiwVISvnsojrl18XRwayY0c7FcomI/oHZmT4Zv6199v1C5rI5Ak3+TWK+b4+pZfRg8H3y6TJ40 Ek= X-Received: by 2002:a05:600c:310f:b0:477:9976:9e1a with SMTP id 5b1f17b1804b1-482db4597eemr223153825e9.6.1770127289606; Tue, 03 Feb 2026 06:01:29 -0800 (PST) Message-ID: <1ecefc98-f1c2-4116-95bf-a86c3b066843@suse.com> Date: Tue, 3 Feb 2026 15:01:27 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= From: Jan Beulich Subject: [PATCH] x86/P2M: correct type use in p2m_put_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-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1770127355378154100 Content-Type: text/plain; charset="utf-8" Everywhere else gfn_t are passed into respective GFN locking macros: Do so here as well. Amends: 819cdc5a7301 ("x86/p2m: re-arrange {,__}put_gfn()") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 --- Easy to spot by adding ASSERT(!gfn_eq(g, INVALID_GFN)) to the respective macros. While imo that should be a correct thing to do (as with hypothetical split locks a valid GFN would really need passing in, in order to be able to figure out which lock to use), we can't do so right now: The lock is acquired ahead of respective checking in a number of places, e.g. in p2m_get_gfn_type_access(). There's no clear Fixes: tag to use, I think - the problem looks to have been introduced by the gradual conversion to gfn_t. I probably should not have added gfn_x() in the referenced commit, to unbreak things already at that time. --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -338,9 +338,9 @@ mfn_t p2m_get_gfn_type_access(struct p2m =20 void p2m_put_gfn(struct p2m_domain *p2m, gfn_t gfn) { - ASSERT(gfn_locked_by_me(p2m, gfn_x(gfn))); + ASSERT(gfn_locked_by_me(p2m, gfn)); =20 - gfn_unlock(p2m, gfn_x(gfn), 0); + gfn_unlock(p2m, gfn, 0); } =20 static struct page_info *get_page_from_mfn_and_type(