From patchwork Mon Jul 12 06:03:17 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: 473005 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2696172jao; Mon, 12 Jul 2021 00:44:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxB1e7YQuvljacyRjtyUwZStPFumtkrZ5EetHfwkEE3mfdcMJt40CXWoXPeJCWPst299btJ X-Received: by 2002:a17:906:b53:: with SMTP id v19mr19576103ejg.262.1626075851424; Mon, 12 Jul 2021 00:44:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626075851; cv=none; d=google.com; s=arc-20160816; b=Iiax/O74y2Z5Ko+RjxdgHWXBw7Tcxu/L0VPI2fylRFlfkX+f2sHjI6YukmEZz+f+Rn dZvKB9BeBaZ+i5D6o5Un12JH4Z1R5suIj4qVx6W20hWRphVjTTO62doch4XHhKHdmsnc IolleNO1e91DpAvPG1rh5/qFl9O33Mf/7Tk41dKvkOG8aQlGoGsc4fWQVg3GI0aYXYc+ awaFLHFBaBlGvIB9vNCozvzSHb0p/Fl0tsWle1T1waxjkinr6R4HefkR/jTyWyCCWne7 rqKYJvW8zxntUucFIPuaSpFj34zm1DxlYBmwUARL8OFGZvy/pFLnzxKaigabA8I7rzVj qC/w== 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=HPVWXZ5mYkRLp1c3sdHRusvmMLB3lPBA7gQkGximrks=; b=zJ30TXc2e6sTm24NnoUF/MPtOPN94nZPer7ltdiMkwJMQ0nt5fQqni+CIO+5B52CXC CvxwXpex9QJkVI19DUb/gYN1bgP6nKtmo/eyLNpiMjI3B++KmK/Gnar4tnt0hDkh4LgP OHr4Glyh/yiqJ6L0aVIWgafAFJRZlOGsEE+vYePoWOjaQ/JiepRSaVldWkx8iWZZE4gI /5PPq75qLnTPBtZp2BQi8bado8YORVU8gCUmFOsuhzVsNqRGqXrzwnBpI9cxQQmSFeOo ITbmAM/cJpLWvqEMvwWFVmkjFdLHvO8LYNVMi7HvVrAQINPoN/Xh0Is5NGKnAz40x0PU iFAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=D0vvC+iC; 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 n21si13642925eda.13.2021.07.12.00.44.11; Mon, 12 Jul 2021 00:44:11 -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=D0vvC+iC; 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 S1349759AbhGLHok (ORCPT + 12 others); Mon, 12 Jul 2021 03:44:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:46246 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347569AbhGLHju (ORCPT ); Mon, 12 Jul 2021 03:39:50 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C1C486127C; Mon, 12 Jul 2021 07:35:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626075303; bh=JPd5FDLaEWTxgxF4MNIHo12004q4BKHkaAGRwWU5Nng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D0vvC+iC8yjA9NRCJgWRj5BCiWmjcNo9j2UE7F7B3FsdgNCI7L5kZImYJcNM2ns4B YUa8mT3wFEqZgcF68uiGneaPSi2Bgy7S0DBgIPD1sFn1L2eC7+RIJeQtOQA5nb8Rfp pn301mgrtYuoix/CZZx27LV8gBD5LDQJ4Uoxh/bc= 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.13 174/800] Makefile: fix GDB warning with CONFIG_RELR Date: Mon, 12 Jul 2021 08:03:17 +0200 Message-Id: <20210712060937.430170588@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060912.995381202@linuxfoundation.org> References: <20210712060912.995381202@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 069607cfe283..bc039bb78f30 100644 --- a/Makefile +++ b/Makefile @@ -1039,7 +1039,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 # We never want expected sections to be placed heuristically by the 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.