From patchwork Mon Feb 11 02:56:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darrell Ball X-Patchwork-Id: 1039571 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="sxi2rsVS"; 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 43yVpC4024z9s5c for ; Mon, 11 Feb 2019 13:57:55 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 2974E22E6; Mon, 11 Feb 2019 02:57:00 +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 A310222C5 for ; Mon, 11 Feb 2019 02:56:44 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 39A8C5E4 for ; Mon, 11 Feb 2019 02:56:44 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id w4so4635671plz.1 for ; Sun, 10 Feb 2019 18:56:44 -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=AWBN3CN+IKB7LPicj3uekLsfoByq0zqwlMGfiCTbIP4=; b=sxi2rsVSc1ywLkz1HHNRRubpBmi219wNjcFUi/uLy/ZZvl5djvIX7RgfD6Enzxp6bU tz3We4M15a+ddOAYh4tKns30XCfGn1J4khnxDGCMUjrrqsDdVVromsVK+qTJjyt43SJL zqin8XNe4xxjYHqqffHSTKn946WTzSE9firNvooKgFFIcEeTUNjMeotKoewnNNOl0DlZ z1MA8C/1LAG37tvEUDGPBvYZeQlFJ55JUbXQGX6RZurkjzCQ9pudp7GAbFuUtLd24M7A N8K7imjU0Wb0wFhE1bnzuPLYy/uAfH2gzElmekBjX8Y6Z1KfEdd7QiODAaEU1kJTXsMm j9gA== 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=AWBN3CN+IKB7LPicj3uekLsfoByq0zqwlMGfiCTbIP4=; b=Z/uwPvbTgLpyM9lOllfLAlMV4fauI4gCSnFBek1/H5UvUHxbYwvQjio7lGDzw2+cAN qfgfaYQQj8w2QSE/1iFdz5fXA29IrIJ7uBT+qoY+9Kju2pSM/wEpDhKKC8/MIraIz0ic +LPn/tBX7F7X+pIIJvnIGbEbHf86N5H4REFDUzT0KaaZ6ynOVHHyttMa2lF4ZqVAAy90 3NDoSGZJQw2Wr9FR+lxRpRGab2TvATk7WBJFbA8aekV0sSP0LM/9K9Rnvu5PW4xhnRf1 R3CcVwdB73PN/LdJaJkSTdPdzlyfBl0Zpi6UOkfMnEa7Dudh6TKi46KvkQrkKlosdcNi DL6w== X-Gm-Message-State: AHQUAub1Zlf3W/W38iApqxkLqYlYWRm54GILEBm46guJqBlktS3s8RoS 4mSXnmCsT3zAaVhCQgy0/4tvm6hd X-Google-Smtp-Source: AHgI3IZJ3OVai1wB/I9hPfvleDTsFNclGaqI3oGOqK5mLyOEvxFnXAvDGWC5T1n0N4OfL8V+CG++tg== X-Received: by 2002:a17:902:27a8:: with SMTP id d37mr35726114plb.182.1549853803791; Sun, 10 Feb 2019 18:56:43 -0800 (PST) Received: from ubuntu.localdomain (c-76-102-76-212.hsd1.ca.comcast.net. [76.102.76.212]) by smtp.gmail.com with ESMTPSA id b24sm12830895pfe.136.2019.02.10.18.56.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 10 Feb 2019 18:56:43 -0800 (PST) From: Darrell Ball To: dlu998@gmail.com, dev@openvswitch.org Date: Sun, 10 Feb 2019 18:56:24 -0800 Message-Id: <1549853790-43330-3-git-send-email-dlu998@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1549853790-43330-1-git-send-email-dlu998@gmail.com> References: <1549853790-43330-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 v12 2/8] 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 Acked-by: Justin Pettit Signed-off-by: Darrell Ball --- lib/conntrack.c | 4 ++-- lib/flow.c | 44 ++++++++++++++++++++++++++++++++++---------- lib/flow.h | 3 ++- 3 files changed, 38 insertions(+), 13 deletions(-) diff --git a/lib/conntrack.c b/lib/conntrack.c index 6b46d0c..3bbe93f 100644 --- a/lib/conntrack.c +++ b/lib/conntrack.c @@ -1314,7 +1314,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; @@ -1562,7 +1561,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 7f3e794..7511b18 100644 --- a/lib/flow.c +++ b/lib/flow.c @@ -476,8 +476,10 @@ 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) { + *frag_hdr = NULL; while (1) { if (OVS_LIKELY((*nw_proto != IPPROTO_HOPOPTS) && (*nw_proto != IPPROTO_ROUTING) @@ -523,17 +525,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; @@ -543,11 +545,29 @@ parse_ipv6_ext_hdrs__(const void **datap, size_t *sizep, uint8_t *nw_proto, } } +/* Parses IPv6 extension headers until a terminal header (or header we + * don't understand) is found. '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. + * + * If a fragment header is found, '*frag_hdr' is set to the fragment + * header and otherwise set to NULL. If it is the first fragment, + * extension header parsing otherwise continues as usual. If it's not + * the first fragment, 'nw_proto' is set to IPPROTO_FRAGMENT and 'nw_frag' + * has FLOW_NW_FRAG_LATER set. Both first and later fragments have + * FLOW_NW_FRAG_ANY set in 'nw_frag'. + * + * A return value of false indicates that there was a problem parsing + * the extension headers.*/ 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 @@ -894,7 +914,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; } @@ -1115,7 +1137,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 5ebdb1f..7298c71 100644 --- a/lib/flow.h +++ b/lib/flow.h @@ -131,7 +131,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);