From nobody Sun Feb 8 13:39:27 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49635C7EE37 for ; Tue, 6 Jun 2023 23:38:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240366AbjFFXif (ORCPT ); Tue, 6 Jun 2023 19:38:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239876AbjFFXi0 (ORCPT ); Tue, 6 Jun 2023 19:38:26 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61E711712; Tue, 6 Jun 2023 16:38:20 -0700 (PDT) Date: Tue, 06 Jun 2023 23:38:17 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686094698; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Equul31tyb3rOZreGt/tUeXVvhpBwBra9uCHyHhfYvY=; b=BTs02gl/3qbZ9L9+y0j9rD2S+Y3iEGId2wdyCJfg2cxMEl22dN7Z5aD/uIltoE64VELgay GRC6SHnJY4zuOFkfrA/9bCHga8j6lymr5CSwFixQZbzhek/AxzKf2mIRq30cAOk1vsf2XN p/rSobeYErXcVsDTmvAjNVbXdUP97tn5CMQwOASCr36bALcorWOyPUB11ykLuWoPeEq50T xMJwlVv6rP1wUiJZLcKGHYQQ/f4bHPjhkPMhHpk+KdfCJI9QToh1XptxUCO36x8R74KMnV xCn7BYhEBXKnYxEpULqWVgDDYgM8b+pAsU7o/H9TPqf7Or9SIGYQ7OLQ42IN8A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686094698; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Equul31tyb3rOZreGt/tUeXVvhpBwBra9uCHyHhfYvY=; b=b3WtUVf21vNP6qD6s8I5fJCKk+s56ha0WzUgL7lRXLUaZnCeE/kn4sPCVN92KP8wJAklav 06GIH7Y60/sefJBg== From: "tip-bot2 for Kirill A. Shutemov" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/tdx] x86/mm: Fix enc_status_change_finish_noop() Cc: "Kirill A. Shutemov" , Dave Hansen , Kuppuswamy Sathyanarayanan , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <168609469763.404.15773231678482556597.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/tdx branch of tip: Commit-ID: 94142c9d1bdf1c18027a42758ceb6bdd59a92012 Gitweb: https://git.kernel.org/tip/94142c9d1bdf1c18027a42758ceb6bdd5= 9a92012 Author: Kirill A. Shutemov AuthorDate: Tue, 06 Jun 2023 12:56:22 +03:00 Committer: Dave Hansen CommitterDate: Tue, 06 Jun 2023 16:24:27 -07:00 x86/mm: Fix enc_status_change_finish_noop() enc_status_change_finish_noop() is now defined as always-fail, which doesn't make sense for noop. The change has no user-visible effect because it is only called if the platform has CC_ATTR_MEM_ENCRYPT. All platforms with the attribute override the callback with their own implementation. Signed-off-by: Kirill A. Shutemov Signed-off-by: Dave Hansen Reviewed-by: Kuppuswamy Sathyanarayanan Link: https://lore.kernel.org/all/20230606095622.1939-4-kirill.shutemov%40l= inux.intel.com --- arch/x86/kernel/x86_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c index f230d4d..6466431 100644 --- a/arch/x86/kernel/x86_init.c +++ b/arch/x86/kernel/x86_init.c @@ -131,7 +131,7 @@ struct x86_cpuinit_ops x86_cpuinit =3D { static void default_nmi_init(void) { }; =20 static bool enc_status_change_prepare_noop(unsigned long vaddr, int npages= , bool enc) { return true; } -static bool enc_status_change_finish_noop(unsigned long vaddr, int npages,= bool enc) { return false; } +static bool enc_status_change_finish_noop(unsigned long vaddr, int npages,= bool enc) { return true; } static bool enc_tlb_flush_required_noop(bool enc) { return false; } static bool enc_cache_flush_required_noop(void) { return false; } static bool is_private_mmio_noop(u64 addr) {return false; }