From patchwork Mon Mar 4 12:15:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 209516 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp1379094dyc; Mon, 4 Mar 2024 04:16:16 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXyXKNoVtAnKdxSRfoLhtstnUe4+pgXZEa7jZTmGKJwtBaGZ2YG9ISC8k8zv4DGztJdVfMDCwW7sAMx+N4MIg+37ue22A== X-Google-Smtp-Source: AGHT+IFPlQ8lFWwCcKU05RkuPjbaqUrAzWxYhb9Fb1RpJRchlDbe70TyRzSlIsq4us9tWzXrebe0 X-Received: by 2002:a05:6a20:da82:b0:1a1:1f17:596d with SMTP id iy2-20020a056a20da8200b001a11f17596dmr7650248pzb.3.1709554576308; Mon, 04 Mar 2024 04:16:16 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709554576; cv=pass; d=google.com; s=arc-20160816; b=nw0riuppTzr6eSasOifo4t2C0BnNzGNvuIXi8ChQsvjcOQHtqfaGyoMRXpJZa8z9Z5 j1Al5u1XLVRWr/VxziIw9cmDhNfLMtnxLPprDK/lZMcz1AlFZ2BVf9pdKxZgwNMc9bxi aS9nzFdL2C3f4x/7O8wOxDuy2Dy8+FGLMRh6yRvbnr9GTZ2NLLth1x+sSEX6afCEDfFl TLZdqHE+mOYqlP+Skx3p7ODkyTmU0iThIMNls1tRbtIjHj9v0xyYg/LStb1xfjmX2zNY VTi3GTkPbdOhpPgvIYVs3wIrUuTDdCgMIZ14xZe03GHlMIr7oMGhyINdvkk++B/SVigI Z/zQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:precedence:robot-unsubscribe:robot-id :message-id:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:in-reply-to:cc:subject:to:reply-to:sender :from:dkim-signature:dkim-signature:date; bh=7N9qOOwQmUXP7QrOL2kka5r8Z1g9mVq6jel3jR8Cz0w=; fh=ug+vbjx3hYEyfsB5aHBhxI+u027oSYAUfnsAoBvj5oA=; b=mJm/MVjbvzdq5yEmd0UJ8AclooEQTQDCMgYwjihpvsVxmp2TdEWwaakknj7C8/ysF/ IOBlzCNWLKL+0gToBYcfaQXxWyWbNXuOMCli8vN/ymAHzKFnh1SYQq7Lf5gnGRoeJMvD HGogAyYJjJcccXEuZMyFLeCf/L45dC0B53yhP6gj/6CzKxoGqnCmyTwLk+8MWmE3qHzu /E3XZ4txh0vHrhLpDZqUv3isqa1i88F7peZOTlF0+mTFHEBBy7V2k6CQE2nr3Y6E5uQ7 F2hj1rVoi3HF2LDXudpIV2SM8eAKrdgCeEhpAW52yBVzCzaP54MwIxLSlBZQ6keglzsS maOg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=cRM7mk6k; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-90550-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90550-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id t13-20020a6564cd000000b005dbd0d798a7si7992829pgv.558.2024.03.04.04.16.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 04:16:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-90550-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=cRM7mk6k; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-90550-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90550-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id EE602B217EF for ; Mon, 4 Mar 2024 12:15:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 874A13D0C1; Mon, 4 Mar 2024 12:15:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="cRM7mk6k"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="lxB/8/80" 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 5F9BB3B296; Mon, 4 Mar 2024 12:15:06 +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=1709554507; cv=none; b=GaSvklAkFQfUvJ91Hl/28MMqyu8fagWA4qvXKzOsOT/MXlEAU9QKQ3EiEGZNVGUJtshehrtu/WqGXO1JstrQdF4ePNeLhieIU1q9iwDxXebkkn/Qhju5Icupla1X7ztwk/YzRA8lN5JO2JjXOgeva4+BDhz4tnJI+5NbuCxlK1s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709554507; c=relaxed/simple; bh=myU2MHmyuavQwo0kLcMM2KpnHVDmGR3sl1y7z9EG9PU=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=eVBbfP4RdjdnsP1O9bp+WxDFC+WbQ4DB9RFw0283dgyXJLZ+es5weVYSBEukkbkBtvq4R4DuJAWbr9EYA+uKpc9CKaxu5mnUxKiaPMckiosrFcL3h9KIll7xnvBRpFjdlSQn9ttlRjjw0Qiia1LQoRUvaLDJgFrIUJGVSUCczME= 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=cRM7mk6k; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=lxB/8/80; 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 Date: Mon, 04 Mar 2024 12:15:03 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1709554504; 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=7N9qOOwQmUXP7QrOL2kka5r8Z1g9mVq6jel3jR8Cz0w=; b=cRM7mk6kCP9b6RdsVU5yh31Af2O72dq5wkyc+3902sLLm5fCLScG7N6xoE2u4e5oDAgXgU jU9994bBFEUj2lxPbOiYwiuo+4ndzmoFaLpJlD8dl3dByO+MorfIfvaqhQ/J8H8f9eLTKm ElnmcjkiCtZ0vzKp5s4fLrRoz/v0Sc/14qonsbIxvKgoNX4pteNeUnP94vHglSC9ogjLcU FBDrt6efV5wqNLd981KJtPpfjb5kO8zPm4fyJ8uuIxjI1RFfThBtIvoKIJvIGL40Du8TqD 0xQrdZXJA46v8/mVl2PPBjCb23WWbmypRE4kd6HTnl1b2qEXlPHDitulrNJDdw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1709554504; 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=7N9qOOwQmUXP7QrOL2kka5r8Z1g9mVq6jel3jR8Cz0w=; b=lxB/8/80AK9dW70tEk2OkQx981Rdm19FOmlxeqLGxyy/gUJ24uIJAwJNU5QpWbJe+GesjS WxWajL68/5LTyqCw== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cleanups] x86/cpu: Provide a declaration for itlb_multihit_kvm_mitigation Cc: Thomas Gleixner , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20240304005104.787173239@linutronix.de> References: <20240304005104.787173239@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <170955450365.398.1226028096148035951.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792590755026982711 X-GMAIL-MSGID: 1792597899182373562 The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 65efc4dc12c5cc296374278673b89390eba79fe6 Gitweb: https://git.kernel.org/tip/65efc4dc12c5cc296374278673b89390eba79fe6 Author: Thomas Gleixner AuthorDate: Mon, 04 Mar 2024 11:12:28 +01:00 Committer: Ingo Molnar CommitterDate: Mon, 04 Mar 2024 12:09:13 +01:00 x86/cpu: Provide a declaration for itlb_multihit_kvm_mitigation Sparse complains rightfully about the missing declaration which has been placed sloppily into the usage site: bugs.c:2223:6: sparse: warning: symbol 'itlb_multihit_kvm_mitigation' was not declared. Should it be static? Add it to where it belongs and remove the one in the KVM code. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20240304005104.787173239@linutronix.de --- arch/x86/include/asm/spec-ctrl.h | 2 ++ arch/x86/kvm/mmu/mmu.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/spec-ctrl.h b/arch/x86/include/asm/spec-ctrl.h index c648502..658b690 100644 --- a/arch/x86/include/asm/spec-ctrl.h +++ b/arch/x86/include/asm/spec-ctrl.h @@ -96,4 +96,6 @@ static inline void speculative_store_bypass_ht_init(void) { } extern void speculation_ctrl_update(unsigned long tif); extern void speculation_ctrl_update_current(void); +extern bool itlb_multihit_kvm_mitigation; + #endif diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 2d6cdea..3c89d3e 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -53,12 +53,11 @@ #include #include #include +#include #include #include "trace.h" -extern bool itlb_multihit_kvm_mitigation; - static bool nx_hugepage_mitigation_hard_disabled; int __read_mostly nx_huge_pages = -1;