[PATCH 0/3] 6lowpan: few changes to help with backports

[PATCH 0/3] 6lowpan: few changes to help with backports

[Luis R. Rodriguez]

Here's a few changes that can help automate the backport of 6lowpan.
I've been carrying them around for a while, I think its best to just
merge these upstream as its nothing controversial.

Luis R. Rodriguez (3):
  6lowpan: add helper to get 6lowpan namespace
  6lowpan: make lowpan_cb static
  6lowpan: include net/net_namespace.h on 6lowpan namepsace header

 include/net/6lowpan.h       |  1 +
 include/net/net_namespace.h | 15 ++++++++++++++
 net/ieee802154/reassembly.c | 48 +++++++++++++++++++++++++++++----------------
 3 files changed, 47 insertions(+), 17 deletions(-)

-- 
1.9.1

[PATCH 1/3] 6lowpan: add helper to get 6lowpan namespace

[Luis R. Rodriguez]

From: "Luis R. Rodriguez" <mcgrof-IBi9RG/b67k@public.gmane.org>

This will simplify the new reassembly backport
with no code changes being required.

CC: Alexander Smirnov <alex.bluesman.smirnov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Dmitry Eremin-Solenikov <dbaryshkov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: linux-zigbee-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
Cc: David S. Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Signed-off-by: Luis R. Rodriguez <mcgrof-IBi9RG/b67k@public.gmane.org>
---
 include/net/net_namespace.h | 15 +++++++++++++++
 net/ieee802154/reassembly.c | 46 +++++++++++++++++++++++++++++----------------
 2 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 5f9eb26..bc4118e 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -373,6 +373,21 @@ static inline void rt_genid_bump_ipv6(struct net *net)
 }
 #endif
 
+#if IS_ENABLED(CONFIG_IEEE802154_6LOWPAN)
+static inline struct netns_ieee802154_lowpan *
+net_ieee802154_lowpan(struct net *net)
+{
+	return &net->ieee802154_lowpan;
+}
+#else
+static inline struct netns_ieee802154_lowpan *
+net_ieee802154_lowpan(struct net *net)
+{
+	return NULL;
+}
+#endif
+
+
 /* For callers who don't really care about whether it's IPv4 or IPv6 */
 static inline void rt_genid_bump_all(struct net *net)
 {
diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c
index ef2d543..132b65b 100644
--- a/net/ieee802154/reassembly.c
+++ b/net/ieee802154/reassembly.c
@@ -120,6 +120,8 @@ fq_find(struct net *net, const struct lowpan_frag_info *frag_info,
 	struct inet_frag_queue *q;
 	struct lowpan_create_arg arg;
 	unsigned int hash;
+	struct netns_ieee802154_lowpan *ieee802154_lowpan =
+		net_ieee802154_lowpan(net);
 
 	arg.tag = frag_info->d_tag;
 	arg.d_size = frag_info->d_size;
@@ -129,7 +131,7 @@ fq_find(struct net *net, const struct lowpan_frag_info *frag_info,
 	read_lock(&lowpan_frags.lock);
 	hash = lowpan_hash_frag(frag_info->d_tag, frag_info->d_size, src, dst);
 
-	q = inet_frag_find(&net->ieee802154_lowpan.frags,
+	q = inet_frag_find(&ieee802154_lowpan->frags,
 			   &lowpan_frags, &arg, hash);
 	if (IS_ERR_OR_NULL(q)) {
 		inet_frag_maybe_warn_overflow(q, pr_fmt());
@@ -357,6 +359,8 @@ int lowpan_frag_rcv(struct sk_buff *skb, const u8 frag_type)
 	struct net *net = dev_net(skb->dev);
 	struct lowpan_frag_info *frag_info = lowpan_cb(skb);
 	struct ieee802154_addr source, dest;
+	struct netns_ieee802154_lowpan *ieee802154_lowpan =
+		net_ieee802154_lowpan(net);
 	int err;
 
 	source = mac_cb(skb)->source;
@@ -366,10 +370,10 @@ int lowpan_frag_rcv(struct sk_buff *skb, const u8 frag_type)
 	if (err < 0)
 		goto err;
 
-	if (frag_info->d_size > net->ieee802154_lowpan.max_dsize)
+	if (frag_info->d_size > ieee802154_lowpan->max_dsize)
 		goto err;
 
-	inet_frag_evictor(&net->ieee802154_lowpan.frags, &lowpan_frags, false);
+	inet_frag_evictor(&ieee802154_lowpan->frags, &lowpan_frags, false);
 
 	fq = fq_find(net, frag_info, &source, &dest);
 	if (fq != NULL) {
@@ -436,6 +440,8 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
 {
 	struct ctl_table *table;
 	struct ctl_table_header *hdr;
+	struct netns_ieee802154_lowpan *ieee802154_lowpan =
+		net_ieee802154_lowpan(net);
 
 	table = lowpan_frags_ns_ctl_table;
 	if (!net_eq(net, &init_net)) {
@@ -444,10 +450,10 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
 		if (table == NULL)
 			goto err_alloc;
 
-		table[0].data = &net->ieee802154_lowpan.frags.high_thresh;
-		table[1].data = &net->ieee802154_lowpan.frags.low_thresh;
-		table[2].data = &net->ieee802154_lowpan.frags.timeout;
-		table[3].data = &net->ieee802154_lowpan.max_dsize;
+		table[0].data = &ieee802154_lowpan->frags.high_thresh;
+		table[1].data = &ieee802154_lowpan->frags.low_thresh;
+		table[2].data = &ieee802154_lowpan->frags.timeout;
+		table[3].data = &ieee802154_lowpan->max_dsize;
 
 		/* Don't export sysctls to unprivileged users */
 		if (net->user_ns != &init_user_ns)
@@ -458,7 +464,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
 	if (hdr == NULL)
 		goto err_reg;
 
-	net->ieee802154_lowpan.sysctl.frags_hdr = hdr;
+	ieee802154_lowpan->sysctl.frags_hdr = hdr;
 	return 0;
 
 err_reg:
@@ -471,9 +477,11 @@ err_alloc:
 static void __net_exit lowpan_frags_ns_sysctl_unregister(struct net *net)
 {
 	struct ctl_table *table;
+	struct netns_ieee802154_lowpan *ieee802154_lowpan =
+		net_ieee802154_lowpan(net);
 
-	table = net->ieee802154_lowpan.sysctl.frags_hdr->ctl_table_arg;
-	unregister_net_sysctl_table(net->ieee802154_lowpan.sysctl.frags_hdr);
+	table = ieee802154_lowpan->sysctl.frags_hdr->ctl_table_arg;
+	unregister_net_sysctl_table(ieee802154_lowpan->sysctl.frags_hdr);
 	if (!net_eq(net, &init_net))
 		kfree(table);
 }
@@ -514,20 +522,26 @@ static inline void lowpan_frags_sysctl_unregister(void)
 
 static int __net_init lowpan_frags_init_net(struct net *net)
 {
-	net->ieee802154_lowpan.frags.high_thresh = IPV6_FRAG_HIGH_THRESH;
-	net->ieee802154_lowpan.frags.low_thresh = IPV6_FRAG_LOW_THRESH;
-	net->ieee802154_lowpan.frags.timeout = IPV6_FRAG_TIMEOUT;
-	net->ieee802154_lowpan.max_dsize = 0xFFFF;
+	struct netns_ieee802154_lowpan *ieee802154_lowpan =
+		net_ieee802154_lowpan(net);
 
-	inet_frags_init_net(&net->ieee802154_lowpan.frags);
+	ieee802154_lowpan->frags.high_thresh = IPV6_FRAG_HIGH_THRESH;
+	ieee802154_lowpan->frags.low_thresh = IPV6_FRAG_LOW_THRESH;
+	ieee802154_lowpan->frags.timeout = IPV6_FRAG_TIMEOUT;
+	ieee802154_lowpan->max_dsize = 0xFFFF;
+
+	inet_frags_init_net(&ieee802154_lowpan->frags);
 
 	return lowpan_frags_ns_sysctl_register(net);
 }
 
 static void __net_exit lowpan_frags_exit_net(struct net *net)
 {
+	struct netns_ieee802154_lowpan *ieee802154_lowpan =
+		net_ieee802154_lowpan(net);
+
 	lowpan_frags_ns_sysctl_unregister(net);
-	inet_frags_exit_net(&net->ieee802154_lowpan.frags, &lowpan_frags);
+	inet_frags_exit_net(&ieee802154_lowpan->frags, &lowpan_frags);
 }
 
 static struct pernet_operations lowpan_frags_ops = {
-- 
1.9.1


------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech

[PATCH 2/3] 6lowpan: make lowpan_cb static

[Luis R. Rodriguez]

From: "Luis R. Rodriguez" <mcgrof-IBi9RG/b67k@public.gmane.org>

CC: Alexander Smirnov <alex.bluesman.smirnov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Dmitry Eremin-Solenikov <dbaryshkov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: linux-zigbee-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
Signed-off-by: Luis R. Rodriguez <mcgrof-IBi9RG/b67k@public.gmane.org>
---
 net/ieee802154/reassembly.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c
index 132b65b..6f1428c 100644
--- a/net/ieee802154/reassembly.c
+++ b/net/ieee802154/reassembly.c
@@ -36,7 +36,7 @@ struct lowpan_frag_info {
 	u8 d_offset;
 };
 
-struct lowpan_frag_info *lowpan_cb(struct sk_buff *skb)
+static struct lowpan_frag_info *lowpan_cb(struct sk_buff *skb)
 {
 	return (struct lowpan_frag_info *)skb->cb;
 }
-- 
1.9.1


------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech

[PATCH 3/3] 6lowpan: include net/net_namespace.h on 6lowpan namepsace header

[Luis R. Rodriguez]

From: "Luis R. Rodriguez" <mcgrof-IBi9RG/b67k@public.gmane.org>

Don't rely on driver files or other headers having this file included.

CC: Alexander Smirnov <alex.bluesman.smirnov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Dmitry Eremin-Solenikov <dbaryshkov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: linux-zigbee-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
Signed-off-by: Luis R. Rodriguez <mcgrof-IBi9RG/b67k@public.gmane.org>
---
 include/net/6lowpan.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/net/6lowpan.h b/include/net/6lowpan.h
index f7d372b..79b530f 100644
--- a/include/net/6lowpan.h
+++ b/include/net/6lowpan.h
@@ -54,6 +54,7 @@
 #define __6LOWPAN_H__
 
 #include <net/ipv6.h>
+#include <net/net_namespace.h>
 
 #define UIP_802154_SHORTADDR_LEN	2  /* compressed ipv6 address length */
 #define UIP_IPH_LEN			40 /* ipv6 fixed header size */
-- 
1.9.1


------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech

Re: [PATCH 0/3] 6lowpan: few changes to help with backports

[David Miller]

From: "Luis R. Rodriguez" <mcgrof-3uybbJdB1yH774rrrx3eTA@public.gmane.org>
Date: Thu, 17 Apr 2014 18:22:53 -0700

> Here's a few changes that can help automate the backport of 6lowpan.
> I've been carrying them around for a while, I think its best to just
> merge these upstream as its nothing controversial.

Series applied.

Re: [PATCH 1/3] 6lowpan: add helper to get 6lowpan namespace

[Johannes Berg]

On Thu, 2014-04-17 at 18:22 -0700, Luis R. Rodriguez wrote:

> +#if IS_ENABLED(CONFIG_IEEE802154_6LOWPAN)
> [...]
> +#else
> +static inline struct netns_ieee802154_lowpan *
> +net_ieee802154_lowpan(struct net *net)
> +{
> +	return NULL;
> +}
> +#endif

Why would that be needed? If nobody compiles 802.15.4 then it seems
nothing should reference it?

johannes

Re: [PATCH 1/3] 6lowpan: add helper to get 6lowpan namespace

[Alexander Aring]

Hi,

On Tue, Apr 22, 2014 at 11:44:46AM +0200, Johannes Berg wrote:
> On Thu, 2014-04-17 at 18:22 -0700, Luis R. Rodriguez wrote:
> 
> > +#if IS_ENABLED(CONFIG_IEEE802154_6LOWPAN)
> > [...]
> > +#else
> > +static inline struct netns_ieee802154_lowpan *
> > +net_ieee802154_lowpan(struct net *net)
> > +{
> > +	return NULL;
> > +}
> > +#endif
> 
> Why would that be needed? If nobody compiles 802.15.4 then it seems
> nothing should reference it?
> 
Indeed I think this is unnecessary, also.

- Alex

Re: [PATCH 1/3] 6lowpan: add helper to get 6lowpan namespace

[Luis R. Rodriguez]

[-- Attachment #1: Type: text/plain, Size: 786 bytes --]

On Tue, Apr 22, 2014 at 11:53:03AM +0200, Alexander Aring wrote:
> Hi,
> 
> On Tue, Apr 22, 2014 at 11:44:46AM +0200, Johannes Berg wrote:
> > On Thu, 2014-04-17 at 18:22 -0700, Luis R. Rodriguez wrote:
> > 
> > > +#if IS_ENABLED(CONFIG_IEEE802154_6LOWPAN)
> > > [...]
> > > +#else
> > > +static inline struct netns_ieee802154_lowpan *
> > > +net_ieee802154_lowpan(struct net *net)
> > > +{
> > > +	return NULL;
> > > +}
> > > +#endif
> > 
> > Why would that be needed? If nobody compiles 802.15.4 then it seems
> > nothing should reference it?
> > 
> Indeed I think this is unnecessary, also.

I wanted to be sure, and I was not. Right now 6lowpan does not depend
on CONFIG_NET_NS, is this intentional? I think its fine without it
but I was not sure.

  Luis

[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

Re: [PATCH 1/3] 6lowpan: add helper to get 6lowpan namespace

[Johannes Berg]

On Tue, 2014-04-22 at 19:58 +0200, Luis R. Rodriguez wrote:

> > > > +#if IS_ENABLED(CONFIG_IEEE802154_6LOWPAN)
> > > > [...]
> > > > +#else
> > > > +static inline struct netns_ieee802154_lowpan *
> > > > +net_ieee802154_lowpan(struct net *net)
> > > > +{
> > > > +	return NULL;
> > > > +}
> > > > +#endif
> > > 
> > > Why would that be needed? If nobody compiles 802.15.4 then it seems
> > > nothing should reference it?
> > > 
> > Indeed I think this is unnecessary, also.
> 
> I wanted to be sure, and I was not. Right now 6lowpan does not depend
> on CONFIG_NET_NS, is this intentional? I think its fine without it
> but I was not sure.

I fail to see how !CONFIG_LOWPAN is related CONFIG_NET_NS?

johannes

Re: [PATCH 1/3] 6lowpan: add helper to get 6lowpan namespace

[Alexander Aring]

On Tue, Apr 22, 2014 at 08:45:15PM +0200, Johannes Berg wrote:
> On Tue, 2014-04-22 at 19:58 +0200, Luis R. Rodriguez wrote:
> 
> > > > > +#if IS_ENABLED(CONFIG_IEEE802154_6LOWPAN)
> > > > > [...]
> > > > > +#else
> > > > > +static inline struct netns_ieee802154_lowpan *
> > > > > +net_ieee802154_lowpan(struct net *net)
> > > > > +{
> > > > > +	return NULL;
> > > > > +}
> > > > > +#endif
> > > > 
> > > > Why would that be needed? If nobody compiles 802.15.4 then it seems
> > > > nothing should reference it?
> > > > 
> > > Indeed I think this is unnecessary, also.
> > 
> > I wanted to be sure, and I was not. Right now 6lowpan does not depend
> > on CONFIG_NET_NS, is this intentional? I think its fine without it
> > but I was not sure.
> 
> I fail to see how !CONFIG_LOWPAN is related CONFIG_NET_NS?
> 

mhh, IEEE802154_6LOWPAN depends on IPV6 and I think IPV6 is related to
CONFIG_NET_NS.

- Alex

Re: [PATCH 1/3] 6lowpan: add helper to get 6lowpan namespace

[Luis R. Rodriguez]

On Tue, Apr 22, 2014 at 11:45 AM, Johannes Berg
<johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org> wrote:
> On Tue, 2014-04-22 at 19:58 +0200, Luis R. Rodriguez wrote:
>
>> > > > +#if IS_ENABLED(CONFIG_IEEE802154_6LOWPAN)
>> > > > [...]
>> > > > +#else
>> > > > +static inline struct netns_ieee802154_lowpan *
>> > > > +net_ieee802154_lowpan(struct net *net)
>> > > > +{
>> > > > +       return NULL;
>> > > > +}
>> > > > +#endif
>> > >
>> > > Why would that be needed? If nobody compiles 802.15.4 then it seems
>> > > nothing should reference it?
>> > >
>> > Indeed I think this is unnecessary, also.
>>
>> I wanted to be sure, and I was not. Right now 6lowpan does not depend
>> on CONFIG_NET_NS, is this intentional? I think its fine without it
>> but I was not sure.
>
> I fail to see how !CONFIG_LOWPAN is related CONFIG_NET_NS?

I concerned about the inverse but I just test compiled it and it seems
fine, will send a follow up to nuke this hunk.

  Luis

------------------------------------------------------------------------------
Start Your Social Network Today - Download eXo Platform
Build your Enterprise Intranet with eXo Platform Software
Java Based Open Source Intranet - Social, Extensible, Cloud Ready
Get Started Now And Turn Your Intranet Into A Collaboration Platform
http://p.sf.net/sfu/ExoPlatform

Re: [PATCH 1/3] 6lowpan: add helper to get 6lowpan namespace

[Luis R. Rodriguez]

On Tue, Apr 22, 2014 at 11:49 AM, Alexander Aring <alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> On Tue, Apr 22, 2014 at 08:45:15PM +0200, Johannes Berg wrote:
>> On Tue, 2014-04-22 at 19:58 +0200, Luis R. Rodriguez wrote:
>>
>> > > > > +#if IS_ENABLED(CONFIG_IEEE802154_6LOWPAN)
>> > > > > [...]
>> > > > > +#else
>> > > > > +static inline struct netns_ieee802154_lowpan *
>> > > > > +net_ieee802154_lowpan(struct net *net)
>> > > > > +{
>> > > > > +     return NULL;
>> > > > > +}
>> > > > > +#endif
>> > > >
>> > > > Why would that be needed? If nobody compiles 802.15.4 then it seems
>> > > > nothing should reference it?
>> > > >
>> > > Indeed I think this is unnecessary, also.
>> >
>> > I wanted to be sure, and I was not. Right now 6lowpan does not depend
>> > on CONFIG_NET_NS, is this intentional? I think its fine without it
>> > but I was not sure.
>>
>> I fail to see how !CONFIG_LOWPAN is related CONFIG_NET_NS?
>>
>
> mhh, IEEE802154_6LOWPAN depends on IPV6 and I think IPV6 is related to
> CONFIG_NET_NS.

Just test compiled IEEE802154_6LOWPAN without NET_NS and then also
disabled IPV6 and it compiles, IEEE802154_6LOWPAN already depends on
IPV6.

  Luis

------------------------------------------------------------------------------
Start Your Social Network Today - Download eXo Platform
Build your Enterprise Intranet with eXo Platform Software
Java Based Open Source Intranet - Social, Extensible, Cloud Ready
Get Started Now And Turn Your Intranet Into A Collaboration Platform
http://p.sf.net/sfu/ExoPlatform