From patchwork Wed May 4 12:31:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102382 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp154321qge; Wed, 4 May 2016 05:32:15 -0700 (PDT) X-Received: by 10.98.41.70 with SMTP id p67mr11657100pfp.93.1462365135366; Wed, 04 May 2016 05:32:15 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rw1si4814071pab.58.2016.05.04.05.32.15; Wed, 04 May 2016 05:32:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751655AbcEDMcN (ORCPT + 29 others); Wed, 4 May 2016 08:32:13 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:59640 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750910AbcEDMcL (ORCPT ); Wed, 4 May 2016 08:32:11 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue101) with ESMTPA (Nemesis) id 0Lu5Go-1bhLGR24vO-011VPb; Wed, 04 May 2016 14:32:01 +0200 From: Arnd Bergmann To: Matan Barak , Leon Romanovsky , Saeed Mahameed Cc: netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, arnd@arndb.de, davem@davemloft.net, Matthew Finlay , Richard Cochran , Amir Vadai , Haggai Abramonvsky , Maor Gottlieb , Or Gerlitz , Majd Dibbiny , Achiad Shochat , Tariq Toukan , Gal Pressman Subject: [PATCH 2/3] net/mlx5e: make VXLAN support conditional Date: Wed, 4 May 2016 14:31:14 +0200 Message-Id: <1462365116-3856622-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1462364774-3792510-1-git-send-email-arnd@arndb.de> References: <1462364774-3792510-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:skAXLvxpdMqB0XX9Ybd3/tieljd7t1IMjCxq0Hx/Jxe45nwZy0W x6ZHf6rwbP2cXWoavIDadhy5LY4P/W6eZbFXqulcRSoAfu6Dx5VATQS3Z9TgOhJKDLL8AtH RN5XlBcGcwIdhwdy9649/bn16O0x77m1kEvFrozihwDA5z5LK2+Dhxm1L+cHra63uIH6yeH dyW6mPbn67MWkB96bq1bQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:YTn3btVvNaM=:SoSmn5BWQ3cThWqDi/Oj7V kB3YuQtrhRQpDkESB0VT2OBxsMg1l7FHsOqAHK58n6/NVn9MkgCIKs4Xn5sdNVhUsJ9r76m8e eGEN++dbMUSJ17pBAcntXRprq9mdMJ2xeqXKG2CLmwkIM855RGeKikl4nWLfkQT6sdKvtQew/ AY2+3+XU5LcY10Ba6c/6679s9dKOEI35vFPKVxvQ035ubZ0FUNPUV99WqKyGKpejC55vuxYGx Cy3dzoqvEchkUCRl9HAfd3VQl2TqouxACdYd1ot+RfMUGUV+lsDb+XOV01elVx0Ke95/PKE0y ckCLLYRtOCoTP4dw+MKgIAaHO1IF/5x5fK8Y3YYpl0n9ZmTQFSpF+zEUUlQMKq4RHmP6jGdJ7 k2XH4Y6f8ucgG+oj15VU7p0Ix97UUv8q49RlYtXXPpdEj2Uw1lvHFH22/2zvIvYinj6ZgQ0N4 WAtx+cSsYzEsSGbxPf5ThYxGjqTKApfBIZLwiGXlSuyyX5NASbD7dkS/kdyXXpfqhSbtR2Bik kKFuCPC30IU8ahYypYVpz0la3aqnEh8stAiTyiSFTFLahb1MVhR+DRajiXo4gQtYtj+59cxg2 icZFJgkRWyvQjv8VUeUncYuW7eXwmZByKRGmf3T+opJFOsXRXYfvicd0DMpHfl7uhrvEvKhGD oaYXRuToXflItZUc/ouzRjPDeXZzAbAq9k0UHGk9LpA/tAOgf85RIWma5zwhPzN1FokY= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org VXLAN can be disabled at compile-time or it can be a loadable module while mlx5 is built-in, which leads to a link error: drivers/net/built-in.o: In function `mlx5e_create_netdev': ntb_netdev.c:(.text+0x106de4): undefined reference to `vxlan_get_rx_port' This avoids the link error and makes the vxlan code optional, like the other ethernet drivers do as well. Signed-off-by: Arnd Bergmann Link: https://patchwork.ozlabs.org/patch/589296/ Fixes: b3f63c3d5e2c ("net/mlx5e: Add netdev support for VXLAN tunneling") --- I sent it originally on Feb 26 2016, but misread Saeed Mahameed's reply as saying that he'd fix it up himself. The new version should address the original comment. --- drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 7 +++++++ drivers/net/ethernet/mellanox/mlx5/core/Makefile | 4 +++- drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 ++ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 ++++ drivers/net/ethernet/mellanox/mlx5/core/vxlan.h | 11 +++++++++-- 5 files changed, 25 insertions(+), 3 deletions(-) -- 2.7.0 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig index 1cf722eba607..f5c3b9465d8d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig +++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig @@ -31,3 +31,10 @@ config MLX5_CORE_EN_DCB This flag is depended on the kernel's DCB support. If unsure, set to Y + +config MLX5_CORE_EN_VXLAN + bool "VXLAN offloads Support" + default y + depends on MLX5_CORE_EN && VXLAN && !(MLX5_CORE=y && VXLAN=m) + ---help--- + Say Y here if you want to use VXLAN offloads in the driver. diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/Makefile index 679e18ffb3a6..6b8da0b36acd 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/Makefile +++ b/drivers/net/ethernet/mellanox/mlx5/core/Makefile @@ -6,7 +6,9 @@ mlx5_core-y := main.o cmd.o debugfs.o fw.o eq.o uar.o pagealloc.o \ mlx5_core-$(CONFIG_MLX5_CORE_EN) += wq.o eswitch.o \ en_main.o en_fs.o en_ethtool.o en_tx.o en_rx.o \ - en_txrx.o en_clock.o vxlan.o en_tc.o + en_txrx.o en_clock.o en_tc.o + +mlx5_core-$(CONFIG_MLX5_CORE_EN_VXLAN) += vxlan.o mlx5_core-$(CONFIG_MLX5_CORE_EN_DCB) += en_dcbnl.o mlx5_core-$(CONFIG_RFS_ACCEL) += en_arfs.o diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h index bfa5daaaf5aa..19b1b021af2d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h @@ -522,7 +522,9 @@ struct mlx5e_priv { struct mlx5e_direct_tir direct_tir[MLX5E_MAX_NUM_CHANNELS]; struct mlx5e_flow_steering fs; +#ifdef CONFIG_MLX5_CORE_EN_VXLAN struct mlx5e_vxlan_db vxlan; +#endif struct mlx5e_params params; struct workqueue_struct *wq; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 7dfb73aa8e41..5e710315c5a9 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -2494,6 +2494,7 @@ static int mlx5e_get_vf_stats(struct net_device *dev, vf_stats); } +#if IS_ENABLED(CONFIG_MLX5_CORE_EN_VXLAN) static void mlx5e_add_vxlan_port(struct net_device *netdev, sa_family_t sa_family, __be16 port) { @@ -2565,6 +2566,7 @@ static netdev_features_t mlx5e_features_check(struct sk_buff *skb, return features; } +#endif static const struct net_device_ops mlx5e_netdev_ops_basic = { .ndo_open = mlx5e_open, @@ -2599,9 +2601,11 @@ static const struct net_device_ops mlx5e_netdev_ops_sriov = { .ndo_set_features = mlx5e_set_features, .ndo_change_mtu = mlx5e_change_mtu, .ndo_do_ioctl = mlx5e_ioctl, +#ifdef CONFIG_MLX5_CORE_EN_VXLAN .ndo_add_vxlan_port = mlx5e_add_vxlan_port, .ndo_del_vxlan_port = mlx5e_del_vxlan_port, .ndo_features_check = mlx5e_features_check, +#endif #ifdef CONFIG_RFS_ACCEL .ndo_rx_flow_steer = mlx5e_rx_flow_steer, #endif diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.h b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.h index 129f3527aa14..217ac530a514 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.h @@ -48,14 +48,21 @@ struct mlx5e_vxlan_work { static inline bool mlx5e_vxlan_allowed(struct mlx5_core_dev *mdev) { - return (MLX5_CAP_ETH(mdev, tunnel_stateless_vxlan) && + return IS_ENABLED(CONFIG_MLX5_CORE_EN_VXLAN) && + (MLX5_CAP_ETH(mdev, tunnel_stateless_vxlan) && mlx5_core_is_pf(mdev)); } +#ifdef CONFIG_MLX5_CORE_EN_VXLAN void mlx5e_vxlan_init(struct mlx5e_priv *priv); +void mlx5e_vxlan_cleanup(struct mlx5e_priv *priv); +#else +static inline void mlx5e_vxlan_init(struct mlx5e_priv *priv) {} +static inline void mlx5e_vxlan_cleanup(struct mlx5e_priv *priv) {} +#endif + void mlx5e_vxlan_queue_work(struct mlx5e_priv *priv, sa_family_t sa_family, u16 port, int add); struct mlx5e_vxlan *mlx5e_vxlan_lookup_port(struct mlx5e_priv *priv, u16 port); -void mlx5e_vxlan_cleanup(struct mlx5e_priv *priv); #endif /* __MLX5_VXLAN_H__ */