From patchwork Mon Jul 12 06:07:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 472835 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2641031jao; Sun, 11 Jul 2021 23:18:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJydADTxq/zZN4JET4D/Q8lUDw0y7wdXLbUX/08oaFQglXxo8umIdWn37wZzod+Efd8gDR2C X-Received: by 2002:a50:ee87:: with SMTP id f7mr40823113edr.155.1626070723337; Sun, 11 Jul 2021 23:18:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626070723; cv=none; d=google.com; s=arc-20160816; b=Xd87aK+PU868YTwLpNOxXavdt9ol8U+jwyLxTg3elnZOASxaZlX9/RhxzlATKpaZQX 9qrD9xb6bsop9hwCcwM2QbD4yOECSbPMdjofiFjgv2i2k2SPH+4UKzThotzXl5BjSTIx p0zqYb3NIQSzhXcRq7LnqqhcSCjTeGH5W63DK6I/LHAfntU/sJGfT9ztUQt/TakU1TTA +JVbKNVt99ahaE9dXzsDgkDmA8oKxdHuhAv5fkzkrPtxQcOcDmx0YpA1DIGOLIXgHGTA 12y43UsofDt9+zYCAoheBL1G9oSx1BUWo7ffiPnFI1M1gT+n0EnoOY/Gxf5QIjcX57ZU pHjw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=MpHdC2x9ntnHUxHvaznzhV65C3SXUyFwC3QitZltVSo=; b=RZnQ+smn7EWcXmsjaerq9qZbwZO+0epgIamsiv0VEdDNhiO6pC1BEwpbVkxPzZH1N3 ljjEjTKvDDSz4iNtQ9VG+sf1aKCLF7oCIEX3EIj76RvM40H+574UjWAPs+Hui/hiNJSu ClfvZ4otL/0bvd07C8lmM+yqyZK60Dy1nIhQUZyal1dZnkVmA2oZulIkGti9dZXJm1KT PB+Hn0n47tO/vDD0mQkPzgQuM025354FNpa84QWNAPdUJUXPe6KF3qRAzdt4vzz/3GMN L4CUjp/n/EnK2tX4ZQNVrsQQ5E8Vgw6yhuastnUqB72RvirbVngIcbxf/t2IuG4jCxvp /oKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gjT7J2Ie; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m19si15233686eje.174.2021.07.11.23.18.43; Sun, 11 Jul 2021 23:18:43 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gjT7J2Ie; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234078AbhGLGV0 (ORCPT + 12 others); Mon, 12 Jul 2021 02:21:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:39102 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233915AbhGLGUj (ORCPT ); Mon, 12 Jul 2021 02:20:39 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C4CBF6113C; Mon, 12 Jul 2021 06:17:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626070671; bh=2nJJco2azTiYt1duVH38YUs+erKeeoIVOFHiYT2buTU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gjT7J2IeDiKzAs1XcUgyBt84ahkZ4EljGt3XS+IgHrbSODDVDDiy7PVq786laqU6W pe+Nfc7wvLf9kfuo2FV2DjRPX9JSssMoVnpg367Q0puNBLnOzyVNA6gGc4taDcDCk+ VSLKbzmHPv0ufZh93rBZGZM3na2S3rYj38lut+1w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Collingbourne , Nathan Chancellor , Nick Desaulniers , Will Deacon , Sasha Levin Subject: [PATCH 5.4 090/348] Makefile: fix GDB warning with CONFIG_RELR Date: Mon, 12 Jul 2021 08:07:54 +0200 Message-Id: <20210712060713.698660838@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060659.886176320@linuxfoundation.org> References: <20210712060659.886176320@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nick Desaulniers [ Upstream commit 27f2a4db76e8d8a8b601fc1c6a7a17f88bd907ab ] GDB produces the following warning when debugging kernels built with CONFIG_RELR: BFD: /android0/linux-next/vmlinux: unknown type [0x13] section `.relr.dyn' when loading a kernel built with CONFIG_RELR into GDB. It can also prevent debugging symbols using such relocations. Peter sugguests: [That flag] means that lld will use dynamic tags and section type numbers in the OS-specific range rather than the generic range. The kernel itself doesn't care about these numbers; it determines the location of the RELR section using symbols defined by a linker script. Link: https://github.com/ClangBuiltLinux/linux/issues/1057 Suggested-by: Peter Collingbourne Reviewed-by: Nathan Chancellor Signed-off-by: Nick Desaulniers Link: https://lore.kernel.org/r/20210522012626.2811297-1-ndesaulniers@google.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- Makefile | 2 +- scripts/tools-support-relr.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) -- 2.30.2 diff --git a/Makefile b/Makefile index 5e8716dbbadc..78efac6021b6 100644 --- a/Makefile +++ b/Makefile @@ -937,7 +937,7 @@ LDFLAGS_vmlinux += $(call ld-option, -X,) endif ifeq ($(CONFIG_RELR),y) -LDFLAGS_vmlinux += --pack-dyn-relocs=relr +LDFLAGS_vmlinux += --pack-dyn-relocs=relr --use-android-relr-tags endif # make the checker run with the right architecture diff --git a/scripts/tools-support-relr.sh b/scripts/tools-support-relr.sh index 45e8aa360b45..cb55878bd5b8 100755 --- a/scripts/tools-support-relr.sh +++ b/scripts/tools-support-relr.sh @@ -7,7 +7,8 @@ trap "rm -f $tmp_file.o $tmp_file $tmp_file.bin" EXIT cat << "END" | $CC -c -x c - -o $tmp_file.o >/dev/null 2>&1 void *p = &p; END -$LD $tmp_file.o -shared -Bsymbolic --pack-dyn-relocs=relr -o $tmp_file +$LD $tmp_file.o -shared -Bsymbolic --pack-dyn-relocs=relr \ + --use-android-relr-tags -o $tmp_file # Despite printing an error message, GNU nm still exits with exit code 0 if it # sees a relr section. So we need to check that nothing is printed to stderr.