Skip to contentSkip to conversation

batman-adv: unicast fragmentation enhancements

B.A.T.M.A.N. In review Andreas Langer 3 participants 7 messages Sep 10, 2010 – Sep 13, 2010

lore
Share & tools
lore
#0 lore raw

Hi,

things that changed since the last patch:
- add support to fragment packets on every node, if outgoing iface mtu is smaller as the packet
- add support to defragment packets on every node, if outgoing iface mtu is >= original size
- rename some functions

In this patch every node defragment packets if it can. Do you think it is better to add an option to enable/disable this ?

regards,
Andreas

#1 lore raw

PATCH 1/1 batman-adv: layer2 unicast packet fragmentation enhancements

This patch improves the fragmentation by also fragmenting packets that came in via an interface which does not need fragmentation. In addition it reassembles fragmented packets as soon as the interface MTU allows it.

Signed-off-by Andreas Langer <an.langer at gmx.de>
---
 batman-adv/routing.c |   64 +++++++++---------------
 batman-adv/unicast.c |  130 +++++++++++++++++++++++++++++++++-----------------
 batman-adv/unicast.h |   13 ++----
 3 files changed, 114 insertions(+), 93 deletions(-)
batman-adv/routing.c +24 -40
index a2c64a4..e975452 100644
@@ -1142,15 +1142,11 @@ static int route_unicast_packet(struct sk_buff *skb,
 	unsigned long flags;
 	struct unicast_packet *unicast_packet;
 	struct ethhdr *ethhdr = (struct ethhdr *)skb_mac_header(skb);
+	int hdr_lenght = sizeof(struct unicast_packet),
+	    uni_diff = sizeof(struct unicast_frag_packet) - hdr_lenght;
 
 	unicast_packet = (struct unicast_packet *)skb->data;
 
-	/* packet for me */
-	if (is_my_mac(unicast_packet->dest)) {
-		interface_rx(recv_if->soft_iface, skb, hdr_size);
-		return NET_RX_SUCCESS;
-	}
-
 	/* TTL exceeded */
 	if (unicast_packet->ttl < 2) {
 		pr_debug("Warning - can't forward unicast packet from %pM to "
@@ -1184,7 +1180,26 @@ static int route_unicast_packet(struct sk_buff *skb,
 		return NET_RX_DROP;
 
 	unicast_packet = (struct unicast_packet *)skb->data;
-	ethhdr = (struct ethhdr *)skb_mac_header(skb);
+
+	if (unicast_packet->packet_type == BAT_UNICAST &&
+	    atomic_read(&bat_priv->frag_enabled) &&
+	    skb->len > batman_if->net_dev->mtu)
+		return frag_send_skb(skb, bat_priv, batman_if,
+				     dstaddr);
+
+	if (unicast_packet->packet_type == BAT_UNICAST_FRAG &&
+	    2 * skb->len - hdr_size <= batman_if->net_dev->mtu) {
+
+		skb = frag_reassemble_skb(skb, bat_priv);
+		if (!skb)
+			return NET_RX_SUCCESS;
+
+		memmove(skb->data + uni_diff, skb->data, hdr_lenght);
+		skb_pull(skb, uni_diff);
+
+		unicast_packet = (struct unicast_packet *)skb->data;
+		unicast_packet->packet_type = BAT_UNICAST;
+	}
 
 	/* decrement ttl */
 	unicast_packet->ttl--;
@@ -1218,10 +1233,7 @@ int recv_ucast_frag_packet(struct sk_buff *skb, struct batman_if *recv_if)
 {
 	struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
 	struct unicast_frag_packet *unicast_packet;
-	struct orig_node *orig_node;
-	struct frag_packet_list_entry *tmp_frag_entry;
 	int hdr_size = sizeof(struct unicast_frag_packet);
-	unsigned long flags;
 
 	if (check_unicast_packet(skb, hdr_size) < 0)
 		return NET_RX_DROP;
@@ -1231,38 +1243,10 @@ int recv_ucast_frag_packet(struct sk_buff *skb, struct batman_if *recv_if)
 	/* packet for me */
 	if (is_my_mac(unicast_packet->dest)) {
 
-		spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-		orig_node = ((struct orig_node *)
-			hash_find(bat_priv->orig_hash, unicast_packet->orig));
-
-		if (!orig_node) {
-			pr_debug("couldn't find orig node for fragmentation\n");
-			spin_unlock_irqrestore(&bat_priv->orig_hash_lock,
-					       flags);
-			return NET_RX_DROP;
-		}
-
-		orig_node->last_frag_packet = jiffies;
-
-		if (list_empty(&orig_node->frag_list))
-			create_frag_buffer(&orig_node->frag_list);
+		skb = frag_reassemble_skb(skb, bat_priv);
 
-		tmp_frag_entry =
-			search_frag_packet(&orig_node->frag_list,
-					   unicast_packet);
-
-		if (!tmp_frag_entry) {
-			create_frag_entry(&orig_node->frag_list, skb);
-			spin_unlock_irqrestore(&bat_priv->orig_hash_lock,
-					       flags);
-			return NET_RX_SUCCESS;
-		}
-
-		skb = merge_frag_packet(&orig_node->frag_list,
-					tmp_frag_entry, skb);
-		spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
 		if (!skb)
-			return NET_RX_DROP;
+			return NET_RX_SUCCESS;
 
 		interface_rx(recv_if->soft_iface, skb, hdr_size);
 		return NET_RX_SUCCESS;
batman-adv/unicast.c +86 -44

188 lines not on this page · raw message

batman-adv/unicast.h +4 -9
index 1d5cbeb..d1a606f 100644
@@ -25,15 +25,10 @@
 #define FRAG_TIMEOUT 10000	/* purge frag list entrys after time in ms */
 #define FRAG_BUFFER_SIZE 6	/* number of list elements in buffer */
 
-struct sk_buff *merge_frag_packet(struct list_head *head,
-	struct frag_packet_list_entry *tfp,
-	struct sk_buff *skb);
-
-void create_frag_entry(struct list_head *head, struct sk_buff *skb);
-void create_frag_buffer(struct list_head *head);
-struct frag_packet_list_entry *search_frag_packet(struct list_head *head,
-	struct unicast_frag_packet *up);
 void frag_list_free(struct list_head *head);
+struct sk_buff *frag_reassemble_skb(struct sk_buff *skb,
+				    struct bat_priv *bat_priv);
+int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
+		  struct batman_if *batman_if, uint8_t dstaddr[]);
 int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv);
-
 #endif /* _NET_BATMAN_ADV_UNICAST_H_ */
Signature · 1 line
1.7.0.4
#2 lore raw

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: layer2 unicast packet fragmentation enhancements

Quoted 6 lines · Andreas Langer

things that changed since the last patch:
- add support to fragment packets on every node, if outgoing iface mtu is smaller as the packet
- add support to defragment packets on every node, if outgoing iface mtu is >= original size
- rename some functions

Is it possible to split the patch in those parts? It would make it easier to read it and understand the patches later.

I haven't checked the patch in detail, but scrolled over it a little bit.

Quoted 18 lines · Andreas Langer

This patch improves the fragmentation by also fragmenting packets that came in via an interface which does not need fragmentation. In addition it reassembles fragmented packets as soon as the interface MTU allows it.

Signed-off-by Andreas Langer <an.langer at gmx.de>
---
 batman-adv/routing.c |   64 +++++++++---------------
 batman-adv/unicast.c |  130
+++++++++++++++++++++++++++++++++----------------- batman-adv/unicast.h | 
 13 ++----
 3 files changed, 114 insertions(+), 93 deletions(-)
batman-adv/routing.c +0 -0
index a2c64a4..e975452 100644

batman-adv/routing.c static int route_unicast_packet(struct sk_buff · line 1147

Quoted 6 lines
batman-adv/routing.c +2 -0
@@ -1142,15 +1142,11 @@ static int route_unicast_packet(struct sk_buff
 *skb, unsigned long flags;
 	struct unicast_packet *unicast_packet;
 	struct ethhdr *ethhdr = (struct ethhdr *)skb_mac_header(skb);
+	int hdr_lenght = sizeof(struct unicast_packet),
+	    uni_diff = sizeof(struct unicast_frag_packet) - hdr_lenght;
 

Could you change lenght to length?

batman-adv/routing.c static int route_unicast_packet(struct sk_buff *skb, · line 1153

Quoted 8 lines
batman-adv/routing.c +0 -6
 	unicast_packet = (struct unicast_packet *)skb->data;
 
-	/* packet for me */
-	if (is_my_mac(unicast_packet->dest)) {
-		interface_rx(recv_if->soft_iface, skb, hdr_size);
-		return NET_RX_SUCCESS;
-	}
-

There are different parts of the patch which makes ma a little bit curious - for example: why it is possible to drop that check entirely? Could that be an extra patch with an explanation why that can be dropped? Is it only valid in context of the new fragmentation handling? ...

[...]

batman-adv/routing.c static int route_unicast_packet(struct sk_buff · line 1152

Quoted 5 lines
batman-adv/routing.c +2 -2
-static int unicast_send_frag_skb(struct sk_buff *skb, struct bat_priv
 *bat_priv, -			  struct batman_if *batman_if, uint8_t dstaddr[],
-			  struct orig_node *orig_node)
+/* if matching fragment found return reassembled skb
+   otherwise buffer the fragment */

Could you change the first three spaces to a " * ". Otherwise checkpatch.pl is unhappy again.

thanks,
Sven

#3 lore raw

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: layer2 unicast packet fragmentation enhancements

Quoted 2 lines · On Saturday 11 September 2010 11:26:37 Sven Eckelmann wrote:

Is it possible to split the patch in those parts? It would make it easier to read it and understand the patches later.

I'm not sure that will do much good. He managed to reorganize the code and thereby remove redundancies. The second patch would probably be no bigger than 3-5 lines of code.

Quoted 11 lines

batman-adv/routing.c static int route_unicast_packet(struct sk_buff *skb, · line 1153

Quoted 6 lines
batman-adv/routing.c +0 -6
-	/* packet for me */
-	if (is_my_mac(unicast_packet->dest)) {
-		interface_rx(recv_if->soft_iface, skb, hdr_size);
-		return NET_RX_SUCCESS;
-	}
-

There are different parts of the patch which makes ma a little bit curious
- for example: why it is possible to drop that check entirely? Could that be an extra patch with an explanation why that can be dropped? Is it only valid in context of the new fragmentation handling? ...

I ran into the same question as it looks a bit odd here but if you apply the patch it all looks good. As I said: it seems he managed to purge quite a bit of redundancy (fragmented and non-fragmented packets are almost identical after all).

Cheers,
Marek

#4 lore raw

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: layer2 unicast packet fragmentation enhancements

Quoted 7 lines · Marek Lindner
Quoted 2 lines · On Saturday 11 September 2010 11:26:37 Sven Eckelmann wrote:

Is it possible to split the patch in those parts? It would make it easier to read it and understand the patches later.

I'm not sure that will do much good. He managed to reorganize the code and thereby remove redundancies. The second patch would probably be no bigger than 3-5 lines of code.

That would not be bad. But refactoring and adding two new features isn't something I personally like. Guessing what part could belong to which other part just makes it hard to find the real problems. Take for example the missing failure checks in the patch.

Something I had in mind would be a patch which adds frag_send_skb and starts to use it, one that removes the duplicated code, another one that does the cleanup/renaming stuff, the next adds the fragmentation on routing and finally there is the defragmentation (probably skipped some steps) - you could much more easily check the actual change in its own context. That would for example remove the question why those lines were removed - the patch itself would answer that question using its commit message which states: "hey those lines aren't needed because we already check that fact here and there and don't need that information before".

And if a patch real adds a cool feature only by changing some lines and without rewriting the whole code then we must have done something right.

If you think different - ok, leave it that way.

Quoted 17 lines
Quoted 4 lines
Quoted 4 lines
batman-adv/routing.c +0 -4
-	/* packet for me */
-	if (is_my_mac(unicast_packet->dest)) {
-		interface_rx(recv_if->soft_iface, skb, hdr_size);
-		return NET_RX_SUCCESS;
Quoted 8 lines

Review

Quoted 2 lines
(quoted diff) +0 -2
-	}
-

There are different parts of the patch which makes ma a little bit curious - for example: why it is possible to drop that check entirely? Could that be an extra patch with an explanation why that can be dropped? Is it only valid in context of the new fragmentation handling?
...

I ran into the same question as it looks a bit odd here but if you apply the patch it all looks good. As I said: it seems he managed to purge quite a bit of redundancy (fragmented and non-fragmented packets are almost identical after all).

Quoted 1 line · Andreas Langer

what are the other parts which makes you curious ?

That a failure in frag_reassemble_skb is a good successfully rx, that frag_create_buffer is magically always successful even when the called functions can fail, that you use skb_pull and directly afterward access the data pointer, that no one frees the skb when frag_reassemble_skb cannot find a matching originator, ...

Best regards,
Sven

#5 lore raw

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: layer2 unicast packet fragmentation enhancements

Am Sun, 12 Sep 2010 22:11:06 +0200
schrieb Sven Eckelmann <[email protected]>:

Quoted 24 lines
Quoted 7 lines · Marek Lindner
Quoted 2 lines · On Saturday 11 September 2010 11:26:37 Sven Eckelmann wrote:

Is it possible to split the patch in those parts? It would make it easier to read it and understand the patches later.

I'm not sure that will do much good. He managed to reorganize the code and thereby remove redundancies. The second patch would probably be no bigger than 3-5 lines of code.

That would not be bad. But refactoring and adding two new features isn't something I personally like. Guessing what part could belong to which other part just makes it hard to find the real problems. Take for example the missing failure checks in the patch.

Something I had in mind would be a patch which adds frag_send_skb and starts to use it, one that removes the duplicated code, another one that does the cleanup/renaming stuff, the next adds the fragmentation on routing and finally there is the defragmentation (probably skipped some steps) - you could much more easily check the actual change in its own context. That would for example remove the question why those lines were removed - the patch itself would answer that question using its commit message which states: "hey those lines aren't needed because we already check that fact here and there and don't need that information before".

Quoted 4 lines

And if a patch real adds a cool feature only by changing some lines and without rewriting the whole code then we must have done something right.

If you think different - ok, leave it that way.

No it's ok, you are right. I will split the patch.

Quoted 19 lines
Quoted 14 lines
Quoted 13 lines

batman-adv/routing.c static int route_unicast_packet(struct sk_buff *skb, · line 1153

Quoted 7 lines
batman-adv/routing.c +0 -6
-	/* packet for me */
-	if (is_my_mac(unicast_packet->dest)) {
-		interface_rx(recv_if->soft_iface, skb, hdr_size);
-		return NET_RX_SUCCESS;
-	}
-

There are different parts of the patch which makes ma a little bit curious - for example: why it is possible to drop that check entirely? Could that be an extra patch with an explanation why that can be dropped? Is it only valid in context of the new fragmentation handling?
...

Quoted 4 lines

I ran into the same question as it looks a bit odd here but if you apply the patch it all looks good. As I said: it seems he managed to purge quite a bit of redundancy (fragmented and non-fragmented packets are almost identical after all).

Quoted 8 lines
Quoted 1 line · Andreas Langer

what are the other parts which makes you curious ?

That a failure in frag_reassemble_skb is a good successfully rx, that frag_create_buffer is magically always successful even when the called functions can fail, that you use skb_pull and directly afterward access the data pointer, that no one frees the skb when frag_reassemble_skb cannot find a matching originator, ...

I will look into it.Thanks for your hints.

regards,
andreas

#6 lore raw

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: layer2 unicast packet fragmentation enhancements

In reply to Sven Eckelmann

Am Sat, 11 Sep 2010 11:26:37 +0200
schrieb Sven Eckelmann <[email protected]>:

Quoted 10 lines
Quoted 6 lines · Andreas Langer

things that changed since the last patch:
- add support to fragment packets on every node, if outgoing iface mtu is smaller as the packet
- add support to defragment packets on every node, if outgoing iface mtu is >= original size
- rename some functions

Is it possible to split the patch in those parts? It would make it easier to read it and understand the patches later.

I think it makes no sense, it belongs together. But I can put the renaming in an extra patch. Would that be ok ?

Quoted 17 lines

I haven't checked the patch in detail, but scrolled over it a little bit.

Quoted 13 lines · Andreas Langer

This patch improves the fragmentation by also fragmenting packets that came in via an interface which does not need fragmentation. In addition it reassembles fragmented packets as soon as the interface MTU allows it.

Signed-off-by Andreas Langer <an.langer at gmx.de>
---
 batman-adv/routing.c |   64 +++++++++---------------
 batman-adv/unicast.c |  130
+++++++++++++++++++++++++++++++++----------------- batman-adv/unicast.h | 
 13 ++----
 3 files changed, 114 insertions(+), 93 deletions(-)
Quoted 13 lines

batman-adv/routing.c static int route_unicast_packet(struct sk_buff · line 1147

Quoted 11 lines
batman-adv/routing.c +2 -0
index a2c64a4..e975452 100644
@@ -1142,15 +1142,11 @@ static int route_unicast_packet(struct sk_buff
 *skb, unsigned long flags;
 	struct unicast_packet *unicast_packet;
 	struct ethhdr *ethhdr = (struct ethhdr *)skb_mac_header(skb);
+	int hdr_lenght = sizeof(struct unicast_packet),
+	    uni_diff = sizeof(struct unicast_frag_packet) - hdr_lenght;
 

Could you change lenght to length?

yes i can.

Quoted 14 lines

batman-adv/routing.c static int route_unicast_packet(struct sk_buff *skb, · line 1153

Quoted 9 lines
batman-adv/routing.c +0 -6
 	unicast_packet = (struct unicast_packet *)skb->data;
 
-	/* packet for me */
-	if (is_my_mac(unicast_packet->dest)) {
-		interface_rx(recv_if->soft_iface, skb, hdr_size);
-		return NET_RX_SUCCESS;
-	}
-

There are different parts of the patch which makes ma a little bit curious - for example: why it is possible to drop that check entirely? Could that be an extra patch with an explanation why that can be dropped? Is it only valid in context of the new fragmentation handling? .

No it's not in context, recv_unicast_packet and recv_ucast_frag_packet check this, so it makes no sense to call it again in route_unicast_packet. I'm not sure if it came from the first fragmentation patch, i put it extra.

what are the other parts which makes you curious ?

Quoted 11 lines

[...]

batman-adv/routing.c

Quoted 5 lines

-static int unicast_send_frag_skb(struct sk_buff *skb, struct bat_priv
*bat_priv, - struct batman_if *batman_if, uint8_t dstaddr[],

batman-adv/routing.c +2 -1
-			  struct orig_node *orig_node)
+/* if matching fragment found return reassembled skb
+   otherwise buffer the fragment */

Could you change the first three spaces to a " * ". Otherwise checkpatch.pl is unhappy again.

Quoted 2 lines

thanks,
Sven

thanks, andreas