From: Toshiaki Makita <toshiaki.makita1@gmail.com>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <jakub.kicinski@netronome.com>,
Jesper Dangaard Brouer <hawk@kernel.org>,
John Fastabend <john.fastabend@gmail.com>,
Jamal Hadi Salim <jhs@mojatatu.com>,
Cong Wang <xiyou.wangcong@gmail.com>,
Jiri Pirko <jiri@resnulli.us>,
Pablo Neira Ayuso <pablo@netfilter.org>,
Jozsef Kadlecsik <kadlec@netfilter.org>,
Florian Westphal <fw@strlen.de>,
Pravin B Shelar <pshelar@ovn.org>
Cc: Toshiaki Makita <toshiaki.makita1@gmail.com>,
netdev@vger.kernel.org, bpf@vger.kernel.org,
William Tu <u9012063@gmail.com>,
Stanislav Fomichev <sdf@fomichev.me>
Subject: [RFC PATCH v2 bpf-next 12/15] xdp_flow: Implement vlan_push action
Date: Fri, 18 Oct 2019 13:07:45 +0900 [thread overview]
Message-ID: <20191018040748.30593-13-toshiaki.makita1@gmail.com> (raw)
In-Reply-To: <20191018040748.30593-1-toshiaki.makita1@gmail.com>
This is another example action.
Signed-off-by: Toshiaki Makita <toshiaki.makita1@gmail.com>
---
net/xdp_flow/xdp_flow_kern_bpf.c | 23 +++++++++++++++++++++--
net/xdp_flow/xdp_flow_kern_mod.c | 5 +++++
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/net/xdp_flow/xdp_flow_kern_bpf.c b/net/xdp_flow/xdp_flow_kern_bpf.c
index 381d67e..7930349 100644
--- a/net/xdp_flow/xdp_flow_kern_bpf.c
+++ b/net/xdp_flow/xdp_flow_kern_bpf.c
@@ -90,10 +90,29 @@ static inline int action_redirect(struct xdp_flow_action *action)
static inline int action_vlan_push(struct xdp_md *ctx,
struct xdp_flow_action *action)
{
+ struct vlan_ethhdr *vehdr;
+ void *data, *data_end;
+ __be16 proto, tci;
+
account_action(XDP_FLOW_ACTION_VLAN_PUSH);
- // TODO: implement this
- return XDP_ABORTED;
+ proto = action->vlan.proto;
+ tci = action->vlan.tci;
+
+ if (bpf_xdp_adjust_head(ctx, -VLAN_HLEN))
+ return XDP_DROP;
+
+ data_end = (void *)(long)ctx->data_end;
+ data = (void *)(long)ctx->data;
+ if (data + VLAN_ETH_HLEN > data_end)
+ return XDP_DROP;
+
+ __builtin_memmove(data, data + VLAN_HLEN, ETH_ALEN * 2);
+ vehdr = data;
+ vehdr->h_vlan_proto = proto;
+ vehdr->h_vlan_TCI = tci;
+
+ return _XDP_CONTINUE;
}
static inline int action_vlan_pop(struct xdp_md *ctx,
diff --git a/net/xdp_flow/xdp_flow_kern_mod.c b/net/xdp_flow/xdp_flow_kern_mod.c
index 2581b81..7ce1733 100644
--- a/net/xdp_flow/xdp_flow_kern_mod.c
+++ b/net/xdp_flow/xdp_flow_kern_mod.c
@@ -84,6 +84,11 @@ static int xdp_flow_parse_actions(struct xdp_flow_actions *actions,
action->ifindex = act->dev->ifindex;
break;
case FLOW_ACTION_VLAN_PUSH:
+ action->id = XDP_FLOW_ACTION_VLAN_PUSH;
+ action->vlan.tci = act->vlan.vid |
+ (act->vlan.prio << VLAN_PRIO_SHIFT);
+ action->vlan.proto = act->vlan.proto;
+ break;
case FLOW_ACTION_VLAN_POP:
case FLOW_ACTION_VLAN_MANGLE:
case FLOW_ACTION_MANGLE:
--
1.8.3.1
next prev parent reply other threads:[~2019-10-18 5:00 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-18 4:07 [RFC PATCH v2 bpf-next 00/15] xdp_flow: Flow offload to XDP Toshiaki Makita
2019-10-18 4:07 ` [RFC PATCH v2 bpf-next 01/15] xdp_flow: Add skeleton of XDP based flow offload driver Toshiaki Makita
2019-10-18 4:07 ` [RFC PATCH v2 bpf-next 02/15] xdp_flow: Add skeleton bpf program for XDP Toshiaki Makita
2019-10-18 4:07 ` [RFC PATCH v2 bpf-next 03/15] bpf: Add API to get program from id Toshiaki Makita
2019-10-18 4:07 ` [RFC PATCH v2 bpf-next 04/15] xdp: Export dev_check_xdp and dev_change_xdp Toshiaki Makita
2019-10-18 4:07 ` [RFC PATCH v2 bpf-next 05/15] xdp_flow: Attach bpf prog to XDP in kernel after UMH loaded program Toshiaki Makita
2019-10-18 4:07 ` [RFC PATCH v2 bpf-next 06/15] xdp_flow: Prepare flow tables in bpf Toshiaki Makita
2019-10-18 4:07 ` [RFC PATCH v2 bpf-next 07/15] xdp_flow: Add flow entry insertion/deletion logic in UMH Toshiaki Makita
2019-10-18 4:07 ` [RFC PATCH v2 bpf-next 08/15] xdp_flow: Add flow handling and basic actions in bpf prog Toshiaki Makita
2019-10-18 4:07 ` [RFC PATCH v2 bpf-next 09/15] xdp_flow: Implement flow replacement/deletion logic in xdp_flow kmod Toshiaki Makita
2019-10-18 4:07 ` [RFC PATCH v2 bpf-next 10/15] xdp_flow: Add netdev feature for enabling flow offload to XDP Toshiaki Makita
2019-10-18 4:07 ` [RFC PATCH v2 bpf-next 11/15] xdp_flow: Implement redirect action Toshiaki Makita
2019-10-18 4:07 ` Toshiaki Makita [this message]
2019-10-18 4:07 ` [RFC PATCH v2 bpf-next 13/15] bpf, selftest: Add test for xdp_flow Toshiaki Makita
2019-10-18 4:07 ` [RFC PATCH v2 bpf-next 14/15] i40e: prefetch xdp->data before running XDP prog Toshiaki Makita
2019-10-18 4:07 ` [RFC PATCH v2 bpf-next 15/15] bpf, hashtab: Compare keys in long Toshiaki Makita
2019-10-18 15:22 ` [RFC PATCH v2 bpf-next 00/15] xdp_flow: Flow offload to XDP John Fastabend
2019-10-21 7:31 ` Toshiaki Makita
2019-10-22 16:54 ` John Fastabend
2019-10-22 17:45 ` Toke Høiland-Jørgensen
2019-10-24 4:27 ` John Fastabend
2019-10-24 10:13 ` Toke Høiland-Jørgensen
2019-10-27 13:19 ` Toshiaki Makita
2019-10-27 15:21 ` Toke Høiland-Jørgensen
2019-10-28 3:16 ` David Ahern
2019-10-28 8:36 ` Toke Høiland-Jørgensen
2019-10-28 10:08 ` Jesper Dangaard Brouer
2019-10-28 19:07 ` David Ahern
2019-10-28 19:05 ` David Ahern
2019-10-31 0:18 ` Toshiaki Makita
2019-10-31 12:12 ` Toke Høiland-Jørgensen
2019-11-11 7:32 ` Toshiaki Makita
2019-11-12 16:53 ` Toke Høiland-Jørgensen
2019-11-14 10:11 ` Toshiaki Makita
2019-11-14 12:41 ` Toke Høiland-Jørgensen
2019-11-18 6:41 ` Toshiaki Makita
2019-11-18 10:20 ` Toke Høiland-Jørgensen
2019-11-22 5:42 ` Toshiaki Makita
2019-11-22 11:54 ` Toke Høiland-Jørgensen
2019-11-25 10:18 ` Toshiaki Makita
2019-11-25 13:03 ` Toke Høiland-Jørgensen
2019-11-18 10:28 ` Toke Høiland-Jørgensen
2019-10-27 13:13 ` Toshiaki Makita
2019-10-27 15:24 ` Toke Høiland-Jørgensen
2019-10-27 19:17 ` David Miller
2019-10-31 0:32 ` Toshiaki Makita
2019-11-12 17:50 ` William Tu
2019-11-14 10:06 ` Toshiaki Makita
2019-11-14 17:09 ` William Tu
2019-11-15 13:16 ` Toke Høiland-Jørgensen
2019-11-12 17:38 ` William Tu
2019-10-23 14:11 ` Jamal Hadi Salim
2019-10-24 4:38 ` John Fastabend
2019-10-24 17:05 ` Jamal Hadi Salim
2019-10-27 13:27 ` Toshiaki Makita
2019-10-27 13:06 ` Toshiaki Makita
2019-10-21 11:23 ` Björn Töpel
2019-10-21 11:47 ` Toshiaki Makita
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191018040748.30593-13-toshiaki.makita1@gmail.com \
--to=toshiaki.makita1@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=fw@strlen.de \
--cc=hawk@kernel.org \
--cc=jakub.kicinski@netronome.com \
--cc=jhs@mojatatu.com \
--cc=jiri@resnulli.us \
--cc=john.fastabend@gmail.com \
--cc=kadlec@netfilter.org \
--cc=kafai@fb.com \
--cc=netdev@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=pshelar@ovn.org \
--cc=sdf@fomichev.me \
--cc=songliubraving@fb.com \
--cc=u9012063@gmail.com \
--cc=xiyou.wangcong@gmail.com \
--cc=yhs@fb.com \
--subject='Re: [RFC PATCH v2 bpf-next 12/15] xdp_flow: Implement vlan_push action' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).