From patchwork Wed Aug 10 17:34:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pravin Shelar X-Patchwork-Id: 657761 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3s8dZq0v0Nz9sxR for ; Thu, 11 Aug 2016 03:35:15 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 7C16F10B59; Wed, 10 Aug 2016 10:35:10 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 8031310B55 for ; Wed, 10 Aug 2016 10:35:09 -0700 (PDT) Received: from bar6.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id 14751161D0B for ; Wed, 10 Aug 2016 11:35:09 -0600 (MDT) X-ASG-Debug-ID: 1470850507-0b323777e1b5690001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar6.cudamail.com with ESMTP id fVyIbIMFjKgGGK1t (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 10 Aug 2016 11:35:08 -0600 (MDT) X-Barracuda-Envelope-From: pshelar@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO relay5-d.mail.gandi.net) (217.70.183.197) by mx1-pf1.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 10 Aug 2016 17:35:07 -0000 Received-SPF: pass (mx1-pf1.cudamail.com: SPF record at ovn.org designates 217.70.183.197 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.183.197 X-Barracuda-RBL-IP: 217.70.183.197 Received: from mfilter42-d.gandi.net (mfilter42-d.gandi.net [217.70.178.172]) by relay5-d.mail.gandi.net (Postfix) with ESMTP id E785341C08A; Wed, 10 Aug 2016 19:35:05 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter42-d.gandi.net Received: from relay5-d.mail.gandi.net ([IPv6:::ffff:217.70.183.197]) by mfilter42-d.gandi.net (mfilter42-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id WHG6rciaDkNV; Wed, 10 Aug 2016 19:35:04 +0200 (CEST) X-Originating-IP: 24.130.10.65 Received: from localhost.localdomain.localdomain (c-24-130-10-65.hsd1.ca.comcast.net [24.130.10.65]) (Authenticated sender: pshelar@ovn.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id BC45E41C090; Wed, 10 Aug 2016 19:35:03 +0200 (CEST) X-CudaMail-Envelope-Sender: pshelar@ovn.org From: Pravin B Shelar To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E1-809047802 X-CudaMail-DTE: 081016 X-CudaMail-Originating-IP: 217.70.183.197 Date: Wed, 10 Aug 2016 10:34:37 -0700 X-ASG-Orig-Subj: [##CM-E1-809047802##][PATCH 2/3] datapath: compat: geneve: fix geneve_notify_add_rx_port() Message-Id: <1470850478-108111-2-git-send-email-pshelar@ovn.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1470850478-108111-1-git-send-email-pshelar@ovn.org> References: <1470850478-108111-1-git-send-email-pshelar@ovn.org> X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1470850508 X-Barracuda-Encrypted: ECDHE-RSA-AES256-GCM-SHA384 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 2/3] datapath: compat: geneve: fix geneve_notify_add_rx_port() 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" Remove mutual exclusion between udp-gro registration and geneve receive port registration. Signed-off-by: Pravin B Shelar Acked-by: Jesse Gross --- acinclude.m4 | 4 +++ datapath/linux/Modules.mk | 1 + datapath/linux/compat/geneve.c | 44 +++++++++++----------------- datapath/linux/compat/include/net/protocol.h | 19 ++++++++++++ 4 files changed, 41 insertions(+), 27 deletions(-) create mode 100644 datapath/linux/compat/include/net/protocol.h diff --git a/acinclude.m4 b/acinclude.m4 index bbbad23..25295c5 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -667,6 +667,10 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_GREP_IFELSE([$KSRC/include/linux/udp.h], [no_check6_tx]) OVS_GREP_IFELSE([$KSRC/include/linux/utsrelease.h], [el6], [OVS_DEFINE([HAVE_RHEL6_PER_CPU])]) + OVS_FIND_PARAM_IFELSE([$KSRC/include/net/protocol.h], + [udp_add_offload], [net], + [OVS_DEFINE([HAVE_UDP_ADD_OFFLOAD_TAKES_NET])]) + if cmp -s datapath/linux/kcompat.h.new \ datapath/linux/kcompat.h >/dev/null 2>&1; then diff --git a/datapath/linux/Modules.mk b/datapath/linux/Modules.mk index 1f701a3..26f6d22 100644 --- a/datapath/linux/Modules.mk +++ b/datapath/linux/Modules.mk @@ -82,6 +82,7 @@ openvswitch_headers += \ linux/compat/include/net/mpls.h \ linux/compat/include/net/net_namespace.h \ linux/compat/include/net/netlink.h \ + linux/compat/include/net/protocol.h \ linux/compat/include/net/route.h \ linux/compat/include/net/rtnetlink.h \ linux/compat/include/net/udp.h \ diff --git a/datapath/linux/compat/geneve.c b/datapath/linux/compat/geneve.c index 74e0cbc..cbaa47c 100644 --- a/datapath/linux/compat/geneve.c +++ b/datapath/linux/compat/geneve.c @@ -411,64 +411,54 @@ static struct socket *geneve_create_sock(struct net *net, bool ipv6, static void geneve_notify_add_rx_port(struct geneve_sock *gs) { -#ifdef HAVE_NDO_ADD_GENEVE_PORT struct net_device *dev; struct sock *sk = gs->sock->sk; struct net *net = sock_net(sk); sa_family_t sa_family = geneve_get_sk_family(gs); - __be16 port = inet_sk(sk)->inet_sport; - - rcu_read_lock(); - for_each_netdev_rcu(net, dev) { - if (dev->netdev_ops->ndo_add_geneve_port) - dev->netdev_ops->ndo_add_geneve_port(dev, sa_family, - port); - } - rcu_read_unlock(); -#else -#ifdef HAVE_UDP_OFFLOAD - struct sock *sk = gs->sock->sk; - sa_family_t sa_family = sk->sk_family; int err; if (sa_family == AF_INET) { - err = udp_add_offload(&gs->udp_offloads); + err = udp_add_offload(sock_net(sk), &gs->udp_offloads); if (err) pr_warn("geneve: udp_add_offload failed with status %d\n", err); } -#endif -#endif + rcu_read_lock(); + for_each_netdev_rcu(net, dev) { +#ifdef HAVE_NDO_ADD_GENEVE_PORT + __be16 port = inet_sk(sk)->inet_sport; + + if (dev->netdev_ops->ndo_add_geneve_port) + dev->netdev_ops->ndo_add_geneve_port(dev, sa_family, + port); +#endif + } + rcu_read_unlock(); } static void geneve_notify_del_rx_port(struct geneve_sock *gs) { -#ifdef HAVE_NDO_ADD_GENEVE_PORT struct net_device *dev; struct sock *sk = gs->sock->sk; struct net *net = sock_net(sk); sa_family_t sa_family = geneve_get_sk_family(gs); - __be16 port = inet_sk(sk)->inet_sport; rcu_read_lock(); for_each_netdev_rcu(net, dev) { +#ifdef HAVE_NDO_ADD_GENEVE_PORT + __be16 port = inet_sk(sk)->inet_sport; + if (dev->netdev_ops->ndo_del_geneve_port) dev->netdev_ops->ndo_del_geneve_port(dev, sa_family, - port); + port); +#endif } rcu_read_unlock(); -#else -#ifdef HAVE_UDP_OFFLOAD - struct sock *sk = gs->sock->sk; - sa_family_t sa_family = sk->sk_family; if (sa_family == AF_INET) udp_del_offload(&gs->udp_offloads); -#endif - -#endif } #if defined(HAVE_UDP_OFFLOAD) || \ diff --git a/datapath/linux/compat/include/net/protocol.h b/datapath/linux/compat/include/net/protocol.h new file mode 100644 index 0000000..0247a26 --- /dev/null +++ b/datapath/linux/compat/include/net/protocol.h @@ -0,0 +1,19 @@ +#ifndef _NET_PROTOCOL_WRAPPER_H +#define _NET_PROTOCOL_WRAPPER_H + +#include_next + +#ifdef HAVE_UDP_OFFLOAD + +#ifndef HAVE_UDP_ADD_OFFLOAD_TAKES_NET +#define udp_add_offload(net, prot) udp_add_offload(prot) +#endif + +#else + +#define udp_add_offload(net, prot) 0 +#define udp_del_offload(prot) do {} while(0) + +#endif /* HAVE_UDP_OFFLOAD */ + +#endif /* _NET_PROTOCOL_WRAPPER_H */