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>,
        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 5.15 fix build id for arm64 2/5] powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT
Date:   Fri, 27 Jan 2023 13:40:08 -0700
Message-Id: <53aa41078473a9e5475cb4607e5a8c890658dfd0.1674851705.git.tom.saeger@oracle.com>
In-Reply-To: <cover.1674851705.git.tom.saeger@oracle.com>
References: <cover.1674851705.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?21l4bO9HfLvdtao4YROIjr5tsax3u93RL6/WRiv8jpr/8OAbVb2evEys3kvh?=
 =?us-ascii?Q?m02xukw5Kp+DMZT2V88cmLoRsGcPNjZYIcumf0Eqk3t8bHpjDKWoAjAf6eTw?=
 =?us-ascii?Q?ENWt73KnJ4hcGPG8Pq3H5v55G3f6x9u/dZcj/KQJMtL89xAdJHyjMTLB/Stl?=
 =?us-ascii?Q?xk6akJUjHjoEBkJzzdZm5ZsPd5WbkWvObM2TKWvsT/DNG2FQzd1lfMzWXC4O?=
 =?us-ascii?Q?Q6KWAQazi4gkzkcIwLWmxbaImQVvibNPRbQjOj9VAUyunN4ognhD5N/o7qyK?=
 =?us-ascii?Q?4UrM4zm14iy8eEWqmq56G5FradqLgr/a7G6qytGAud8wKX2Z9uwbmiQ9/op6?=
 =?us-ascii?Q?4hIMi+ANTTvfnXLPFLSbQVwS2HQL93ZGjVBCgx6PAAZQjWyhoyvQ4W4aEu8+?=
 =?us-ascii?Q?QgmSeRqSt2GO0GvqgSjNvyrLzaOE0Si5Tedj6JfMeaKGCgKnGJZks7NUy7su?=
 =?us-ascii?Q?P5xwa99MI/dYU0Uu7yDqAtj7rmDlVTrXuevJ+0qNjgNm22lM/t1gMTvrPpsb?=
 =?us-ascii?Q?ELb0BYUnHtRsNFtBvw9e97yZJBuTy0JjQpLcs+/lZ61CQfWE5ZZ6yDnz1HHu?=
 =?us-ascii?Q?PLHF70uhUf54FKBNwD3fLvBUuZz/GueKWPvgsDMms0zaKHJYGadsgSp81WNa?=
 =?us-ascii?Q?FBb+llqbKWW+5hdIioIAF10PI3GZZysYZZZLGLXo6dFBbFKFxJAsUXf47Qgb?=
 =?us-ascii?Q?zw8n+8R9fyAtnMqdN4HMy1+wwbRFKiWXhW6mey8fwM6o1XG92PcqlBm0oC45?=
 =?us-ascii?Q?n4RPQzCdkm9PhdqMgLbNYT/1mKQQFifNj3BtX14BHLvlEsd6MRZUuiLL3qnz?=
 =?us-ascii?Q?84SdLzph8x4fQUnZnh+JupnaK1qbEdqPEt4nHEX7BdOYeUNGr6FtHchzTF8Z?=
 =?us-ascii?Q?AAFFAKRF38zT3LpTs01QNYeDqh/LShtjX93RUfSnprxz46/Zmuw7w89P8imr?=
 =?us-ascii?Q?JtTtkyCPnqIBgckbb8XxWElVRdE+hkJTWpsNGBy7Wd8LK40QBUCpGsG0JufS?=
 =?us-ascii?Q?XJTDuqgz4eOGXXSGJpnT8Li7WCvgUOOiIIA+vJdTICBZGLXePS/1FPDfMifK?=
 =?us-ascii?Q?w3cMTxOXXVrQ8/OYl2FUD6ak7NcS6BCDkrhxwNYxIrXqP/45XaMh6ZQUEqeh?=
 =?us-ascii?Q?+gNRJ2bRECRTl2Tw0eAhfbZZdtpEXTatloZ4dg1KtmjQr80zdte2KCZENlo3?=
 =?us-ascii?Q?FKO0Ehp7/pgrlVF9VSCLT62qg6q5FOYP1OjXHGOyFIzvIDggJLiBImD7s2/3?=
 =?us-ascii?Q?H5GhBppFv3tN7Aox1MEOtgX9LpjNpYHf8DHVAE/m93cVHdv6m4mUTRrDTerQ?=
 =?us-ascii?Q?t+SbPe7YNplq/MLFR9qY1z0slep1AeuxSjXyzR3oOaC0aJThsducT1H6AMQV?=
 =?us-ascii?Q?E1uzPsN/1TUfNSAAibFHcZ8XP00eltC51B6QYdTpfkJ/1jsfuvWUbtd4RjZN?=
 =?us-ascii?Q?yfar2E56OntQexd6U+13qBCdtEAMpWLjjjzsjr+bIQd5NOqZqtwQJ/NeB07Q?=
 =?us-ascii?Q?IwAluUDy4IRRBuns7IpH4iRnEMF7clEYuWE1FPGQ/TH7w4WCS5ZduUtNMS//?=
 =?us-ascii?Q?/0P8iL195A18UJSXQ9HY3AuC/EyijWiXR4bPbD8F2DHYEtJ6X5lmvy3psas9?=
 =?us-ascii?Q?J9X+mk4tcb2rPy38dVyTN0k=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?63PQ7HKeNX/2VfIbf9H/6nmZjtTxvNg6cjUkgO8cyHoTVPyq7iHVfHZWZPNR?=
 =?us-ascii?Q?Pbml8dDrLjAcIHb+kkUyi3487qC+PShUp7CdkwBb8IOkKUboEXagiElAurh8?=
 =?us-ascii?Q?zY9ZwoXQMc2EfdsOMhb/ssug2alXLeLJeQHWmbQHAU9bTiT2cWEWrW5r337O?=
 =?us-ascii?Q?QQhP9W15L3ATgj3Imwfe1H0Zc9ivSui+qzJairwY1ijUiZmdXbhBu0d/v6tC?=
 =?us-ascii?Q?ZgSNDNDkYwEtzzJhnjCsvQRyH1fdpokXM+42FTEL3KjZnNI9J+jlkINH2Tew?=
 =?us-ascii?Q?5RPqvpacEjczHz7eQn789rF7ppowZRCqFxrEq8KcoaogPsmPzrwhm2FflCIs?=
 =?us-ascii?Q?jbvx0hlkfMiaQvQEMIxrmLDhw4M+7XT0W18fDg4zfPyZ6+ZAzHB2lP/H+rso?=
 =?us-ascii?Q?40Ftn3aJkRU238VuYlWzguf5CV+Yo09BXbEOhT0pKD9sYYZw1py33mxcmojm?=
 =?us-ascii?Q?xpa0tJlFyQb0gxy1DpLnCpYpIR2UflGLgFksAk9VQE68dhmoZ0r0IHJHrEj8?=
 =?us-ascii?Q?KL6lsEnxUHwoyrOQeLuxtXKOp2NG2C0lhTNjXDnW04FP01wGLu/jEZjnJoqP?=
 =?us-ascii?Q?hqFz9S1LXS9peZwwzFgDYbRWhO8nORNqSEzoSCsGTnj1t8NJoAKZo73NLrFl?=
 =?us-ascii?Q?cCzims+iQVef+ndWo955YNbLMIapQdRKLfDD1zZLcXqCurjIIkqEaizyGZ48?=
 =?us-ascii?Q?YG+x27RW/lbI+GWyKxw2snJwtKvAdktmAntLeM7s73G3A8XlrKHdDCB/hprS?=
 =?us-ascii?Q?A6SD9HzBc8J73jHQ5m9TZw+HnsrgiQC+hmn6VwYLv0vVt64I+HD7AUXKVzPV?=
 =?us-ascii?Q?IDmenl4vLlXfEV+CciXT+VrgG8mnpFLFx9dV2m13pk8feLM+rB/W6HmYGFV9?=
 =?us-ascii?Q?21GYoUXr/V9oChaItLAAKU6yd4I1fsFqsJEXsJAYDkzPr6mkC6L6L1d/StgO?=
 =?us-ascii?Q?42DeKobHbFxbuqV7CrxEG4hN3HfJ7v1AKaoR/fRY4ytpkYev7trAvbMDTvLj?=
 =?us-ascii?Q?H2mFscoA36x7z8Mg4Mnbrp69Asx9Trs2dMrjzb+kNpIL22CUtRZWxwhUi3m1?=
 =?us-ascii?Q?CmkHsQ8SxzJ51Ae6bt3C7y73Q3AlUw=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: af555a53-89d2-4906-a121-08db00a6b6ee
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2023 20:40:23.8751
 (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: 16XXKK9AjoR4NWrHSad7yXu8zitvnrod/bRlhG2p4xz658P/gGvsvh4/50E2UhAP7cMKhTWe+yqxybMrC927kQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB5019
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-27_13,2023-01-27_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxscore=0 spamscore=0
 bulkscore=0 mlxlogscore=999 malwarescore=0 adultscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2301270190
X-Proofpoint-GUID: 9At66RkmU9ubrHUHTFUtyftKoXh9agF-
X-Proofpoint-ORIG-GUID: 9At66RkmU9ubrHUHTFUtyftKoXh9agF-
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 1a63e37f336a..2cfb1b52d123 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