From patchwork Thu Aug 29 17:55:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 1155450 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="sHSxJKaN"; 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 46K9PL1cQ2z9sML for ; Fri, 30 Aug 2019 04:00:06 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id CE8364C8D; Thu, 29 Aug 2019 17:57:30 +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 31C7E4BAD for ; Thu, 29 Aug 2019 17:55:45 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 90926EC for ; Thu, 29 Aug 2019 17:55:44 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id m3so1961731pgv.13 for ; Thu, 29 Aug 2019 10:55:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=2UkJu1evRF4ttYJ+pI+R7e5g3cWaHjbDquWXIdW01EI=; b=sHSxJKaNFFoWOGl0D8blK4Zncvh6FE/5ei9/1kEliQ5h8mpuPzT181JbWsYrLa+3rU +8HIh9TV8PKHRAjJJHW1wpzfEG2+x5wYEn+kIDWpK3Se1+eTW1Y0iyflw1jRzL5ftt6j /uY8zaFIA+z1G8jOJoaL72apL01nWVfEDp3o0Yh8oDsXq6i2yZl6kgtUlBsNIGHlM5Pb eHYX0MsJMAtRgmfCPf/2+BOVk9ltvf6mUC7CXxqFj1EqwHWcctPcoA2KfKuNKPTKOc11 sgfHdmGDcX6euzw+4bG31q6ITtqY3l8iqma8iN3JQObowQHy9yx5b1sPUU4ht+P6cBV+ MHUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=2UkJu1evRF4ttYJ+pI+R7e5g3cWaHjbDquWXIdW01EI=; b=R2V0hNz+QeejUWARiKg0rkXE1w0D/1RBVCICeO/p9WI0ho/fcxC1E0vI4pIm5TzIoE ZL+/9huppgUXn+TamoszltaE+1E3gLdlHSRgCqwihBp+IME3KlOUUQEcrgftLtKHKfve 6curxLZg3YMe9hmplo847Q60XSElApdz7q8ft32rUemaUE3aCWE/U/pd9gYrBHU3ec6p vYDkeUYQPPvI5yilBOZFAKZ186RkQbgzx7rHgobBCAbJxPc1/XYeVzhLTXTbtLa0qGBr fjoUlfEiFXmpIQpcbtXs1ZSzG3WjZpGIZAgx6xJlxmLpoufteK+TVQ31bs+RFQIvjBNC 5PNg== X-Gm-Message-State: APjAAAWfmzlJ5CvfGW2UcJmp8Yiik8e2qWYCTstQsc9lnncmlYSmOmnG cz2aKs0PIWGpe9DX9Hl+tMysGPR3 X-Google-Smtp-Source: APXvYqzKUbESWVzstn4OmuMM+0dZKNwxgK9j/q3egyUazjTUZhKXQNcHSy4Y8Zb4/YIrRyjAPX2POQ== X-Received: by 2002:aa7:8acb:: with SMTP id b11mr12581520pfd.109.1567101343749; Thu, 29 Aug 2019 10:55:43 -0700 (PDT) Received: from gizo.domain (97-115-90-227.ptld.qwest.net. [97.115.90.227]) by smtp.gmail.com with ESMTPSA id s13sm3751532pfm.12.2019.08.29.10.55.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Aug 2019 10:55:43 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org, jpettit@ovn.org Date: Thu, 29 Aug 2019 10:55:39 -0700 Message-Id: <1567101340-27825-1-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 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 branch-2.6 1/2] datapath: Properly set L4 keys on "later" IP fragments 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 Upstream commit: commit ad06a566e118e57b852cab5933dbbbaebb141de3 Author: Greg Rose Date: Tue Aug 27 07:58:09 2019 -0700 openvswitch: Properly set L4 keys on "later" IP fragments When IP fragments are reassembled before being sent to conntrack, the key from the last fragment is used. Unless there are reordering issues, the last fragment received will not contain the L4 ports, so the key for the reassembled datagram won't contain them. This patch updates the key once we have a reassembled datagram. The handle_fragments() function works on L3 headers so we pull the L3/L4 flow key update code from key_extract into a new function 'key_extract_l3l4'. Then we add a another new function ovs_flow_key_update_l3l4() and export it so that it is accessible by handle_fragments() for conntrack packet reassembly. Co-authored-by: Justin Pettit Signed-off-by: Greg Rose Acked-by: Pravin B Shelar Signed-off-by: David S. Miller Signed-off-by: Greg Rose Signed-off-by: Justin Pettit --- datapath/conntrack.c | 5 ++ datapath/flow.c | 141 ++++++++++++++++++++++++++++++++------------------- datapath/flow.h | 1 + 3 files changed, 95 insertions(+), 52 deletions(-) diff --git a/datapath/conntrack.c b/datapath/conntrack.c index 2aa0105..8d33bcd 100644 --- a/datapath/conntrack.c +++ b/datapath/conntrack.c @@ -461,6 +461,11 @@ static int handle_fragments(struct net *net, struct sw_flow_key *key, return -EPFNOSUPPORT; } + /* The key extracted from the fragment that completed this datagram + * likely didn't have an L4 header, so regenerate it. + */ + ovs_flow_key_update_l3l4(skb, key); + key->ip.frag = OVS_FRAG_TYPE_NONE; skb_clear_hash(skb); skb->ignore_df = 1; diff --git a/datapath/flow.c b/datapath/flow.c index 581d1d2..e3b0900 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -436,63 +436,14 @@ invalid: } /** - * key_extract - extracts a flow key from an Ethernet frame. + * key_extract_l3l4 - extracts L3/L4 header information. * @skb: sk_buff that contains the frame, with skb->data pointing to the - * Ethernet header + * L3 header * @key: output flow key - * - * The caller must ensure that skb->len >= ETH_HLEN. - * - * Returns 0 if successful, otherwise a negative errno value. - * - * Initializes @skb header pointers as follows: - * - * - skb->mac_header: the Ethernet header. - * - * - skb->network_header: just past the Ethernet header, or just past the - * VLAN header, to the first byte of the Ethernet payload. - * - * - skb->transport_header: If key->eth.type is ETH_P_IP or ETH_P_IPV6 - * on output, then just past the IP header, if one is present and - * of a correct length, otherwise the same as skb->network_header. - * For other key->eth.type values it is left untouched. */ -static int key_extract(struct sk_buff *skb, struct sw_flow_key *key) +static int key_extract_l3l4(struct sk_buff *skb, struct sw_flow_key *key) { int error; - struct ethhdr *eth; - - /* Flags are always used as part of stats */ - key->tp.flags = 0; - - skb_reset_mac_header(skb); - - /* Link layer. We are guaranteed to have at least the 14 byte Ethernet - * header in the linear data area. - */ - eth = eth_hdr(skb); - ether_addr_copy(key->eth.src, eth->h_source); - ether_addr_copy(key->eth.dst, eth->h_dest); - - __skb_pull(skb, 2 * ETH_ALEN); - /* We are going to push all headers that we pull, so no need to - * update skb->csum here. - */ - - key->eth.tci = 0; - if (skb_vlan_tag_present(skb)) - key->eth.tci = htons(skb->vlan_tci); - else if (eth->h_proto == htons(ETH_P_8021Q)) - if (unlikely(parse_vlan(skb, key))) - return -ENOMEM; - - key->eth.type = parse_ethertype(skb); - if (unlikely(key->eth.type == htons(0))) - return -ENOMEM; - - skb_reset_network_header(skb); - skb_reset_mac_len(skb); - __skb_push(skb, skb->data - skb_mac_header(skb)); /* Network layer. */ if (key->eth.type == htons(ETH_P_IP)) { @@ -688,6 +639,92 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key) return 0; } +/** + * key_extract - extracts a flow key from an Ethernet frame. + * @skb: sk_buff that contains the frame, with skb->data pointing to the + * Ethernet header + * @key: output flow key + * + * The caller must ensure that skb->len >= ETH_HLEN. + * + * Returns 0 if successful, otherwise a negative errno value. + * + * Initializes @skb header fields as follows: + * + * - skb->mac_header: the L2 header. + * + * - skb->network_header: just past the L2 header, or just past the + * VLAN header, to the first byte of the L2 payload. + * + * - skb->transport_header: If key->eth.type is ETH_P_IP or ETH_P_IPV6 + * on output, then just past the IP header, if one is present and + * of a correct length, otherwise the same as skb->network_header. + * For other key->eth.type values it is left untouched. + * + * - skb->protocol: the type of the data starting at skb->network_header. + * Equals to key->eth.type. + */ +static int key_extract(struct sk_buff *skb, struct sw_flow_key *key) +{ + struct ethhdr *eth; + + /* Flags are always used as part of stats */ + key->tp.flags = 0; + + skb_reset_mac_header(skb); + + /* Link layer. */ + clear_vlan(key); + if (ovs_key_mac_proto(key) == MAC_PROTO_NONE) { + if (unlikely(eth_type_vlan(skb->protocol))) + return -EINVAL; + + skb_reset_network_header(skb); + key->eth.type = skb->protocol; + } else { + eth = eth_hdr(skb); + ether_addr_copy(key->eth.src, eth->h_source); + ether_addr_copy(key->eth.dst, eth->h_dest); + + __skb_pull(skb, 2 * ETH_ALEN); + /* We are going to push all headers that we pull, so no need to + * update skb->csum here. + */ + + if (unlikely(parse_vlan(skb, key))) + return -ENOMEM; + + key->eth.type = parse_ethertype(skb); + if (unlikely(key->eth.type == htons(0))) + return -ENOMEM; + + /* Multiple tagged packets need to retain TPID to satisfy + * skb_vlan_pop(), which will later shift the ethertype into + * skb->protocol. + */ + if (key->eth.cvlan.tci & htons(VLAN_CFI_MASK)) + skb->protocol = key->eth.cvlan.tpid; + else + skb->protocol = key->eth.type; + + skb_reset_network_header(skb); + __skb_push(skb, skb->data - skb_mac_header(skb)); + } + + skb_reset_mac_len(skb); + + /* Fill out L3/L4 key info, if any */ + return key_extract_l3l4(skb, key); +} + +/* In the case of conntrack fragment handling it expects L3 headers, + * add a helper. + */ +int ovs_flow_key_update_l3l4(struct sk_buff *skb, struct sw_flow_key *key) +{ + return key_extract_l3l4(skb, key); +} + int ovs_flow_key_update(struct sk_buff *skb, struct sw_flow_key *key) { return key_extract(skb, key); diff --git a/datapath/flow.h b/datapath/flow.h index 2dd0696..79973c1 100644 --- a/datapath/flow.h +++ b/datapath/flow.h @@ -218,6 +218,7 @@ u64 ovs_flow_used_time(unsigned long flow_jiffies); /* Update the non-metadata part of the flow key using skb. */ int ovs_flow_key_update(struct sk_buff *skb, struct sw_flow_key *key); +int ovs_flow_key_update_l3l4(struct sk_buff *skb, struct sw_flow_key *key); int ovs_flow_key_extract(const struct ip_tunnel_info *tun_info, struct sk_buff *skb, struct sw_flow_key *key); From patchwork Thu Aug 29 17:55:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 1155451 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="S7JAUHFX"; 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 46K9Pt2FPHz9s4Y for ; Fri, 30 Aug 2019 04:00:34 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id A93F94C94; Thu, 29 Aug 2019 17:57:31 +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 1DA244BAD for ; Thu, 29 Aug 2019 17:55:46 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id CCE2BEC for ; Thu, 29 Aug 2019 17:55:45 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id m3so1961756pgv.13 for ; Thu, 29 Aug 2019 10:55:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fvg7lTz7Nzj2wA2xGd07i6WTWdvQyCoHanMnrTCLvFY=; b=S7JAUHFX6NUMKzU3nJAKDR8FvJ1yaJebRBxGTEw7xEgnV0ZifXbGoxDA0MT5DQDF2Y vklvu/GOyB3S/kGCfKuguldQuCPXxK5QJnOsZlg6Piua2WKJMsqDgifvkItwiIxOhjQR eCEJx1P9gLIhW6SMf4in8J8KQbwJd8tDb9Nb0sKFFYUXahxhCO7XzZ+ymVd8VpiSs3h9 ZNV22FNk7WAVKgkJdOjU9cPsbIlaivm79priNnaKVRRRyUJrP7RkGN0czpjgcmgYImFZ SfDwM84NiKb3QOm+vq9fhOrY9JUUQATn/j9O9NJepDojwPTVULhS1kPRFTOcBv3VLVR8 2Qqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fvg7lTz7Nzj2wA2xGd07i6WTWdvQyCoHanMnrTCLvFY=; b=OK0TzJiBo9Q1+n5oG85MFXhhiLEGw70eMpfxHROQSTYTC7ZuXmDwnkLwWQOEpLEVj3 v1XyB19prjlwiqt+peH6YzASC33hRXGABSMwEG1JGvrjH/jWAitduFvZmieuQyH8xjt0 zmvLUPNOWuusJeMIa65Ho2nYGOQBrO8m3uHf2eidr6PTYShOvopixJwMovVcK4C67pHF 7wP3KVHxx6KrG6faWtFJpjFKMhz31jneGxoIOXvZ6gKoPmQNlXxOSj/teVf+Eue/HCPI SZ5bLhsXVI2r6prWh6HP+QW8apGPby9PbETrtNyHxWIV3bqciWpqo0cZxAP/0hKrbdCW IK6A== X-Gm-Message-State: APjAAAV+14bdNcCRQmczRCiQNjhnFUpfJIYAfpi8Ny4OLXS/v/Mq88g+ gUZ7GAF3P9mFprw1C5tb2hYxhyES X-Google-Smtp-Source: APXvYqzE056UJMBugxUPAnWYB2mDLZysDltMsJTK75IohgaahZ8n9nnaQ5kdjz7fAz7/3PwzqBLwWw== X-Received: by 2002:a17:90a:1a8d:: with SMTP id p13mr11616799pjp.15.1567101345112; Thu, 29 Aug 2019 10:55:45 -0700 (PDT) Received: from gizo.domain (97-115-90-227.ptld.qwest.net. [97.115.90.227]) by smtp.gmail.com with ESMTPSA id s13sm3751532pfm.12.2019.08.29.10.55.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Aug 2019 10:55:44 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org, jpettit@ovn.org Date: Thu, 29 Aug 2019 10:55:40 -0700 Message-Id: <1567101340-27825-2-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1567101340-27825-1-git-send-email-gvrose8192@gmail.com> References: <1567101340-27825-1-git-send-email-gvrose8192@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 branch-2.6 2/2] datapath: Clear the L4 portion of the key for "later" fragments 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 From: Justin Pettit Upstream commit: commit 0754b4e8cdf3eec6e4122e79af26ed9bab20f8f8 Author: Justin Pettit Date: Tue Aug 27 07:58:10 2019 -0700 openvswitch: Clear the L4 portion of the key for "later" fragments. Only the first fragment in a datagram contains the L4 headers. When the Open vSwitch module parses a packet, it always sets the IP protocol field in the key, but can only set the L4 fields on the first fragment. The original behavior would not clear the L4 portion of the key, so garbage values would be sent in the key for "later" fragments. This patch clears the L4 fields in that circumstance to prevent sending those garbage values as part of the upcall. Signed-off-by: Justin Pettit Acked-by: Pravin B Shelar Signed-off-by: David S. Miller Signed-off-by: Greg Rose Signed-off-by: Justin Pettit --- datapath/flow.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/datapath/flow.c b/datapath/flow.c index e3b0900..87d1f8e 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -472,6 +472,7 @@ static int key_extract_l3l4(struct sk_buff *skb, struct sw_flow_key *key) offset = nh->frag_off & htons(IP_OFFSET); if (offset) { key->ip.frag = OVS_FRAG_TYPE_LATER; + memset(&key->tp, 0, sizeof(key->tp)); return 0; } if (nh->frag_off & htons(IP_MF) || @@ -595,8 +596,11 @@ static int key_extract_l3l4(struct sk_buff *skb, struct sw_flow_key *key) return error; } - if (key->ip.frag == OVS_FRAG_TYPE_LATER) + if (key->ip.frag == OVS_FRAG_TYPE_LATER) { + memset(&key->tp, 0, sizeof(key->tp)); return 0; + } +#ifdef HAVE_SKB_GSO_UDP if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP) key->ip.frag = OVS_FRAG_TYPE_FIRST;