From patchwork Mon Dec 28 09:25:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: taoyunxiang X-Patchwork-Id: 1420974 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cmss.chinamobile.com Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D4QcL5yPnz9sVv for ; Tue, 29 Dec 2020 05:12:02 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2D7448748C; Mon, 28 Dec 2020 18:12:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kIZq5ahMFJFM; Mon, 28 Dec 2020 18:11:53 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id 2364F871BA; Mon, 28 Dec 2020 18:11:28 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id B0A5EC1ECE; Mon, 28 Dec 2020 18:11:27 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5545EC0891 for ; Mon, 28 Dec 2020 09:26:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 440F686C8A for ; Mon, 28 Dec 2020 09:26:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IUsRRFMU5bi8 for ; Mon, 28 Dec 2020 09:26:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from cmccmta1.chinamobile.com (cmccmta1.chinamobile.com [221.176.66.79]) by whitealder.osuosl.org (Postfix) with ESMTP id E5E5B86C8C for ; Mon, 28 Dec 2020 09:26:15 +0000 (UTC) Received: from spf.mail.chinamobile.com (unknown[172.16.121.3]) by rmmx-syy-dmz-app02-12002 (RichMail) with SMTP id 2ee25fe9a4a4d84-bec0d; Mon, 28 Dec 2020 17:25:56 +0800 (CST) X-RM-TRANSID: 2ee25fe9a4a4d84-bec0d X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 Received: from yun.localdomain (unknown[112.25.154.146]) by rmsmtp-syy-appsvr02-12002 (RichMail) with SMTP id 2ee25fe9a48a90b-7b8d9; Mon, 28 Dec 2020 17:25:55 +0800 (CST) X-RM-TRANSID: 2ee25fe9a48a90b-7b8d9 From: Tao YunXiang To: ovs-dev@openvswitch.org Date: Mon, 28 Dec 2020 01:25:03 -0800 Message-Id: <20201228092520.11807-46-taoyunxiang@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201228092520.11807-1-taoyunxiang@cmss.chinamobile.com> References: <8> <20201228092520.11807-1-taoyunxiang@cmss.chinamobile.com> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 28 Dec 2020 18:10:34 +0000 Cc: Taoyunxiang Subject: [ovs-dev] [PATCH 45/62] netdev-offload-dpdk: Add geneve option header parse/encap X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Taoyunxiang Code Source From: Self Code Description: Add geneve tunnel header parse/encap support. Jira: #[Optional] 市场项目编号（名称）：[Optional] --- lib/netdev-offload-dpdk.c | 96 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 77 insertions(+), 19 deletions(-) diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c index 12aa5c1..fb36466 100644 --- a/lib/netdev-offload-dpdk.c +++ b/lib/netdev-offload-dpdk.c @@ -413,12 +413,37 @@ dump_flow_pattern(struct ds *s, const struct rte_flow_item *item) ds_put_cstr(s, " Spec = null\n"); } if (geneve_mask) { - ds_put_format(s, "vni mask 0x%06x ", + ds_put_format(s, "vni mask 0x%06x \n", ntohl(*(ovs_be32 *)geneve_mask->vni) >> 8); } else { ds_put_cstr(s, " Mask = null\n"); } ds_put_cstr(s, "/ "); + } else if (item->type == RTE_FLOW_ITEM_TYPE_GENEVE_OPTIONS) { + const struct rte_flow_item_geneve_options *op_spec = item->spec; + const struct rte_flow_item_geneve_options *op_mask = item->mask; + + ds_put_cstr(s, "rte flow geneve options pattern:\n"); + ds_put_cstr(s, "geneve op \n"); + if (op_spec) { + ds_put_format(s, "class spec 0x%04x \n", ntohs(op_spec->class)); + ds_put_format(s, "type spec 0x%02x \n", op_spec->type); + ds_put_format(s, "len spec %d \n", op_spec->len); + ds_put_format(s, "opdata spec 0x%08x \n", + ntohl(op_spec->option_data)); + } else { + ds_put_cstr(s, " Spec = null\n"); + } + if (op_mask) { + ds_put_format(s, "class mask 0x%04x \n", ntohs(op_mask->class)); + ds_put_format(s, "type mask 0x%02x \n", op_mask->type); + ds_put_format(s, "len mask %d \n", op_mask->len); + ds_put_format(s, "opdata mask 0x%08x \n", + ntohl(op_mask->option_data)); + } else { + ds_put_cstr(s, " Mask = null\n"); + } + ds_put_cstr(s, "/ "); } else { ds_put_format(s, "unknown rte flow pattern (%d)\n", item->type); } @@ -489,7 +514,6 @@ dump_flow_action(struct ds *s, const struct rte_flow_action *actions) } } else if (actions->type == RTE_FLOW_ACTION_TYPE_VXLAN_DECAP) { ds_put_format(s, "vxlan-decap: nop\n"); - /* TBD } else if (actions->type == RTE_FLOW_ACTION_TYPE_GENEVE_ENCAP) { const struct rte_flow_action_geneve_encap *geneve_encap = actions->conf; const struct rte_flow_item *items = geneve_encap->definition; @@ -501,7 +525,6 @@ dump_flow_action(struct ds *s, const struct rte_flow_action *actions) } } else if (actions->type == RTE_FLOW_ACTION_TYPE_GENEVE_DECAP) { ds_put_format(s, "geneve-decap: nop\n"); - */ } else if (actions->type == RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN) { const struct rte_flow_action_of_push_vlan *vlan_tci = actions->conf; @@ -760,10 +783,11 @@ parse_geneve_match(struct flow_patterns *patterns, const struct match *match) { struct rte_flow_item_geneve *vx_spec, *vx_mask; - /* TBD */ + struct rte_flow_item_geneve_options *op_spec, *op_mask; uint8_t data_len; uint32_t len,opt_data; struct geneve_opt *opt; + const void *gnv; uint8_t i; if (is_all_zeros(&match->wc.masks.tunnel, sizeof match->wc.masks.tunnel)) { @@ -789,17 +813,28 @@ parse_geneve_match(struct flow_patterns *patterns, add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_GENEVE, vx_spec, vx_mask); - /* TBD: add option hdr */ len = match->flow.tunnel.metadata.present.len; if (len > 0) { - opt = &match->flow.tunnel.metadata.opts.gnv; + gnv = &(match->flow.tunnel.metadata.opts.gnv); + opt = (struct geneve_opt *)gnv; data_len = opt->length*4; - uint8_t *buf = (opt+1); + uint8_t *buf = (uint8_t *)(opt+1); for (i=0; iclass = opt->opt_class; + op_spec->type = opt->type; + op_spec->len = opt->length; + op_spec->option_data = htonl(opt_data); + + add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_GENEVE_OPTIONS, op_spec, op_mask); } return 0; } @@ -1461,7 +1496,7 @@ err: return -1; } -#define ACTION_GENEVE_ENCAP_ITEMS_NUM 5 +#define ACTION_GENEVE_ENCAP_ITEMS_NUM 6 static int add_geneve_encap_action(struct flow_actions *actions, @@ -1469,18 +1504,21 @@ add_geneve_encap_action(struct flow_actions *actions, { const struct eth_header *eth; const struct udp_header *udp; + const struct genevehdr *geneve; struct geneve_data { - /* TBD struct rte_flow_action_geneve_encap conf; - */ - struct rte_flow_action_vxlan_encap conf; struct rte_flow_item items[0]; } *geneve_data; BUILD_ASSERT_DECL(offsetof(struct geneve_data, conf) == 0); - const void *geneve; const void *l3; const void *l4; + const void *l5; + struct rte_flow_item_geneve_options *op_spec; + struct rte_flow_item_geneve *gnv_spec; + struct geneve_opt *opt; int field; + uint8_t data_len,i; + uint32_t opt_data = 0; VLOG_DBG("TIMO DBG: in add_geneve_encap_action"); geneve_data = xzalloc(sizeof *geneve_data + @@ -1529,21 +1567,44 @@ add_geneve_encap_action(struct flow_actions *actions, geneve_data->items[field].type = RTE_FLOW_ITEM_TYPE_UDP; geneve_data->items[field].spec = udp; geneve_data->items[field].mask = &rte_flow_item_udp_mask; + l5 = (udp + 1); field++; - geneve = (udp + 1); + geneve = (const struct genevehdr *)l5; + gnv_spec = xzalloc(sizeof *gnv_spec); geneve_data->items[field].type = RTE_FLOW_ITEM_TYPE_GENEVE; - geneve_data->items[field].spec = geneve; + gnv_spec->protocol = geneve->proto_type; + put_unaligned_be32((ovs_be32 *)gnv_spec->vni, + get_16aligned_be32(&geneve->vni)); + geneve_data->items[field].spec = gnv_spec; geneve_data->items[field].mask = &rte_flow_item_geneve_mask; field++; + opt =(struct geneve_opt *)&geneve->options; + data_len = opt->length*4; + if (data_len) { + uint8_t *buf = (uint8_t *)(opt+1); + for (i=0; iclass = opt->opt_class; + op_spec->type = opt->type; + op_spec->len = opt->length; + op_spec->option_data = htonl(opt_data); + geneve_data->items[field].type = RTE_FLOW_ITEM_TYPE_GENEVE_OPTIONS; + geneve_data->items[field].spec = op_spec; + geneve_data->items[field].mask = &rte_flow_item_geneve_options_mask; + field++; + } + geneve_data->items[field].type = RTE_FLOW_ITEM_TYPE_END; geneve_data->conf.definition = geneve_data->items; - /* TBD add_flow_action(actions, RTE_FLOW_ACTION_TYPE_GENEVE_ENCAP, geneve_data); - */ return 0; err: @@ -1562,10 +1623,7 @@ static void add_geneve_decap_action(struct flow_actions *actions) { VLOG_DBG("TIMO DBG: in add_geneve_decap_action"); - /* TBD need change to geneve decap add_flow_action(actions, RTE_FLOW_ACTION_TYPE_GENEVE_DECAP, NULL); - */ - add_flow_action(actions, RTE_FLOW_ACTION_TYPE_VXLAN_DECAP, NULL); } static int