Commit 388fa7f1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-fixes-2021-06-09' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-fixes-2021-06-09
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6cde05ab 54e1217b

drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ struct devlink_port *mlx5e_get_devlink_port(struct net_device *dev) 
	struct mlx5e_priv *priv = netdev_priv(dev);

	struct devlink_port *port;



	if (!netif_device_present(dev))

		return NULL;

	port = mlx5e_devlink_get_dl_port(priv);

	if (port->registered)

		return port;

drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c

+0 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB

// Copyright (c) 2020 Mellanox Technologies



#include <linux/ptp_classify.h>

#include "en/ptp.h"

#include "en/txrx.h"

#include "en/params.h"

drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h

+22 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


#include "en.h"

#include "en_stats.h"

#include <linux/ptp_classify.h>



struct mlx5e_ptpsq {

	struct mlx5e_txqsq       txqsq;
@@ -43,6 +44,27 @@ struct mlx5e_ptp { 
	DECLARE_BITMAP(state, MLX5E_PTP_STATE_NUM_STATES);

};



static inline bool mlx5e_use_ptpsq(struct sk_buff *skb)

{

	struct flow_keys fk;



	if (!(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP))

		return false;



	if (!skb_flow_dissect_flow_keys(skb, &fk, 0))

		return false;



	if (fk.basic.n_proto == htons(ETH_P_1588))

		return true;



	if (fk.basic.n_proto != htons(ETH_P_IP) &&

	    fk.basic.n_proto != htons(ETH_P_IPV6))

		return false;



	return (fk.basic.ip_proto == IPPROTO_UDP &&

		fk.ports.dst == htons(PTP_EV_PORT));

}



int mlx5e_ptp_open(struct mlx5e_priv *priv, struct mlx5e_params *params,

		   u8 lag_port, struct mlx5e_ptp **cp);

void mlx5e_ptp_close(struct mlx5e_ptp *c);

drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.c

+6 −9
Original line number Diff line number Diff line
@@ -129,10 +129,9 @@ static void mlx5e_rep_neigh_update(struct work_struct *work) 
							     work);

	struct mlx5e_neigh_hash_entry *nhe = update_work->nhe;

	struct neighbour *n = update_work->n;

	struct mlx5e_encap_entry *e = NULL;

	bool neigh_connected, same_dev;

	struct mlx5e_encap_entry *e;

	unsigned char ha[ETH_ALEN];

	struct mlx5e_priv *priv;

	u8 nud_state, dead;



	rtnl_lock();
@@ -156,14 +155,12 @@ static void mlx5e_rep_neigh_update(struct work_struct *work) 
	if (!same_dev)

		goto out;



	list_for_each_entry(e, &nhe->encap_list, encap_list) {

		if (!mlx5e_encap_take(e))

			continue;

	/* mlx5e_get_next_init_encap() releases previous encap before returning

	 * the next one.

	 */

	while ((e = mlx5e_get_next_init_encap(nhe, e)) != NULL)

		mlx5e_rep_update_flows(netdev_priv(e->out_dev), e, neigh_connected, ha);



		priv = netdev_priv(e->out_dev);

		mlx5e_rep_update_flows(priv, e, neigh_connected, ha);

		mlx5e_encap_put(priv, e);

	}

out:

	rtnl_unlock();

	mlx5e_release_neigh_update_work(update_work);

drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c

+1 −5
Original line number Diff line number Diff line
@@ -94,13 +94,9 @@ void mlx5e_rep_update_flows(struct mlx5e_priv *priv, 


	ASSERT_RTNL();



	/* wait for encap to be fully initialized */

	wait_for_completion(&e->res_ready);



	mutex_lock(&esw->offloads.encap_tbl_lock);

	encap_connected = !!(e->flags & MLX5_ENCAP_ENTRY_VALID);

	if (e->compl_result < 0 || (encap_connected == neigh_connected &&

				    ether_addr_equal(e->h_dest, ha)))

	if (encap_connected == neigh_connected && ether_addr_equal(e->h_dest, ha))

		goto unlock;



	mlx5e_take_all_encap_flows(e, &flow_list);