From patchwork Sun Feb 4 16:22:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darrell Ball X-Patchwork-Id: 869045 X-Patchwork-Delegate: ian.stokes@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GV0uCOsj"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zZGJC3CtDz9s7v for ; Mon, 5 Feb 2018 03:24:11 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 01AFAF46; Sun, 4 Feb 2018 16:23:04 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id E7404F21 for ; Sun, 4 Feb 2018 16:23:01 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 9671B305 for ; Sun, 4 Feb 2018 16:23:01 +0000 (UTC) Received: by mail-pl0-f68.google.com with SMTP id 13so10122000plb.5 for ; Sun, 04 Feb 2018 08:23:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=9mh92J/nvuUIG3sa0DER1PmJsmHisHlZHLuek82WkrY=; b=GV0uCOsj590EbMfs6951KY783Z++5PD4v7jkk1ms+F5dx/maOv5CDaFjzoVRnM0drO 2NuTA6N6K0UwfFsg5U9QxtiF9TumeWt0X2io7i6NR4wex4TVu+0I6iJrokkycWX/h9yY Lt+D+cMlXk+0WchYfsZtgtPLzSt2Nf+UREzjRSlrcjjFsSYayiP9UeMoPAjB+0q6hyKO wiRTLZRiM2PuNUfXkuF0rTgaVheiH3US9Xv7A2XEdjcLZ7SbRQ2859E8ellw1nRwkkTE r2+PHiBF3b7W8McMXt7z0yu3vYLXqnMtK0J05WedDJLBx/+bCi4Z5SXXkSvLWe3vj29r 5B2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=9mh92J/nvuUIG3sa0DER1PmJsmHisHlZHLuek82WkrY=; b=oVvB38m3Q+wQRP0IIbitmz+w6A3dFjVRh84ytSCWCnfKN+vv24+pbzunBgQrpfHQ8+ iDeJgo/kIRhbQXeS21HMsDZglrTy6evGBmePpg4pt6SjSkDLM5TUMEYzgTRjLFGal+hS /+MxcZQoYX52ZNfTj05PXrXbxzT9/sL4uWgL94Q9xGsha9nt6EBjOClwtfiLJR6rHwK6 6aG1vVe32reb9zW2rU30nt5bsZEtNDU7p+LhPU5DwItlEwRTR6Jbk78bG5CiNRvR7dEr M4hc2x/qA1JiPWFFmKe3Lo+dvxrvEOdP4qrm8tNlkYeZwgipo/1DPrfu4focxglSilFL TLfg== X-Gm-Message-State: AKwxytcM2SMUGTxPG1p2ppq2Bs/HjTVsq71HEteJD6m6W8U5F8ddWhaT zLW9OugAkKuVaM3NtTvnNz8= X-Google-Smtp-Source: AH8x224MeNKq8KOrPNpT2U2jiGANZsiMhgyydscgBaX6mxrSj6CmaZikojW18LA92jzPW5pKodhX6w== X-Received: by 2002:a17:902:a589:: with SMTP id az9-v6mr20186034plb.298.1517761381148; Sun, 04 Feb 2018 08:23:01 -0800 (PST) Received: from ubuntu.localdomain (c-73-162-236-45.hsd1.ca.comcast.net. [73.162.236.45]) by smtp.gmail.com with ESMTPSA id e9sm10109503pgv.14.2018.02.04.08.23.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 04 Feb 2018 08:23:00 -0800 (PST) From: Darrell Ball To: dlu998@gmail.com, dev@openvswitch.org Date: Sun, 4 Feb 2018 08:22:35 -0800 Message-Id: <1517761364-17655-3-git-send-email-dlu998@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1517761364-17655-1-git-send-email-dlu998@gmail.com> References: <1517761364-17655-1-git-send-email-dlu998@gmail.com> X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [patch v5 02/11] flow: Enhance parse_ipv6_ext_hdrs. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Enhance the api parse_ipv6_ext_hdrs to return the fragmentation header to be used in later patches. Signed-off-by: Darrell Ball Acked-by: Justin Pettit --- lib/conntrack.c | 5 +++-- lib/flow.c | 23 ++++++++++++++--------- lib/flow.h | 3 ++- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/lib/conntrack.c b/lib/conntrack.c index fe5fd0f..d34eb32 100644 --- a/lib/conntrack.c +++ b/lib/conntrack.c @@ -1308,7 +1308,6 @@ conntrack_execute(struct conntrack *ct, struct dp_packet_batch *pkt_batch, const struct nat_action_info_t *nat_action_info, long long now) { - struct dp_packet *packet; struct conn_lookup_ctx ctx; @@ -1566,7 +1565,9 @@ extract_l3_ipv6(struct conn_key *key, const void *data, size_t size, uint8_t nw_proto = ip6->ip6_nxt; uint8_t nw_frag = 0; - if (!parse_ipv6_ext_hdrs(&data, &size, &nw_proto, &nw_frag)) { + const struct ovs_16aligned_ip6_frag *frag_hdr; + if (!parse_ipv6_ext_hdrs(&data, &size, &nw_proto, &nw_frag, + &frag_hdr)) { return false; } diff --git a/lib/flow.c b/lib/flow.c index 38ff29c..0283e6d 100644 --- a/lib/flow.c +++ b/lib/flow.c @@ -455,7 +455,8 @@ invalid: static inline bool parse_ipv6_ext_hdrs__(const void **datap, size_t *sizep, uint8_t *nw_proto, - uint8_t *nw_frag) + uint8_t *nw_frag, + const struct ovs_16aligned_ip6_frag **frag_hdr) { while (1) { if (OVS_LIKELY((*nw_proto != IPPROTO_HOPOPTS) @@ -502,17 +503,17 @@ parse_ipv6_ext_hdrs__(const void **datap, size_t *sizep, uint8_t *nw_proto, return false; } } else if (*nw_proto == IPPROTO_FRAGMENT) { - const struct ovs_16aligned_ip6_frag *frag_hdr = *datap; + *frag_hdr = *datap; - *nw_proto = frag_hdr->ip6f_nxt; - if (!data_try_pull(datap, sizep, sizeof *frag_hdr)) { + *nw_proto = (*frag_hdr)->ip6f_nxt; + if (!data_try_pull(datap, sizep, sizeof **frag_hdr)) { return false; } /* We only process the first fragment. */ - if (frag_hdr->ip6f_offlg != htons(0)) { + if ((*frag_hdr)->ip6f_offlg != htons(0)) { *nw_frag = FLOW_NW_FRAG_ANY; - if ((frag_hdr->ip6f_offlg & IP6F_OFF_MASK) != htons(0)) { + if (((*frag_hdr)->ip6f_offlg & IP6F_OFF_MASK) != htons(0)) { *nw_frag |= FLOW_NW_FRAG_LATER; *nw_proto = IPPROTO_FRAGMENT; return true; @@ -524,9 +525,11 @@ parse_ipv6_ext_hdrs__(const void **datap, size_t *sizep, uint8_t *nw_proto, bool parse_ipv6_ext_hdrs(const void **datap, size_t *sizep, uint8_t *nw_proto, - uint8_t *nw_frag) + uint8_t *nw_frag, + const struct ovs_16aligned_ip6_frag **frag_hdr) { - return parse_ipv6_ext_hdrs__(datap, sizep, nw_proto, nw_frag); + return parse_ipv6_ext_hdrs__(datap, sizep, nw_proto, nw_frag, + frag_hdr); } bool @@ -840,7 +843,9 @@ miniflow_extract(struct dp_packet *packet, struct miniflow *dst) nw_ttl = nh->ip6_hlim; nw_proto = nh->ip6_nxt; - if (!parse_ipv6_ext_hdrs__(&data, &size, &nw_proto, &nw_frag)) { + const struct ovs_16aligned_ip6_frag *frag_hdr; + if (!parse_ipv6_ext_hdrs__(&data, &size, &nw_proto, &nw_frag, + &frag_hdr)) { goto out; } } else { diff --git a/lib/flow.h b/lib/flow.h index 770a07a..7a9eb47 100644 --- a/lib/flow.h +++ b/lib/flow.h @@ -129,7 +129,8 @@ void flow_compose(struct dp_packet *, const struct flow *, void packet_expand(struct dp_packet *, const struct flow *, size_t size); bool parse_ipv6_ext_hdrs(const void **datap, size_t *sizep, uint8_t *nw_proto, - uint8_t *nw_frag); + uint8_t *nw_frag, + const struct ovs_16aligned_ip6_frag **frag_hdr); ovs_be16 parse_dl_type(const struct eth_header *data_, size_t size); bool parse_nsh(const void **datap, size_t *sizep, struct ovs_key_nsh *key);