From nobody Thu Dec 18 23:25:11 2025 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=1754380722; cv=none; d=zohomail.com; s=zohoarc; b=lsT96R39g57KzQBWpv5WLf7EVqiVCWudJV4fO4Kemx46qh0qVZx3LabvS8qUjboV3/o4tpt47k7GhKdlAD15EW/B9j+1nO6bKopRYdgihkxryJRAgyAzeCR2EjlrxKs1uyJmquIk21JgKcag5HP76DzROnuEGYagCVXK46VaJfY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754380722; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zk8ARQLxEnVZagtjLCkEYukRPf4eTmdGxwGH7j4lTGc=; b=DHd6/J4HPWHVwe7mXYlH06mnBu950lZUzPptqP1zAuZ6uLOUYRMlJW+hXpQYGyKhwUrgT4Q8g349G22fNtOU9UX/J+Cuj9kU2Qpn/xUru1Ed4dxcbLaQKMV15AdyuFnX3tij9H864LAwhr09jeuBiby1wM8okbg6bPY03fJmMGU= 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 1754380722898241.74046302130046; Tue, 5 Aug 2025 00:58:42 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1070083.1433736 (Exim 4.92) (envelope-from ) id 1ujCZ5-0004u6-6H; Tue, 05 Aug 2025 07:58:31 +0000 Received: by outflank-mailman (output) from mailman id 1070083.1433736; Tue, 05 Aug 2025 07:58:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujCZ5-0004tz-2l; Tue, 05 Aug 2025 07:58:31 +0000 Received: by outflank-mailman (input) for mailman id 1070083; Tue, 05 Aug 2025 07:58:29 +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 1ujCZ3-0004ej-LS for xen-devel@lists.xenproject.org; Tue, 05 Aug 2025 07:58:29 +0000 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [2a00:1450:4864:20::62b]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id f8f4ef2c-71d1-11f0-a321-13f23c93f187; Tue, 05 Aug 2025 09:58:28 +0200 (CEST) Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-af967835d0aso310496466b.0 for ; Tue, 05 Aug 2025 00:58:29 -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 a640c23a62f3a-af91a21c0e7sm862177966b.114.2025.08.05.00.58.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 05 Aug 2025 00:58:28 -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" X-Inumbo-ID: f8f4ef2c-71d1-11f0-a321-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1754380708; x=1754985508; 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=zk8ARQLxEnVZagtjLCkEYukRPf4eTmdGxwGH7j4lTGc=; b=bNaNRjhgt0e6XGbfCEoaKmg6KGAolQUbiPnTJzXdrWBkfKmKllHaxSZopIfXFrQP3F iceHo3vsutWe8nfRl3dP1nYlyUfjM+NJnu2BVRxox1IZ+qwDaYqpqnOx7AN9ok3EtTRF w6K3wUTuwdcXB5rGbj7wiULt4hCFqJ2EOBXTEoTZ21wURuBoYfVCTe+NDqC7elJZaDl3 wvGY2uM8vmeQZDv2wFazojhG98d+av3IRxUdufe9/jWMEHT7FgQn4Fr1w8Ti+4qipdrW xjKu7R8IMwaUMnoNV0fR4eVhyg068knitBiOiZgMHilA45n0rcBdFuBUZBOpzeq5flBC C03A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754380708; x=1754985508; 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=zk8ARQLxEnVZagtjLCkEYukRPf4eTmdGxwGH7j4lTGc=; b=pMosYoudmrmsu9MGUUqAtHm3GplZgWki2JNHrAcaiHLInV8VuldNzHs5ePmfbqI2Fn RSICfWqf47c/3ARYZnAlfE6Vaxfb9cKD42soI65r0rbTZ8JSU/ImknX7Q6WCJTy++182 6hTmZIw2PrxYr4zSvFtALxCY+4wpWE7zfloVZGbe5RMCfYHyB60K3jCM/SufPZVZNbPV RtAQ8br8/imWXcThjI95oyEkYG3mrOyRpik/JkP12qwDuJmlJao4uwHM0bKzTnLm6ccY r5EkAsg7VM6EvKV7OZx3ztlGD9raae2URMZGbrREpiY/8aUNIZTWgUnuWKuIsi0txdE6 5gBw== X-Gm-Message-State: AOJu0YzA8nBSnGxZdlhh4+GbaX/h2jsP5keAwbMoi/Hhlckvwp+pgG/Z c1LhYHxfnP5hexi3U0xkJTPxot/tDhk1yefkyFs2Hb5MToaKN2jwg1KFASf61tg1lAQ/+x7ovS5 g9ck= X-Gm-Gg: ASbGncuae2G2OdhKey32zwUBHpcCOSTAiwnGX7kVRRlvBB6qZRxfA/e5XAiowpoquPK braYL0Gl5XQMJi20Lq/1ILbF/5frgLtwPjPD62jQJft82sa8Pze9CK7pW1ew/ry2dHx9PcFxZAV TzX7bHZP/Z9fvMYMoYoco/G/hjus+attpwRfIiUQdFOaL8TgvF9O5ipHJInmfpAm2VtVTF1SBlz Y0/e3Ryi9S6EgYoFwOpUJ9G6SM44ZOpoFqaM6KQ0JLqEgzfn33zhEw//O8bXkSy18oTXFCYXhCF haEHxGRVcpH/aRtIC8eJGn6rl4vgAsGsQih3nR+5sZ9zyFGo7B4QIpTOFpAebe9ycsFL2FeewjI wHCs3/m2b/fKdbNEIzF6g6bd3TWZ/rbFJT/drqmbi4cfDuUXHuI/LFhnOrw21q9RztJJVVI0d9d ci8rfCviBH5xiS5oE6HA== X-Google-Smtp-Source: AGHT+IHrh6RWKmfuaIlBXu9xt3EqUmQYyQKIlJvef21/qMD6Jcd0zL1ygxI2tqPUlH7X8z0nVPyotQ== X-Received: by 2002:a17:907:86a0:b0:ae3:f2a0:459f with SMTP id a640c23a62f3a-af9402225damr1292618166b.54.1754380708362; Tue, 05 Aug 2025 00:58:28 -0700 (PDT) Message-ID: <0c75ef27-7584-4e56-9ead-6bb0274ce3eb@suse.com> Date: Tue, 5 Aug 2025 09:58:27 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 1/2] x86/mm: drop paging_get_mode() From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Penny Zheng References: 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: Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1754380724873124100 Content-Type: text/plain; charset="utf-8" The function was introduced without any caller, and never gained any. Thus it has always been violating Misra rule 2.1 (unreachable code). Fixes: dd6de3ab9985 ("Implement Nested-on-Nested") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- a/xen/arch/x86/include/asm/paging.h +++ b/xen/arch/x86/include/asm/paging.h @@ -225,7 +225,6 @@ int paging_enable(struct domain *d, u32 =20 #define paging_get_hostmode(v) ((v)->arch.paging.mode) #define paging_get_nestedmode(v) ((v)->arch.paging.nestedmode) -const struct paging_mode *paging_get_mode(struct vcpu *v); void paging_update_nestedmode(struct vcpu *v); =20 /* Page fault handler --- unstable.orig/xen/arch/x86/mm/paging.c 2025-08-05 08:59:15.512131147 +0= 200 +++ unstable/xen/arch/x86/mm/paging.c 2025-08-05 09:00:24.160657794 +0200 @@ -946,14 +946,6 @@ void paging_dump_vcpu_info(struct vcpu * } } =20 -const struct paging_mode *paging_get_mode(struct vcpu *v) -{ - if (!nestedhvm_is_n2(v)) - return paging_get_hostmode(v); - - return paging_get_nestedmode(v); -} - #ifdef CONFIG_HVM void paging_update_nestedmode(struct vcpu *v) { From nobody Thu Dec 18 23:25:11 2025 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=1754380779; cv=none; d=zohomail.com; s=zohoarc; b=OLFESSWXyar8SsFjy/gEicTeQsILoRLvQEL+RS4M1/0YMiTiQo62uRwxnLNnisJY2xPWvPdymgsa6EUcK5CMl4/wzEM6QGgZLR9Ma8p6fRM3e5zHtp4/W4d0mytD/YL8BsDbIcmx3D96Dm45yHQNiwEeAxMYrcZN4k8XpoThCF4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754380779; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=lDYhhVqtVHSkEY2KScDddpRPE5yfRSX0wYxMEMeyzd0=; b=Xh+7uGt3hcvTwS6jVwnkGAeiAwTvcYOfVuWB/evPjx/ZM1xpDhm6q+Ob6n7/IyauYu++ugPmXH91/B0h8ddCSweg8GJYaPBZXt8WV5FaKqb7lLz0oYS5Z0EVK+ZblTlJdz84T3tYDvVCu1a5GWkjzF9nCAuHjLjXdhG8N/kN4lc= 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 1754380779704968.3968660653568; Tue, 5 Aug 2025 00:59:39 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1070092.1433745 (Exim 4.92) (envelope-from ) id 1ujCZw-0005Rs-DX; Tue, 05 Aug 2025 07:59:24 +0000 Received: by outflank-mailman (output) from mailman id 1070092.1433745; Tue, 05 Aug 2025 07:59:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujCZw-0005Rl-Aw; Tue, 05 Aug 2025 07:59:24 +0000 Received: by outflank-mailman (input) for mailman id 1070092; Tue, 05 Aug 2025 07:59:22 +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 1ujCZu-0005FK-Qs for xen-devel@lists.xenproject.org; Tue, 05 Aug 2025 07:59:22 +0000 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [2a00:1450:4864:20::531]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 1836bb6f-71d2-11f0-b898-0df219b8e170; Tue, 05 Aug 2025 09:59:21 +0200 (CEST) Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-61553a028dfso5261368a12.0 for ; Tue, 05 Aug 2025 00:59:21 -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 4fb4d7f45d1cf-615a8fe7970sm7829833a12.31.2025.08.05.00.59.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 05 Aug 2025 00:59:20 -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" X-Inumbo-ID: 1836bb6f-71d2-11f0-b898-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1754380761; x=1754985561; 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=lDYhhVqtVHSkEY2KScDddpRPE5yfRSX0wYxMEMeyzd0=; b=WiXf0sIS/t6jokvq+lYDpSMOOaEp+GoKJV8Cb0AwtKvumEt3CacOaf+eajB5D4oL/Q QM2l3DYuavaWasOsd5DjlMVtHhW/69eHTevTrCLbVSE83/iIIFA4kF//xM+WRskt8fzR hYR8mgi/QYBx7oFfBbLlND/n2UYSovuh27u9MNbiSXlyJyUeb9c6MzhCD1NyUFQDlg5P 0u/8QBFXZ8jp6U2yULKinpYS3Gd7qFpmc1oF4jX932cNGvNKo/lKnyZ3b5ykEzSM1eIe v3p6+9Fny7nJHeAILfLQ6/EDSJq+tWVHRrS9u2oDRCULVZPeQ8ZxqMAu7V9080iWEvRE 4zsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754380761; x=1754985561; 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=lDYhhVqtVHSkEY2KScDddpRPE5yfRSX0wYxMEMeyzd0=; b=g2RYuTDkC7eXWpXco4g2bEIgxdQIyw0/AqVTJrF9ZZXqNFU612/pVjW5J2kVPBc4+6 ladFiUWIfSlwkRbl3ZC10jOw5wMR0JYl85O2DrZKPUOGRQRn0zXMGQiCVFZvwGXFHRxm 91G2P1RWdDlgGxRcxHwx40E2pNpI59IC14N2z84WbbKNweQ/Ya8V8XTvzKAeD0jKxfhp qDpya4ccnnizB8yTcc4JWgue//EUhsE7UMKzvNRjDDxGDaPguqy3+2Jw7/u1t9ZDNemT Y66KQ1KhTdeUDK4qGYB+kwvbjMquaBFHSrrc6dFHonxtSldTmMlObKOMIN7nFXnWnT6n 9MlQ== X-Gm-Message-State: AOJu0YyvvhzNRXRRNPi1d7muManujTwWc2EDKuhx5WJhpNhTj7N2bA15 Ny+CyoVUW4DLvYgBaiHjnBuBePkV2Y2O+uUA/9H0JjVKlRDz0iaMBm7Bshgq41IdxcE1XBVj5ue Hsq0= X-Gm-Gg: ASbGncsFFywQBp7vuDuG6OEKLEcE+DpPwrjN+rAYB2X09P3P6cwaPwTwXaX2vVGxOB4 8OCzNG7A+OTx/GMS7V6hva7cx4QP0AXOiD9k9NbKQhAm8FVgm9X1BMBv8XNvxSzvQETjkBhrb+g bbhRpBaAdXLkEHVFP5Cz99uqLcLbLrOrur8H9jdE3gyqZCcvwUj6R7+d9ORLr4GTjbR4bjfniAa 8Lifnax1sXpB7ixx1uovvaMUQaqGHZkFkkSps/Yzfp5hStjjAjWVRU6fnqq/xV1YPcH6nCyPwTD HKj+1NLOKpM0M7uq/nvGpLvnZoPedpMECcX/CkLDp/AZFwH7GnDGCaAPUQJqbazJPBSdF96vyMd cD+tRkSWuTZVpDYLwj/myMuZw6BUVn+8imofPx+NMBnjVan2w9R+P14v6wklRrA69vNqJb+QjMK ZsJTE0FOw= X-Google-Smtp-Source: AGHT+IH3VSvg/T0CwmYObPNUvKXOBd6Eas/r6GDF+jg82t7MVSCFQYTH3sHkvamtqTu71XfW3BmJsQ== X-Received: by 2002:a50:cc03:0:b0:615:b6b9:d873 with SMTP id 4fb4d7f45d1cf-615e715d669mr8536823a12.24.1754380760630; Tue, 05 Aug 2025 00:59:20 -0700 (PDT) Message-ID: <65e27b35-9256-4ab0-966a-c50a18900ba5@suse.com> Date: Tue, 5 Aug 2025 09:59:19 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 2/2] x86/mm: correct PG_log_dirty definition From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Julien Grall , Stefano Stabellini , Anthony PERARD , Michal Orzel , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Penny Zheng References: 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: Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1754380781111116600 Content-Type: text/plain; charset="utf-8" While it is correct that in shim-exclusive mode log-dirty handling is all unreachable code, the present conditional still isn't correct: In a HVM=3Dn and SHADOW_PAGING=3Dn configuration log-dirty code also is all unreachable (and hence violating Misra rule 2.1). As we're aiming at moving away from special casing PV_SHIM_EXCLUSIVE=3Dy, don't retain that part of the conditional. Because of hypercall-defs.c we need to carry out the dependency by introducing a new auxiliary PAGING control. Since compiling out mm/paging.c altogether would entail further changes, merely conditionalize the one function in there (paging_enable()) which would otherwise remain unreachable (Misra rule 2.1 again) when PAGING=3Dn. Fixes: 23d4e0d17b76 ("x86/shim: fix build with PV_SHIM_EXCLUSIVE and SHADOW= _PAGING") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Reviewed-by: Jason Andryuk --- Of course PAGING is at risk of being confused with MEM_PAGING. It not having a prompt, I hope that's tolerable, as I can't really think of a better name. Other PG_log_dirty pre-processor conditionals then likely also want replacing. mm/paging.c and mm/p2m-basic.c could also be compiled out altogether when PAGING=3Dn, at the expense of introducing a few more stubs. FTAOD, the Fixes: tag being referenced does not mean this patch corrects the far more recently introduced build issue with the combination of the two features. That's still work that I expect Penny to carry out (with there still being the option of reverting the final part of the earlier series). --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -162,6 +162,9 @@ config SHADOW_PAGING =20 If unsure, say Y. =20 +config PAGING + def_bool HVM || SHADOW_PAGING + config BIGMEM bool "big memory support" default n --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -213,11 +213,15 @@ long arch_do_domctl( { =20 case XEN_DOMCTL_shadow_op: +#ifdef CONFIG_PAGING ret =3D paging_domctl(d, &domctl->u.shadow_op, u_domctl, 0); if ( ret =3D=3D -ERESTART ) return hypercall_create_continuation( __HYPERVISOR_paging_domctl_cont, "h", u_domctl); copyback =3D true; +#else + ret =3D -EOPNOTSUPP; +#endif break; =20 case XEN_DOMCTL_ioport_permission: --- a/xen/arch/x86/include/asm/paging.h +++ b/xen/arch/x86/include/asm/paging.h @@ -55,7 +55,7 @@ #define PG_translate 0 #define PG_external 0 #endif -#if defined(CONFIG_HVM) || !defined(CONFIG_PV_SHIM_EXCLUSIVE) +#ifdef CONFIG_PAGING /* Enable log dirty mode */ #define PG_log_dirty (XEN_DOMCTL_SHADOW_ENABLE_LOG_DIRTY << PG_mode_shif= t) #else --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -864,6 +864,7 @@ void paging_final_teardown(struct domain p2m_final_teardown(d); } =20 +#ifdef CONFIG_PAGING /* Enable an arbitrary paging-assistance mode. Call once at domain * creation. */ int paging_enable(struct domain *d, u32 mode) @@ -889,6 +890,7 @@ int paging_enable(struct domain *d, u32 else return shadow_enable(d, mode); } +#endif =20 #ifdef CONFIG_HVM /* Called from the guest to indicate that a process is being torn down --- a/xen/include/hypercall-defs.c +++ b/xen/include/hypercall-defs.c @@ -197,9 +197,11 @@ dm_op(domid_t domid, unsigned int nr_buf #ifdef CONFIG_SYSCTL sysctl(xen_sysctl_t *u_sysctl) #endif +#if defined(CONFIG_X86) && defined(CONFIG_PAGING) +paging_domctl_cont(xen_domctl_t *u_domctl) +#endif #ifndef CONFIG_PV_SHIM_EXCLUSIVE domctl(xen_domctl_t *u_domctl) -paging_domctl_cont(xen_domctl_t *u_domctl) platform_op(xen_platform_op_t *u_xenpf_op) #endif #ifdef CONFIG_HVM @@ -296,7 +298,7 @@ dm_op compa hypfs_op do do do do do #endif mca do do - - - -#ifndef CONFIG_PV_SHIM_EXCLUSIVE +#if defined(CONFIG_X86) && defined(CONFIG_PAGING) paging_domctl_cont do do do do - #endif