Skip to contentSkip to conversation

"no new features"...

PATCH Applied David Miller 3 participants 8 messages Feb 1, 2008 – Feb 5, 2008

Subsystems (3)
lore
Share & tools
lore

David Miller

author maintainer
#0 lore raw

I've just sent a pull request to Linus for net-2.6 and that should effectively be my final feature merge to him.

Outside of the 6-patch thing Arnaldo is respinning I am calling for no new stuff to go in at this time. Only bug fixes.

We've merged a lot of stuff already (on the order of 1800 patches in total). So we should draw the line in the sand so that we can have some hope to fix the almost guarenteed bugs.

Many folks, including Linus, are flying home this weekend.

So my basic plan is to open up a net-2.6.26 tree about a week and a half from now.

Please set your feature work aside for the moment and find a fun bug to fix instead. :-)

Thanks!

#1 lore raw

PATCH 1/1 vlan tag match

Provide a way to use tc filters on vlan tag even if tag is buried in skb due to hardware acceleration.

---
 include/linux/pkt_cls.h              |    3 ++-
 include/linux/tc_ematch/tc_em_meta.h |    1 +
 net/sched/em_meta.c                  |   17 +++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletions(-)
include/linux/pkt_cls.h +2 -1
index 1c1dba9..40fac8c 100644
@@ -459,7 +459,8 @@ enum
 #define	TCF_EM_U32		3
 #define	TCF_EM_META		4
 #define	TCF_EM_TEXT		5
-#define	TCF_EM_MAX		5
+#define        TCF_EM_VLAN		6
+#define	TCF_EM_MAX		6
 
 enum
 {
include/linux/tc_ematch/tc_em_meta.h +1 -0
index e21937c..c50d2ba 100644
@@ -81,6 +81,7 @@ enum
  	TCF_META_ID_SK_SNDTIMEO,
  	TCF_META_ID_SK_SENDMSG_OFF,
  	TCF_META_ID_SK_WRITE_PENDING,
+	TCF_META_ID_VLAN_TAG,
 	__TCF_META_ID_MAX
 };
 #define TCF_META_ID_MAX (__TCF_META_ID_MAX - 1)
net/sched/em_meta.c +17 -0
index a1e5619..9c2ec19 100644
@@ -65,6 +65,7 @@
 #include <linux/string.h>
 #include <linux/skbuff.h>
 #include <linux/random.h>
+#include <linux/if_vlan.h>
 #include <linux/tc_ematch/tc_em_meta.h>
 #include <net/dst.h>
 #include <net/route.h>
@@ -170,6 +171,21 @@ META_COLLECTOR(var_dev)
 }
 
 /**************************************************************************
+ * vlan tag
+ **************************************************************************/
+
+META_COLLECTOR(int_vlan_tag)
+{
+	unsigned short tag;
+	if (vlan_get_tag(skb, &tag) < 0)
+		*err = -1;
+	else
+		dst->value = tag;
+}
+
+
+
+/**************************************************************************
  * skb attributes
  **************************************************************************/
 
@@ -520,6 +536,7 @@ static struct meta_ops __meta_ops[TCF_META_TYPE_MAX+1][TCF_META_ID_MAX+1] = {
 		[META_ID(SK_SNDTIMEO)]		= META_FUNC(int_sk_sndtimeo),
 		[META_ID(SK_SENDMSG_OFF)]	= META_FUNC(int_sk_sendmsg_off),
 		[META_ID(SK_WRITE_PENDING)]	= META_FUNC(int_sk_write_pend),
+		[META_ID(VLAN_TAG)]		= META_FUNC(int_vlan_tag),
 	}
 };
 
Signature · 1 line
1.5.3.8
#2 lore raw

Re: [PATCH] vlan tag match

Quoted 2 lines · Stephen Hemminger

Provide a way to use tc filters on vlan tag even if tag is buried in skb due to hardware acceleration.

Looks reasonable. Would you like to add the same feature to the flow classifier?

#3 lore raw

Re: [PATCH] vlan tag match

Quoted 7 lines · On Fri, 01 Feb 2008 06:34:34 +0100 Patrick McHardy <[email protected]> wrote:
Quoted 2 lines · Stephen Hemminger

Provide a way to use tc filters on vlan tag even if tag is buried in skb due to hardware acceleration.

Looks reasonable. Would you like to add the same feature to the flow classifier?

Yes, that would be good.

Signature · 1 line
Stephen Hemminger <[email protected]>
author maintainer
#4 lore raw

Re: [PATCH] vlan tag match

From: Stephen Hemminger <[email protected]>
Date: Thu, 31 Jan 2008 21:50:25 -0800

Quoted 11 lines
Quoted 6 lines · On Fri, 01 Feb 2008 06:34:34 +0100 Patrick McHardy <[email protected]> wrote:
Quoted 2 lines · Stephen Hemminger

Provide a way to use tc filters on vlan tag even if tag is buried in skb due to hardware acceleration.

Looks reasonable. Would you like to add the same feature to the flow classifier?

Yes, that would be good.

Did that patch get posted? I didn't see it.

#5 lore raw

Re: [PATCH] vlan tag match

Quoted 6 lines · David Miller

From: Stephen Hemminger <[email protected]>
Date: Thu, 31 Jan 2008 21:50:25 -0800

Quoted 3 lines

On Fri, 01 Feb 2008 06:34:34 +0100
Patrick McHardy <[email protected]> wrote:

Quoted 8 lines
Quoted 6 lines
Quoted 5 lines
Quoted 2 lines · Stephen Hemminger

Provide a way to use tc filters on vlan tag even if tag is buried in skb due to hardware acceleration.

Looks reasonable. Would you like to add the same feature to the flow classifier?

Yes, that would be good.

Did that patch get posted? I didn't see it.

No, but I already added it myself. I'll post it in a new thread.

BTW, Stephen, I noticed your ematch patch doesn't mask out the VLAN priority which is also included in the return value of vlan_get_tag(), is that intentional?

#6 lore raw

Re: [PATCH] vlan tag match

Quoted 14 lines · On Tue, 05 Feb 2008 15:26:07 +0100 Patrick McHardy <[email protected]> wrote:
Quoted 13 lines · David Miller

From: Stephen Hemminger <[email protected]>
Date: Thu, 31 Jan 2008 21:50:25 -0800

Quoted 9 lines
Quoted 5 lines · On Fri, 01 Feb 2008 06:34:34 +0100 Patrick McHardy <[email protected]> wrote:
Quoted 2 lines · Stephen Hemminger

Provide a way to use tc filters on vlan tag even if tag is buried in skb due to hardware acceleration.

Looks reasonable. Would you like to add the same feature to the flow classifier?

Yes, that would be good.

Quoted 9 lines
Quoted 1 line

Did that patch get posted? I didn't see it.

No, but I already added it myself. I'll post it in a new thread.

BTW, Stephen, I noticed your ematch patch doesn't mask out the VLAN priority which is also included in the return value of vlan_get_tag(), is that intentional?

It seemed easier than adding two different tag related matches, since meta match can do expressions.

Signature · 1 line
Stephen Hemminger <[email protected]>