From patchwork Mon Aug 13 23:00:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 957311 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="uN8mgPDs"; 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 41qB5m20Dfz9s8T for ; Tue, 14 Aug 2018 09:00:26 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id D7863D40; Mon, 13 Aug 2018 23:00:22 +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 75D1DD33 for ; Mon, 13 Aug 2018 23:00:22 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 3083F70B for ; Mon, 13 Aug 2018 23:00:22 +0000 (UTC) Received: by mail-pl0-f65.google.com with SMTP id w14-v6so7501167plp.6 for ; Mon, 13 Aug 2018 16:00:22 -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=YPLFREskTenbYuayDOFXBqLu/rWOUyM5DTfxWfUk64M=; b=uN8mgPDsFq7fs5i29KzVlnka5k6Puexu8/y2le/Jr1suxX3/O67QV96JxWHi1r9RNc +cLq1GlEzyqFdJK9Q6rxdwbUjPzc3dNvE5h9XvukrMC5pOgA8Oj5vHHwWEYCtXtZpd+q qjwk88NMuKm/YvB/2xe8PZK5UQbkmdH+yjXvrnvVvwHdqsIXWvy1UcQWhtH3XmVg5bGv sKTTW6tBitXZfrpJu/CQO5klScpWqrvrUEnlev0nhHJANUYFHQ/KM8wpf3fya15ID0Pp /8oMYWqyqkWXrPzdyWXLvg4d6vIJDJeyKSTTtbPzLsg5ymkDYvUCilJngKxg2jGgjTzA fxaQ== 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=YPLFREskTenbYuayDOFXBqLu/rWOUyM5DTfxWfUk64M=; b=du+XKqjPuKRuOqbCKScwAzYIbzo0gLk8weNI18BBCjEqv+s1SR7SrnnncFpbfosgw1 +MAAvJnYSCQDcSe5Ps9nKXIAjDvf1zPmUYR8LluXYlFtcEMfY06cvdnF4mLg/4+Wbj8A DEPc45Ursd9G27IK7anbW1q5sUsLcEdzNte4S9BX/Ic214l/SvFEbjjKr7bTeOUUMZp2 FgQ+UBKsYVpzpKKzdBSv5vT8hNY7FNcfBRBOfh+eQqnBFUZiPIQmq8SFPvbiYitkmrpF jiYPnt8+TQzBMxfFBBlJX/Ug304Yx30qMjOcHdyXayMwHZ7XuFanx+1L/8zvmoK9TmxD pPog== X-Gm-Message-State: AOUpUlHO5LwQsbkDHCaJUGOpmDZ5OTOOWm4ZKK7XN5hHptSAsaNHhKXF u1CQRBe+FKqhlTM0chKVJ2TIm34i X-Google-Smtp-Source: AA+uWPwmZtvYfLEje0wMU8+dH/tNprJMOkgv28A4HQdWNHJGG9rpjFC6CjKIFgbz3LQH7Uo3ZLCD9A== X-Received: by 2002:a17:902:44a4:: with SMTP id l33-v6mr18175374pld.134.1534201221279; Mon, 13 Aug 2018 16:00:21 -0700 (PDT) Received: from gizo.domain ([97.115.152.114]) by smtp.gmail.com with ESMTPSA id v6-v6sm36240232pfa.28.2018.08.13.16.00.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Aug 2018 16:00:20 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 13 Aug 2018 16:00:16 -0700 Message-Id: <1534201216-27912-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] compat: Substitute more dependable define 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 The compat layer ip_tunnel_get_stats64 function was checking for the Linux kernel version to determine if the return was void or a pointer. This is not very reliable and caused compile warnings on SLES 12 SP3. In acinclude.m4 create a more reliable method of determining when to use a void return vs. a pointer return. Signed-off-by: Greg Rose --- acinclude.m4 | 3 +++ datapath/linux/compat/include/net/ip_tunnels.h | 2 +- datapath/linux/compat/ip_tunnels_core.c | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index ac81d0c..6e7ea4c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -880,6 +880,9 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ [OVS_DEFINE([HAVE_SKBUFF_CSUM_VALID])]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_checksum_simple_validate]) + OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], + [void.*ndo_get_stats64], + [OVS_DEFINE([HAVE_VOID_NDO_GET_STATS64])]) if cmp -s datapath/linux/kcompat.h.new \ datapath/linux/kcompat.h >/dev/null 2>&1; then diff --git a/datapath/linux/compat/include/net/ip_tunnels.h b/datapath/linux/compat/include/net/ip_tunnels.h index d187a12..ce6fca4 100644 --- a/datapath/linux/compat/include/net/ip_tunnels.h +++ b/datapath/linux/compat/include/net/ip_tunnels.h @@ -364,7 +364,7 @@ static inline int ovs_ip_tunnel_encap(struct sk_buff *skb, struct ip_tunnel *t, } #define ip_tunnel_get_stats64 rpl_ip_tunnel_get_stats64 -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0) && !defined(HAVE_RHEL7_MAX_MTU) +#if !defined(HAVE_VOID_NDO_GET_STATS64) && !defined(HAVE_RHEL7_MAX_MTU) struct rtnl_link_stats64 *rpl_ip_tunnel_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *tot); #else diff --git a/datapath/linux/compat/ip_tunnels_core.c b/datapath/linux/compat/ip_tunnels_core.c index 38fb801..a3b1f7f 100644 --- a/datapath/linux/compat/ip_tunnels_core.c +++ b/datapath/linux/compat/ip_tunnels_core.c @@ -274,7 +274,7 @@ static void netdev_stats_to_stats64(struct rtnl_link_stats64 *stats64, } #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0) && !defined(HAVE_RHEL7_MAX_MTU) +#if !defined(HAVE_VOID_NDO_GET_STATS64) && !defined(HAVE_RHEL7_MAX_MTU) struct rtnl_link_stats64 *rpl_ip_tunnel_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *tot) #else @@ -306,7 +306,7 @@ void rpl_ip_tunnel_get_stats64(struct net_device *dev, tot->tx_bytes += tx_bytes; } -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0) && !defined(HAVE_RHEL7_MAX_MTU) +#if !defined(HAVE_VOID_NDO_GET_STATS64) && !defined(HAVE_RHEL7_MAX_MTU) return tot; #endif }