Merge branch 'bpf-next'
Daniel Borkmann says: ==================== Misc cls_bpf/act_bpf improvements Two minor improvements to {cls,act}_bpf. For details please see individual patches. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
c865250164
|
@ -39,13 +39,10 @@ static struct tc_action_ops act_bpf_ops;
|
||||||
static int tcf_bpf(struct sk_buff *skb, const struct tc_action *act,
|
static int tcf_bpf(struct sk_buff *skb, const struct tc_action *act,
|
||||||
struct tcf_result *res)
|
struct tcf_result *res)
|
||||||
{
|
{
|
||||||
|
bool at_ingress = skb_at_tc_ingress(skb);
|
||||||
struct tcf_bpf *prog = to_bpf(act);
|
struct tcf_bpf *prog = to_bpf(act);
|
||||||
struct bpf_prog *filter;
|
struct bpf_prog *filter;
|
||||||
int action, filter_res;
|
int action, filter_res;
|
||||||
bool at_ingress = G_TC_AT(skb->tc_verd) & AT_INGRESS;
|
|
||||||
|
|
||||||
if (unlikely(!skb_mac_header_was_set(skb)))
|
|
||||||
return TC_ACT_UNSPEC;
|
|
||||||
|
|
||||||
tcf_lastuse_update(&prog->tcf_tm);
|
tcf_lastuse_update(&prog->tcf_tm);
|
||||||
bstats_cpu_update(this_cpu_ptr(prog->common.cpu_bstats), skb);
|
bstats_cpu_update(this_cpu_ptr(prog->common.cpu_bstats), skb);
|
||||||
|
|
|
@ -83,9 +83,6 @@ static int cls_bpf_classify(struct sk_buff *skb, const struct tcf_proto *tp,
|
||||||
struct cls_bpf_prog *prog;
|
struct cls_bpf_prog *prog;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
|
|
||||||
if (unlikely(!skb_mac_header_was_set(skb)))
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
/* Needed here for accessing maps. */
|
/* Needed here for accessing maps. */
|
||||||
rcu_read_lock();
|
rcu_read_lock();
|
||||||
list_for_each_entry_rcu(prog, &head->plist, link) {
|
list_for_each_entry_rcu(prog, &head->plist, link) {
|
||||||
|
|
Loading…
Reference in a new issue