From patchwork Tue Jan 12 01:54:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 566256 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 2E8F91402D6 for ; Tue, 12 Jan 2016 12:55:23 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 954E4108BB; Mon, 11 Jan 2016 17:54:34 -0800 (PST) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 1B8BD1089D for ; Mon, 11 Jan 2016 17:54:31 -0800 (PST) Received: from bar2.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id 97DEB420056 for ; Mon, 11 Jan 2016 18:54:30 -0700 (MST) X-ASG-Debug-ID: 1452563670-03dc5324b3a14d0001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar2.cudamail.com with ESMTP id 3bveSm2aSdP11umG (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 11 Jan 2016 18:54:30 -0700 (MST) X-Barracuda-Envelope-From: joe@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO relay2-d.mail.gandi.net) (217.70.183.194) by mx1-pf2.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 12 Jan 2016 01:54:29 -0000 Received-SPF: pass (mx1-pf2.cudamail.com: SPF record at ovn.org designates 217.70.183.194 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.183.194 X-Barracuda-RBL-IP: 217.70.183.194 Received: from mfilter18-d.gandi.net (mfilter18-d.gandi.net [217.70.178.146]) by relay2-d.mail.gandi.net (Postfix) with ESMTP id C799AC5A4B; Tue, 12 Jan 2016 02:54:28 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter18-d.gandi.net Received: from relay2-d.mail.gandi.net ([IPv6:::ffff:217.70.183.194]) by mfilter18-d.gandi.net (mfilter18-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id EREuZL0dsE3c; Tue, 12 Jan 2016 02:54:27 +0100 (CET) X-Originating-IP: 208.91.1.34 Received: from localhost.localdomain (unknown [208.91.1.34]) (Authenticated sender: joe@ovn.org) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 68C4EC5A3C; Tue, 12 Jan 2016 02:54:26 +0100 (CET) X-CudaMail-Envelope-Sender: joe@ovn.org From: Joe Stringer To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E2-110087650 X-CudaMail-DTE: 011116 X-CudaMail-Originating-IP: 217.70.183.194 Date: Mon, 11 Jan 2016 17:54:00 -0800 X-ASG-Orig-Subj: [##CM-E2-110087650##][PATCH 12/13] datapath: Re-designate OVS_FRAGMENT_BACKPORT. Message-Id: <1452563641-33507-13-git-send-email-joe@ovn.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1452563641-33507-1-git-send-email-joe@ovn.org> References: <1452563641-33507-1-git-send-email-joe@ovn.org> X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1452563670 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [PATCH 12/13] datapath: Re-designate OVS_FRAGMENT_BACKPORT. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Typically the way that we include backported code is by testing for existence of the feature in the upstream codebase via header checks, then attempt to use the upstream code as much as possible. However, for the IP fragmentation handling backport we have an additional constraint which is that we cannot support kernels older than Linux-3.10. To date, OVS_FRAGMENT_BACKPORT has been defined to include the backport of the IP fragmentation code for all kernels from 3.10 to 4.2, rather than attempting to use the upstream code as much as possible. This patch relaxes OVS_FRAGMENT_BACKPORT to only check the lower bound so that the upstream code may be used in more circumstances. Signed-off-by: Joe Stringer --- acinclude.m4 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index 7357a9fdfc74..bd38214618b7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -547,7 +547,10 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_GREP_IFELSE([$KSRC/include/linux/utsrelease.h], [el6], [OVS_DEFINE([HAVE_RHEL6_PER_CPU])]) - if test "$version" = 4 && test "$patchlevel" -le 2; then + dnl Conntrack support, and therefore, IP fragment handling backport, should + dnl only be enabled on kernels 3.10+. In future when OVS drops support for + dnl kernels older than 3.10, this macro could be removed from the codebase. + if test "$version" = 4; then OVS_DEFINE([OVS_FRAGMENT_BACKPORT]) elif test "$version" = 3 && test "$patchlevel" -ge 10; then OVS_DEFINE([OVS_FRAGMENT_BACKPORT])