Received-SPF: pass (google.com: domain of linux-kernel+bounces-181735-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
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>,
        Masahiro Yamada <masahiroy@kernel.org>,
        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 v3 5/6] kbuild: generate modules.builtin.ranges when linking the kernel
Date: Fri, 17 May 2024 00:28:38 -0400
Message-ID: <20240517042839.544650-6-kris.van.hees@oracle.com>
In-Reply-To: <20240517042839.544650-1-kris.van.hees@oracle.com>
References: <20240517042839.544650-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?IbdQnHmogaMrLVaqBfy+18tdISq6yfRHEqs9PQjRd5DmlQMc+H9w0HtTF7FU?=
 =?us-ascii?Q?ljetoVdCHH/2xwOnRX3DlEKuPRUx6IsnQL1M07bDXY2zWWXxN1jw72FIzq5N?=
 =?us-ascii?Q?lJ1DBnQG/0482+XtxwkC0127IFC3ZaapCurg04f2+mnkJd0qydG7iE4x5I1J?=
 =?us-ascii?Q?VYWFsoJjrte4A1jn7G0tpWlDTJW5xBKwo/CfddVcY59asBLUf9mSFvDanNz7?=
 =?us-ascii?Q?GHumDPHNGdBnBcgtAoaxVoAtnKQIkq4k4hLQpxA07Wn+sz0tHLr+m3JJYVlO?=
 =?us-ascii?Q?K2xnGSWP8dp4/CxpxKTjisu4+aWYqwI9TmmoEeflYs46HguSZ4LYEFFLLgz3?=
 =?us-ascii?Q?0cy5oCVpH6zKgeKEZBQjPwsZhGaaIXnwebcFrtdXxGU1R1KHbMAXRg1TkVLn?=
 =?us-ascii?Q?WG7BvUsUbhiinvkHj9NQcIkdX0AHsWbuCEp7kJIw9jqeUWqGcBXA2+FuYky7?=
 =?us-ascii?Q?o5OnSlZhnG591+zpsXBpu+OwwajUa4k19bjH7005FwZqLq9wcKN4SHm/DaeM?=
 =?us-ascii?Q?wqrspQUS2qNqLv2R/38Y2eO2fTT+inO525pwiicnb3OuWmNIqpkzl+zOQTNh?=
 =?us-ascii?Q?qFfy8EoJYj9pI06mV7oaiZkKcya1nTRDnyUBFD+AMXVeNKotWY/vwfFcMkdD?=
 =?us-ascii?Q?fTX9/SzqLwOLn9e51TlbK26zy96CVaG0Q3kI4Lu4A0iD2xYxZ/x6b2zW3D6D?=
 =?us-ascii?Q?RmU0XoR3UPRKkf8gUNwX+4Vw8oZHauBy7TAFNGr6mRczmesDBywhFpjh8mfF?=
 =?us-ascii?Q?+ficKFjkzIX9Gd5NQCwtypYDszuj9EITxzrY2J4SZUv3Gw/1mNvmOcdXFqAu?=
 =?us-ascii?Q?EjjLutewQ4gnqXsa7Z98VFGlC7u0/zyNv9naWCN+NVeprfcu3KcGiXEvwTzP?=
 =?us-ascii?Q?lTiD39kqggUIiw2sSm0L5hczUxhbRrNI2CEQyxKid+YuDQoNTio2PQ3MgVIQ?=
 =?us-ascii?Q?5QZh+9T5yJiFKoJZNIP0n/SP0RZx1j1pDArvKQDCBUEcpWrNusxh/TInnErm?=
 =?us-ascii?Q?Uy7p94/M/1NltUi4xLzSrU7nGKfQcN5lp/7z51x8sSsN3MD2EhXCUg1VQwnS?=
 =?us-ascii?Q?hWux7XIC0BPDXuCSA/r6ZZCxZOMM9Wp6dCUNSdeuKUcMeEmyhjnwrqYpGlnP?=
 =?us-ascii?Q?8LxLkqCKvAt6eHIj7MGPEocgh846kqzv1XFNBJlMVQSHZReXEBIIZDAqnhF3?=
 =?us-ascii?Q?GoYs/fVir9LOzZhSfLhUtrWwPYNcd2MXwGHs0XuoBjkrrmq++ST3FPUZgI8G?=
 =?us-ascii?Q?D6gLsV/TQHbOQ5loU/82n8A+VRLit1sgbd8NwRVKeMK9vtZFWL1C6lJLCrnS?=
 =?us-ascii?Q?ZzGBsBHZquWeRRELZrC3/p/SzRW1fl0trlGdS/HzM4ySuJcXTrU9yncAt2Bd?=
 =?us-ascii?Q?6M+14rC/V2knIyZ7HYJW+EByL+wjTacgFhfEoMzmEpG70lh5/HjVnp24mPRc?=
 =?us-ascii?Q?J1g+JBrZAwdLVYuqwJEV//jcXr7ius15+2Q8uWKuzSGGUQRtLc21Yan6V3Tg?=
 =?us-ascii?Q?gDf2db0AWgI4vSb+GOSpsqrtaRU7+pnVt9/DudS6iinEz/V5gGSTVF/TxDOF?=
 =?us-ascii?Q?4JoUHX5M85ksBmE45sMdqKG8+HOf35xG7MuJt9CfDx7bIhfOADOR8FcfJmBb?=
 =?us-ascii?Q?7A=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	z07jlB6qhDxPFNfyV904SbqJSE1boNqWx+DgPS2CnCJj6cP48z93yhy/KE6RCh7ZVxMAD1lyHv3him7uaM6b7Awln0WpXEclE8lY/V5j7BSoYkQ+S8RkT38qO2V8IVnxV5Li2xeRkn7ABwHXlWeLaPQEM0I0469B054dUGuOFRvYlsOsWc2VLZEO3iiVOvL0AL0k+X/scbJGEsoL+h+PVAn5YBi8U5WTgPgQ4JH51dKrVOr6uQZFAf/yG3qlQ/lQxZN7nJ1LcsgljUuXweOE2swAhFUnD2B34m9DgHK4oSrl4Sy+FF6gCYXboB7cowEbX3g+UA/hvb4vNvsB2who+75YDrKXzEfZlWs+7WAs3LrL9LNApD38SBCY/f9TF4/DKBLg5Gr4bkRorm5G4sY19wI++KVQgZiPx2ojfqeXJU57CoP4YBCTXWxjSRxDaPIdrlsGATMKPXoeuvOGZIU3wXK1RD3BtMD6ZyL5vbtEgExpnNgR6bezIP156RHIxLJaVzLF1WlJIacVkHkK550K4ZuCNENUtFZp59GPbWVx9EqiyvxaovHONipp313pU2OVifKUcaVyVUUG4wKGJ/HSPcLdOJZM5yQYm2YiYATAkSo=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 217835b8-c8a2-4e26-93af-08dc762a4f21
X-MS-Exchange-CrossTenant-AuthSource: SN7PR10MB6287.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2024 04:32:06.8873
 (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: Uju9xsSffIzBGqd2QOstq9D5IO4/JY/P/wACHZcjJBjlbdZGRnVkgmpnpaVERkcP3z9N5nXJODrNXbUITWs+AVhB5WYalDrrS56kIvgOYlE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR10MB7746
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-16_07,2024-05-15_01,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-2405170034
X-Proofpoint-ORIG-GUID: -1gHYEWlKQzcp8SiYAN83oHzN0dtzxz6
X-Proofpoint-GUID: -1gHYEWlKQzcp8SiYAN83oHzN0dtzxz6

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
Reviewed-by: Nick Alcock <nick.alcock@oracle.com>
---
Changes since v2:
 - 1st arg to generate_builtin_ranges.awk is now modules.builtin.modinfo
 - Use $(real-prereqs) rather than $(filter-out ...)
---
 scripts/Makefile.vmlinux | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/scripts/Makefile.vmlinux b/scripts/Makefile.vmlinux
index c9f3e03124d7f..afe8287e8dda0 100644
--- a/scripts/Makefile.vmlinux
+++ b/scripts/Makefile.vmlinux
@@ -36,6 +36,22 @@ targets += vmlinux
 vmlinux: scripts/link-vmlinux.sh vmlinux.o $(KBUILD_LDS) FORCE
 	+$(call if_changed_dep,link_vmlinux)
 
+# module.builtin.ranges
+# ---------------------------------------------------------------------------
+ifdef CONFIG_BUILTIN_MODULE_RANGES
+__default: modules.builtin.ranges
+
+quiet_cmd_modules_builtin_ranges = GEN     $@
+      cmd_modules_builtin_ranges = \
+	$(srctree)/scripts/generate_builtin_ranges.awk $(real-prereqs) > $@
+
+vmlinux.map: vmlinux
+
+targets += modules.builtin.ranges
+modules.builtin.ranges: modules.builtin.modinfo vmlinux.map vmlinux.o.map FORCE
+	$(call if_changed,modules_builtin_ranges)
+endif
+
 # Add FORCE to the prequisites of a target to force it to be always rebuilt.
 # ---------------------------------------------------------------------------
 
-- 
2.43.0