From patchwork Mon Dec 28 09:24:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: taoyunxiang X-Patchwork-Id: 1420950 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.138; helo=whitealder.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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D4Qb23CX3z9sWC for ; Tue, 29 Dec 2020 05:10:53 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 203FE86E54; Mon, 28 Dec 2020 18:10:50 +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 dRVNEBZvBQe1; Mon, 28 Dec 2020 18:10:41 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 3557F86D03; Mon, 28 Dec 2020 18:10:38 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 0B743C1DA2; Mon, 28 Dec 2020 18:10:38 +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 861D6C0891 for ; Mon, 28 Dec 2020 09:25:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 74FB986C46 for ; Mon, 28 Dec 2020 09:25:56 +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 qWXRKniilDQ7 for ; Mon, 28 Dec 2020 09:25:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from cmccmta2.chinamobile.com (cmccmta2.chinamobile.com [221.176.66.80]) by whitealder.osuosl.org (Postfix) with ESMTP id AC95486C77 for ; Mon, 28 Dec 2020 09:25:54 +0000 (UTC) Received: from spf.mail.chinamobile.com (unknown[172.16.121.3]) by rmmx-syy-dmz-app06-12006 (RichMail) with SMTP id 2ee65fe9a4905b9-c1c50; Mon, 28 Dec 2020 17:25:36 +0800 (CST) X-RM-TRANSID: 2ee65fe9a4905b9-c1c50 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-7b853; Mon, 28 Dec 2020 17:25:36 +0800 (CST) X-RM-TRANSID: 2ee25fe9a48a90b-7b853 From: Tao YunXiang To: ovs-dev@openvswitch.org Date: Mon, 28 Dec 2020 01:24:27 -0800 Message-Id: <20201228092520.11807-10-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:33 +0000 Cc: Liuchang Subject: [ovs-dev] [PATCH 09/62] netdev-offload-dpdk: Add consumed_mask check in parse_flow_match 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: Liuchang Code Source From: Self Code Description: Add consumed_mask check in parse_flow_match Jira: #[Optional] 市场项目编号（名称）：[Optional] --- lib/netdev-offload-dpdk.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c index 05c7558..5cce175 100644 --- a/lib/netdev-offload-dpdk.c +++ b/lib/netdev-offload-dpdk.c @@ -568,6 +568,14 @@ parse_flow_match(struct flow_patterns *patterns, { uint8_t *next_proto_mask = NULL; uint8_t proto = 0; + struct flow *consumed_masks; + + consumed_masks = &match->wc.masks; + /* Not attemp to offload in_port/recirc_id ? + memset(&consumed_masks->in_port, 0, sizeof consumed_masks->in_port); + consumed_masks->recirc_id = 0; + */ + consumed_masks->packet_type = 0; /* Eth */ if (!eth_addr_is_zero(match->wc.masks.dl_src) || @@ -586,6 +594,9 @@ parse_flow_match(struct flow_patterns *patterns, mask->type = match->wc.masks.dl_type; add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_ETH, spec, mask); + memset(&consumed_masks->dl_dst, 0, sizeof consumed_masks->dl_dst); + memset(&consumed_masks->dl_src, 0, sizeof consumed_masks->dl_src); + } else { /* * If user specifies a flow (like UDP flow) without L2 patterns, @@ -596,6 +607,7 @@ parse_flow_match(struct flow_patterns *patterns, */ add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_ETH, NULL, NULL); } + consumed_masks->dl_type = 0; /* VLAN */ if (match->wc.masks.vlans[0].tci && match->flow.vlans[0].tci) { @@ -612,6 +624,7 @@ parse_flow_match(struct flow_patterns *patterns, add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_VLAN, spec, mask); } + memset(&consumed_masks->vlans[0], 0, sizeof consumed_masks->vlans[0]); /* do not attempt to offload frags. */ if (match->flow.nw_frag != OVS_FRAG_TYPE_NONE && match->wc.masks.nw_frag) { @@ -619,6 +632,7 @@ parse_flow_match(struct flow_patterns *patterns, match->wc.masks.nw_frag); return -1; } + consumed_masks->nw_frag = 0; /* IP v4 */ if (match->flow.dl_type == htons(ETH_TYPE_IP)) { @@ -641,6 +655,12 @@ parse_flow_match(struct flow_patterns *patterns, add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_IPV4, spec, mask); + consumed_masks->nw_tos = 0; + consumed_masks->nw_ttl = 0; + consumed_masks->nw_proto = 0; + consumed_masks->nw_src = 0; + consumed_masks->nw_dst = 0; + /* Save proto for L4 protocol setup. */ proto = spec->hdr.next_proto_id & mask->hdr.next_proto_id; @@ -679,6 +699,10 @@ parse_flow_match(struct flow_patterns *patterns, add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_TCP, spec, mask); + consumed_masks->tp_src = 0; + consumed_masks->tp_dst = 0; + consumed_masks->tcp_flags = 0; + /* proto == TCP and ITEM_TYPE_TCP, thus no need for proto match. */ if (next_proto_mask) { *next_proto_mask = 0; @@ -697,6 +721,9 @@ parse_flow_match(struct flow_patterns *patterns, add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_UDP, spec, mask); + consumed_masks->tp_src = 0; + consumed_masks->tp_dst = 0; + /* proto == UDP and ITEM_TYPE_UDP, thus no need for proto match. */ if (next_proto_mask) { *next_proto_mask = 0; @@ -715,6 +742,9 @@ parse_flow_match(struct flow_patterns *patterns, add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_SCTP, spec, mask); + consumed_masks->tp_src = 0; + consumed_masks->tp_dst = 0; + /* proto == SCTP and ITEM_TYPE_SCTP, thus no need for proto match. */ if (next_proto_mask) { *next_proto_mask = 0; @@ -733,6 +763,9 @@ parse_flow_match(struct flow_patterns *patterns, add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_ICMP, spec, mask); + consumed_masks->tp_src = 0; + consumed_masks->tp_dst = 0; + /* proto == ICMP and ITEM_TYPE_ICMP, thus no need for proto match. */ if (next_proto_mask) { *next_proto_mask = 0; @@ -741,6 +774,12 @@ parse_flow_match(struct flow_patterns *patterns, add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_END, NULL, NULL); + if (!is_all_zeros(consumed_masks, sizeof *consumed_masks)) { + VLOG_DBG("Cannot match all matches. dl_type=0x%04x", + ntohs(match->flow.dl_type)); + return -1; + } + return 0; }