From patchwork Sun May 4 14:20:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Ard Biesheuvel X-Patchwork-Id: 887893 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1FAF71A2C25; Sun, 4 May 2025 14:20:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746368432; cv=none; b=mDOB9DXY1oOEF+Avx7YqLibGmIFUMltIgWK+Bpxi9qtG37X+VC1mjw4V61c918t8mXnQtklbBhIzM0FRhunqRecs+PQyJd1u/gdWln8lY8ahmWAgb3r4qdkIeHWcuzzQ96CT9BdKCHLC98PzJcm5+Ja50mqZDEIR1jGFJCseZuM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746368432; c=relaxed/simple; bh=rXOG1P2zI2iB+m1WcXaNc8h94r7CNEjmT/2bPQYTmJQ=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=kyPqUDS3hmr39Xw2rwsUgBZKHJd8c3grym3bWf20zRvPqwNoLEpXwoWQhg+ty3anCUBaFnEG2P11i+3sRqdk6v51Pc9Hw8fXc9KRjO3awDZvskJUSQs02BrY66LyLl6U27VkYPCyaC+kiFY7jME/t4pL7zH/uz82o/uCKWous9s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=fuSvXdgm; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=hi/g/bD+; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="fuSvXdgm"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="hi/g/bD+" Date: Sun, 04 May 2025 14:20:17 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1746368429; 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: in-reply-to:in-reply-to:references:references; bh=QPOslDqyXpdDq6W6zD/xT+G/7G0VjZbZReDsNjePvp8=; b=fuSvXdgm+tyAGCCt27Oj95R3syYJrzGX80HlBEg4dbiwFIHCDEvJ/YuNDmml2ADwh0FoRC BfRNpAZWF7reOtNo6HY9UHd62CNSVUZBGsBH6JLNOTpRwm9pqZ3Uhl3vfc1JW6aqO78/Vn L5M91LY4Fc2SX2RhjFPHo9Zm2K2XrHss07fKYJ0WH7aybrmVi5QbjpS2TudT2ygtl71peW B026um/IurXkbBwrwS6jlQf9Cv+kx/egF2nLZA3YtgRtT0DaGCkk96dwTJOhqdzHcu6Q0Z WnMQL41GCuJ9ENeQqG+SQHnnTipSw+MTLM1YEo+lcYJT/DVys3OeyasJIHRRBg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1746368429; 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: in-reply-to:in-reply-to:references:references; bh=QPOslDqyXpdDq6W6zD/xT+G/7G0VjZbZReDsNjePvp8=; b=hi/g/bD+n9+soNIKKMB4O9GKgAW82qzcL8wIy8TF24cN1G8ooWZmCZL+7VJwDl6OVTMXGu LUQdy356oy3J7YDQ== From: "tip-bot2 for Ard Biesheuvel" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/boot] x86/sev: Make sev_snp_enabled() a static function Cc: Ard Biesheuvel , Ingo Molnar , Arnd Bergmann , David Woodhouse , Dionna Amalie Glaze , "H. Peter Anvin" , Kees Cook , Kevin Loughlin , Len Brown , Linus Torvalds , "Rafael J. Wysocki" , Tom Lendacky , linux-efi@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20250504095230.2932860-29-ardb+git@google.com> References: <20250504095230.2932860-29-ardb+git@google.com> Precedence: bulk X-Mailing-List: linux-efi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <174636841731.22196.14042198424404966355.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk The following commit has been merged into the x86/boot branch of tip: Commit-ID: fae89bbfdd9d692e3cb6eace89f4994177731b8c Gitweb: https://git.kernel.org/tip/fae89bbfdd9d692e3cb6eace89f4994177731b8c Author: Ard Biesheuvel AuthorDate: Sun, 04 May 2025 11:52:34 +02:00 Committer: Ingo Molnar CommitterDate: Sun, 04 May 2025 15:53:06 +02:00 x86/sev: Make sev_snp_enabled() a static function sev_snp_enabled() is no longer used outside of the source file that defines it, so make it static and drop the extern declarations. Signed-off-by: Ard Biesheuvel Signed-off-by: Ingo Molnar Cc: Arnd Bergmann Cc: David Woodhouse Cc: Dionna Amalie Glaze Cc: H. Peter Anvin Cc: Kees Cook Cc: Kevin Loughlin Cc: Len Brown Cc: Linus Torvalds Cc: Rafael J. Wysocki Cc: Tom Lendacky Cc: linux-efi@vger.kernel.org Link: https://lore.kernel.org/r/20250504095230.2932860-29-ardb+git@google.com --- arch/x86/boot/compressed/sev.c | 2 +- arch/x86/boot/compressed/sev.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/x86/boot/compressed/sev.c b/arch/x86/boot/compressed/sev.c index 2ccad0a..f4b7f17 100644 --- a/arch/x86/boot/compressed/sev.c +++ b/arch/x86/boot/compressed/sev.c @@ -164,7 +164,7 @@ int svsm_perform_call_protocol(struct svsm_call *call) return ret; } -bool sev_snp_enabled(void) +static bool sev_snp_enabled(void) { return sev_status & MSR_AMD64_SEV_SNP_ENABLED; } diff --git a/arch/x86/boot/compressed/sev.h b/arch/x86/boot/compressed/sev.h index d390038..e87af54 100644 --- a/arch/x86/boot/compressed/sev.h +++ b/arch/x86/boot/compressed/sev.h @@ -10,14 +10,12 @@ #ifdef CONFIG_AMD_MEM_ENCRYPT -bool sev_snp_enabled(void); void snp_accept_memory(phys_addr_t start, phys_addr_t end); u64 sev_get_status(void); bool early_is_sevsnp_guest(void); #else -static inline bool sev_snp_enabled(void) { return false; } static inline void snp_accept_memory(phys_addr_t start, phys_addr_t end) { } static inline u64 sev_get_status(void) { return 0; } static inline bool early_is_sevsnp_guest(void) { return false; } From patchwork Sun May 4 09:52:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 887905 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EBB901A8401 for ; Sun, 4 May 2025 09:53:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746352395; cv=none; b=pUBsIuPtwLpK4tSosPJchPeYeAlGrjEFyWny4uEIDz4y3gR1xNsuBzO27pDE8ttbMb0wNzgfRZ67gLbwu7Ai9NrU1UbDAs9bSXNytoDdcQiLWe/5D8rAnMawLuQFnkTHwnXNQqA8j7qe4V8TVJ7+5ABWfkP7YXa+l9h16Fag/gw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746352395; c=relaxed/simple; bh=wAopLMca1UYjHu6q///t2MON0majb2OOzEkKv0U9LCI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=EjUMBD0Wek3JFRSpKYfPsm1R0yDy1sMgFAbNnlqZ/pTgsSPX3R9Sv1tl8Op+UBIo7tBUiPb8RyGK4iuqPlMekRaPIRHFnurrCEZiu+9iuB3dUu2da65zLqmAaA7PosLX9yGokhVvQmNrhOMEt0FU6sK+4SrXj4S7HfSm9gBiRXE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=EdY5hqOw; arc=none smtp.client-ip=209.85.221.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="EdY5hqOw" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-39c30f26e31so1933933f8f.3 for ; Sun, 04 May 2025 02:53:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1746352392; x=1746957192; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=nAweXUFMoRYKercdO+M+dsvHLlCp3KZIzpWmAZjUMHA=; b=EdY5hqOwYHDN+3NplhxQeKnQjKAZYgYHdJ5NLaAOC0saxUedOg21YCfBoEq20wRAZ1 WkmK6EwaRN4yBwag4lcsB8UNfTXMlBEQFmA/nD6k2Txrid6WF+npGmqoLnlh8XXyUVw2 XkXaLiI7V0lMbRQXDp28flRIu4+uYiX+BG4MLT22rafCNOzIcNMgOVurpIL7/Bu1gKxA upuHigeJCuPXAjvBDoI/hlPueHrLXnBgqC35sZzxIVNrO5ACXeV+JellfceiZeXfDg0I hM2GjqmmXjPWn7FF6OmMoLcOclLYb0uueUL1JFVU9+XfuSegaEzawJfHtg9xRoiF9FET vhTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746352392; x=1746957192; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nAweXUFMoRYKercdO+M+dsvHLlCp3KZIzpWmAZjUMHA=; b=RaoAPfdBwaHVrye8o5VBExb1KbF5sx7R0HB03yWPYk7MZupf3ypeAoR3tOZ3J8ntTw wYnns4EtBmtm0iOApEZbhie2keht2kGrca13V9yWSmqpYV+w1bHBT266o/X79tenLNcX O8GrsOZQNEqcTQQsIeTstKdzbvayLTr3gakAarBC9BFGXEFZK2cNl//wnNQ2RhmpycUQ 1PeW/y90RoHXwLvid6xyMvkEnqngPNUaEGKsCOgqy/d6doIrExJSCCXmjPshuKT9Y82S UoV1sbvrcIx8o00OHUBkK2QT/vOSJSYFOnqi6ZJpBDpGorRFKDxcN43yR1LPeJp+wNPn SNLQ== X-Gm-Message-State: AOJu0YyBoYiuS/ah/wFtRhYJ3sTFkHwrJ4pSKeMYgpZUN8TA19E5IRVz ABnKLAStZFasQqmBpsWEaOZc7A9VIa4T7eDQI3VtKkjLLw+OttcyANZa3eR5c0IVKqDZWw== X-Google-Smtp-Source: AGHT+IFM8cy2OT3ETxysigkIKqj/0ZIhQF3bs+uCxzkZ6dCqhcT/sDAKlDn0k6MRjCEA2TTZpReBQrga X-Received: from wro15.prod.google.com ([2002:a05:6000:41cf:b0:39e:c3a8:56e]) (user=ardb job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:5f4a:0:b0:39e:e259:91dd with SMTP id ffacd0b85a97d-3a09fd767fdmr2356447f8f.17.1746352392609; Sun, 04 May 2025 02:53:12 -0700 (PDT) Date: Sun, 4 May 2025 11:52:34 +0200 In-Reply-To: <20250504095230.2932860-25-ardb+git@google.com> Precedence: bulk X-Mailing-List: linux-efi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250504095230.2932860-25-ardb+git@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=1358; i=ardb@kernel.org; h=from:subject; bh=JGgi/PR6B/UfDqiCR294jKpXFY27Hox0oJTQ0bF4MW4=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIUPc4oma+ffGA1wJetcP5/u63mjazBjxYtYal82dN0syz d8unOHRUcrCIMbBICumyCIw+++7nacnStU6z5KFmcPKBDKEgYtTACZyX4Thf+FdTjPxxQJZxgev WMq2T7bfuftDUOq6a2WO//Ysu7l1HT8jwyzdvPX68Zt8Jj538g5ofPDeWmfO2/jMXf4RWTfYVs5 S5wQA X-Mailer: git-send-email 2.49.0.906.g1f30a19c02-goog Message-ID: <20250504095230.2932860-29-ardb+git@google.com> Subject: [RFT PATCH v2 04/23] x86/sev: Make sev_snp_enabled() a static function From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Cc: linux-efi@vger.kernel.org, x86@kernel.org, Ard Biesheuvel , Borislav Petkov , Ingo Molnar , Dionna Amalie Glaze , Kevin Loughlin , Tom Lendacky From: Ard Biesheuvel sev_snp_enabled() is no longer used outside of the source file that defines it, so make it static and drop the extern declarations. Signed-off-by: Ard Biesheuvel --- arch/x86/boot/compressed/sev.c | 2 +- arch/x86/boot/compressed/sev.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/x86/boot/compressed/sev.c b/arch/x86/boot/compressed/sev.c index 478c65149cf0..bc52c0aa96d4 100644 --- a/arch/x86/boot/compressed/sev.c +++ b/arch/x86/boot/compressed/sev.c @@ -164,7 +164,7 @@ int svsm_perform_call_protocol(struct svsm_call *call) return ret; } -bool sev_snp_enabled(void) +static bool sev_snp_enabled(void) { return sev_status & MSR_AMD64_SEV_SNP_ENABLED; } diff --git a/arch/x86/boot/compressed/sev.h b/arch/x86/boot/compressed/sev.h index 4e463f33186d..9d21af3a220d 100644 --- a/arch/x86/boot/compressed/sev.h +++ b/arch/x86/boot/compressed/sev.h @@ -10,13 +10,11 @@ #ifdef CONFIG_AMD_MEM_ENCRYPT -bool sev_snp_enabled(void); void snp_accept_memory(phys_addr_t start, phys_addr_t end); u64 sev_get_status(void); #else -static inline bool sev_snp_enabled(void) { return false; } static inline void snp_accept_memory(phys_addr_t start, phys_addr_t end) { } static inline u64 sev_get_status(void) { return 0; }