iproute2 skbedit: Add support to mark packets
Subsystems (2)
PATCH 2/2 iproute2 skbedit: Add support to mark packets
I did this originally because i was getting too many support questions on ipt with mark. It still makes sense since skbedit seems to be the mother action of skb metadata (should probably have been called skbmeta).
cheers,
jamal
commit 90afac29b6e8c62bc1b2a4da7c0dd4407ea9dd3f
Author: Jamal Hadi Salim <[email protected]> Date: Thu Dec 3 08:18:41 2009 -0500
skbedit: Add support to mark packets
This adds support for setting the skb mark.
include/linux/tc_act/tc_skbedit.h +2 -0
@@ -26,6 +26,7 @@#define SKBEDIT_F_PRIORITY 0x1#define SKBEDIT_F_QUEUE_MAPPING 0x2 +#define SKBEDIT_F_MARK 0x4struct tc_skbedit {tc_gen ;
@@ -37,6 +38,7 @@ enum {TCA_SKBEDIT_PARMS ,TCA_SKBEDIT_PRIORITY ,TCA_SKBEDIT_QUEUE_MAPPING , +TCA_SKBEDIT_MARK , __TCA_SKBEDIT_MAX };#define TCA_SKBEDIT_MAX (__TCA_SKBEDIT_MAX - 1)
tc/m_skbedit.c +21 -3
@@ -31,11 +31,13 @@static void explain (void ) { -fprintf (stderr,"Usage: ... skbedit <[QM] [PM]>\n" +fprintf (stderr,"Usage: ... skbedit <[QM] [PM] [MM]>\n" "QM = queue_mapping QUEUE_MAPPING\n" "PM = priority PRIORITY \n" +"MM = mark MARK \n" "QUEUE_MAPPING = device transmit queue to use\n" -"PRIORITY = classID to assign to priority field\n" ); +"PRIORITY = classID to assign to priority field\n" +"MARK = firewall mark to set\n" ); } static void
@@ -55,7 +57,7 @@ parse_skbedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id,struct rtattr *tail;unsigned int tmp;__u16 queue_mapping; -__u32 flags =0 , priority; +__u32 flags =0 , priority, mark;struct tc_skbedit sel = {0 };if (matches (*argv,"skbedit" ) !=0 )
@@ -81,6 +83,14 @@ parse_skbedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id,return -1 ; } ok++; + }else if (matches (*argv,"mark" ) ==0 ) { + flags |=SKBEDIT_F_MARK ; +NEXT_ARG (); +if (get_tc_classid (&mark, *argv)) { +fprintf (stderr,"Illegal mark\n" ); +return -1 ; + } + ok++; }else if (matches (*argv,"help" ) ==0 ) {usage (); }else {
@@ -138,6 +148,9 @@ parse_skbedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id,if (flags &SKBEDIT_F_PRIORITY )addattr_l (n,MAX_MSG ,TCA_SKBEDIT_PRIORITY , &priority,sizeof (priority)); +if (flags &SKBEDIT_F_MARK ) +addattr_l (n,MAX_MSG ,TCA_SKBEDIT_MARK , + &mark,sizeof (mark)); tail->rta_len = (char *)NLMSG_TAIL (n) - (char *)tail; *argc_p = argc;
@@ -151,6 +164,7 @@ static int print_skbedit(struct action_util *au, FILE *f, struct rtattr *arg)struct rtattr *tb[TCA_SKBEDIT_MAX +1 ];SPRINT_BUF (b1);__u32 *priority; +__u32 *mark;__u16 *queue_mapping;if (arg ==NULL )
@@ -175,6 +189,10 @@ static int print_skbedit(struct action_util *au, FILE *f, struct rtattr *arg) priority =RTA_DATA (tb[TCA_SKBEDIT_PRIORITY ]);fprintf (f," priority %s" ,sprint_tc_classid (*priority, b1)); } +if (tb[TCA_SKBEDIT_MARK ] !=NULL ) { + mark =RTA_DATA (tb[TCA_SKBEDIT_MARK ]); +fprintf (f," mark %d" , *mark); + }if (show_stats) {if (tb[TCA_SKBEDIT_TM ]) {
Stephen Hemminger
AppliedQuoted 7 lines · On Thu, 03 Dec 2009 08:32:48 -0500 jamal <[email protected]> wrote:
I did this originally because i was getting too many support questions on ipt with mark. It still makes sense since skbedit seems to be the mother action of skb metadata (should probably have been called skbmeta).
cheers,
jamal
applied to repository for next version (header changes for 2.6.33 already done)
Stephen Hemminger
AppliedQuoted 7 lines · On Thu, 03 Dec 2009 08:32:48 -0500 jamal <[email protected]> wrote:
I did this originally because i was getting too many support questions on ipt with mark. It still makes sense since skbedit seems to be the mother action of skb metadata (should probably have been called skbmeta).
cheers,
jamal
Applied
You applied 2/2 but not 1/2.
cheers,
jamal
Quoted 17 lines · Stephen Hemminger
Quoted 7 lines · On Thu, 03 Dec 2009 08:32:48 -0500 jamal <[email protected]> wrote:
I did this originally because i was getting too many support questions on ipt with mark. It still makes sense since skbedit seems to be the mother action of skb metadata (should probably have been called skbmeta).
cheers,
jamalApplied
--
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 16 lines · On Wed, 03 Mar 2010 21:51:31 -0500 jamal <[email protected]> wrote:
You applied 2/2 but not 1/2.
cheers,
jamalQuoted 11 lines · Stephen Hemminger
Quoted 7 lines · On Thu, 03 Dec 2009 08:32:48 -0500 jamal <[email protected]> wrote:
I did this originally because i was getting too many support questions on ipt with mark. It still makes sense since skbedit seems to be the mother action of skb metadata (should probably have been called skbmeta).
cheers,
jamal
The first was the help message text, and that was already there. Or was there some other bit.
Quoted 9 lines · Stephen Hemminger
Quoted 3 lines · On Wed, 03 Mar 2010 21:51:31 -0500 jamal <[email protected]> wrote:
You applied 2/2 but not 1/2.
Quoted 1 line
The first was the help message text, and that was already there. Or was there some other bit.
I can see that now. The git logs dont show how that change made it in - thats how i concluded it wasnt there. How did that sneak in there?
cheers,
jamal
Quoted 8 lines · On Thu, 04 Mar 2010 11:58:32 -0500 jamal <[email protected]> wrote:
Quoted 7 lines · Stephen Hemminger
Quoted 3 lines · On Wed, 03 Mar 2010 21:51:31 -0500 jamal <[email protected]> wrote:
You applied 2/2 but not 1/2.
Quoted 1 line
Quoted 6 lines
Quoted 2 lines
The first was the help message text, and that was already there. Or was there some other bit.
I can see that now. The git logs dont show how that change made it in - thats how i concluded it wasnt there. How did that sneak in there?
I put the first bit in back in December. It was too early since kernel wasn't ready yet, but generally harmless
commit e04dd30a38130a3d85065a747cc33274766a9cb6
Author: Jamal Hadi Salim <[email protected]> Date: Sat Dec 26 11:12:43 2009 -0800
skbedit: Add support to mark packets
This adds support for setting the skb mark.
Quoted 2 lines · Stephen Hemminger
I put the first bit in back in December. It was too early since kernel wasn't ready yet, but generally harmless
Ah, my bad. git whatchanged didnt show that.
cheers,
jamal