Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp730825ybn; Tue, 24 Sep 2019 08:38:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqzReKIyUYEcVP3M9H6gqgPWPsmQu9+uaboJlhXb6tQ2kO45BQtuvVsJapWuM0DZ31q8Tqtd X-Received: by 2002:adf:f1d1:: with SMTP id z17mr2874066wro.330.1569339517863; Tue, 24 Sep 2019 08:38:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569339517; cv=none; d=google.com; s=arc-20160816; b=F3bchksi4QFSnUkpTWfAsmeR6UUZ91bVkuCpIX56jKqohnCbKMoCHjjsBxMfv1YNdQ FruhQIVLlH5Iiy9Pl1GmlFFN8gJCGg+NVyRWlIoOHlutMa2So7R2ALaG0C2uUDhXGoiK hI8izDfYLUrlffDSu/kI6MstQeZ6vl1OyCFkhDY+d82p7IHTdjX4pJlNNDbhDXR6r+Bc /sfGoOyx0z+rF78+Sw/HfoP2t0qz8KdMkgHqTRts6gvFG78k5H9Hwbk+2s/msgPpjheM UQcpkUquCqDqAIl7xXdGqzHumaiZoT9KsNz5qTEOJlori0EqaOWUn5v6G9yMi3WcDd7l D6/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dMzH94cJFQ5HhjtF0lC2+emO+TbjymVXRuR/ZfC2id4=; b=kmfu3cYN7EK4qtGaOmngXlCk1wp3DyuYgvfHcvFu7IssQ5wG4MhZD7OGBX/+C8wGK6 aGS4MvJcVBGz+ne48He6Bkuk1FptXZ/APjRFFIRb1vM+MXmSOCIM5E64XrBsJzt35w2u S/gg6uqaNKku+0LYUhvTkxKfWfbLBzH7jRUpOKnveR2lvpmu29T09aEt2kOeEgwNzwkU sCaIU6rcC/5dubxuHslvAJXmnfvUGMXZ9GSQvMXK05D693vETZim7qTVf3DylMmgvYZ7 ZrpAlVKYpKW9B/fu0dZMdgIVMJtfYpo2gNgbax9SB7msfmR4TFuMmM9c/b666GPoF88p LxMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xVs0rNrG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w5si1323684eds.179.2019.09.24.08.38.13; Tue, 24 Sep 2019 08:38:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xVs0rNrG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2438070AbfIVTdN (ORCPT + 99 others); Sun, 22 Sep 2019 15:33:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:44412 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390924AbfIVSru (ORCPT ); Sun, 22 Sep 2019 14:47:50 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B497221479; Sun, 22 Sep 2019 18:47:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178069; bh=2et6kh5u9FLYVe88GeLbMKtsoeoF/CZr/Ah6IeVbid4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xVs0rNrG1X8f3caEDqiyQSCDlYJMhYYMwZrI6S5UXeTXdrJl0xiHVfMFNA9Vqa+vo CYVI9+bVdCQYtvFq95d9gEiFNeipnCi3vIO/qhiupYWi374MCZN3Fur9tL3/3kvz27 FuFIdr7VmnNtKLCFDRdfc04m0osIq/71nywINIis= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Thomas Gleixner , Dave Hansen , Ingo Molnar , Song Liu , Peter Zijlstra , Sasha Levin Subject: [PATCH AUTOSEL 5.3 142/203] x86/mm/pti: Do not invoke PTI functions when PTI is disabled Date: Sun, 22 Sep 2019 14:42:48 -0400 Message-Id: <20190922184350.30563-142-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thomas Gleixner [ Upstream commit 990784b57731192b7d90c8d4049e6318d81e887d ] When PTI is disabled at boot time either because the CPU is not affected or PTI has been disabled on the command line, the boot code still calls into pti_finalize() which then unconditionally invokes: pti_clone_entry_text() pti_clone_kernel_text() pti_clone_kernel_text() was called unconditionally before the 32bit support was added and 32bit added the call to pti_clone_entry_text(). The call has no side effects as cloning the page tables into the available second one, which was allocated for PTI does not create damage. But it does not make sense either and in case that this functionality would be extended later this might actually lead to hard to diagnose issues. Neither function should be called when PTI is runtime disabled. Make the invocation conditional. Signed-off-by: Thomas Gleixner Reviewed-by: Dave Hansen Acked-by: Ingo Molnar Acked-by: Song Liu Acked-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20190828143124.063353972@linutronix.de Signed-off-by: Sasha Levin --- arch/x86/mm/pti.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c index b196524759ec5..ba22b50f4eca2 100644 --- a/arch/x86/mm/pti.c +++ b/arch/x86/mm/pti.c @@ -666,6 +666,8 @@ void __init pti_init(void) */ void pti_finalize(void) { + if (!boot_cpu_has(X86_FEATURE_PTI)) + return; /* * We need to clone everything (again) that maps parts of the * kernel image. -- 2.20.1