From patchwork Tue Feb 7 16:41:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 53994 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2958904wrn; Tue, 7 Feb 2023 08:57:45 -0800 (PST) X-Google-Smtp-Source: AK7set/hV3AarFIx5S5fpcmiqxGTMP1RIb688d11JfvSSPIzyWD1DlQ3mh+30HXQcEk6QyG5FK5F X-Received: by 2002:a05:6a20:160c:b0:bf:707a:b626 with SMTP id l12-20020a056a20160c00b000bf707ab626mr3622478pzj.61.1675789065042; Tue, 07 Feb 2023 08:57:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675789065; cv=none; d=google.com; s=arc-20160816; b=UlKDjSQFaNJv1uH6GIRuxSaB9axv3GIDSBkdf60nUUwYeIHreXTGr37+Ci4ij3wkp2 QmZMVQBc7yrNmbPGh+BvztThmoQbHlm6ZUlKmR9OReJkkPMysOCeLczkIk8gR4wj+Xbo P1uHF++/7U5kePBkWaqvYJHgQ40aTXOQPMYVeYIZpopazEcOjfrPXVa0MAHpQoCQtvdZ 3J0u3LVDsqaHa9viXpaFh6hmwrWXf0o4q2XIwFOVHYOpLr5p7OoGGpYWeIZno2earyT3 6hELXZXZpximlMncuSWsds18Jowy5/NDYJAKmlZ1nABKXJQVmc98Pm3PW8ILQEdsSONL ywvQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=CPs6bZrMvW5K5CPmc0HriTu3GT3uSk0NHyHQql44ugU=; b=iio4q4XeDfzUvKI6mSyMf+HFU0wHHoWBOUxapxuzncZaOv2WjiXPcQqX0QTplaUACP KYkUvkrpkklcsY134O7nsICC248Wi/xDqwUaY5fUALHHYwufblFs/EGwYTWnwZlj3uWA Do4/IL0+pIqWneEyUh1A/yPzSlQ5UyNQTMT23DxUJ24Esw8PbD1DKrBKuPtxnjrqkl8F cE8FGqqWVx4YddlCrn9NaEwBZLs6Pkr6AZCGooo4V1WzWnVW4MRL68aFxwOmw20TgTlV 3HLmgUMaEuAJY0Gc46KpHPbtaTl535EjP19gr2tXTEdWjgAKijXbPFSVKiPmmtyRjfNw 7l6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QZo0j0je; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l184-20020a6391c1000000b004fb11b18e3csi3116642pge.166.2023.02.07.08.57.32; Tue, 07 Feb 2023 08:57:45 -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=@kernel.org header.s=k20201202 header.b=QZo0j0je; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231572AbjBGQmv (ORCPT + 99 others); Tue, 7 Feb 2023 11:42:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231622AbjBGQmu (ORCPT ); Tue, 7 Feb 2023 11:42:50 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7BBC676AF for ; Tue, 7 Feb 2023 08:42:47 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EBEFF60F3B for ; Tue, 7 Feb 2023 16:42:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9818EC4339B; Tue, 7 Feb 2023 16:42:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675788166; bh=/VdpoMtMa66d53ADOA7T8FLFwQUFmoaRRMXtxeZ3tF0=; h=From:To:Cc:Subject:Date:From; b=QZo0j0je9ovFBf+nj0zqSX8Nw/eWDl4xGzmPRNuxid5gjjSvPSYAGJCH/7FUqP930 ebpKqlcINwH2r3v5abAMfocaKqTOWBzRoVsPfTCW3jhaAgfzGr5Ke65ht53tPEtAQI B312PEFjIp6/ksBh3TY9QAnfH5gl2I4Coko5AWHbQZkjeHdyViwajaUBlUvKck4HA2 M5nrGMj8FwR3qrqnRJupNZqENoX5/NHqmxlTYcXVoA8jG2+wdQkcELPzY69s1QDXg5 V/m6ou6W+Gafzo+LGiUrw/YN3KJSgEfgRM8jMS6zBNRlUQYjEbYJOeqrRBO7eGW4Ux ekxANYooet6pg== From: Masahiro Yamada To: Richard Weinberger , Anton Ivanov , Johannes Berg , linux-um@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , SeongJae Park , Palmer Dabbelt Subject: [PATCH] UML: define RUNTIME_DISCARD_EXIT Date: Wed, 8 Feb 2023 01:41:56 +0900 Message-Id: <20230207164156.537378-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, 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?1757192194451047062?= X-GMAIL-MSGID: =?utf-8?q?1757192194451047062?= With CONFIG_VIRTIO_UML=y, GNU ld < 2.36 fails to link UML vmlinux (w/wo CONFIG_LD_SCRIPT_STATIC). `.exit.text' referenced in section `.uml.exitcall.exit' of arch/um/drivers/virtio_uml.o: defined in discarded section `.exit.text' of arch/um/drivers/virtio_uml.o collect2: error: ld returned 1 exit status This fix is similar to the following commits: - 4b9880dbf3bd ("powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT") - a494398bde27 ("s390: define RUNTIME_DISCARD_EXIT to fix link error with GNU ld < 2.36") - c1c551bebf92 ("sh: define RUNTIME_DISCARD_EXIT") Fixes: 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv") Reported-by: SeongJae Park Signed-off-by: Masahiro Yamada Tested-by: SeongJae Park --- arch/um/kernel/vmlinux.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/um/kernel/vmlinux.lds.S b/arch/um/kernel/vmlinux.lds.S index 16e49bfa2b42..53d719c04ba9 100644 --- a/arch/um/kernel/vmlinux.lds.S +++ b/arch/um/kernel/vmlinux.lds.S @@ -1,4 +1,4 @@ - +#define RUNTIME_DISCARD_EXIT KERNEL_STACK_SIZE = 4096 * (1 << CONFIG_KERNEL_STACK_ORDER); #ifdef CONFIG_LD_SCRIPT_STATIC