From patchwork Tue Dec 27 11:59:16 2022 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: 36841 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1355163wrt; Tue, 27 Dec 2022 04:02:08 -0800 (PST) X-Google-Smtp-Source: AMrXdXt5G8Wcx76jnd1L1GkHXD5DSvkWd1pojEnXTFQ9KcRiwvjzkQYCeZ2wRjnxfqH4t5srFg2K X-Received: by 2002:a17:907:3e26:b0:7ad:c8d7:4fd9 with SMTP id hp38-20020a1709073e2600b007adc8d74fd9mr23488931ejc.36.1672142528572; Tue, 27 Dec 2022 04:02:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672142528; cv=none; d=google.com; s=arc-20160816; b=mYpaAKm0H0/Vi1KYT9T+AZTYG6Hqf0so/ohdO3Ka3K/FYweDWzTwvAac1T6uebpSW9 jJhxOYNzAKUxmV7LIDCRIvEK1bfFo7R0S9eSIi5JR6pq01w+0nG5WjGPTY2Zusy3TvD7 pEYgjwa/Li+6mMAdF9jnxtUZ3Xp7QeKy8Cp95krYxkwv1d3+sJIZzrcDP22v7oyAXpMq ptOsoRRz+JN2roJFxkWHxPKn/mt4SPFmPsDV9xQCb7l6gAsrsDyxTicp2B6AR9rUlisi iLE3fsp2534W2Us6hnqJKR/uzWICBumhpzIXphU8IlvJ1YDG8HvJR8gtaMggPvFaJjF3 HhOQ== 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=5iqAaKJfRk6rZtNTrGoo86R4tttMmLNYvpxtFe/8uMQ=; b=U7ZFYSUC4yNOyEC/KcqntZOSqNaEoIYUaA7ne+xqX4YFbP24h2aKwKezXWcmIReD/b GgdrldAXpBxbrs1vvzYCCF7t8G5L7qCOcoUx1Md0mXd41ev96xt6efjHP7B4x69q+Frk nX2IfI99RLFlHEVH2Zm0fM5gQ3fSwrO7O9fh3PcYdSZIbeRFqRbCqgugCvjHRklT6vzU ROmfDJI4L3vKyBYvvkmbuP0N+HhV9+svlNGucbcCKyERt/gQzprQs+l/J5LX9OyWjh0i 5QsSW43KaTjIaf7XCGsRxuazMRKPItruj+tOJHjTh4+kRKhcxWBG6aGx3vhFclu3u4sD PJkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=a2bc7NZ0; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jg25-20020a170907971900b007c11f2411e1si11419918ejc.815.2022.12.27.04.01.44; Tue, 27 Dec 2022 04:02:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=a2bc7NZ0; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232047AbiL0MAb (ORCPT + 99 others); Tue, 27 Dec 2022 07:00:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232109AbiL0L7a (ORCPT ); Tue, 27 Dec 2022 06:59:30 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24734B7F5; Tue, 27 Dec 2022 03:59:18 -0800 (PST) Date: Tue, 27 Dec 2022 11:59:16 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1672142356; 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=5iqAaKJfRk6rZtNTrGoo86R4tttMmLNYvpxtFe/8uMQ=; b=a2bc7NZ0C4QuX7KiujnTBhlwvSlrRfOLQ4QGtQRNMLr4WJK5ORVr/uOMtpp2KzQ4c7JvVw HyUO6dnmtVZkYdycX3oukMOeWmX2orVW/q2VFKv5Ey8O0eXHs8nB1Y6dQllubgh9ZRLYXK N2NMJAfLgV7h2UbjMAzGik1cuG8L9c6s18RpxWVBZFi9CvASVG4nuhNed/SbLNOEcbKGtw u/nCqL/5EDJiuQx2/pgah2AAjw9sZNJGkebOu60cmIT3EUUoV0ZdbMuYNGlTE6f8EhMOig fFNypQngHcjpm/xVbpUrSuHqKoRh6ALLLtoPHT6vZ6j+AfF04Gt/jPDfvQMalg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1672142356; 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=5iqAaKJfRk6rZtNTrGoo86R4tttMmLNYvpxtFe/8uMQ=; b=Qkq88T6V+9wSNySeT77jwo/lEkusWNf66uaM8mSKjI62l3MBFtYrqs5nWqFfpqWPWazral ubFwLU6coi/n2zBg== From: "tip-bot2 for Arnd Bergmann" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/urgent] x86/calldepth: Fix incorrect init section references Cc: Arnd Bergmann , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221215164334.968863-1-arnd@kernel.org> References: <20221215164334.968863-1-arnd@kernel.org> MIME-Version: 1.0 Message-ID: <167214235637.4906.10804629490623439525.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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753368524182643789?= X-GMAIL-MSGID: =?utf-8?q?1753368524182643789?= The following commit has been merged into the x86/urgent branch of tip: Commit-ID: ade8c20847fcc3f4de08b35f730ec04ef29ddbdc Gitweb: https://git.kernel.org/tip/ade8c20847fcc3f4de08b35f730ec04ef29ddbdc Author: Arnd Bergmann AuthorDate: Thu, 15 Dec 2022 17:43:23 +01:00 Committer: Peter Zijlstra CommitterDate: Tue, 27 Dec 2022 12:51:58 +01:00 x86/calldepth: Fix incorrect init section references The addition of callthunks_translate_call_dest means that skip_addr() and patch_dest() can no longer be discarded as part of the __init section freeing: WARNING: modpost: vmlinux.o: section mismatch in reference: callthunks_translate_call_dest.cold (section: .text.unlikely) -> skip_addr (section: .init.text) WARNING: modpost: vmlinux.o: section mismatch in reference: callthunks_translate_call_dest.cold (section: .text.unlikely) -> patch_dest (section: .init.text) WARNING: modpost: vmlinux.o: section mismatch in reference: is_callthunk.cold (section: .text.unlikely) -> skip_addr (section: .init.text) ERROR: modpost: Section mismatches detected. Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them. Fixes: b2e9dfe54be4 ("x86/bpf: Emit call depth accounting if required") Signed-off-by: Arnd Bergmann Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20221215164334.968863-1-arnd@kernel.org --- arch/x86/kernel/callthunks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/callthunks.c b/arch/x86/kernel/callthunks.c index 7d2c75e..ffea98f 100644 --- a/arch/x86/kernel/callthunks.c +++ b/arch/x86/kernel/callthunks.c @@ -119,7 +119,7 @@ static bool is_coretext(const struct core_text *ct, void *addr) return within_module_coretext(addr); } -static __init_or_module bool skip_addr(void *dest) +static bool skip_addr(void *dest) { if (dest == error_entry) return true; @@ -181,7 +181,7 @@ static const u8 nops[] = { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, }; -static __init_or_module void *patch_dest(void *dest, bool direct) +static void *patch_dest(void *dest, bool direct) { unsigned int tsize = SKL_TMPL_SIZE; u8 *pad = dest - tsize;