Received-SPF: pass (google.com: domain of linux-kernel+bounces-176762-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Kris Van Hees <kris.van.hees@oracle.com>
To: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org,
        linux-modules@vger.kernel.org, linux-trace-kernel@vger.kernel.org
Cc: Kris Van Hees <kris.van.hees@oracle.com>,
        Nick Alcock <nick.alcock@oracle.com>,
        Steven Rostedt <rostedt@goodmis.org>,
        Luis Chamberlain <mcgrof@kernel.org>,
        Masami Hiramatsu <mhiramat@kernel.org>,
        Nick Desaulniers <ndesaulniers@google.com>,
        Jiri Olsa <olsajiri@gmail.com>,
        Elena Zannoni <elena.zannoni@oracle.com>
Subject: [PATCH v2 3/6] kbuild: generate a linker map for vmlinux.o
Date: Sat, 11 May 2024 18:40:32 -0400
Message-ID: <20240511224035.27775-4-kris.van.hees@oracle.com>
In-Reply-To: <20240511224035.27775-1-kris.van.hees@oracle.com>
References: <20240511224035.27775-1-kris.van.hees@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?nd+JMlccDpTEKlDpy577yqOn+o+cB7a/mYCS8LbknGROg7f4P3WtJC5tTtWD?=
 =?us-ascii?Q?6fqJBOVb9YbzFTeIB2vqukb+iZ4sejMbFvNZqUGlInXo2aadUwdHGR5y8j8g?=
 =?us-ascii?Q?91dRc/rI6qvJfvXFD+DFU9rYCO0ilEsdOh8tGPv/pL8oW664AIQhCKA6H7+Y?=
 =?us-ascii?Q?iY6LLJu7FIn9Ycn/O4XxicfI+E/O3zjzKpaTl+hYpdTjZ5fGCxpsBr/jvaCk?=
 =?us-ascii?Q?aiYIOyoWPSukVKkYI5Me5ZUoeoxQBp1IhwidVSaEh3YqHM9weMBVHsh/WPmo?=
 =?us-ascii?Q?PFNK3p2vJfxb3BAVARhYa+2N7wPEburFOZJJAk/0FA1AwpcEowkUFeelqQ0J?=
 =?us-ascii?Q?Ey/VtCT9pGh7W+C5+V5xs5eQOu4r2RE275mqktXPf2i62RpGwcGHf06++GiE?=
 =?us-ascii?Q?H91+zDu1Ke2m91NKRCqs/P4BYaEJOqxflclTlly01FOO4m+PJgmHG+0mYUC3?=
 =?us-ascii?Q?OpOVyvJXOdtalxoSMnUFmLWVKOEFjrZyIQtjpFQmvg1iCJ3pJBKiqE/WFcp9?=
 =?us-ascii?Q?mtTUGFtNPs/KN4vevYukSTIjAlgIPmzTarUVDJzR4BtJI2aFc5qH9FpU8XZn?=
 =?us-ascii?Q?RHABhSsTyelzbTN476+ybmK2RCs8r3U7iStrESpBemPYUooVMDB4FI7iLqzX?=
 =?us-ascii?Q?Z0eGwxKr1BHzMQbk5YD8v8488y8FPnh8YZQUE7nRDIigzzLhck/dqi3G1MyM?=
 =?us-ascii?Q?BuMi+hh3R0Bt/yN8/tiD+6P4Bcmzzb5PiR+9GjJOSkRYZvcU09jPacv89FpW?=
 =?us-ascii?Q?ZE3KouxpFw5Wk2KXCXsbJqx4zLMjmOInkDRDsuQycHM6siFuUVPKYXvhlnA7?=
 =?us-ascii?Q?8Gc0orCa9ec75FfSLsYnZvO3sBGH/x3rFibrU5nhPhq+dzsZm3pJ9LQ05UXy?=
 =?us-ascii?Q?q11kaFuEKV1Z5a6cfNaGwTI+tl8pgWBv4VRM410kQzws9RYbPJP17OZ50ysL?=
 =?us-ascii?Q?Ezn0rK2RCOqbNYXe90Ez2jtsWymEGjM2tTlCYawHlSHGOfojUQMLQVUV/rNY?=
 =?us-ascii?Q?2XvwGF6I5heEIQOd1sjdMJNKmjhNj+WBWylTCkoJ8rr2EOpM+VoqIaAycn6F?=
 =?us-ascii?Q?d6CffT+n0V8cX8BfXNWKEIibF/eqUxBwN9n1IxlJs7rZB/UgZGpqDpvZs5bW?=
 =?us-ascii?Q?J6KyX7ae+hdcbG4siuCTr+FlcqqAWkS6+8UJTb6cOXhMYwPbff3R9wXwItgj?=
 =?us-ascii?Q?mXgXzGThtKHK9RRtxLaV30Y00mwo3aBNuzXImYxfpQIRdKhYSNWrPzsWbRw3?=
 =?us-ascii?Q?g+/PpJxqU2FlXFgO/CjAdTAeF2zfLOB9nWScWX3LZbzWwQZ1cYX+Wyv8V+2X?=
 =?us-ascii?Q?eNL/DzDDlAcLNMQAWzBUIkRr/okV4oC1SoUj0G6PC7OGizSxsQc60uhJz6iU?=
 =?us-ascii?Q?wOgv9zE52UfMYT1XA5ZzhNi8FwSW1ef/DJe4pDIQgWMh9CtmGjqcaGeV4ok0?=
 =?us-ascii?Q?A1xRARnnlE4uw0RYqchJlQX6wTIFAy3fE/4ilimSvkc6K7iEGcx3cii7DZ+d?=
 =?us-ascii?Q?9gps1SDTbHe/+px4ss0FoFrhrTroA8Cw0nBeMLf+uF/eJWeVJ+QX/XuMpt8N?=
 =?us-ascii?Q?IbzVuGEJB1rbjvHCuROGmD0kkzfYOjLgfxaWhV274yzQiMt5q7EF0orPnJWH?=
 =?us-ascii?Q?fA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	SgOVY3NgEMxC4kUPyEMewSZ96c5zzx0XZZu3NUWlH7y0CGRv4edWvTFwd+CGhsF0Bfn3wm2efIKIVEH+Fgja+Tp5mU0k6dvxQzSb/wmMdsBZzr9eUFKLhtLP5K+pMrpzqA7Pc3juLdE65pWS5G+LQa+BM5AcpU54TrXlpfJcITwTG8uzcI5efl0ICeXCXrtmAIPQky/FFnlop1orLQ7WJrS46xkCMjcheXZY/aJq3fAKbbNjupi7fc/WsGMhjg1OtKRcAb18wviSJ1eFMcxtvvqkDXPJRX7OcKBWI3XV6moK2ipiJNjEyDrzyx8uletynlyMjaJymby0yvUxhDi4R6VLjmbhteRU327MreMMUb6IP6/wnHr7GVDpSqO13eRuxIeizbNomfRnESUQpx23G4Vgvmz5O7EKwOxxBNdvtZXVk5/su2TTe0BmbR9ww1woNY1UhQ6gZvGfRsXsuGpbPPFhrCcHoiSQg18N/NcSHbdpcSCYJ+8sa3+0FMJRFVeLUw7i7to3ROF1/00MaA2aMf5+9HspxuTVYJk1XJ/Pd+5WScvRoWIJtTm1MwcclmQwj4FLzl92GrXgTYLox6RPaVGcpPfr+V/2M+p4JYdsr2I=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dbebf08e-f2bb-4d76-c9e5-08dc720bb7dd
X-MS-Exchange-CrossTenant-AuthSource: SN7PR10MB6287.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 22:43:03.5492
 (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: macHHg0pDa8FL8oIq3gW8XklnMMmqMWl8le7B94x8o1pQ9UJUAGBtxiXVg3ITgKAsd54ah2n2YheVETBIyPZTohHY8aPSyT1ny0lNiCU73w=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5184
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26
 definitions=2024-05-11_06,2024-05-10_02,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 mlxlogscore=999 adultscore=0
 bulkscore=0 phishscore=0 suspectscore=0 spamscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000
 definitions=main-2405110171
X-Proofpoint-GUID: jUTHAVBN2C5w31VM2qqsx5jADYgSZj6w
X-Proofpoint-ORIG-GUID: jUTHAVBN2C5w31VM2qqsx5jADYgSZj6w

When CONFIG_BUILTIN_MODULE_RANGES is set, a linker map for vmlinux.o needs
to be generated.  The generation of offset range data for builtin modules
depends on that linker map to know what offsets in an ELF section belong
to an object file for a particular builtin module.

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
Reviewed-by: Nick Alcock <nick.alcock@oracle.com>
---
Changes since v1:
 - Renamed CONFIG_BUILTIN_RANGES to CONFIG_BUILTIN_MODULE_RANGES
---
 scripts/Makefile.vmlinux_o | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/Makefile.vmlinux_o b/scripts/Makefile.vmlinux_o
index 508b3294e2cf1..e4a92838780d5 100644
--- a/scripts/Makefile.vmlinux_o
+++ b/scripts/Makefile.vmlinux_o
@@ -45,9 +45,12 @@ objtool-args = $(vmlinux-objtool-args-y) --link
 # Link of vmlinux.o used for section mismatch analysis
 # ---------------------------------------------------------------------------
 
+vmlinux-o-ld-args-$(CONFIG_BUILTIN_MODULE_RANGES)	+= -Map=$@.map
+
 quiet_cmd_ld_vmlinux.o = LD      $@
       cmd_ld_vmlinux.o = \
 	$(LD) ${KBUILD_LDFLAGS} -r -o $@ \
+	$(vmlinux-o-ld-args-y) \
 	$(addprefix -T , $(initcalls-lds)) \
 	--whole-archive vmlinux.a --no-whole-archive \
 	--start-group $(KBUILD_VMLINUX_LIBS) --end-group \
-- 
2.43.0