From patchwork Wed Feb 26 11:53:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13992166 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 B54A9C021B8 for ; Wed, 26 Feb 2025 11:53:30 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.896460.1305162 (Exim 4.92) (envelope-from ) id 1tnFyY-0007hI-Nn; Wed, 26 Feb 2025 11:53:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 896460.1305162; Wed, 26 Feb 2025 11:53:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tnFyY-0007hB-Kr; Wed, 26 Feb 2025 11:53:18 +0000 Received: by outflank-mailman (input) for mailman id 896460; Wed, 26 Feb 2025 11:53:17 +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 1tnFyX-0006xM-0I for xen-devel@lists.xenproject.org; Wed, 26 Feb 2025 11:53:17 +0000 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [2a00:1450:4864:20::430]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 43257d6d-f438-11ef-9aae-95dc52dad729; Wed, 26 Feb 2025 12:53:15 +0100 (CET) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-390d6426f1bso338799f8f.2 for ; Wed, 26 Feb 2025 03:53:15 -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 ffacd0b85a97d-390cd8e7121sm5377361f8f.61.2025.02.26.03.53.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 03:53:14 -0800 (PST) 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: 43257d6d-f438-11ef-9aae-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1740570795; x=1741175595; 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=7P5C2APSwoFZMq5J+tFruta/TZatKK4sGBr/+R4Wqn4=; b=C0UtWShowlZep7wnBJFiVMzEHVSq6yc4EdsgHb7wIvOksiKdIABMOvufCz5pBIV5UO qTvWrGARDt/nnHb1+asav7S4UJ6Vp/mYnaVhw49qv6TL2FGlTpIaI8iyMe9v34pIW2zH CmZ96UFZXG27eAni8MHRckE0MiyFBGwTrKhUNQ3NGEePj85f6b2CpoECUlxodAN3zGW4 atdacHYxs0u+EapZ1m3rl4hxHz3MpnI0DVEE7jEfLagJ8RJV8se6kbPrVPtx/tTDN0gq kxC2bz3m9RgbzhrD5GRuvWhn9b9nN7XdCVzbPx7ukj7puy8HWMAqCGL8nQ2teloY4HjU 86cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740570795; x=1741175595; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7P5C2APSwoFZMq5J+tFruta/TZatKK4sGBr/+R4Wqn4=; b=frhKcUeNAZMFNLyCSvV28KtkxJWJDWJzUz3giqLHotVDRL9wLYLn6fPISR1Pf6qJQx mh4XR92De9GjsaoCtw/ZHns/GIgDMhSvCX6/4NYr9SAz2Qjl85dJdS5/YbCgooe8i/ZM Mi2l5kmCdYe+U9GVy6UEXnDXY8bwdBxjE4XtbREy8JGZWyIAb0jjHQ5H6yarc2Fkx9Zw gjYDN/4svOw9kh0LFunxn7yeEPvgwHt5C9Iy/2i/hBoxdSrBa1PivZmM0/jXJL+o+AEl M5FwXeA0iCfr1eS85vv66O7feEKX0mMC30rd51QJXZUmxxngbCD+vD0lJqJ+fYO+6uM4 7lOQ== X-Gm-Message-State: AOJu0Yw9Xvnb+sioR7gWqE8mDNde1JfIB4yCIrU7CUMSpEwBy4A91fmw 6yyTJc/BOWHznK3oC2MA8D1GZGrv0BDf7WNCwcYKIcnQImMzeNjfltntu95axBgdBwEwpd/FgO4 = X-Gm-Gg: ASbGncuI6NfLhUVsmnGOuUKDzl2UErRjYIGvVV6aj2nqxM+akJplmCx455UoiGzkkAx DbpJHiMEX7yzOQpfbPejiCqzFPWMkW82WNYmhdLawoywXZ7udVCRc+s16NS8H0JFoTE04Hl8i3O fETRwzEx5s+KWL/1ya/NKaRmYHGUDMaO+f2TXAuvZUjKAILjWo2zPHOzD9+oBut5j/O8Hoy26PW ZXjFo1OhaM5fznR7fMWH0u/Pe8u5FzhwX2bBxIE+4uXmqTzqfiNjOi+FqaKRZh7NFwd0nUS/V1Y 2KRH2OFE6JA4avrcMkyf9xaB96ubS/mDk0rqrI9FFtV4KfIh6ykdRZdvNrAUuxoZSM1No6RSp39 RwDKGG8XLWJ4= X-Google-Smtp-Source: AGHT+IGBWKScsf+3TQwRVP/ld+kKdLzZlQGdSV1MHSo14ss+v2qgw4sfLLN3sNF0XTgTCyteEUy6EQ== X-Received: by 2002:a5d:6d82:0:b0:38f:2b49:7bfe with SMTP id ffacd0b85a97d-38f6f0ae7eamr19788694f8f.47.1740570794950; Wed, 26 Feb 2025 03:53:14 -0800 (PST) Message-ID: <2c9885d4-4a9f-4998-b0fa-15c17115fa1e@suse.com> Date: Wed, 26 Feb 2025 12:53:14 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 3/3] x86/P2M: don't include MMIO_DM in p2m_is_valid() From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?utf-8?q?Roger_Pau_Monn?= =?utf-8?q?=C3=A9?= References: <7363b2ee-f297-4b0b-9c4d-bdebe08d514b@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: <7363b2ee-f297-4b0b-9c4d-bdebe08d514b@suse.com> MMIO_DM specifically marks pages which aren't valid, much like INVALID does. Dropping the type from the predicate - (conceptually) corrects _sh_propagate(), where the comment says that "something valid" is needed (the only call path not passing in RAM_RW would pass in INVALID_GFN along with MMIO_DM), - is benign to the use in sh_page_fault(), where the subsequent mfn_valid() check would otherwise cause the same bail-out code path to be taken, - is benign to all three uses in p2m_pt_get_entry(), as MMIO_DM entries will only ever yield non-present entries, which are being checked for earlier, - is benign to sh_unshadow_for_p2m_change(), for the same reason, - is benign to gnttab_transfer() with EPT not in use, again because MMIO_DM entries will only ever yield non-present entries, and INVALID_MFN is returned for those anyway by p2m_pt_get_entry(). - for gnttab_transfer() with EPT in use (conceptually) corrects the corner case of a page first being subject to XEN_DMOP_set_mem_type converting a RAM type to MMIO_DM (which retains the MFN in the entry), and then being subject to GNTTABOP_transfer, except that steal_page() would later make the operation fail unconditionally anyway. While there also drop the unused (and otherwise now redundant) p2m_has_emt(). Signed-off-by: Jan Beulich --- a/xen/arch/x86/include/asm/p2m.h +++ b/xen/arch/x86/include/asm/p2m.h @@ -168,8 +168,8 @@ typedef unsigned int p2m_query_t; /* Grant types are *not* considered valid, because they can be unmapped at any time and, unless you happen to be the shadow or p2m implementations, there's no way of synchronising against that. */ -#define p2m_is_valid(_t) (p2m_to_mask(_t) & (P2M_RAM_TYPES | P2M_MMIO_TYPES)) -#define p2m_has_emt(_t) (p2m_to_mask(_t) & (P2M_RAM_TYPES | p2m_to_mask(p2m_mmio_direct))) +#define p2m_is_valid(_t) (p2m_to_mask(_t) & \ + (P2M_RAM_TYPES | p2m_to_mask(p2m_mmio_direct))) #define p2m_is_pageable(_t) (p2m_to_mask(_t) & P2M_PAGEABLE_TYPES) #define p2m_is_paging(_t) (p2m_to_mask(_t) & P2M_PAGING_TYPES) #define p2m_is_paged(_t) (p2m_to_mask(_t) & P2M_PAGED_TYPES)