From patchwork Sat May 13 16:01:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 93540 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5856456vqo; Sat, 13 May 2023 09:11:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7MUlC1pauknh24hDEWtRDm6Bjo7gwxR+qIHMWF8SSGzKkoxEYeoHh1GINscQrLoLDsLqS0 X-Received: by 2002:a17:903:2292:b0:1a2:3108:5cc9 with SMTP id b18-20020a170903229200b001a231085cc9mr38609696plh.40.1683994264772; Sat, 13 May 2023 09:11:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683994264; cv=none; d=google.com; s=arc-20160816; b=TCM2Y5KUKjdXiFeidMyMQGeM7E8vViPPB9DimVVxWd/aIdcoByFkGZIQKW7S34wiby vsu0yQUpnqRLcQXggIh88SOdNO1Ab+MITcQuNJ1nhCK5W7oDVLw2kf7JnHpnLokI/pRJ /MdHHoT5tRH1oAZp76NYZ/DxNiUxfFQn5tlvQlfQ3BZWND+x0ylcMFViu/X0QXv8hL3J QF8gB+TT1YNa5L4iy8TkcqiF+XkVKttIu8xlf3iCRhy/NXTlRqQZGZdTejTxwY9Is8Zy Y7k0FzFiu7ktS6R67zaM4bzAsJUXJuEociUb9ik0RBf/UjIr6NWRdD7HwgdaTkiwmd58 7qlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WSyTX/s9Jr5V9s4h9XPfSKjkj7PuJf1fUrxghd91drE=; b=w13l9myddTzzq1n0spIV+W7j6L5/L4RjMghui6kZBvgFfrptpJkeSu+m+Fel+av7Px +ZiNDz99Fv3DOPc2iB05UAZiJld1IN3mVmFIHUGXdpgS15on3EOKGxdGLF9QCLbqZJq4 NpF8/36KfyD4C6T/SQw7VaKbbCqvS1+b/8+W1BPQjhEiBDftkru6+McN6xAKgC7qxItD ogp4KHeIQRxwOfYckL6fvjFmjY8NMBHdgEJzBVQamvVqgtobNAPQmf4SAsRZehsWYwod 3h50b/MHaOql1solluF70NQEnP4paWufK0zqhwAF15z/jnlrpJY4esSrqMtgqGy8xZ/c cR9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b=JwVExmHu; 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=NONE dis=NONE) header.from=alien8.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s3-20020a17090b070300b0023b481b8dcesi9862277pjz.102.2023.05.13.09.10.50; Sat, 13 May 2023 09:11:04 -0700 (PDT) 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=@alien8.de header.s=dkim header.b=JwVExmHu; 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=NONE dis=NONE) header.from=alien8.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239167AbjEMQCE (ORCPT + 99 others); Sat, 13 May 2023 12:02:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229910AbjEMQCC (ORCPT ); Sat, 13 May 2023 12:02:02 -0400 Received: from mail.skyhub.de (mail.skyhub.de [IPv6:2a01:4f8:190:11c2::b:1457]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 071741737 for ; Sat, 13 May 2023 09:02:00 -0700 (PDT) Received: from zn.tnic (p5de8e8ea.dip0.t-ipconnect.de [93.232.232.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 655261EC0506; Sat, 13 May 2023 18:01:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1683993719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WSyTX/s9Jr5V9s4h9XPfSKjkj7PuJf1fUrxghd91drE=; b=JwVExmHu+FJvy+wbZnOqhAC+0ifK81B24Uc5C7cEJEdXBdahK3xP9eJvAda+3HL7VWWoWE MRW3FAIL2TYWtGWjNZyBxgDy5atmrk+GMUXSDcul9VSGQocQZVekQBdnBXoK8Trc+nUvCS dNOImTGUPM7FaHv6eWI1UYJdVQVN/vU= From: Borislav Petkov To: X86 ML Cc: LKML Subject: [PATCH] x86/alternatives: Fix section mismatch warnings Date: Sat, 13 May 2023 18:01:46 +0200 Message-Id: <20230513160146.16039-1-bp@alien8.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <168398302732.404.4356413406268674545.tip-bot2@tip-bot2> References: <168398302732.404.4356413406268674545.tip-bot2@tip-bot2> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1765795970138280481?= X-GMAIL-MSGID: =?utf-8?q?1765795970138280481?= From: "Borislav Petkov (AMD)" Fix stuff like: WARNING: modpost: vmlinux.o: section mismatch in reference: \ __optimize_nops (section: .text) -> debug_alternative (section: .init.data) Signed-off-by: Borislav Petkov (AMD) --- arch/x86/kernel/alternative.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 3bb0a5f61e8c..93aa95afd005 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -193,8 +193,8 @@ static int skip_nops(u8 *instr, int offset, int len) * Optimize a sequence of NOPs, possibly preceded by an unconditional jump * to the end of the NOP sequence into a single NOP. */ -static bool __optimize_nops(u8 *instr, size_t len, struct insn *insn, - int *next, int *prev, int *target) +static bool __init_or_module +__optimize_nops(u8 *instr, size_t len, struct insn *insn, int *next, int *prev, int *target) { int i = *next - insn->length; @@ -765,7 +765,7 @@ void __init_or_module noinline apply_returns(s32 *start, s32 *end) { } #ifdef CONFIG_X86_KERNEL_IBT -static void poison_endbr(void *addr, bool warn) +static void __init_or_module poison_endbr(void *addr, bool warn) { u32 endbr, poison = gen_endbr_poison();