From patchwork Mon Jul 12 06:05:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 472883 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2651588jao; Sun, 11 Jul 2021 23:35:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuijRGpfQ9Ri3vJtoy8xwN5DHn7N1lv6VA8VPnDcRg8wWRjD9Iy/Z3cycV7i+RRvpt20ua X-Received: by 2002:a05:6402:138c:: with SMTP id b12mr63712166edv.268.1626071731014; Sun, 11 Jul 2021 23:35:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626071731; cv=none; d=google.com; s=arc-20160816; b=kHMIfXoPEdQztEU9LdtlpyZkoozezH7eaIB8BtUqdXE5t4hkeWKFzjJSuZjy1PkZN2 5SeG4GFHMNpwNjoJoqiOhUUHg0rpLqZOJdCNRT70Qy6co104y+hUUntvwTd3fzOsnzRq xUc92JZ0KLoPDMBk3FlGeSDGsEDxyoQzT4Z7JcKux3/OlMA+PDMM0CT9pA0czTCOofu8 G5upDQ4xTX+5evOy1bLAvS3oPtzHsElP9J/5Noumqb/nP5q//dbaw4HbAuGdFnkIJHtW 8K97g/j27ovWoFoUJDahQ01BcoklQYqa/A7vS9B3PuCeb0UqQPHIbFIIVJmoWh2ymVgT vfEw== 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=Der3e4Fu0l4ueHhm6PL1ZzSsfJIhCID4XNnZXbvGXK8=; b=tfafopCzE2t6QqT7hkXIZvJWJj57Gx/0eydjlJRf6AirUtgXvdQmLxCOFezNuGGLOx EQ12SpasOTPGawrcN6bwgYqmVjz3UpjWbW02Z1434dtVWXCgQ9Q1S7eNKUQrEJVBegut 26+G5Vwkm1Z7G9XmJfv2Jqj2EMOFmyu4Jel7+L9CJI+CYhuSfbaOq8gV1OifWIOG5t31 zy5M3AJ/trF3z7I7cdQNXrzBxZJ8PKNgYjAAAQDw88hc3Hk5qMl6cMm9HeoF+NglKIWz 1ogJq14sYU5nnzJ/KR9b4Rb0lp9PdeeEnXQOA+QErOLq1dAqwlC1/0rcPknHu9fZpcZb E1dA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yRi9VgKg; 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 o8si16456940edc.250.2021.07.11.23.35.30; Sun, 11 Jul 2021 23:35:31 -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=yRi9VgKg; 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 S235939AbhGLGiN (ORCPT + 12 others); Mon, 12 Jul 2021 02:38:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:55532 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235990AbhGLGhK (ORCPT ); Mon, 12 Jul 2021 02:37:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5EF6E61156; Mon, 12 Jul 2021 06:33:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626071607; bh=+ZK7Ccb45rA5ogKwV62PBxD4LhJYLedAqvnDSmwSrWM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yRi9VgKgDmEsG0HfJ86H/qDEeqPvf88VyFe3/gOnVdsTYodohnYCfSX9JxxKHUDqZ 1lXOUTQOzfHS0uTvkFgUd6HTTCvmx7H1l/NYnOO53eLZrPpAYoC4zR2QOb85ZNB/gb Y9CaDYcrHZxgOVeUCvLDl4QN5AHly8E/Xyn8dcuw= 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.10 141/593] Makefile: fix GDB warning with CONFIG_RELR Date: Mon, 12 Jul 2021 08:05:01 +0200 Message-Id: <20210712060858.584445500@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@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 c51b73455ea3..ddd30b068be7 100644 --- a/Makefile +++ b/Makefile @@ -978,7 +978,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.