From patchwork Mon Jul 9 23:48:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darrell Ball X-Patchwork-Id: 941738 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; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WmM42xe7"; 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 41PhrJ3LpFz9s1R for ; Tue, 10 Jul 2018 09:49:20 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 8FCE1E4C; Mon, 9 Jul 2018 23:48:33 +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 7CE5BE45 for ; Mon, 9 Jul 2018 23:48:32 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pl0-f67.google.com (mail-pl0-f67.google.com [209.85.160.67]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 0DF1877D for ; Mon, 9 Jul 2018 23:48:32 +0000 (UTC) Received: by mail-pl0-f67.google.com with SMTP id a17-v6so900266plm.12 for ; Mon, 09 Jul 2018 16:48:32 -0700 (PDT) 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=5FO1ilynnaSwgjWQtDXwsUowgFeRwpDEPvK/Y0ZI8Os=; b=WmM42xe7WkWqRIDS7HN/x9eKGSZknaj/8Tu43CxS3hzaV3sjvvHkpx1aJSWRdbpl85 JZyETsieEnS7yOc+ieGl7qe65pNrZ6zDRt7QMUDAZ6joDnl7ZqClQGVyhMVAeH6NPmEr BG4c39sZ456pxA0+rXPcDERoVqzRfzEXrF/QySpC5+FikPcRw+TitwhN6nQ120DFXG1Z jJVbDUuWgmNOpx/krr4bHaYmNo3LkUEg070GDU4H3ld4bdYYg0RhrKfpE3hNgpQqMG/k m8Et4plN8oLLmyrmPS5ic5s7VDZpTVipOpEQfL/SCxpRmiBiI5oaFMjT+oQo971wRxxm 23vg== 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=5FO1ilynnaSwgjWQtDXwsUowgFeRwpDEPvK/Y0ZI8Os=; b=YkhO6XQwACzC7WNq9XZqWRe7rMUyMM6FW1vTangvv26z48JeF8G2UaSsr7UVQlqRoE aTBLuVarcrO1J8OJl0M77bDgy08ttqvrQew9pmqKYmN4vB/UyuZux7is1RQZU7T9NZ87 gkHyjHIrbQY+DYohDFfd3eFdwF1WmXAcqaOZTGxk8s4HqQBuZtHG0U5YsAHMQMIWHLh6 iU3J24X7tUOgOKvxGaYx7EEuFwUPC1tcy4Zf5I1oLFWDoGtvhzWoBZCvcf8ztZfWcQyr vNfv/Uuo4r45dSoK4Qn0gmYDC5TjySRod0WO4Zson49w5H+N3XXqemA8it/CiTHm0er7 LmJA== X-Gm-Message-State: APt69E3+XgZmHK9U01bIh3Dev8DwrSIswoLwptoTVd+WgdpNHLYnarQn WcpMTR3zUtS0t37YtXdXlWI= X-Google-Smtp-Source: AAOMgpe78wzjB0oWyNFQD/CRQgTxq17g+8LUXAZH+E1nqJM17n4JYpLR6VbBlqxvIBLaIEf9sX6k2A== X-Received: by 2002:a17:902:3124:: with SMTP id w33-v6mr22248858plb.235.1531180111808; Mon, 09 Jul 2018 16:48:31 -0700 (PDT) Received: from ubuntu.localdomain ([208.91.3.26]) by smtp.gmail.com with ESMTPSA id r188-v6sm30849988pgr.78.2018.07.09.16.48.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Jul 2018 16:48:30 -0700 (PDT) From: Darrell Ball To: dlu998@gmail.com, dev@openvswitch.org, jpettit@ovn.org Date: Mon, 9 Jul 2018 16:48:08 -0700 Message-Id: <1531180095-74941-3-git-send-email-dlu998@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1531180095-74941-1-git-send-email-dlu998@gmail.com> References: <1531180095-74941-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 v7 2/9] 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 | 4 ++-- lib/flow.c | 31 +++++++++++++++++++++---------- lib/flow.h | 3 ++- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/lib/conntrack.c b/lib/conntrack.c index 97fd46a..efe8a18 100644 --- a/lib/conntrack.c +++ b/lib/conntrack.c @@ -1307,7 +1307,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; @@ -1555,7 +1554,8 @@ 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 a785e63..8c4baf0 100644 --- a/lib/flow.c +++ b/lib/flow.c @@ -453,9 +453,14 @@ invalid: return true; } +/* datap points to the first extension header and advances as parsing + * occurs; sizep is the remaining size and is decreased accordingly. + * nw_proto starts as the first extension header to process and is + * updated as the extension headers are parsed. */ 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 +507,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 +529,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 @@ -877,7 +884,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 { @@ -1067,7 +1076,9 @@ parse_tcp_flags(struct dp_packet *packet) plen = ntohs(nh->ip6_plen); /* Never pull padding. */ dp_packet_set_l2_pad_size(packet, size - plen); size = plen; - 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 0; } nw_proto = nh->ip6_nxt; diff --git a/lib/flow.h b/lib/flow.h index af7b5e9..e3e30f1 100644 --- a/lib/flow.h +++ b/lib/flow.h @@ -130,7 +130,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); uint16_t parse_tcp_flags(struct dp_packet *packet);