Re: [PATCH] qeth: Move away from using neighbour entries in qeth_l3_fill_header()

2 messages, 2 authors, 2012-02-02 · open the first message on its own page

Re: [PATCH] qeth: Move away from using neighbour entries in qeth_l3_fill_header()

From: Ursula Braun <hidden>
Date: 2012-02-02 13:45:25

Dave,

I have tested your qeth patch on top of net-next with ipv4 and ipv6
traffic successfully. I just had to add includes for net/route.h and
net/ip6_fib.h.

Regards, Ursula Braun, IBM Germany, Linux on System z development

quoted hunk

From:
David Miller [off-list ref]
To:
Einar EL Lueck/Germany/IBM@IBMDE
Cc:
Ursula Braun1/Germany/IBM@IBMDE, netdev@vger.kernel.org
Date:
01/02/2012 21:49
Subject:
[PATCH] qeth: Move away from using neighbour entries in 
qeth_l3_fill_header()

We've moving to a model where dst_entry objects to not have
a reference to the associated neighbour entry, instead such
neighbours must be looked up on-demand.

Here in qeth_l3_fill_header() it's actually much simpler to
use the information in the route itself.  The code is
already conditionalized upon protocol type.

Signed-off-by: David S. Miller <davem@davemloft.net>
--
If one of you could test this against net-next, I'd appreciate
it.  I plan to make similar changes to the other dst_get_neighbour*()
call in this driver.

Thanks!

diff --git a/drivers/s390/net/qeth_l3_main.c

b/drivers/s390/net/qeth_l3_main.c
index 9648e4e..6d95c38 100644

--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c

@@ -2832,7 +2832,6 @@ static void qeth_l3_fill_af_iucv_hdr(struct

qeth_card *card,
 static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr 
*hdr,
                                 struct sk_buff *skb, int ipv, int 
cast_type)
 {
-                struct neighbour *n = NULL;
                 struct dst_entry *dst;

                 memset(hdr, 0, sizeof(struct qeth_hdr));

@@ -2855,33 +2854,29 @@ static void qeth_l3_fill_header(struct qeth_card

*card, struct qeth_hdr *hdr,

                 rcu_read_lock();
                 dst = skb_dst(skb);
-                if (dst)
-                                n = dst_get_neighbour_noref(dst);
                 if (ipv == 4) {
+                                struct rtable *rt = (struct rtable *) 
dst;
+                                __be32 *pkey = &ip_hdr(skb)->daddr;
+
+                                if (rt->rt_gateway)
+                                                pkey = &rt->rt_gateway;
+
                                 /* IPv4 */
                                 hdr->hdr.l3.flags = 
qeth_l3_get_qeth_hdr_flags4(cast_type);
                                 memset(hdr->hdr.l3.dest_addr, 0, 12);
-                                if (n) {
-                                                *((u32 *) 
(&hdr->hdr.l3.dest_addr[12])) =
-                                                    *((u32 *) 
n->primary_key);
-                                } else {
-                                                /* fill in destination 
address used in ip header */
-                                                *((u32 *) 
(&hdr->hdr.l3.dest_addr[12])) =
-                                ip_hdr(skb)->daddr;
-                                }
+                                *((__be32 *) 
(&hdr->hdr.l3.dest_addr[12])) = *pkey;
                 } else if (ipv == 6) {
+                                struct rt6_info *rt = (struct rt6_info *) 
dst;
+                                struct in6_addr *pkey = 
&ipv6_hdr(skb)->daddr;
+
+                                if (!ipv6_addr_any(&rt->rt6i_gateway))
+                                                pkey = &rt->rt6i_gateway;
+
                                 /* IPv6 */
                                 hdr->hdr.l3.flags = 
qeth_l3_get_qeth_hdr_flags6(cast_type);
                                 if (card->info.type == 
QETH_CARD_TYPE_IQD)
                                                 hdr->hdr.l3.flags &= 
~QETH_HDR_PASSTHRU;
-                                if (n) {
- memcpy(hdr->hdr.l3.dest_addr,
-                                                       n->primary_key, 
16);
-                                } else {
-                                                /* fill in destination 
address used in ip header */
- memcpy(hdr->hdr.l3.dest_addr,
- &ipv6_hdr(skb)->daddr, 16);
-                                }
+                                memcpy(hdr->hdr.l3.dest_addr, pkey, 16);
                 } else {
                                 /* passthrough */
                                 if ((skb->dev->type == ARPHRD_IEEE802_TR) 
&&

Re: [PATCH] qeth: Move away from using neighbour entries in qeth_l3_fill_header()

From: David Miller <davem@davemloft.net>
Date: 2012-02-02 19:37:39

From: Ursula Braun <redacted>
Date: Thu, 02 Feb 2012 14:44:51 +0100

I have tested your qeth patch on top of net-next with ipv4 and ipv6
traffic successfully. I just had to add includes for net/route.h and
net/ip6_fib.h.

Thanks a lot, here is the final version I checked in:

--------------------
qeth: Move away from using neighbour entries in qeth_l3_fill_header()

We've moving to a model where dst_entry objects to not have
a reference to the associated neighbour entry, instead such
neighbours must be looked up on-demand.

Here in qeth_l3_fill_header() it's actually much simpler to
use the information in the route itself.  The code is
already conditionalized upon protocol type.

Signed-off-by: David S. Miller <davem@davemloft.net>
Tested-by: Ursula Braun <redacted>
---
 drivers/s390/net/qeth_l3_main.c |   35 ++++++++++++++++-------------------
 1 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 9648e4e..25cd379 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c

@@ -28,6 +28,8 @@
 
 #include <net/ip.h>
 #include <net/arp.h>
+#include <net/route.h>
+#include <net/ip6_fib.h>
 #include <net/ip6_checksum.h>
 #include <net/iucv/af_iucv.h>

@@ -2832,7 +2834,6 @@ static void qeth_l3_fill_af_iucv_hdr(struct qeth_card *card,
 static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
 		struct sk_buff *skb, int ipv, int cast_type)
 {
-	struct neighbour *n = NULL;
 	struct dst_entry *dst;
 
 	memset(hdr, 0, sizeof(struct qeth_hdr));

@@ -2855,33 +2856,29 @@ static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
 
 	rcu_read_lock();
 	dst = skb_dst(skb);
-	if (dst)
-		n = dst_get_neighbour_noref(dst);
 	if (ipv == 4) {
+		struct rtable *rt = (struct rtable *) dst;
+		__be32 *pkey = &ip_hdr(skb)->daddr;
+
+		if (rt->rt_gateway)
+			pkey = &rt->rt_gateway;
+
 		/* IPv4 */
 		hdr->hdr.l3.flags = qeth_l3_get_qeth_hdr_flags4(cast_type);
 		memset(hdr->hdr.l3.dest_addr, 0, 12);
-		if (n) {
-			*((u32 *) (&hdr->hdr.l3.dest_addr[12])) =
-			    *((u32 *) n->primary_key);
-		} else {
-			/* fill in destination address used in ip header */
-			*((u32 *) (&hdr->hdr.l3.dest_addr[12])) =
-							ip_hdr(skb)->daddr;
-		}
+		*((__be32 *) (&hdr->hdr.l3.dest_addr[12])) = *pkey;
 	} else if (ipv == 6) {
+		struct rt6_info *rt = (struct rt6_info *) dst;
+		struct in6_addr *pkey = &ipv6_hdr(skb)->daddr;
+
+		if (!ipv6_addr_any(&rt->rt6i_gateway))
+			pkey = &rt->rt6i_gateway;
+
 		/* IPv6 */
 		hdr->hdr.l3.flags = qeth_l3_get_qeth_hdr_flags6(cast_type);
 		if (card->info.type == QETH_CARD_TYPE_IQD)
 			hdr->hdr.l3.flags &= ~QETH_HDR_PASSTHRU;
-		if (n) {
-			memcpy(hdr->hdr.l3.dest_addr,
-			       n->primary_key, 16);
-		} else {
-			/* fill in destination address used in ip header */
-			memcpy(hdr->hdr.l3.dest_addr,
-			       &ipv6_hdr(skb)->daddr, 16);
-		}
+		memcpy(hdr->hdr.l3.dest_addr, pkey, 16);
 	} else {
 		/* passthrough */
 		if ((skb->dev->type == ARPHRD_IEEE802_TR) &&

-- 
1.7.7.6

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help