From:   Tom Saeger <tom.saeger@oracle.com>
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc:     Naresh Kamboju <naresh.kamboju@linaro.org>,
        John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
        Rich Felker <dalias@libc.org>,
        Masahiro Yamada <masahiroy@kernel.org>,
        Ard Biesheuvel <ardb@kernel.org>,
        Nathan Chancellor <nathan@kernel.org>,
        Dennis Gilmore <dennis@ausil.us>,
        Jisheng Zhang <jszhang@kernel.org>,
        Palmer Dabbelt <palmer@rivosinc.com>,
        Arnd Bergmann <arnd@arndb.de>,
        Andrew Morton <akpm@linux-foundation.org>,
        Tom Saeger <tom.saeger@oracle.com>, stable@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org
Subject: [PATCH 6.1 fix build id for arm64 2/5] powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT
Date:   Fri, 27 Jan 2023 21:10:19 -0700
Message-Id: <f4a3342159c5ddaba69e4ecfd5e997174b6e015c.1674876902.git.tom.saeger@oracle.com>
In-Reply-To: <cover.1674876902.git.tom.saeger@oracle.com>
References: <cover.1674876902.git.tom.saeger@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NltXa6NkSVp635s5CjXotGn87bh1MeeTLo1qSKKPAMcFzdrEI5H0XocXuFnd?=
 =?us-ascii?Q?SkvvJO6fM732hVB4lQtbOIedMkiXRJx+XSqjho6PfkuIJr33m7f32D6vjofS?=
 =?us-ascii?Q?Bef4Vjsh1vlnaLRKmxWHAxGVRkZRxBgYnUX0Dhc2+psjmjMWGOApZMIMRplG?=
 =?us-ascii?Q?n32YzYkWn3FWQjgO0YKKRuxQfC5HieLuxCPn+lvyUBgdvdK6WSb6ps9gEDec?=
 =?us-ascii?Q?6HrFSF+IMtkoK8n2TKTT+SsSSzVN2T2Q7PuAZbX5RewrwU3XQ7+bw0zmx+i6?=
 =?us-ascii?Q?AyDgp0otuo+8IhfoMKWVOjcdK1JBo51tK7+iwI64wt/s7/HXjnOj0U58MHf5?=
 =?us-ascii?Q?Zh676ox0BqCG/z3SjTS4alvOqGWclJmcoyyypMdalPhweW/VuWj6sfEkxQbL?=
 =?us-ascii?Q?vI6M5hUmfWZFTzSWP8IKja9OBJNVMfGBav+RFi6pYnBAvFqlI9DURTaXcm4d?=
 =?us-ascii?Q?cxqcOAkwtLZH2GZ6eAuTZA7WWBV7EZ9bfaxpqt13sZr9ugzJYy0wA09SUMLU?=
 =?us-ascii?Q?DsovWXvY0xHkxtoOyz8+eqE001q7fRJgBNV9eH+lVNEz0ersCn020SYzCarl?=
 =?us-ascii?Q?YnEMvpUwAYo4OFy1t/F71F3biKf0SNhV/TXPkiq6GcXvg9AEg9hexEDadHSd?=
 =?us-ascii?Q?ssrD3SnNMsG+64LSms7Gm10EB8urc4RhotDAzmUL8nLsTnLnVZQLkvzpepKc?=
 =?us-ascii?Q?/PIJ+9KrnqapoaKyki4clP//6QeG37Nmn5e1WQ0e4oazE3Dnij+wn8ovuPH6?=
 =?us-ascii?Q?/MUBytVXkqhiAWKz/zpTN4jpnm6wSIEZfr3P01Sbxt56wEQAexaieEB+juJI?=
 =?us-ascii?Q?daoZnwWC99lcvX7WbX8Q6XF/q9xhZfyy/Zk0S8W8DRc9+zNNvjqy2W1wnfNr?=
 =?us-ascii?Q?CutNZxv6DezITyFsm3MxTWI8LsJia7X35bJI1xMOotji/tDaJVgJ/goUw3ZJ?=
 =?us-ascii?Q?v19//kBWCA/kxbNQkKOVppiou7ZEqn5ECehJDJKa4VvZBU8PshSdUkZOp54z?=
 =?us-ascii?Q?/nh0tLZYL58Vv3YuEUpZpEAj7a7dVhvNa3fcBhwMGLDi/u7go2yVFbzOSmbk?=
 =?us-ascii?Q?3UX76tYE1PLeGUQIdVONhtvo000Oh6YgraHs5j6+bTiEdzkUFw0/muObnBoq?=
 =?us-ascii?Q?axWDHgCPYXI5xF0hmEcExNCcXBCqKbVLHQysHSfN8IW7B7BhNso8oemwAv80?=
 =?us-ascii?Q?tXb8O/nHAG0X6SzL6O16NJD4IRzimxoCnj24q0ibLFjTQD+Il3BQd506x8jl?=
 =?us-ascii?Q?dxmQYc47BtVKduVxef4GBH5l4vvVL3BnO5armLyjsqy7Wo2QcPdssGJvCWKT?=
 =?us-ascii?Q?g4aRbHuNtESmNs/SBLNqlMjU1YtRfJTwmEuAHiGmsNA3+oW/uQpO7KKW8sb0?=
 =?us-ascii?Q?O8fJ5wL+6QJk3AFapbJI4HFmApZ6IgV2CMsf9hWjD/haK52iSNwQLrT48T5i?=
 =?us-ascii?Q?+fZvAjVIwCm2JIH83WeFBPI5cAijMmK8cJbcdoX0qvGarq9FIJEd6XEc+FnZ?=
 =?us-ascii?Q?OHFRG+0lYX/LG/RtjlkOHRYKxXPsPeJ5mH9Zs4tlJFFNmfO8KFDHnD8wWr37?=
 =?us-ascii?Q?IAhFzPNTCwIAHgpw9PRK3S1LLLKpe1BaiS1p620yglEVTC6dpLYySW6SzgXR?=
 =?us-ascii?Q?cwTQlMuGrPhI5hy+tOO71sw=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?CJfFOmVEiFDx5BrGEqaJjra3Oi/US3GeEaRoNXP7jTwQW96CrpCR+YXG8Bag?=
 =?us-ascii?Q?+I7w+cvFoG1AokljLcN/3IFCjRvXjdmG/MEI3ZRVbGil1HmcjI2j5jIGQVbM?=
 =?us-ascii?Q?lt5ofSs/727DhbG84wvnH8T3uUiy9s8w297c/T69U4uKZmiXNjgZh28Tj31h?=
 =?us-ascii?Q?LvHMf6DZP8+lHi/+MiYd9PmiL0613zjOQYxa+eo0bM3H+OWwIRHTu6FaLs7C?=
 =?us-ascii?Q?TN4dGTPqLPzgNXY0KqyojFZkwPaIYy+a2G0joIjwQgVo/GcXC5sEPvD2t8iu?=
 =?us-ascii?Q?+ZWndIgUqmJ5u4AydiCnW20eQVatnrrNoHHHzmZW7FDGyT13GQKTN6kF8l4U?=
 =?us-ascii?Q?7x24RRS4RDPqFYDMkTW2vkE7UE4V+UspN5Bg27e2rNGXQ4Uy+eLLTiOkcvmc?=
 =?us-ascii?Q?62dmABvcENdaxaZIJYyVmAD4NflmHmd41ZqHFB31Ji7QCRURC7Hq4DoA0SMA?=
 =?us-ascii?Q?NER0k+6xC3r5DcP+R8gPl2Cn7RGuoAwLbitNn1Z3xI+4tbL06HRP/q/uIlDh?=
 =?us-ascii?Q?mM5KEkW4L+r1u8qDjuVX438qDaEkZ8ggPdhVP2WX2l/X3hl/muWged21ultH?=
 =?us-ascii?Q?20U9VAv6G1KFc8m0UWdamAO896SAQPORlyyggqsXXmnOlBN2B6ndpA/LAzTs?=
 =?us-ascii?Q?uFE8Il68d4306EH5G/Ks2SP8437rj4m2TkUl48ZVb/lQRKNgA+WauBvw02ha?=
 =?us-ascii?Q?RnZWlJv1A1LGZjLwOs1BKKiZ5o1Bzg4zzwBwDcIn8scshRwwyoALB/Ue6899?=
 =?us-ascii?Q?aVWbk1oS65G0TCIuHDg+7aM5gymL/xjnUzCmf2+4NgHcmbfdTmo8I/0eTi5S?=
 =?us-ascii?Q?mp805dpa7aF51YeDFXsoc9ezD+EIKG+SNOU7k/h0HYfbgjtX/7HO6E6URnUH?=
 =?us-ascii?Q?NQ4wGd7T6FSy5GREMfC8W3PiExYohagb/KYd8poDOQQ09U4JpPlDXl9mdGJm?=
 =?us-ascii?Q?NZc+zwRdsn1kgwoIbjpRcIv6ui2F6cTDmqOuuqikCRVaNkTihuXTVfFONirq?=
 =?us-ascii?Q?H6Zyx7Dbm4yJiKdVw5S+FF6+2AdTIvMtSj8kp6JhbTwlGObmDel3mTnhkhDr?=
 =?us-ascii?Q?hKc09eaP7ur3rBqfZB7FXBy+lPaE0A=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 720f5e1a-ef8c-4a5b-b041-08db00e59abe
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2023 04:10:34.8474
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 2AT38PMGXrB3iL2AAcYT4/Z0BdxRtriiKRt1EJYgJdwlViBe3qleyiTRcEDTBMZkqdYuy9YIuzngkRP5oCp5ww==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB7124
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1
 definitions=2023-01-28_01,2023-01-27_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0
 suspectscore=0 mlxscore=0 spamscore=0 phishscore=0 bulkscore=0
 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2301280039
X-Proofpoint-ORIG-GUID: QbYqKjwBleZwFRpnw8YvU0sy3JnAtuIM
X-Proofpoint-GUID: QbYqKjwBleZwFRpnw8YvU0sy3JnAtuIM
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Michael Ellerman <mpe@ellerman.id.au>

commit 4b9880dbf3bdba3a7c56445137c3d0e30aaa0a40 upstream.

The powerpc linker script explicitly includes .exit.text, because
otherwise the link fails due to references from __bug_table and
__ex_table. The code is freed (discarded) at runtime along with
.init.text and data.

That has worked in the past despite powerpc not defining
RUNTIME_DISCARD_EXIT because DISCARDS appears late in the powerpc linker
script (line 410), and the explicit inclusion of .exit.text
earlier (line 280) supersedes the discard.

However commit 99cb0d917ffa ("arch: fix broken BuildID for arm64 and
riscv") introduced an earlier use of DISCARD as part of the RO_DATA
macro (line 136). With binutils < 2.36 that causes the DISCARD
directives later in the script to be applied earlier [1], causing
.exit.text to actually be discarded at link time, leading to build
errors:

  '.exit.text' referenced in section '__bug_table' of crypto/algboss.o: defined in
  discarded section '.exit.text' of crypto/algboss.o
  '.exit.text' referenced in section '__ex_table' of drivers/nvdimm/core.o: defined in
  discarded section '.exit.text' of drivers/nvdimm/core.o

Fix it by defining RUNTIME_DISCARD_EXIT, which causes the generic
DISCARDS macro to not include .exit.text at all.

1: https://lore.kernel.org/lkml/87fscp2v7k.fsf@igel.home/

Fixes: 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20230105132349.384666-1-mpe@ellerman.id.au
Signed-off-by: Tom Saeger <tom.saeger@oracle.com>
---
 arch/powerpc/kernel/vmlinux.lds.S | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 8c3862b4c259..b24b53134bad 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -24,6 +24,7 @@
 		KEEP(*(__restart_table))				\
 		__stop___restart_table = .;				\
 	}
+#define RUNTIME_DISCARD_EXIT
 
 #include <asm/page.h>
 #include <asm-generic/vmlinux.lds.h>
-- 
2.39.1