From patchwork Thu Oct 12 18:36:46 2023 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: 152116 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp1427722vqb; Thu, 12 Oct 2023 11:37:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEwa7MOll4Ay2FjPuAfAUnHU2OYoMsIki3SdizsT8lCrAmTlhTPvhaGM/cfBRVv54MDwOLF X-Received: by 2002:a17:90a:2dc5:b0:27c:e2d5:abb6 with SMTP id q5-20020a17090a2dc500b0027ce2d5abb6mr8593033pjm.0.1697135839125; Thu, 12 Oct 2023 11:37:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697135839; cv=none; d=google.com; s=arc-20160816; b=v7WvibocCD5oogwHF6OjotDKcg2jfJCqBcn4wbboehNDgRExdXIKnJx+e2C82NZj2F MRYxb30LjTK9IfndqOmAe83Il6LVaXS94fN5Zgz0olBbiLyOYNY9o2Z3obxLluMP10Ol OJ7C8WpCEtrKtWz2taOj1mDa6swz8pdgxqv1eu8x42JJRvAuzNZSz1QYUBSCAtG+PVTd waiPn2XrqmXLgMoxHIyFtLUrXdDepejVe0q3R1fBEdfzrVt9SvDG1gPH6ADMq0XCAl1l 1+nXPlGcm1+UumPlHaPVOOVv5/I0LlEJMEw8CaDWI+AF7k3EPzAaEG+Btt0MvAo8J9qd E9jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=Pw7es2hh7qvHHY9PDbdAV77XkoPYW54NCoEKygSaPGA=; fh=yjPhVgBwpHPoIAulKuJuMHKqsHlAINTxH2uG30+8QoU=; b=JNZ94Z/se2P/e1sbTK4xBEYHq0K9QEYzFc7uagnqAcbcbPeX5fX0HgkkBRyIhsNUAO oETSNhWT37fkxdnwQ5l+r/PHLbYj0vWc60wBh66431yKhQjVgFUI6k76OFFXlOHj0/Qf cUeWPtj+FTXIOGP8mI6ImloPmTHuPCJioJndkWWowySxMm8h/BtvOrRsRMeY8KcxroYQ gUMGTxBRuMJ3EWY1/Xge2jKFePKHya6GDaWWI3kHaB/UCkDUQ2SnELtSPo8MfY5921KG ruN5cHQzR3ltXrqei5Ecskz2GSGo+4mXSNmvb/xmO/aGFKjoTLBbn/zqsxXQdCoeD8Zu U6Fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=obEgyN14; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=BK9Fm3pb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id kk5-20020a17090b4a0500b00277816efefasi3085960pjb.106.2023.10.12.11.37.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 11:37:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=obEgyN14; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=BK9Fm3pb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id DE79280EE0EB; Thu, 12 Oct 2023 11:37:01 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1441821AbjJLSg4 (ORCPT + 19 others); Thu, 12 Oct 2023 14:36:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379714AbjJLSgu (ORCPT ); Thu, 12 Oct 2023 14:36:50 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2A53E8; Thu, 12 Oct 2023 11:36:48 -0700 (PDT) Date: Thu, 12 Oct 2023 18:36:46 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1697135807; 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=Pw7es2hh7qvHHY9PDbdAV77XkoPYW54NCoEKygSaPGA=; b=obEgyN14FSYqYZ4k/o0BZYWyv892Xc8mH1ru52uWXOufIYANZm4Khh9yQ/PAwXKg1LW99v JQHhxR74Um9OVmAzGQ7/S9ejMMjKb9/OTotrMYynzQs+DRx6jqwQGJoWmh3S3/klWAKbBI usf9u2ZS7sAqr1+phY0ngH1HcE4kllUd8lFybyXcnnIwztvhEbvFOKg/68oGc1p5X9ByJR InHWHJv7WS+w5tZuqj5e4BK+LZM8XDrgch1oiWIvYGJZGemMZklNQwr3sp6klKSVZB6Uhy nPBd0h0QfLfMyxLU59Jn4dILqZlnpw1dnUoWsaEKMWxtoeIexGPcxjm6UmgI3g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1697135807; 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=Pw7es2hh7qvHHY9PDbdAV77XkoPYW54NCoEKygSaPGA=; b=BK9Fm3pbkZP3Z70AdYJks9gghRogBj730FV1St1XIfoS3wM5MmF9E0CxWFujwqnltexNdV CVxUzeY+odCHAyAA== 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/urgent] x86/alternatives: Disable KASAN in apply_alternatives() Cc: Fei Yang , "Kirill A. Shutemov" , Ingo Molnar , "Peter Zijlstra (Intel)" , Linus Torvalds , stable@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231012100424.1456-1-kirill.shutemov@linux.intel.com> References: <20231012100424.1456-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 Message-ID: <169713580687.3135.7724105544670888547.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 12 Oct 2023 11:37:01 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779543663817091873 X-GMAIL-MSGID: 1779575909310448565 The following commit has been merged into the x86/urgent branch of tip: Commit-ID: d35652a5fc9944784f6f50a5c979518ff8dacf61 Gitweb: https://git.kernel.org/tip/d35652a5fc9944784f6f50a5c979518ff8dacf61 Author: Kirill A. Shutemov AuthorDate: Thu, 12 Oct 2023 13:04:24 +03:00 Committer: Ingo Molnar CommitterDate: Thu, 12 Oct 2023 20:27:16 +02:00 x86/alternatives: Disable KASAN in apply_alternatives() Fei has reported that KASAN triggers during apply_alternatives() on a 5-level paging machine: BUG: KASAN: out-of-bounds in rcu_is_watching() Read of size 4 at addr ff110003ee6419a0 by task swapper/0/0 ... __asan_load4() rcu_is_watching() trace_hardirqs_on() text_poke_early() apply_alternatives() ... On machines with 5-level paging, cpu_feature_enabled(X86_FEATURE_LA57) gets patched. It includes KASAN code, where KASAN_SHADOW_START depends on __VIRTUAL_MASK_SHIFT, which is defined with cpu_feature_enabled(). KASAN gets confused when apply_alternatives() patches the KASAN_SHADOW_START users. A test patch that makes KASAN_SHADOW_START static, by replacing __VIRTUAL_MASK_SHIFT with 56, works around the issue. Fix it for real by disabling KASAN while the kernel is patching alternatives. [ mingo: updated the changelog ] Fixes: 6657fca06e3f ("x86/mm: Allow to boot without LA57 if CONFIG_X86_5LEVEL=y") Reported-by: Fei Yang Signed-off-by: Kirill A. Shutemov Signed-off-by: Ingo Molnar Acked-by: Peter Zijlstra (Intel) Cc: Linus Torvalds Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20231012100424.1456-1-kirill.shutemov@linux.intel.com --- arch/x86/kernel/alternative.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 517ee01..73be393 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -403,6 +403,17 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start, u8 insn_buff[MAX_PATCH_LEN]; DPRINTK(ALT, "alt table %px, -> %px", start, end); + + /* + * In the case CONFIG_X86_5LEVEL=y, KASAN_SHADOW_START is defined using + * cpu_feature_enabled(X86_FEATURE_LA57) and is therefore patched here. + * During the process, KASAN becomes confused seeing partial LA57 + * conversion and triggers a false-positive out-of-bound report. + * + * Disable KASAN until the patching is complete. + */ + kasan_disable_current(); + /* * The scan order should be from start to end. A later scanned * alternative code can overwrite previously scanned alternative code. @@ -452,6 +463,8 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start, text_poke_early(instr, insn_buff, insn_buff_sz); } + + kasan_enable_current(); } static inline bool is_jcc32(struct insn *insn)