From patchwork Mon Nov 27 12:00:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 13469459 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5ECEBC46CA3 for ; Mon, 27 Nov 2023 12:01:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=ZyHxUAuInGVuSn3yyBJkuKhh5S/v7OTBX98PmEkdjMA=; b=CI9x3mQPBGt+wyj0nMTQ05y8UP EK4h3PcSHJCbA0GckAd0tCI13+b1M06e/x4vCGQTeaZD/tVIbgNzzILO+M7rrr5gYMKEw82+Wchb9 xcMv5K1bMrMTw0Yv1/IyWI5YExPdvIZO8cQ99QKDfa5owtbW4tuR8a3oH1RQZA7VBiFiYzxIOSQSo 6OjyQgxN/IHkpG+LUmmqFtauVbvE48UDSthL4ebZrYTBN36LrfwRHNqeCt2HrhepAOR/1+K6iuUG5 Boxv53v6uNDyr6E+6/qH3pD9CXOr0rFDgrQBo9T7bw7ip3/62E9LKYVXZMAB1vRGojlbmfqPgKv3h FjJEnyww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r7aIe-002P3t-1O; Mon, 27 Nov 2023 12:01:16 +0000 Received: from mail-wr1-x44a.google.com ([2a00:1450:4864:20::44a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r7aIY-002P1g-13 for linux-arm-kernel@lists.infradead.org; Mon, 27 Nov 2023 12:01:11 +0000 Received: by mail-wr1-x44a.google.com with SMTP id ffacd0b85a97d-33306c2a005so249500f8f.1 for ; Mon, 27 Nov 2023 04:01:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701086466; x=1701691266; darn=lists.infradead.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=illwpV4ns/Zb9jIBFHqWUWbLFXz/BtCqVksmbuVGi2g=; b=UcU2Sef9IzcsvO8sKMLqMNrdBD92KZ9BHOTASAhn14dNsT2CtNC88Dw0Q2ZrJ9h49c kiqK1y+XlbsL9MNwFxijmx9b3LdrjxdeUEKUG/2e+UUM4IrLeQhzjZ9hgauvNA6fkGAG rHZZ0N/T4ZWO3efcax+zoskA7v+7Zb7VIllA2rMXVI6NKvFMxLCigywaFBDgEsEiW9lx D1Jj3htiJgt8bDyrIe3SOUJG1a3d8CivL7zt5CjbxH1US6tECS9Jk7J9onLPHF3FR5lY Xhgs3fxWfx03Cy6G0OEU4epbEC4gRRJlnfTLVRt7Gm5Qj+TF1jj4/x//QPXuP2itWY28 eXwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701086466; x=1701691266; 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=illwpV4ns/Zb9jIBFHqWUWbLFXz/BtCqVksmbuVGi2g=; b=EayPS1qUH+XttguaXEQYoqfQL/RKdi4lGGnDWOg30G/K9tSGRtnC/guQXxSIEVTAN6 1q+2JvFA8kZksDK9LebKjuWxFSdob83/g9OCJuIZPigkod9AaKzqELXm3A8J65kUOfr/ Me0GWzCP3w6W/CLv6F637HfPxYJOcBFJXw5In9RRxCI+XxWLdIGBFslukIAYyjsmTMxP XbYn+caRdTtB115uDAthY3DHEbRedpQjVARJQh1txBipG1H/N5ISkPQzxYiwUJjAxWaj 0CZ/Gwi2k6DRlTHIsGju0R02CaXwFlkBCmt3/TmZLQ227YnK1zIIjpMjWC52GYO4Sp2k 2wVw== X-Gm-Message-State: AOJu0Yx8DfesHLXSxouhVJqIDT4lL8rIZ17PgOfqxdK/mHdFOLwwDo7z +S00uz+GxX166jVSJOI1YbpwIL0EZWi2boNWM/Z20iTZe/mUeS5DeQsy08JAAlBIeaBWXPLuM/l b+RldtCOk4dw9cSpbaPEG+dkmWRWoKtouhZs/TuB8N4sptG6TbO00z5wasyK9VrOzNwB7+mTHB5 8= X-Google-Smtp-Source: AGHT+IFypZmLXZxwpzulumyganOR2ds2ltfgG9EkC2U3l36bpJNmZCPtDd3zwmxDRc7hAZB+2qCpHlOv X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:adf:b649:0:b0:32d:89ed:d4cc with SMTP id i9-20020adfb649000000b0032d89edd4ccmr169156wre.12.1701086465645; Mon, 27 Nov 2023 04:01:05 -0800 (PST) Date: Mon, 27 Nov 2023 13:00:51 +0100 In-Reply-To: <20231127120049.2258650-5-ardb@google.com> Mime-Version: 1.0 References: <20231127120049.2258650-5-ardb@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=1190; i=ardb@kernel.org; h=from:subject; bh=yvUrrhXUCClkOlwm3HgCY28b3ETcjkq5w480kxYoFAI=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JITWl5XNw3rSNyySOhF64nZqnrhYj5MGXf77j/a1rRY8KV qqpz5neUcrCIMbBICumyCIw+++7nacnStU6z5KFmcPKBDKEgYtTACayM47hn/GJvWe/fDqiHql/ x+DhTIlTUbGe74+e8HJ9d0VAMixgcjLDP/Wd6xSu8u5512O0bbnkbB+l8q+FG599NlqzofnQ5de eDjwA X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231127120049.2258650-6-ardb@google.com> Subject: [PATCH v2 1/3] arm64: Avoid enabling KPTI unnecessarily From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Catalin Marinas , Will Deacon , Marc Zyngier , Mark Rutland X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231127_040110_379635_C74A4792 X-CRM114-Status: GOOD ( 14.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Ard Biesheuvel Commit 42c5a3b04bf6 refactored the KPTI init code in a way that results in the use of non-global kernel mappings even on systems that have no need for it, and even when KPTI has been disabled explicitly via the command line. Ensure that this only happens when we have decided (based on the detected system-wide CPU features) that KPTI should be enabled. Fixes: 42c5a3b04bf6 ("arm64: Split kpti_install_ng_mappings()") Signed-off-by: Ard Biesheuvel Acked-by: Will Deacon --- arch/arm64/kernel/cpufeature.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 646591c67e7a..91d2d6714969 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1839,6 +1839,10 @@ static int __init __kpti_install_ng_mappings(void *__unused) static void __init kpti_install_ng_mappings(void) { + /* Check whether KPTI is going to be used */ + if (!cpus_have_cap(ARM64_UNMAP_KERNEL_AT_EL0)) + return; + /* * We don't need to rewrite the page-tables if either we've done * it already or we have KASLR enabled and therefore have not From patchwork Mon Nov 27 12:00:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 13469458 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 44A9BC4167B for ; Mon, 27 Nov 2023 12:01:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=b3AWKFnLIhSBvk4V7gkn7hklGXDXnVBOu/ufewMGwqM=; b=mODsXguYqGBu6oJidc6pz8w4o2 mVVMyYHCrbvCiFmtkaO1SJHk+yXatO9u6C6c+vPXx7e+XLKfo1HNKNNruTq1vDSTIp0n/UTae0OpH gKfZy1gEgdjSeBmayFWyFJyZCYaXXuLcVnA3Dyl74C3nlwmky+dsEuanfQTOWv+F2vURm9SSMUMim zIef2/6CO7OifrdMEYfNfCg8pvVmLmN3asZFjn7O4shRB6XjZpVOcBLHD74rI5JDjydP4YXQdAWsi qLRqOv+nghPHqqQmRVZPNQj2J8kW8JpIANzZKQoeIrXvmCNLG/Mm+L4n1ufhNLQpXs0wQ+p7GOD7o B1mJs9Nw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r7aIf-002P4C-07; Mon, 27 Nov 2023 12:01:17 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r7aIZ-002P2J-2z for linux-arm-kernel@lists.infradead.org; Mon, 27 Nov 2023 12:01:13 +0000 Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-da31ec03186so2854431276.1 for ; Mon, 27 Nov 2023 04:01:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701086468; x=1701691268; darn=lists.infradead.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=IzI1dZVpK30edcXKTvBDbCxt5xWT4X2K7T27a+tVt9Q=; b=YNQupMY+7jBpmrRnD0qD7iXQiytCKO7fWCaoKco0Rwrk5bBfspdRIJKEYN9cPfvXyx wAGzrUOBUjBZkWA3mMj+i4tdUKuhWPkWwWvxge5V8JlBfEAX/7WZOxRhz7Kbyg/PbDgG ADMRKy0NYF5VS6eabUmXWi4ZBQLimmc7VSEd8PyoaglomaHkpN0XL91PfiF5xpYL1L76 lEZVPxqplOXmP0XavRZzOKzSxWw9H9L9zIl6JSDoMSTX4mzOyipFW44R/gpu0A5JUdGm yE+/hMeFwEx/IY71ZbcsjR8E+2n8ZJw9VaBDiCEou7z8ebhmS7xtYfzYGycUFXZmGY4F ym1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701086468; x=1701691268; 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=IzI1dZVpK30edcXKTvBDbCxt5xWT4X2K7T27a+tVt9Q=; b=WoQ0TXvoSSeQMCOf5NchkkOyPVMXuaRZ+cuuxZDAeeK0rKxSHLR0TMmQTwIcG+uMrr BnI+wOJkKWWOcJzqnfEkT6WQa0WqtuuDeJWXztn8jJ8g6Qtw/bVakIk8oUnZ6N0VnVG4 5Y0QwLzsf27zsRxL/b+CRK9EsfWoVRaEV0j2sn0RAenm4lolIbJpC/2B9rwTc5hJbaKi Z+rQsHctXaMSwnbXfMYWAiZMONaxAtybEPaTyZD6S1p3Z34r+Gpbjbh55JSfSjasLBTH mhJNNfwS1JYbNBlF+KBg2kkKtpuycdttrHVFJ/dredQsN58TMJmnq2NY/vkunyu4ugCA Qu2A== X-Gm-Message-State: AOJu0YwBDLjZcKEg/1mE4wny5tyMH48i699Yj2cIj1EiGFE0pt0Z4j1J oyF4JRFlmucgWoR34jN2ntZKP9He0LMXmapZCJAvpSp4BPqM2JBeJvP/LMGJAKnfYqdd1Ex97w2 ahFXLjER9KbyOPtLDuawC+kng6Fq2ZtZCTuQv3jlrVEk9R4HSnIJoRV+HL0sFthSIojwdD15LPg Y= X-Google-Smtp-Source: AGHT+IF8TI+wqqQmYLT3gdmtdlT16GEN98a1HYZOfc+Cfodfh8VTMubrpPHOCxg9fJX2kHjF3xJa6Wlv X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a25:3055:0:b0:ca3:3341:6315 with SMTP id w82-20020a253055000000b00ca333416315mr386299ybw.0.1701086468252; Mon, 27 Nov 2023 04:01:08 -0800 (PST) Date: Mon, 27 Nov 2023 13:00:52 +0100 In-Reply-To: <20231127120049.2258650-5-ardb@google.com> Mime-Version: 1.0 References: <20231127120049.2258650-5-ardb@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=641; i=ardb@kernel.org; h=from:subject; bh=8TgAlXyrlyDbIj4txHi48geVg20dGicCKMZoLxKnzbk=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JITWl5cuCrUq5boxzZtxO33h3XcYd3dm5z/csycwqY7k9e eGprTm5HaUsDGIcDLJiiiwCs/++23l6olSt8yxZmDmsTCBDGLg4BWAi7qEM/6we7T4/094hgvP5 Necko3VuTKK21zUKQ8smCgQoOe+RTmRkuPPN+3aoQsCKoDLeaeElh79HWjqy/AqflHDvV7pi2Md cdgA= X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231127120049.2258650-7-ardb@google.com> Subject: [PATCH v2 2/3] arm64: mm: Only map KPTI trampoline if it is going to be used From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Catalin Marinas , Will Deacon , Marc Zyngier , Mark Rutland X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231127_040111_963939_19E29E93 X-CRM114-Status: GOOD ( 12.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Ard Biesheuvel Avoid creating the fixmap entries for the KPTI trampoline if KPTI is not in use. Signed-off-by: Ard Biesheuvel --- arch/arm64/mm/mmu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 15f6347d23b6..6c8078916f5e 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -674,6 +674,9 @@ static int __init map_entry_trampoline(void) { int i; + if (!arm64_kernel_unmapped_at_el0()) + return 0; + pgprot_t prot = kernel_exec_prot(); phys_addr_t pa_start = __pa_symbol(__entry_tramp_text_start); From patchwork Mon Nov 27 12:00:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 13469457 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6E93BC4167B for ; Mon, 27 Nov 2023 12:01:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=5H/XBD4Dg58pYwI2ru7zBPQ4vM94n+kXbeg2ZCg3jac=; b=YK2fBwd2p3EQvNosY4cjuwAwMc /Lk6FMKL57PWqGr9bwnlBBe9yRf7CLpbPEA6vqFTRSG8btdLzjBgAbUnrbCCDC0WwZzBj4k7CJciH CQpEm9uvFw5YU5YuLwogfc35drFh1n5DrhydMNcdGSFKAFi40mX/B56L7QbDs/omNUMvRPH3syil8 u4OeMxESRzBMH0hfx4brElWiBSy9M41vEwIinT59K+pgDY44McvIt9mmz28S+ExO6okKmo/AvJZqa N1urQPEzrImxUObf3cepAhyNdsq+Jk6deXI+sVuAtngVbwNdtHAzkDT1EylySuBURVd6WZr7IO0jz HZIVRfeg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r7aIf-002P4Z-2D; Mon, 27 Nov 2023 12:01:17 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r7aIb-002P2c-2B for linux-arm-kernel@lists.infradead.org; Mon, 27 Nov 2023 12:01:14 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-db4038d7cfdso3544787276.2 for ; Mon, 27 Nov 2023 04:01:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701086470; x=1701691270; darn=lists.infradead.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=jP6utEGdlVAtaBIEgGVXERLf6sdxJYngGqlr0NaqNhs=; b=dmenQPJmj6ZOxqt8chd0v7imdPYN/h1cTbcniJQMOy6fiQfkGGv/At0dNg4qdKBo9d HsZ3ii2pIYp0uH/dzbQVELoJUKTWdkFVdKANpOVLUBrcc8gVTW1AiaXNKcqZUAhzHSzB pvO+uoPO6RtljW/eF43NPWAVMVLrCNaGpKSLV7WVO/rvq06WXSJlYhBznXkcS0YP1l22 AAhM4eByooufFutcqh9wKA4rGYaTL3qNNMYrxp8YD2UbBpw/0/nYy7zsz4bGR+q2lKuA weHHtO1U7vMeoY1637jONWOkNhbNDbG5i5JPdF5FpluW6XQv6mWj/dAspc0zu6pY+LiY 3mLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701086470; x=1701691270; 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=jP6utEGdlVAtaBIEgGVXERLf6sdxJYngGqlr0NaqNhs=; b=jlj4lLFXgP7tgP3qRxry+h/Q/mY6OuJKF1GKOmCD7ZwP5vkn7CIaidOcPMn2IbRL9V RG9n4BzYbN1A8owN5FdVYOgxBXFj4KEr75l65MVFzGVjqXHGhIR8DRo/Mqo/+gTqm4be YbJoPIfcea639IMnRyd3L2liAQrYN2rvLvWFVYgbcVnDYQ0HjpMpPGUxqJce+zu78xCz bYQxYxhJMPvyI/HwW8icY8ChpzsOb7/TXRV1E+4yNZj0Rx8roJb5YbnUopDmiYQiZTrJ bwJeG9mq7cQU/OWiA80IIrBZuZgjktKOp3o4qbvTBRwD+xfirWbuxgC/YxrstOmDuzcx MVAg== X-Gm-Message-State: AOJu0YzDAyHOcst5dJSXXduk+gMn7HE1nU/24+FWLbWHbvauI9FpLY1R AIx8eHB7tLkNKSNFFZ/LGCbULamHxFL0o4WnU1xQ9wWkQBhKpgV7Js882W+qywHSO4xIIBepkjV tiMOodwaGlMDvOPdCVUxfTBPzPvrXokHwgLq0fDs4e+V+54KwsxvxdhFHzCPM97M7Qcn+ZgNcl/ o= X-Google-Smtp-Source: AGHT+IF0LR4LiG9WgvlzrO58P/Gt57SnafpEesrVkDg6fZr2/3K8d435owbR9+r2VE1V1QP085m9vhO3 X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a25:d081:0:b0:d9a:c946:c18c with SMTP id h123-20020a25d081000000b00d9ac946c18cmr387721ybg.6.1701086470600; Mon, 27 Nov 2023 04:01:10 -0800 (PST) Date: Mon, 27 Nov 2023 13:00:53 +0100 In-Reply-To: <20231127120049.2258650-5-ardb@google.com> Mime-Version: 1.0 References: <20231127120049.2258650-5-ardb@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=916; i=ardb@kernel.org; h=from:subject; bh=vvlD7dhp6Z3c4pvVp/sdNuSIe9RGkjk9E2jXzSP6zAs=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JITWl5StXz+2D599ZH2S+03Ol1Oj/Kr2H21YLMp0ofdWqU 9sdxlPQUcrCIMbBICumyCIw+++7nacnStU6z5KFmcPKBDKEgYtTACayJ4GRYeXTvfVnVBjFp6cW Smnst5TIU50a8Skw9enKHHf/DXKh/IwMJ63nzQq74zs//XvupQmb3HZXz/S1e7xzZuMtpv3F76s l2AE= X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231127120049.2258650-8-ardb@google.com> Subject: [PATCH v2 3/3] arm64: Kconfig: drop KAISER reference from KPTI option description From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Catalin Marinas , Will Deacon , Marc Zyngier , Mark Rutland X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231127_040113_710999_5C61C1B9 X-CRM114-Status: GOOD ( 12.40 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Ard Biesheuvel KAISER is a reference to the KASLR hardening technique that already existed before Meltdown happened, and by now, it is sufficiently obscure that mentioning it does not actually clarify anything. So remove this reference, and replace it with KPTI. Signed-off-by: Ard Biesheuvel --- arch/arm64/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 7b071a00425d..b67e6934316f 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1549,7 +1549,7 @@ config ARCH_FORCE_MAX_ORDER Don't change if unsure. config UNMAP_KERNEL_AT_EL0 - bool "Unmap kernel when running in userspace (aka \"KAISER\")" if EXPERT + bool "Unmap kernel when running in userspace (KPTI)" if EXPERT default y help Speculation attacks against some high-performance processors can