From mboxrd@z Thu Jan 1 00:00:00 1970 From: Borislav Petkov Subject: Re: [PATCH] net/3com/3c515: Fix MODULE_ARCH_VERMAGIC redefinition Date: Mon, 13 Apr 2020 10:04:52 +0200 Message-ID: <20200413080452.GA3772@zn.tnic> References: <20200413045555.GE334007@unreal> <20200412.220739.516022706077351913.davem@davemloft.net> <20200413052637.GG334007@unreal> <20200412.223604.1160930629964379276.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20200412.223604.1160930629964379276.davem@davemloft.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane-mx.org@lists.infradead.org To: David Miller , leon@kernel.org Cc: thor.thayer@linux.intel.com, heiko@sntech.de, irusskikh@marvell.com, andreas@gaisler.com, chris.snook@gmail.com, dave@thedillows.org, jes@trained-monkey.org, iyappan@os.amperecomputing.com, quan@os.amperecomputing.com, linux-acenic@sunsite.dk, andy@greyhouse.net, akiyano@amazon.com, linux-rockchip@lists.infradead.org, wens@csie.org, LinoSanfilippo@gmx.de, vfalico@gmail.com, kuba@kernel.org, thomas.lendacky@amd.com, jcliburn@gmail.com, j.vosburgh@gmail.com, keyur@os.amperecomputing.com, mripard@kernel.org, pcnet32@frontier.com, nios2-dev@lists.rocketboards.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, ionut@badula.org, netanel@amazon.com, mark.einon@gmail.com List-Id: linux-rockchip.vger.kernel.org On Sun, Apr 12, 2020 at 10:36:04PM -0700, David Miller wrote: > From: Leon Romanovsky > Date: Mon, 13 Apr 2020 08:26:37 +0300 > > > How do you want us to handle it? Boris resend, me to send, you to fix? > > Anyone other than me can do it ;-) Ok, here's what I'm thinking: that vermagic.h is normally automatically included in the *mod.c as part of the module creation, see add_header() in modpost.c. So then perhaps drivers should not use it directly due to the current inclusion order: linux/module.h includes asm/module.h and that arch-specific header defines MODULE_VERMAGIC* for the respective arch. linux/vermagic.h defines all those fallbacks for those MODULE_VERMAGIC* things and if the inclusion order is swapped - we get the redefinition warning. Yesterday I tried the below - basically get rid of all the remaining includers of linux/vermagic.h but two are left: drivers/net/ethernet/hisilicon/hns3/hns3_enet.c:18:#include drivers/net/ethernet/netronome/nfp/nfp_main.c:17:#include because both use VERMAGIC_STRING directly. So, * one could either allow that and sort the inclusion order so that, for example, asm/module.h includes linux/vermagic.h and thus the fallbacks are there present. or * remove all uses of VERMAGIC_STRING from the drivers, add a header guard which prevents people from using it directly and leave VERMAGIC_STRING only to the internal module machinery in the kernel. Judging by how only a handful of old drivers are even using that, perhaps not too far fetched. In any case, this needs a maintainer decision. Leon, if you wanna do it whatever you guys end up agreeing on, just go ahead and submit the patches - it's not like I don't have anything else on the TODO :-) Just add a Reported-by: me and that should be enough. If you're busy too, lemme know and I'll put it on my todo then. Thx. diff --git a/drivers/net/bonding/bonding_priv.h b/drivers/net/bonding/bonding_priv.h index 45b77bc8c7b3..48cdf3a49a7d 100644 --- a/drivers/net/bonding/bonding_priv.h +++ b/drivers/net/bonding/bonding_priv.h @@ -14,7 +14,7 @@ #ifndef _BONDING_PRIV_H #define _BONDING_PRIV_H -#include +#include #define DRV_NAME "bonding" #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver" diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c index b762176a1406..139d0120f511 100644 --- a/drivers/net/ethernet/3com/3c509.c +++ b/drivers/net/ethernet/3com/3c509.c @@ -85,7 +85,6 @@ #include #include #include -#include #include #include diff --git a/drivers/net/ethernet/3com/3c515.c b/drivers/net/ethernet/3com/3c515.c index 90312fcd6319..47b4215bb93b 100644 --- a/drivers/net/ethernet/3com/3c515.c +++ b/drivers/net/ethernet/3com/3c515.c @@ -22,7 +22,6 @@ */ -#include #define DRV_NAME "3c515" #define CORKSCREW 1 diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c index 2db42211329f..a64191fc2af9 100644 --- a/drivers/net/ethernet/adaptec/starfire.c +++ b/drivers/net/ethernet/adaptec/starfire.c @@ -45,7 +45,6 @@ #include /* Processor type for cache alignment. */ #include #include -#include /* * The current frame processor firmware fails to checksum a fragment diff --git a/drivers/net/ethernet/pensando/ionic/ionic_main.c b/drivers/net/ethernet/pensando/ionic/ionic_main.c index 588c62e9add7..3ed150512091 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_main.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_main.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include "ionic.h" #include "ionic_bus.h" diff --git a/drivers/power/supply/test_power.c b/drivers/power/supply/test_power.c index 65c23ef6408d..b3c05ff05783 100644 --- a/drivers/power/supply/test_power.c +++ b/drivers/power/supply/test_power.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include enum test_power_id { TEST_AC, diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index 89d0b1827aaf..adab97e500cf 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -29,6 +28,8 @@ #include #include +#include + #include "common.h" /* -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette