From: Shannon Nelson <shannon.nelson@oracle.com> To: netdev@vger.kernel.org, davem@davemloft.net Cc: sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, Shannon Nelson <shannon.nelson@oracle.com> Subject: [PATCH v2 net-next 1/9] sunvnet: make sunvnet common code dynamically loadable Date: Tue, 7 Feb 2017 14:12:54 -0800 [thread overview] Message-ID: <1486505582-76823-2-git-send-email-shannon.nelson@oracle.com> (raw) In-Reply-To: <1486505582-76823-1-git-send-email-shannon.nelson@oracle.com> When the sunvnet_common code was split out for use by both sunvnet and the newer ldmvsw, it was made into a static kernel library, which limits the usefulness of sunvnet and ldmvsw as loadables, since most of the real work is being done in the shared code. Also, this is simply dead code in kernels that aren't running the LDoms. This patch makes the sunvnet_common into a dynamically loadable module and makes sunvnet and ldmvsw dependent on sunvnet_common. Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com> --- drivers/net/ethernet/sun/Kconfig | 8 ++++++-- drivers/net/ethernet/sun/sunvnet_common.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/sun/Kconfig b/drivers/net/ethernet/sun/Kconfig index a4b40e3..a7d91da 100644 --- a/drivers/net/ethernet/sun/Kconfig +++ b/drivers/net/ethernet/sun/Kconfig @@ -70,19 +70,23 @@ config CASSINI <http://docs.oracle.com/cd/E19113-01/giga.ether.pci/817-4341-10/817-4341-10.pdf>. config SUNVNET_COMMON - bool + tristate "Common routines to support Sun Virtual Networking" depends on SUN_LDOMS - default y if SUN_LDOMS + default m if SUN_LDOMS config SUNVNET tristate "Sun Virtual Network support" + default m depends on SUN_LDOMS + depends on SUNVNET_COMMON ---help--- Support for virtual network devices under Sun Logical Domains. config LDMVSW tristate "Sun4v LDoms Virtual Switch support" + default m depends on SUN_LDOMS + depends on SUNVNET_COMMON ---help--- Support for virtual switch devices under Sun4v Logical Domains. This driver adds a network interface for every vsw-port node diff --git a/drivers/net/ethernet/sun/sunvnet_common.c b/drivers/net/ethernet/sun/sunvnet_common.c index 191c8ad..e03cf13 100644 --- a/drivers/net/ethernet/sun/sunvnet_common.c +++ b/drivers/net/ethernet/sun/sunvnet_common.c @@ -37,6 +37,35 @@ */ #define VNET_MAX_RETRIES 10 +#define DRV_MODULE_NAME "sunvnet_common" +#define DRV_MODULE_VERSION "1.1" +#define DRV_MODULE_RELDATE "February 3, 2017" + +static char version[] = + DRV_MODULE_NAME " " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")"; +MODULE_AUTHOR("David S. Miller (davem@davemloft.net)"); +MODULE_DESCRIPTION("Sun LDOM virtual network support library"); +MODULE_LICENSE("GPL"); +MODULE_VERSION(DRV_MODULE_VERSION); + +static int __init sunvnet_common_init(void) +{ + pr_info("%s\n", version); + return 0; +} +module_init(sunvnet_common_init); + +static void __exit sunvnet_common_exit(void) +{ + /* Empty function, just here to fill the exit function pointer + * slot. In some combinations of older gcc and newer kernel, + * leaving this undefined results in the kernel marking it as a + * permanent module; it will show up in lsmod output as [permanent] + * and not be unloadable. + */ +} +module_exit(sunvnet_common_exit); + static int __vnet_tx_trigger(struct vnet_port *port, u32 start); static void vnet_port_reset(struct vnet_port *port); -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: Shannon Nelson <shannon.nelson@oracle.com> To: netdev@vger.kernel.org, davem@davemloft.net Cc: sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, Shannon Nelson <shannon.nelson@oracle.com> Subject: [PATCH v2 net-next 1/9] sunvnet: make sunvnet common code dynamically loadable Date: Tue, 07 Feb 2017 22:12:54 +0000 [thread overview] Message-ID: <1486505582-76823-2-git-send-email-shannon.nelson@oracle.com> (raw) In-Reply-To: <1486505582-76823-1-git-send-email-shannon.nelson@oracle.com> When the sunvnet_common code was split out for use by both sunvnet and the newer ldmvsw, it was made into a static kernel library, which limits the usefulness of sunvnet and ldmvsw as loadables, since most of the real work is being done in the shared code. Also, this is simply dead code in kernels that aren't running the LDoms. This patch makes the sunvnet_common into a dynamically loadable module and makes sunvnet and ldmvsw dependent on sunvnet_common. Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com> --- drivers/net/ethernet/sun/Kconfig | 8 ++++++-- drivers/net/ethernet/sun/sunvnet_common.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/sun/Kconfig b/drivers/net/ethernet/sun/Kconfig index a4b40e3..a7d91da 100644 --- a/drivers/net/ethernet/sun/Kconfig +++ b/drivers/net/ethernet/sun/Kconfig @@ -70,19 +70,23 @@ config CASSINI <http://docs.oracle.com/cd/E19113-01/giga.ether.pci/817-4341-10/817-4341-10.pdf>. config SUNVNET_COMMON - bool + tristate "Common routines to support Sun Virtual Networking" depends on SUN_LDOMS - default y if SUN_LDOMS + default m if SUN_LDOMS config SUNVNET tristate "Sun Virtual Network support" + default m depends on SUN_LDOMS + depends on SUNVNET_COMMON ---help--- Support for virtual network devices under Sun Logical Domains. config LDMVSW tristate "Sun4v LDoms Virtual Switch support" + default m depends on SUN_LDOMS + depends on SUNVNET_COMMON ---help--- Support for virtual switch devices under Sun4v Logical Domains. This driver adds a network interface for every vsw-port node diff --git a/drivers/net/ethernet/sun/sunvnet_common.c b/drivers/net/ethernet/sun/sunvnet_common.c index 191c8ad..e03cf13 100644 --- a/drivers/net/ethernet/sun/sunvnet_common.c +++ b/drivers/net/ethernet/sun/sunvnet_common.c @@ -37,6 +37,35 @@ */ #define VNET_MAX_RETRIES 10 +#define DRV_MODULE_NAME "sunvnet_common" +#define DRV_MODULE_VERSION "1.1" +#define DRV_MODULE_RELDATE "February 3, 2017" + +static char version[] + DRV_MODULE_NAME " " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")"; +MODULE_AUTHOR("David S. Miller (davem@davemloft.net)"); +MODULE_DESCRIPTION("Sun LDOM virtual network support library"); +MODULE_LICENSE("GPL"); +MODULE_VERSION(DRV_MODULE_VERSION); + +static int __init sunvnet_common_init(void) +{ + pr_info("%s\n", version); + return 0; +} +module_init(sunvnet_common_init); + +static void __exit sunvnet_common_exit(void) +{ + /* Empty function, just here to fill the exit function pointer + * slot. In some combinations of older gcc and newer kernel, + * leaving this undefined results in the kernel marking it as a + * permanent module; it will show up in lsmod output as [permanent] + * and not be unloadable. + */ +} +module_exit(sunvnet_common_exit); + static int __vnet_tx_trigger(struct vnet_port *port, u32 start); static void vnet_port_reset(struct vnet_port *port); -- 1.7.1
next prev parent reply other threads:[~2017-02-07 22:17 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-02-07 22:12 [PATCH v2 net-next 0/9] sunvnet driver updates Shannon Nelson 2017-02-07 22:12 ` Shannon Nelson 2017-02-07 22:12 ` Shannon Nelson [this message] 2017-02-07 22:12 ` [PATCH v2 net-next 1/9] sunvnet: make sunvnet common code dynamically loadable Shannon Nelson 2017-02-08 19:29 ` David Miller 2017-02-08 19:29 ` David Miller 2017-02-08 21:50 ` Shannon Nelson 2017-02-08 21:50 ` Shannon Nelson 2017-02-07 22:12 ` [PATCH v2 net-next 2/9] sunvnet: remove unused variable in maybe_tx_wakeup Shannon Nelson 2017-02-07 22:12 ` Shannon Nelson 2017-02-07 22:12 ` [PATCH v2 net-next 3/9] sunvnet: update version and version printing Shannon Nelson 2017-02-07 22:12 ` Shannon Nelson 2017-02-07 22:12 ` [PATCH v2 net-next 4/9] sunvnet: add driver stats for ethtool support Shannon Nelson 2017-02-07 22:12 ` Shannon Nelson 2017-02-07 22:12 ` [PATCH v2 net-next 5/9] sunvnet: add memory barrier before check for tx enable Shannon Nelson 2017-02-07 22:12 ` Shannon Nelson 2017-02-07 22:12 ` [PATCH v2 net-next 6/9] sunvnet: straighten up message event handling logic Shannon Nelson 2017-02-07 22:12 ` Shannon Nelson 2017-02-08 15:59 ` Sowmini Varadhan 2017-02-08 15:59 ` Sowmini Varadhan 2017-02-08 16:28 ` Shannon Nelson 2017-02-08 16:28 ` Shannon Nelson 2017-02-08 16:34 ` Sowmini Varadhan 2017-02-08 16:34 ` Sowmini Varadhan 2017-02-07 22:13 ` [PATCH v2 net-next 7/9] sunvnet: remove extra rcu_read_unlocks Shannon Nelson 2017-02-07 22:13 ` Shannon Nelson 2017-02-07 22:13 ` [PATCH v2 net-next 8/9] ldmvsw: update and simplify version string Shannon Nelson 2017-02-07 22:13 ` Shannon Nelson 2017-02-07 22:13 ` [PATCH v2 net-next 9/9] ldmvsw: disable tso and gso for bridge operations Shannon Nelson 2017-02-07 22:13 ` Shannon Nelson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1486505582-76823-2-git-send-email-shannon.nelson@oracle.com \ --to=shannon.nelson@oracle.com \ --cc=davem@davemloft.net \ --cc=linux-kernel@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=sparclinux@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.