From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 8A9823882AC6 for ; Tue, 18 Jun 2024 16:52:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8A9823882AC6 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8A9823882AC6 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718729546; cv=none; b=Y/myjvz20/FivxVnehUiQzmlMJ5hbFFV2ikkju/5QseE3a164HdIt8BdYKulNKcFe+zc0c4ERMRF/aZnwiZG1Fn5h5ZxpNcxVHwZhGvVCVLzk/TO+C7qVWJ0Q/s3Qu6ntbYKIo9MNholnkVMwUI/Lp5TY2bCckiXTv8YYfieYhk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718729546; c=relaxed/simple; bh=FjIzSPMKzVGwQ+27XGVkAuDpnRojVul7q/1dg5ggg/Q=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:Message-ID:MIME-Version; b=NwScNLiDRmV21X9mI2wLfkKXm80joFjGOCbZhKDo/Cwy0iILe/wpM2dSFNKTUL3JZ4rOz/spfXYvj7SKt6w2o7tsggbwJqnCP+Wh3b7luCbFe9yVxX6UDEZZ2a8NlYcRkB3jh3X9yn8Id+lDCwMGbtPEd3A25s4AMS1l7DGYCE0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id A50B21F789; Tue, 18 Jun 2024 16:52:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1718729542; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=1XVZ8Go1BmNoT0kCLfkM1Cs4VX3K4DI57L9cDDzkVXU=; b=vErUljwbdLVMnskzpStVxfA9RM2IODAtBPeghBGmaS/aW5ZwZM8tpxYtRFLh0SojpPpToY 00hZM7pcnzQ/qOadOMlRgaURLywgeoLi1pg0Ms6sUvCBr/ubFimCGMNMcoeXIuH6sv+DXN KmIgaFMpmPzvAQhmof4dUs0AKJba3SI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1718729542; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=1XVZ8Go1BmNoT0kCLfkM1Cs4VX3K4DI57L9cDDzkVXU=; b=MZStgkzdZNn+/Yiz6IzYOKyvn69HEz/KacVcXv76rC+WNNbeQ4aLyhyvOupFQsWAMb3XfP Jm9nOKrqMH0tOFAg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1718729542; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=1XVZ8Go1BmNoT0kCLfkM1Cs4VX3K4DI57L9cDDzkVXU=; b=vErUljwbdLVMnskzpStVxfA9RM2IODAtBPeghBGmaS/aW5ZwZM8tpxYtRFLh0SojpPpToY 00hZM7pcnzQ/qOadOMlRgaURLywgeoLi1pg0Ms6sUvCBr/ubFimCGMNMcoeXIuH6sv+DXN KmIgaFMpmPzvAQhmof4dUs0AKJba3SI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1718729542; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=1XVZ8Go1BmNoT0kCLfkM1Cs4VX3K4DI57L9cDDzkVXU=; b=MZStgkzdZNn+/Yiz6IzYOKyvn69HEz/KacVcXv76rC+WNNbeQ4aLyhyvOupFQsWAMb3XfP Jm9nOKrqMH0tOFAg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id D6F9C1369F; Tue, 18 Jun 2024 16:52:20 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id UQb9JES7cWZoIwAAD6G6ig (envelope-from ); Tue, 18 Jun 2024 16:52:20 +0000 Date: Tue, 18 Jun 2024 09:52:15 -0700 From: tonyj@suse.de To: systemtap@sourceware.org Cc: mcermak@redhat.com, wcohen@redhat.com Subject: [PATCH] sym.c: fix module_kallsyms_on_each_symbol not exported Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spamd-Result: default: False [-1.59 / 50.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; BAYES_HAM(-0.29)[74.81%]; NEURAL_HAM_SHORT(-0.20)[-0.998]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_NO_DN(0.00)[]; MISSING_XM_UA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_NONE(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email] X-Spam-Score: -1.59 X-Spam-Level: X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_STOCKGEN,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: module_kallsyms_on_each_symbol has never been exported (as noted by 33fae2d0107f ("This one seems simply like a non-export"). If kallsyms_on_each_symbol is exported (a revert of upstream in our SLES case) then '!defined(STAPCONF_KALLSYMS_ON_EACH_SYMBOL_EXPORTED)' is false and the local definition of module_kallsyms_on_each_symbol is skipped. This results in: ERROR: modpost: "module_kallsyms_on_each_symbol" undefined! Fixes: 33fae2d0107fb6166b4eac3fdffd277829849ab0 Signed-off-by: Tony Jones diff --git a/runtime/sym.c b/runtime/sym.c index 23dd3be30..102257965 100644 --- a/runtime/sym.c +++ b/runtime/sym.c @@ -1180,7 +1180,8 @@ unsigned long kallsyms_lookup_name (const char *name) } #endif -#if defined(STAPCONF_KALLSYMS_ON_EACH_SYMBOL) && !defined(STAPCONF_KALLSYMS_ON_EACH_SYMBOL_EXPORTED) +#if defined(STAPCONF_KALLSYMS_ON_EACH_SYMBOL) +#if !defined(STAPCONF_KALLSYMS_ON_EACH_SYMBOL_EXPORTED) #ifndef KALLSYMS_H_INCLUDED #include #endif @@ -1209,11 +1210,12 @@ int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *, _stp_error("BUG: attempting to use unavailable kallsyms_on_each_symbol!!\n"); return 0; } +#endif // !defined(STAPCONF_KALLSYMS_ON_EACH_SYMBOL_EXPORTED) +// XXX module_kallsyms_on_each_symbol has never been exported #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,12,0) typedef typeof(&module_kallsyms_on_each_symbol) module_kallsyms_on_each_symbol_fn; -// XXX Will be linked in place of the kernel's module_kallsyms_on_each_symbol: #if defined(STAPCONF_KALLSYMS_6_4) int module_kallsyms_on_each_symbol(const char *modname, int (*fn)(void *, const char *,