From patchwork Mon Sep 11 21:10:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 812617 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="a29L3spx"; 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 3xrgbV3w1Zz9s8J for ; Tue, 12 Sep 2017 07:11:50 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 92A6BCA8; Mon, 11 Sep 2017 21:11:17 +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 D73A7C8F for ; Mon, 11 Sep 2017 21:11:15 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 799CEA4 for ; Mon, 11 Sep 2017 21:11:15 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id h4so5399593pfk.0 for ; Mon, 11 Sep 2017 14:11:15 -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=FYHdRzxaSJxtDHuBMqsiQvS/yatwvTh7L+4GBaQczNk=; b=a29L3spxgx22/ehF9qWHQTaIrAtrmS06BOwtxK8GTMUetjHroiUteuCZ9T1uEy1c+r rEZP0avN0I9ev0sb3dlDQ6kd0P1VjKPbDpxagJ1fboB7pCfv01YcGn32876Fq0aJrMK/ uWl8hFEq01ctSTUyhxQjgdepjgF/4VJhCMSuxZYBQ8OYXgkSUQcQO31PFSD4bpgA8F4e cKRvi8BR4zyti5IsuBEPsV+HfSGbgeRkycQdnxgi+fCzBJmBNE6xWiFBykM6baUpcQ8I CoVazPXmzB3e4HtU0AFhuibX2pXj4V+5FJxG7NnsUDyApJ7ofnYyJWoFA26qkxg/waa6 lEcQ== 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=FYHdRzxaSJxtDHuBMqsiQvS/yatwvTh7L+4GBaQczNk=; b=YvWYy6dJHprornYWWS0/x52XdQwdOCaV2WpWu1iUMNiktXPuPrpo63I2ussQAO48Pi UeZPowUPTCTqlHK7aUlYQdhb4zvoyVV7y6Zx5CWI/Pdq5tdHxdEzYFf6wwzwjkhzs8QE 47nzHP/77JggjLp7W6MzHbnBvmZwaV0VjeNLxBwZrG1X42dshhvE+wcwvJw/G/vy6+iW jtY4siW1eQuAATY10/nDG9kp0kizTbRjI0vJuBJFYWCXTCLbjA6Klsz058OFmYoLLutI gGuhjsw+fI/o79xmcKccOknpCWaDdqFg6s1Crzk5OgsJ2uA55OYZnhqcV368UbZnfOdk uf9A== X-Gm-Message-State: AHPjjUiCfMmFEws0nTjhLaZ/ovWIkVFJWkYRZDzrT+QIJrL4k4SpPQQ2 b/PRz8NuTNIcKPWD X-Google-Smtp-Source: ADKCNb6/JQ+8th3Sw+CISv5J8oQxFWyjfIxMnQaS5T5IVT6+rhII3+y8i0/igSiCtn7FlyxFSYMV6A== X-Received: by 10.159.246.12 with SMTP id b12mr14478996pls.58.1505164274740; Mon, 11 Sep 2017 14:11:14 -0700 (PDT) Received: from gizo.domain (67-5-132-83.ptld.qwest.net. [67.5.132.83]) by smtp.gmail.com with ESMTPSA id q23sm6568745pfk.182.2017.09.11.14.11.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 14:11:13 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Sep 2017 14:10:55 -0700 Message-Id: <1505164269-9455-2-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505164269-9455-1-git-send-email-gvrose8192@gmail.com> References: <1505164269-9455-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH V2 02/16] datapath: Remove all references to SKB_GSO_UDP. 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 880388aa3c07fdea4f9b85e35641753017b1852f Author: David S. Miller Date: Mon Jul 3 07:29:12 2017 -0700 net: Remove all references to SKB_GSO_UDP. Such packets are no longer possible. Signed-off-by: David S. Miller SKB_GSO_UDP is removed in the upstream kernel. Use HAVE_SKB_GSO_UDP define from acinclude to detect if SKB_GSO_UDP exists and if so apply openvswitch section of this upstream patch. Signed-off-by: Greg Rose --- datapath/flow.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/datapath/flow.c b/datapath/flow.c index c4f63b0..599b4e5 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -589,8 +589,12 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key) key->ip.frag = OVS_FRAG_TYPE_LATER; return 0; } +#ifdef HAVE_SKB_GSO_UDP if (nh->frag_off & htons(IP_MF) || skb_shinfo(skb)->gso_type & SKB_GSO_UDP) +#else + if (nh->frag_off & htons(IP_MF)) +#endif key->ip.frag = OVS_FRAG_TYPE_FIRST; else key->ip.frag = OVS_FRAG_TYPE_NONE; @@ -707,9 +711,11 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key) if (key->ip.frag == OVS_FRAG_TYPE_LATER) return 0; +#ifdef HAVE_SKB_GSO_UDP if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP) key->ip.frag = OVS_FRAG_TYPE_FIRST; +#endif /* Transport layer. */ if (key->ip.proto == NEXTHDR_TCP) { if (tcphdr_ok(skb)) {