Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c55d62e authored by jamal's avatar jamal Committed by David S. Miller
Browse files

pkt_sched: skbedit add support for setting mark 



This adds support for setting the skb mark.

Signed-off-by: default avatarJamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 188586b2

include/linux/tc_act/tc_skbedit.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ 




#define SKBEDIT_F_PRIORITY		0x1

#define SKBEDIT_F_PRIORITY		0x1

#define SKBEDIT_F_QUEUE_MAPPING		0x2

#define SKBEDIT_F_QUEUE_MAPPING		0x2

#define SKBEDIT_F_MARK			0x4





struct tc_skbedit {

struct tc_skbedit {

	tc_gen;

	tc_gen;
@@ -37,6 +38,7 @@ enum { 
	TCA_SKBEDIT_PARMS,

	TCA_SKBEDIT_PARMS,

	TCA_SKBEDIT_PRIORITY,

	TCA_SKBEDIT_PRIORITY,

	TCA_SKBEDIT_QUEUE_MAPPING,

	TCA_SKBEDIT_QUEUE_MAPPING,

	TCA_SKBEDIT_MARK,

	__TCA_SKBEDIT_MAX

	__TCA_SKBEDIT_MAX

};

};

#define TCA_SKBEDIT_MAX (__TCA_SKBEDIT_MAX - 1)

#define TCA_SKBEDIT_MAX (__TCA_SKBEDIT_MAX - 1)

include/net/tc_act/tc_skbedit.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -26,7 +26,9 @@ struct tcf_skbedit { 
	struct tcf_common	common;

	struct tcf_common	common;

	u32			flags;

	u32			flags;

	u32     		priority;

	u32     		priority;

	u32     		mark;

	u16			queue_mapping;

	u16			queue_mapping;

	/* XXX: 16-bit pad here? */

};

};

#define to_skbedit(pc) \

#define to_skbedit(pc) \

	container_of(pc, struct tcf_skbedit, common)

	container_of(pc, struct tcf_skbedit, common)

net/sched/act_skbedit.c

+16 −1
Original line number Original line Diff line number Diff line
@@ -54,6 +54,8 @@ static int tcf_skbedit(struct sk_buff *skb, struct tc_action *a, 
	if (d->flags & SKBEDIT_F_QUEUE_MAPPING &&

	if (d->flags & SKBEDIT_F_QUEUE_MAPPING &&

	    skb->dev->real_num_tx_queues > d->queue_mapping)

	    skb->dev->real_num_tx_queues > d->queue_mapping)

		skb_set_queue_mapping(skb, d->queue_mapping);

		skb_set_queue_mapping(skb, d->queue_mapping);

	if (d->flags & SKBEDIT_F_MARK)

		skb->mark = d->mark;





	spin_unlock(&d->tcf_lock);

	spin_unlock(&d->tcf_lock);

	return d->tcf_action;

	return d->tcf_action;
@@ -63,6 +65,7 @@ static const struct nla_policy skbedit_policy[TCA_SKBEDIT_MAX + 1] = { 
	[TCA_SKBEDIT_PARMS]		= { .len = sizeof(struct tc_skbedit) },

	[TCA_SKBEDIT_PARMS]		= { .len = sizeof(struct tc_skbedit) },

	[TCA_SKBEDIT_PRIORITY]		= { .len = sizeof(u32) },

	[TCA_SKBEDIT_PRIORITY]		= { .len = sizeof(u32) },

	[TCA_SKBEDIT_QUEUE_MAPPING]	= { .len = sizeof(u16) },

	[TCA_SKBEDIT_QUEUE_MAPPING]	= { .len = sizeof(u16) },

	[TCA_SKBEDIT_MARK]		= { .len = sizeof(u32) },

};

};





static int tcf_skbedit_init(struct nlattr *nla, struct nlattr *est,

static int tcf_skbedit_init(struct nlattr *nla, struct nlattr *est,
@@ -72,7 +75,7 @@ static int tcf_skbedit_init(struct nlattr *nla, struct nlattr *est, 
	struct tc_skbedit *parm;

	struct tc_skbedit *parm;

	struct tcf_skbedit *d;

	struct tcf_skbedit *d;

	struct tcf_common *pc;

	struct tcf_common *pc;

	u32 flags = 0, *priority = NULL;

	u32 flags = 0, *priority = NULL, *mark = NULL;

	u16 *queue_mapping = NULL;

	u16 *queue_mapping = NULL;

	int ret = 0, err;

	int ret = 0, err;
@@ -95,6 +98,12 @@ static int tcf_skbedit_init(struct nlattr *nla, struct nlattr *est, 
		flags |= SKBEDIT_F_QUEUE_MAPPING;

		flags |= SKBEDIT_F_QUEUE_MAPPING;

		queue_mapping = nla_data(tb[TCA_SKBEDIT_QUEUE_MAPPING]);

		queue_mapping = nla_data(tb[TCA_SKBEDIT_QUEUE_MAPPING]);

	}

	}



	if (tb[TCA_SKBEDIT_MARK] != NULL) {

		flags |= SKBEDIT_F_MARK;

		mark = nla_data(tb[TCA_SKBEDIT_MARK]);

	}



	if (!flags)

	if (!flags)

		return -EINVAL;

		return -EINVAL;
@@ -124,6 +133,9 @@ static int tcf_skbedit_init(struct nlattr *nla, struct nlattr *est, 
		d->priority = *priority;

		d->priority = *priority;

	if (flags & SKBEDIT_F_QUEUE_MAPPING)

	if (flags & SKBEDIT_F_QUEUE_MAPPING)

		d->queue_mapping = *queue_mapping;

		d->queue_mapping = *queue_mapping;

	if (flags & SKBEDIT_F_MARK)

		d->mark = *mark;



	d->tcf_action = parm->action;

	d->tcf_action = parm->action;





	spin_unlock_bh(&d->tcf_lock);

	spin_unlock_bh(&d->tcf_lock);
@@ -161,6 +173,9 @@ static inline int tcf_skbedit_dump(struct sk_buff *skb, struct tc_action *a, 
	if (d->flags & SKBEDIT_F_QUEUE_MAPPING)

	if (d->flags & SKBEDIT_F_QUEUE_MAPPING)

		NLA_PUT(skb, TCA_SKBEDIT_QUEUE_MAPPING,

		NLA_PUT(skb, TCA_SKBEDIT_QUEUE_MAPPING,

			sizeof(d->queue_mapping), &d->queue_mapping);

			sizeof(d->queue_mapping), &d->queue_mapping);

	if (d->flags & SKBEDIT_F_MARK)

		NLA_PUT(skb, TCA_SKBEDIT_MARK, sizeof(d->mark),

			&d->mark);

	t.install = jiffies_to_clock_t(jiffies - d->tcf_tm.install);

	t.install = jiffies_to_clock_t(jiffies - d->tcf_tm.install);

	t.lastuse = jiffies_to_clock_t(jiffies - d->tcf_tm.lastuse);

	t.lastuse = jiffies_to_clock_t(jiffies - d->tcf_tm.lastuse);

	t.expires = jiffies_to_clock_t(d->tcf_tm.expires);

	t.expires = jiffies_to_clock_t(d->tcf_tm.expires);