From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78C01C433F5 for ; Thu, 17 Mar 2022 15:50:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236219AbiCQPvV (ORCPT ); Thu, 17 Mar 2022 11:51:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236191AbiCQPvU (ORCPT ); Thu, 17 Mar 2022 11:51:20 -0400 Received: from mail.netfilter.org (mail.netfilter.org [217.70.188.207]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E146F16F6C0; Thu, 17 Mar 2022 08:50:01 -0700 (PDT) Received: from netfilter.org (unknown [78.30.32.163]) by mail.netfilter.org (Postfix) with ESMTPSA id 80A5B601C6; Thu, 17 Mar 2022 16:47:31 +0100 (CET) Date: Thu, 17 Mar 2022 16:49:55 +0100 From: Pablo Neira Ayuso To: Randy Dunlap Cc: linux-kernel@vger.kernel.org, "Michael S. Tsirkin" , Jason Wang , Paolo Bonzini , Stefan Hajnoczi , Jens Axboe , Amit Shah , Arnd Bergmann , Greg Kroah-Hartman , Eli Cohen , Saeed Mahameed , Leon Romanovsky , Jozsef Kadlecsik , Florian Westphal , "David S. Miller" , Jakub Kicinski , "James E.J. Bottomley" , "Martin K. Petersen" , Felipe Balbi , =?utf-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= , Sebastian Andrzej Siewior , Krzysztof Opasiak , Igor Kotrasinski , Valentina Manea , Shuah Khan , Shuah Khan , Jussi Kivilinna , Joachim Fritschi , Herbert Xu , Thomas Gleixner , Steven Rostedt , Ingo Molnar , Karol Herbst , Pekka Paalanen , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Borislav Petkov , "H. Peter Anvin" , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-block@vger.kernel.org, linux-crypto@vger.kernel.org, linux-rdma@vger.kernel.org, linux-scsi@vger.kernel.org, linux-usb@vger.kernel.org, nouveau@lists.freedesktop.org, virtualization@lists.linux-foundation.org, x86@kernel.org Subject: Re: [PATCH 4/9] netfilter: h323: eliminate anonymous module_init & module_exit Message-ID: References: <20220316192010.19001-1-rdunlap@infradead.org> <20220316192010.19001-5-rdunlap@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20220316192010.19001-5-rdunlap@infradead.org> Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org On Wed, Mar 16, 2022 at 12:20:05PM -0700, Randy Dunlap wrote: > Eliminate anonymous module_init() and module_exit(), which can lead to > confusion or ambiguity when reading System.map, crashes/oops/bugs, > or an initcall_debug log. > > Give each of these init and exit functions unique driver-specific > names to eliminate the anonymous names. > > Example 1: (System.map) > ffffffff832fc78c t init > ffffffff832fc79e t init > ffffffff832fc8f8 t init > > Example 2: (initcall_debug log) > calling init+0x0/0x12 @ 1 > initcall init+0x0/0x12 returned 0 after 15 usecs > calling init+0x0/0x60 @ 1 > initcall init+0x0/0x60 returned 0 after 2 usecs > calling init+0x0/0x9a @ 1 > initcall init+0x0/0x9a returned 0 after 74 usecs LGTM. Should I route this through the netfilter tree? > Fixes: f587de0e2feb ("[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port") > Signed-off-by: Randy Dunlap > Cc: Pablo Neira Ayuso > Cc: Jozsef Kadlecsik > Cc: Florian Westphal > Cc: netfilter-devel@vger.kernel.org > Cc: coreteam@netfilter.org > Cc: "David S. Miller" > Cc: Jakub Kicinski > Cc: netdev@vger.kernel.org > --- > net/ipv4/netfilter/nf_nat_h323.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > --- lnx-517-rc8.orig/net/ipv4/netfilter/nf_nat_h323.c > +++ lnx-517-rc8/net/ipv4/netfilter/nf_nat_h323.c > @@ -580,7 +580,7 @@ static struct nf_ct_helper_expectfn call > }; > > /****************************************************************************/ > -static int __init init(void) > +static int __init nf_nat_h323_init(void) > { > BUG_ON(set_h245_addr_hook != NULL); > BUG_ON(set_h225_addr_hook != NULL); > @@ -607,7 +607,7 @@ static int __init init(void) > } > > /****************************************************************************/ > -static void __exit fini(void) > +static void __exit nf_nat_h323_fini(void) > { > RCU_INIT_POINTER(set_h245_addr_hook, NULL); > RCU_INIT_POINTER(set_h225_addr_hook, NULL); > @@ -624,8 +624,8 @@ static void __exit fini(void) > } > > /****************************************************************************/ > -module_init(init); > -module_exit(fini); > +module_init(nf_nat_h323_init); > +module_exit(nf_nat_h323_fini); > > MODULE_AUTHOR("Jing Min Zhao "); > MODULE_DESCRIPTION("H.323 NAT helper"); From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E54EFC4332F for ; Sun, 27 Mar 2022 07:44:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BAEA010E21B; Sun, 27 Mar 2022 07:44:08 +0000 (UTC) X-Greylist: delayed 488 seconds by postgrey-1.36 at gabe; Thu, 17 Mar 2022 15:58:09 UTC Received: from mail.netfilter.org (mail.netfilter.org [217.70.188.207]) by gabe.freedesktop.org (Postfix) with ESMTP id CFB0910EB9B for ; Thu, 17 Mar 2022 15:58:09 +0000 (UTC) Received: from netfilter.org (unknown [78.30.32.163]) by mail.netfilter.org (Postfix) with ESMTPSA id 80A5B601C6; Thu, 17 Mar 2022 16:47:31 +0100 (CET) Date: Thu, 17 Mar 2022 16:49:55 +0100 From: Pablo Neira Ayuso To: Randy Dunlap Message-ID: References: <20220316192010.19001-1-rdunlap@infradead.org> <20220316192010.19001-5-rdunlap@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20220316192010.19001-5-rdunlap@infradead.org> X-Mailman-Approved-At: Sun, 27 Mar 2022 07:44:03 +0000 Subject: Re: [Nouveau] [PATCH 4/9] netfilter: h323: eliminate anonymous module_init & module_exit X-BeenThere: nouveau@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Nouveau development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: x86@kernel.org, Andy Lutomirski , "Michael S. Tsirkin" , Peter Zijlstra , nouveau@lists.freedesktop.org, Jason Wang , Dave Hansen , Valentina Manea , Krzysztof Opasiak , Eli Cohen , netdev@vger.kernel.org, Shuah Khan , Thomas Gleixner , "H. Peter Anvin" , Arnd Bergmann , Leon Romanovsky , linux-rdma@vger.kernel.org, Ingo Molnar , Jozsef Kadlecsik , coreteam@netfilter.org, Jakub Kicinski , Sebastian Andrzej Siewior , Joachim Fritschi , Felipe Balbi , Amit Shah , "James E.J. Bottomley" , Steven Rostedt , =?utf-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= , linux-block@vger.kernel.org, Pekka Paalanen , Borislav Petkov , Stefan Hajnoczi , Shuah Khan , Jussi Kivilinna , virtualization@lists.linux-foundation.org, Herbert Xu , Jens Axboe , linux-scsi@vger.kernel.org, "Martin K. Petersen" , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Florian Westphal , linux-kernel@vger.kernel.org, netfilter-devel@vger.kernel.org, linux-crypto@vger.kernel.org, Igor Kotrasinski , Paolo Bonzini , Saeed Mahameed , "David S. Miller" Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" On Wed, Mar 16, 2022 at 12:20:05PM -0700, Randy Dunlap wrote: > Eliminate anonymous module_init() and module_exit(), which can lead to > confusion or ambiguity when reading System.map, crashes/oops/bugs, > or an initcall_debug log. > > Give each of these init and exit functions unique driver-specific > names to eliminate the anonymous names. > > Example 1: (System.map) > ffffffff832fc78c t init > ffffffff832fc79e t init > ffffffff832fc8f8 t init > > Example 2: (initcall_debug log) > calling init+0x0/0x12 @ 1 > initcall init+0x0/0x12 returned 0 after 15 usecs > calling init+0x0/0x60 @ 1 > initcall init+0x0/0x60 returned 0 after 2 usecs > calling init+0x0/0x9a @ 1 > initcall init+0x0/0x9a returned 0 after 74 usecs LGTM. Should I route this through the netfilter tree? > Fixes: f587de0e2feb ("[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port") > Signed-off-by: Randy Dunlap > Cc: Pablo Neira Ayuso > Cc: Jozsef Kadlecsik > Cc: Florian Westphal > Cc: netfilter-devel@vger.kernel.org > Cc: coreteam@netfilter.org > Cc: "David S. Miller" > Cc: Jakub Kicinski > Cc: netdev@vger.kernel.org > --- > net/ipv4/netfilter/nf_nat_h323.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > --- lnx-517-rc8.orig/net/ipv4/netfilter/nf_nat_h323.c > +++ lnx-517-rc8/net/ipv4/netfilter/nf_nat_h323.c > @@ -580,7 +580,7 @@ static struct nf_ct_helper_expectfn call > }; > > /****************************************************************************/ > -static int __init init(void) > +static int __init nf_nat_h323_init(void) > { > BUG_ON(set_h245_addr_hook != NULL); > BUG_ON(set_h225_addr_hook != NULL); > @@ -607,7 +607,7 @@ static int __init init(void) > } > > /****************************************************************************/ > -static void __exit fini(void) > +static void __exit nf_nat_h323_fini(void) > { > RCU_INIT_POINTER(set_h245_addr_hook, NULL); > RCU_INIT_POINTER(set_h225_addr_hook, NULL); > @@ -624,8 +624,8 @@ static void __exit fini(void) > } > > /****************************************************************************/ > -module_init(init); > -module_exit(fini); > +module_init(nf_nat_h323_init); > +module_exit(nf_nat_h323_fini); > > MODULE_AUTHOR("Jing Min Zhao "); > MODULE_DESCRIPTION("H.323 NAT helper");