diff mbox

[Trusty,SRU] net/mlx4_en: Add VXLAN ndo calls to the PF net device ops too

Message ID 1421879031-604-1-git-send-email-chris.j.arges@canonical.com
State New
Headers show

Commit Message

Chris J Arges Jan. 21, 2015, 10:23 p.m. UTC 
From: Or Gerlitz <ogerlitz@mellanox.com>

BugLink: http://bugs.launchpad.net/bugs/1407760

This is currently missing, which results in a crash when one attempts
to set VXLAN tunnel over the mlx4_en when acting as PF.

	[ 2408.785472] BUG: unable to handle kernel NULL pointer dereference at (null)
	[...]
	[ 2408.994104] Call Trace:
	[ 2408.996584]  [<ffffffffa021f7f5>] ? vxlan_get_rx_port+0xd6/0x103 [vxlan]
	[ 2409.003316]  [<ffffffffa021f71f>] ? vxlan_lowerdev_event+0xf2/0xf2 [vxlan]
	[ 2409.010225]  [<ffffffffa0630358>] mlx4_en_start_port+0x862/0x96a [mlx4_en]
	[ 2409.017132]  [<ffffffffa063070f>] mlx4_en_open+0x17f/0x1b8 [mlx4_en]

While here, make sure to invoke vxlan_get_rx_port() only when VXLAN
offloads are actually enabled and not when they are only supported.

Reported-by: Ido Shamay <idos@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(backported from commit 9737c6ab7afbc950e997ef80cba2c40dbbd16ea4)
Signed-off-by: Eyal Perry <eyalpe@mellanox.com>
Acked-By: Chris J Arges <chris.j.arges@canonical.com>
---
 drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Andy Whitcroft Jan. 22, 2015, 10:29 a.m. UTC | #1 
On Wed, Jan 21, 2015 at 04:23:51PM -0600, Chris J Arges wrote:
> From: Or Gerlitz <ogerlitz@mellanox.com>
> 
> BugLink: http://bugs.launchpad.net/bugs/1407760
> 
> This is currently missing, which results in a crash when one attempts
> to set VXLAN tunnel over the mlx4_en when acting as PF.
> 
> 	[ 2408.785472] BUG: unable to handle kernel NULL pointer dereference at (null)
> 	[...]
> 	[ 2408.994104] Call Trace:
> 	[ 2408.996584]  [<ffffffffa021f7f5>] ? vxlan_get_rx_port+0xd6/0x103 [vxlan]
> 	[ 2409.003316]  [<ffffffffa021f71f>] ? vxlan_lowerdev_event+0xf2/0xf2 [vxlan]
> 	[ 2409.010225]  [<ffffffffa0630358>] mlx4_en_start_port+0x862/0x96a [mlx4_en]
> 	[ 2409.017132]  [<ffffffffa063070f>] mlx4_en_open+0x17f/0x1b8 [mlx4_en]
> 
> While here, make sure to invoke vxlan_get_rx_port() only when VXLAN
> offloads are actually enabled and not when they are only supported.
> 
> Reported-by: Ido Shamay <idos@mellanox.com>
> Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> (backported from commit 9737c6ab7afbc950e997ef80cba2c40dbbd16ea4)
> Signed-off-by: Eyal Perry <eyalpe@mellanox.com>
> Acked-By: Chris J Arges <chris.j.arges@canonical.com>
> ---
>  drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
> index bc29746..c496b15 100644
> --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
> +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
> @@ -1730,7 +1730,7 @@ int mlx4_en_start_port(struct net_device *dev)
>  	mlx4_set_stats_bitmap(mdev->dev, &priv->stats_bitmap);
>  
>  #ifdef CONFIG_MLX4_EN_VXLAN
> -	if (priv->mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS)
> +	if (priv->mdev->dev->caps.tunnel_offload_mode == MLX4_TUNNEL_OFFLOAD_MODE_VXLAN)
>  		vxlan_get_rx_port(dev);
>  #endif
>  	priv->port_up = true;
> @@ -2440,6 +2440,10 @@ static const struct net_device_ops mlx4_netdev_ops_master = {
>  	.ndo_rx_flow_steer	= mlx4_en_filter_rfs,
>  #endif
>  	.ndo_get_phys_port_id	= mlx4_en_get_phys_port_id,
> +#ifdef CONFIG_MLX4_EN_VXLAN
> +	.ndo_add_vxlan_port	= mlx4_en_add_vxlan_port,
> +	.ndo_del_vxlan_port	= mlx4_en_del_vxlan_port,
> +#endif
>  };
>  
>  int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,

Backport looks reasonable.

Acked-by: Andy Whitcroft <apw@canonical.com>

-apw
Stefan Bader Jan. 22, 2015, 12:16 p.m. UTC | #2 
Yep looks more or less sane. This probably should come via stable but I
understand that its hard to predict when. The change was in 3.18, so do we need
a SRU for Utopic as well or will we wait for stable there?

-Stefan
Luis Henriques Jan. 22, 2015, 12:27 p.m. UTC | #3 
On Thu, Jan 22, 2015 at 01:16:56PM +0100, Stefan Bader wrote:
> Yep looks more or less sane. This probably should come via stable but I
> understand that its hard to predict when. The change was in 3.18, so do we need
> a SRU for Utopic as well or will we wait for stable there?
> 
> -Stefan
> 

3.16.7-ckt3 already included this fix.  And this stable release has
already been included in Utopic, so the fix is already in -proposed
(kernel 3.16.0-30.40).

Cheers,
--
Luís
Brad Figg Jan. 27, 2015, 4:41 p.m. UTC | #4 
On Wed, Jan 21, 2015 at 04:23:51PM -0600, Chris J Arges wrote:
> From: Or Gerlitz <ogerlitz@mellanox.com>
> 
> BugLink: http://bugs.launchpad.net/bugs/1407760
> 
> This is currently missing, which results in a crash when one attempts
> to set VXLAN tunnel over the mlx4_en when acting as PF.
> 
> 	[ 2408.785472] BUG: unable to handle kernel NULL pointer dereference at (null)
> 	[...]
> 	[ 2408.994104] Call Trace:
> 	[ 2408.996584]  [<ffffffffa021f7f5>] ? vxlan_get_rx_port+0xd6/0x103 [vxlan]
> 	[ 2409.003316]  [<ffffffffa021f71f>] ? vxlan_lowerdev_event+0xf2/0xf2 [vxlan]
> 	[ 2409.010225]  [<ffffffffa0630358>] mlx4_en_start_port+0x862/0x96a [mlx4_en]
> 	[ 2409.017132]  [<ffffffffa063070f>] mlx4_en_open+0x17f/0x1b8 [mlx4_en]
> 
> While here, make sure to invoke vxlan_get_rx_port() only when VXLAN
> offloads are actually enabled and not when they are only supported.
> 
> Reported-by: Ido Shamay <idos@mellanox.com>
> Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> (backported from commit 9737c6ab7afbc950e997ef80cba2c40dbbd16ea4)
> Signed-off-by: Eyal Perry <eyalpe@mellanox.com>
> Acked-By: Chris J Arges <chris.j.arges@canonical.com>
> ---
>  drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
> index bc29746..c496b15 100644
> --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
> +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
> @@ -1730,7 +1730,7 @@ int mlx4_en_start_port(struct net_device *dev)
>  	mlx4_set_stats_bitmap(mdev->dev, &priv->stats_bitmap);
>  
>  #ifdef CONFIG_MLX4_EN_VXLAN
> -	if (priv->mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS)
> +	if (priv->mdev->dev->caps.tunnel_offload_mode == MLX4_TUNNEL_OFFLOAD_MODE_VXLAN)
>  		vxlan_get_rx_port(dev);
>  #endif
>  	priv->port_up = true;
> @@ -2440,6 +2440,10 @@ static const struct net_device_ops mlx4_netdev_ops_master = {
>  	.ndo_rx_flow_steer	= mlx4_en_filter_rfs,
>  #endif
>  	.ndo_get_phys_port_id	= mlx4_en_get_phys_port_id,
> +#ifdef CONFIG_MLX4_EN_VXLAN
> +	.ndo_add_vxlan_port	= mlx4_en_add_vxlan_port,
> +	.ndo_del_vxlan_port	= mlx4_en_del_vxlan_port,
> +#endif
>  };
>  
>  int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
> -- 
> 1.9.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

Applied to Trusty master-next
diff mbox

Patch

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index bc29746..c496b15 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -1730,7 +1730,7 @@  int mlx4_en_start_port(struct net_device *dev)
 	mlx4_set_stats_bitmap(mdev->dev, &priv->stats_bitmap);
 
 #ifdef CONFIG_MLX4_EN_VXLAN
-	if (priv->mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS)
+	if (priv->mdev->dev->caps.tunnel_offload_mode == MLX4_TUNNEL_OFFLOAD_MODE_VXLAN)
 		vxlan_get_rx_port(dev);
 #endif
 	priv->port_up = true;
@@ -2440,6 +2440,10 @@  static const struct net_device_ops mlx4_netdev_ops_master = {
 	.ndo_rx_flow_steer	= mlx4_en_filter_rfs,
 #endif
 	.ndo_get_phys_port_id	= mlx4_en_get_phys_port_id,
+#ifdef CONFIG_MLX4_EN_VXLAN
+	.ndo_add_vxlan_port	= mlx4_en_add_vxlan_port,
+	.ndo_del_vxlan_port	= mlx4_en_del_vxlan_port,
+#endif
 };
 
 int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,