[PATCH] ipvs: fix header inline net_ipvs function to work without CONFIG_IP_VS

[PATCH] ipvs: fix header inline net_ipvs function to work without CONFIG_IP_VS

[Rafał Miłecki]

Including net/ip_vs.h without CONFIG_IP_VS was causing:
include/net/ip_vs.h: In function 'net_ipvs':
include/net/ip_vs.h:35:12: error: 'struct net' has no member named 'ipvs'

Fixes: 8b4d14d8eb368 ("netns: exclude ipvs from struct net when IPVS disabled")
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
 include/net/ip_vs.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 615b20b..cd3942f 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -32,7 +32,10 @@
 /* Generic access of ipvs struct */
 static inline struct netns_ipvs *net_ipvs(struct net* net)
 {
+#if IS_ENABLED(CONFIG_IP_VS)
 	return net->ipvs;
+#endif
+	return NULL;
 }
 
 /* Get net ptr from skb in traffic cases
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] ipvs: fix header inline net_ipvs function to work without CONFIG_IP_VS

[Nicolas Dichtel]

Le 25/03/2015 09:53, Rafał Miłecki a écrit :
> Including net/ip_vs.h without CONFIG_IP_VS was causing:
> include/net/ip_vs.h: In function 'net_ipvs':
> include/net/ip_vs.h:35:12: error: 'struct net' has no member named 'ipvs'
>
> Fixes: 8b4d14d8eb368 ("netns: exclude ipvs from struct net when IPVS disabled")
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
> ---
>   include/net/ip_vs.h | 3 +++
>   1 file changed, 3 insertions(+)
>
> diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
> index 615b20b..cd3942f 100644
> --- a/include/net/ip_vs.h
> +++ b/include/net/ip_vs.h
> @@ -32,7 +32,10 @@
>   /* Generic access of ipvs struct */
>   static inline struct netns_ipvs *net_ipvs(struct net* net)
>   {
> +#if IS_ENABLED(CONFIG_IP_VS)
>   	return net->ipvs;
> +#endif
> +	return NULL;
>   }
This function is used only by the ipvs module, maybe it should be defined only
when CONFIG_IP_VS is set?

Anyway, it must not return NULL, all callers assume that the pointer is valid.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V2] ipvs: disable inline net_ipvs function with CONFIG_IP_VS not being set

[Rafał Miłecki]

Including net/ip_vs.h without CONFIG_IP_VS was causing:
include/net/ip_vs.h: In function 'net_ipvs':
include/net/ip_vs.h:35:12: error: 'struct net' has no member named 'ipvs'

Fixes: 8b4d14d8eb368 ("netns: exclude ipvs from struct net when IPVS disabled")
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
V2: Disable function totally instead of returning NULL.
---
 include/net/ip_vs.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 615b20b..e6f2f2a 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -29,11 +29,13 @@
 #endif
 #include <net/net_namespace.h>		/* Netw namespace */
 
+#if IS_ENABLED(CONFIG_IP_VS)
 /* Generic access of ipvs struct */
 static inline struct netns_ipvs *net_ipvs(struct net* net)
 {
 	return net->ipvs;
 }
+#endif
 
 /* Get net ptr from skb in traffic cases
  * use skb_sknet when call is from userland (ioctl or netlink)
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH V2] ipvs: disable inline net_ipvs function with CONFIG_IP_VS not being set

[Nicolas Dichtel]

Le 25/03/2015 10:17, Rafał Miłecki a écrit :
> Including net/ip_vs.h without CONFIG_IP_VS was causing:
> include/net/ip_vs.h: In function 'net_ipvs':
> include/net/ip_vs.h:35:12: error: 'struct net' has no member named 'ipvs'
>
> Fixes: 8b4d14d8eb368 ("netns: exclude ipvs from struct net when IPVS disabled")
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
> ---
> V2: Disable function totally instead of returning NULL.
> ---
>   include/net/ip_vs.h | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
> index 615b20b..e6f2f2a 100644
> --- a/include/net/ip_vs.h
> +++ b/include/net/ip_vs.h
> @@ -29,11 +29,13 @@
>   #endif
>   #include <net/net_namespace.h>		/* Netw namespace */
>
> +#if IS_ENABLED(CONFIG_IP_VS)
>   /* Generic access of ipvs struct */
>   static inline struct netns_ipvs *net_ipvs(struct net* net)
>   {
>   	return net->ipvs;
>   }
> +#endif
Ok, but this fix nothing, there is no bug upstream. This file is only included
by ipvs module files.
For me, it's a bit strange to have '#ifdef CONFIG_IP_VS' in a file specific to
this module. This just fix your third party module.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH V2] ipvs: disable inline net_ipvs function with CONFIG_IP_VS not being set

[Rafał Miłecki]

On 25 March 2015 at 11:25, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote:
> Le 25/03/2015 10:17, Rafał Miłecki a écrit :
>>
>> Including net/ip_vs.h without CONFIG_IP_VS was causing:
>> include/net/ip_vs.h: In function 'net_ipvs':
>> include/net/ip_vs.h:35:12: error: 'struct net' has no member named 'ipvs'
>>
>> Fixes: 8b4d14d8eb368 ("netns: exclude ipvs from struct net when IPVS
>> disabled")
>> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
>> ---
>> V2: Disable function totally instead of returning NULL.
>> ---
>>   include/net/ip_vs.h | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
>> index 615b20b..e6f2f2a 100644
>> --- a/include/net/ip_vs.h
>> +++ b/include/net/ip_vs.h
>> @@ -29,11 +29,13 @@
>>   #endif
>>   #include <net/net_namespace.h>                /* Netw namespace */
>>
>> +#if IS_ENABLED(CONFIG_IP_VS)
>>   /* Generic access of ipvs struct */
>>   static inline struct netns_ipvs *net_ipvs(struct net* net)
>>   {
>>         return net->ipvs;
>>   }
>> +#endif
>
> Ok, but this fix nothing, there is no bug upstream. This file is only
> included
> by ipvs module files.

So maybe it should be moved to net/netfilter/ipvs/?


> For me, it's a bit strange to have '#ifdef CONFIG_IP_VS' in a file specific
> to
> this module. This just fix your third party module.

Will do. I was just thinking this header doesn't follow headers logic
well and wanted to help.

-- 
Rafał
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH V2] ipvs: disable inline net_ipvs function with CONFIG_IP_VS not being set

[Nicolas Dichtel]

Le 25/03/2015 12:08, Rafał Miłecki a écrit :
> On 25 March 2015 at 11:25, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote:
[snip]
>> For me, it's a bit strange to have '#ifdef CONFIG_IP_VS' in a file specific
>> to
>> this module. This just fix your third party module.
>
> Will do. I was just thinking this header doesn't follow headers logic
> well and wanted to help.
>
The logic is to fix bug that are in-tree ;-)
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH V2] ipvs: disable inline net_ipvs function with CONFIG_IP_VS not being set

[Julian Anastasov]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1426 bytes --]


	Hello,

On Wed, 25 Mar 2015, Rafał Miłecki wrote:

> Including net/ip_vs.h without CONFIG_IP_VS was causing:
> include/net/ip_vs.h: In function 'net_ipvs':
> include/net/ip_vs.h:35:12: error: 'struct net' has no member named 'ipvs'
> 
> Fixes: 8b4d14d8eb368 ("netns: exclude ipvs from struct net when IPVS disabled")
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
> ---
> V2: Disable function totally instead of returning NULL.

	While this version is better, the commit message
looks scary, it should explain that problem happens only
for modules out of kernel tree, we do not want other admins
to wonder whether they need this commit for their trees.

	And of course, it is better to implement your
own ip_vs_check_diff4 version, it is some inline stuff...

> ---
>  include/net/ip_vs.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
> index 615b20b..e6f2f2a 100644
> --- a/include/net/ip_vs.h
> +++ b/include/net/ip_vs.h
> @@ -29,11 +29,13 @@
>  #endif
>  #include <net/net_namespace.h>		/* Netw namespace */
>  
> +#if IS_ENABLED(CONFIG_IP_VS)
>  /* Generic access of ipvs struct */
>  static inline struct netns_ipvs *net_ipvs(struct net* net)
>  {
>  	return net->ipvs;
>  }
> +#endif
>  
>  /* Get net ptr from skb in traffic cases
>   * use skb_sknet when call is from userland (ioctl or netlink)
> -- 
> 1.8.4.5

Regards

--
Julian Anastasov <ja@ssi.bg>

Re: [PATCH V2] ipvs: disable inline net_ipvs function with CONFIG_IP_VS not being set

[Rafał Miłecki]

On 25 March 2015 at 21:04, Julian Anastasov <ja@ssi.bg> wrote:
>
>         Hello,
>
> On Wed, 25 Mar 2015, Rafał Miłecki wrote:
>
>> Including net/ip_vs.h without CONFIG_IP_VS was causing:
>> include/net/ip_vs.h: In function 'net_ipvs':
>> include/net/ip_vs.h:35:12: error: 'struct net' has no member named 'ipvs'
>>
>> Fixes: 8b4d14d8eb368 ("netns: exclude ipvs from struct net when IPVS disabled")
>> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
>> ---
>> V2: Disable function totally instead of returning NULL.
>
>         While this version is better, the commit message
> looks scary, it should explain that problem happens only
> for modules out of kernel tree, we do not want other admins
> to wonder whether they need this commit for their trees.

OK, I just need some decision if you want/need this patch at all and
if I should send another version.


>         And of course, it is better to implement your
> own ip_vs_check_diff4 version, it is some inline stuff...

I did.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html