firewire net: IPv6 support (RFC3146).

RFC PATCH In review YOSHIFUJI Hideaki 3 participants 6 messages Jan 12, 2013

Subsystems (3)

Networking Network drivers Firewire

lore

Share & tools

lore

YOSHIFUJI Hideaki

author

2013-01-12 14:21 UTC #0 lore raw

RFC PATCH 5/6 firewire net: IPv6 support (RFC3146).

Send packets for IPv6 multicast via GASP.

CC Stephan Gatzka <[email protected]>

CC Stefan Richter <[email protected]>

Signed-off-by YOSHIFUJI Hideaki <[email protected]>

---
 drivers/firewire/Kconfig |    8 ++++++++
 drivers/firewire/net.c   |   13 ++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

drivers/firewire/Kconfig +8 -0

index 7224533..2e3018b 100644
@@ -51,9 +51,17 @@ config FIREWIRE_NET
 	  other implementations of RFC 2734 as found on several operating
 	  systems.  Multicast support is currently limited.
 
+	  Optional IPv6 support is available if you say Y here.
+
 	  To compile this driver as a module, say M here:  The module will be
 	  called firewire-net.
 
+config FIREWIRE_NET_IPV6
+	bool "IPv6 networking over 1394"
+	depends on FIREWIRE_NET=y
+	help
+	  This enabless IPv6 over IEEE 1394, based on RFC 3146.
+
 config FIREWIRE_NOSY
 	tristate "Nosy - a FireWire traffic sniffer for PCILynx cards"
 	depends on PCI

drivers/firewire/net.c +10 -3

index 66c4f1c..a21d2f9 100644
@@ -27,6 +27,8 @@
 #include <linux/spinlock.h>
 
 #include <asm/unaligned.h>
+#include <linux/ipv6.h>
+#include <net/addrconf.h>
 #include <net/arp.h>
 #include <net/firewire.h>

@@ -1329,13 +1331,18 @@ static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net)
 	dg_size = skb->len;
 
 	/*
-	 * Set the transmission type for the packet.  ARP packets and IP
-	 * broadcast packets are sent via GASP.
+	 * Set the transmission type for the packet.  ARP packets, IPv4
+	 * broadcast packets, IPv6 multicast packets are sent via GASP.
 	 */
 	if (memcmp(hdr_buf.h_dest, net->broadcast, FWNET_ALEN) == 0
 	    || proto == htons(ETH_P_ARP)
 	    || (proto == htons(ETH_P_IP)
-		&& IN_MULTICAST(ntohl(ip_hdr(skb)->daddr)))) {
+		&& IN_MULTICAST(ntohl(ip_hdr(skb)->daddr)))
+#if defined(CONFIG_FIREWIRE_NET_IPV6)
+	    || (proto == htons(ETH_P_IPV6)
+		&& ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr))
+#endif
+	   ) {
 		max_payload        = dev->broadcast_xmt_max_payload;
 		datagram_label_ptr = &dev->broadcast_xmt_datagramlabel;

Signature · 1 line

1.7.9.5

Stefan Richter

2013-01-12 15:22 UTC #1 lore raw

Quoted 15 lines · On Jan 12 YOSHIFUJI Hideaki wrote:

Send packets for IPv6 multicast via GASP.
CC Stephan Gatzka <[email protected]>
CC Stefan Richter <[email protected]>
Signed-off-by YOSHIFUJI Hideaki <[email protected]>
---
 drivers/firewire/Kconfig |    8 ++++++++
 drivers/firewire/net.c   |   13 ++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)
drivers/firewire/Kconfig +0 -0
index 7224533..2e3018b 100644

drivers/firewire/Kconfig config FIREWIRE_NET · line 55

Quoted 5 lines

drivers/firewire/Kconfig +2 -0

@@ -51,9 +51,17 @@ config FIREWIRE_NET
 	  other implementations of RFC 2734 as found on several operating
 	  systems.  Multicast support is currently limited.
 
+	  Optional IPv6 support is available if you say Y here.
+

This is a bit premature. At least one thing which is still missing (also missing in Stephan's patch from previous week) is the RFC 3146 clause 5 Configuration ROM entry.

drivers/firewire/Kconfig config FIREWIRE_NET · line 64

Quoted 9 lines

drivers/firewire/Kconfig +6 -0

 	  To compile this driver as a module, say M here:  The module will be
 	  called firewire-net.
 
+config FIREWIRE_NET_IPV6
+	bool "IPv6 networking over 1394"
+	depends on FIREWIRE_NET=y
+	help
+	  This enabless IPv6 over IEEE 1394, based on RFC 3146.
+

I would rather like this to be like an invisible option which is automatically on if IPV6=y || (IPV6=m && FIREWIRE_NET=m), and off otherwise.

Or, as alluded to in my other post, it is going to be written such that

- if IPV6=n, FIREWIRE_NET can be n, y, or m. RFC 3146 support won't be built in in any case.

- If IPV6=y, FIREWIRE_NET can be n, y, or m. RFC 3146 support will be built in.

- If IPV6=m, FIREWIRE_NET can be only n or m. RFC 3146 support will be built in in the latter case.

Quoted 28 lines

drivers/firewire/Kconfig +0 -0

 config FIREWIRE_NOSY
 	tristate "Nosy - a FireWire traffic sniffer for PCILynx cards"
 	depends on PCI

drivers/firewire/net.c +4 -2

index 66c4f1c..a21d2f9 100644
@@ -27,6 +27,8 @@
 #include <linux/spinlock.h>
 
 #include <asm/unaligned.h>
+#include <linux/ipv6.h>
+#include <net/addrconf.h>
 #include <net/arp.h>
 #include <net/firewire.h>

@@ -1329,13 +1331,18 @@ static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net)
 	dg_size = skb->len;
 
 	/*
-	 * Set the transmission type for the packet.  ARP packets and IP
-	 * broadcast packets are sent via GASP.
+	 * Set the transmission type for the packet.  ARP packets, IPv4
+	 * broadcast packets, IPv6 multicast packets are sent via GASP.
 	 */
 	if (memcmp(hdr_buf.h_dest, net->broadcast, FWNET_ALEN) == 0
 	    || proto == htons(ETH_P_ARP)
 	    || (proto == htons(ETH_P_IP)

drivers/firewire/net.c static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net) · line 1348

Quoted 10 lines

drivers/firewire/net.c +6 -1

-		&& IN_MULTICAST(ntohl(ip_hdr(skb)->daddr)))) {
+		&& IN_MULTICAST(ntohl(ip_hdr(skb)->daddr)))
+#if defined(CONFIG_FIREWIRE_NET_IPV6)
+	    || (proto == htons(ETH_P_IPV6)
+		&& ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr))
+#endif
+	   ) {
 		max_payload        = dev->broadcast_xmt_max_payload;
 		datagram_label_ptr = &dev->broadcast_xmt_datagramlabel;

This hunk is fine with me.

Signature · 3 lines

Stefan Richter
-=====-===-= ---= -==--
http://arcgraph.de/sr/

Stephan Gatzka

2013-01-12 16:32 UTC #2 lore raw

Quoted 4 lines

This is a bit premature. At least one thing which is still missing (also missing in Stephan's patch from previous week) is the RFC 3146 clause 5 Configuration ROM entry.

Argh, my fault. I already had it when I began to implement this stuff. It got lost somewhere...

No problem, I'll add it.

Stefan Richter

2013-01-12 17:01 UTC #3 lore raw

In reply to Stefan Richter

Quoted 3 lines · On Jan 12 Stefan Richter wrote:

At least one thing which is still missing (also
missing in Stephan's patch from previous week) is the RFC 3146 clause 5 Configuration ROM entry.

Another thing: As far as I understand, the current code assumes that peers will use the same unicast_FIFO for IPv4 unicast as for IPv6 unicast. This is not necessarily true. Either firewire-net needs to maintain two lists of peers (one for IPv4, another for IPv6), or it needs to maintain two unicast_FIFOs per peer.

Signature · 3 lines

Stefan Richter
-=====-===-= ---= -==--
http://arcgraph.de/sr/

Stephan Gatzka

2013-01-12 17:15 UTC #4 lore raw

Quoted 7 lines

Another thing: As far as I understand, the current code assumes that peers will use the same unicast_FIFO for IPv4 unicast as for IPv6 unicast. This is not necessarily true. Either firewire-net needs to maintain two lists of peers (one for IPv4, another for IPv6), or it needs to maintain two unicast_FIFOs per peer.

Thanks for pointing that out. I would go for two unicast_Fifos per peer.

Stefan Richter

2013-01-12 17:42 UTC #5 lore raw

Quoted 9 lines · On Jan 12 Stephan Gatzka wrote:

Quoted 7 lines
Another thing: As far as I understand, the current code assumes that peers will use the same unicast_FIFO for IPv4 unicast as for IPv6 unicast. This is not necessarily true. Either firewire-net needs to maintain two lists of peers (one for IPv4, another for IPv6), or it needs to maintain two unicast_FIFOs per peer.
Thanks for pointing that out. I would go for two unicast_Fifos per peer.

Indeed. Plus, if we look up an IPv6 peer whose IPv6 unicast_FIFO is as yet unkown but whose IPv4 unicast_FIFO is already known, we could optimistically use the latter until we learn the former. And vice versa.

Signature · 3 lines

Stefan Richter
-=====-===-= ---= -==--
http://arcgraph.de/sr/