Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48107c4e authored by Doug Ledford's avatar Doug Ledford
Browse files

Merge tag 'rdma-rc-2017-07-26' of... 

Merge tag 'rdma-rc-2017-07-26' of git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma

 into leon-ipoib

IPoIB fixes for 4.13

The patchset provides various fixes for IPoIB. It is combination of
fixes to various issues discovered during verification along with
static checkers cleanup patches.

Most of the patches are from pre-git era and hence lack of Fixes lines.

There is one exception in this IPoIB group - addition of patch revert:
Revert "IB/core: Allow QP state transition from reset to error", but
it followed by proper fix to the annoying print, so I thought it is
appropriate to include it.

Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parents 5db465f2 5dc78ad1

drivers/infiniband/core/verbs.c

+0 −1
Original line number Diff line number Diff line
@@ -895,7 +895,6 @@ static const struct { 
} qp_state_table[IB_QPS_ERR + 1][IB_QPS_ERR + 1] = {

	[IB_QPS_RESET] = {

		[IB_QPS_RESET] = { .valid = 1 },

		[IB_QPS_ERR] =   { .valid = 1 },

		[IB_QPS_INIT]  = {

			.valid = 1,

			.req_param = {

drivers/infiniband/ulp/ipoib/ipoib.h

+1 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ struct ipoib_dev_priv { 
	unsigned long flags;



	struct rw_semaphore vlan_rwsem;

	struct mutex mcast_mutex;



	struct rb_root  path_tree;

	struct list_head path_list;

drivers/infiniband/ulp/ipoib/ipoib_cm.c

+0 −1
Original line number Diff line number Diff line
@@ -511,7 +511,6 @@ static int ipoib_cm_rx_handler(struct ib_cm_id *cm_id, 
	case IB_CM_REQ_RECEIVED:

		return ipoib_cm_req_handler(cm_id, event);

	case IB_CM_DREQ_RECEIVED:

		p = cm_id->context;

		ib_send_cm_drep(cm_id, NULL, 0);

		/* Fall through */

	case IB_CM_REJ_RECEIVED:

drivers/infiniband/ulp/ipoib/ipoib_ethtool.c

+2 −1
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ static const struct ipoib_stats ipoib_gstrings_stats[] = { 
	IPOIB_NETDEV_STAT(tx_bytes),

	IPOIB_NETDEV_STAT(tx_errors),

	IPOIB_NETDEV_STAT(rx_dropped),

	IPOIB_NETDEV_STAT(tx_dropped)

	IPOIB_NETDEV_STAT(tx_dropped),

	IPOIB_NETDEV_STAT(multicast),

};



#define IPOIB_GLOBAL_STATS_LEN	ARRAY_SIZE(ipoib_gstrings_stats)

drivers/infiniband/ulp/ipoib/ipoib_ib.c

+24 −1
Original line number Diff line number Diff line
@@ -256,6 +256,8 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc) 


	++dev->stats.rx_packets;

	dev->stats.rx_bytes += skb->len;

	if (skb->pkt_type == PACKET_MULTICAST)

		dev->stats.multicast++;



	skb->dev = dev;

	if ((dev->features & NETIF_F_RXCSUM) &&
@@ -709,6 +711,27 @@ static int recvs_pending(struct net_device *dev) 
	return pending;

}



static void check_qp_movement_and_print(struct ipoib_dev_priv *priv,

					struct ib_qp *qp,

					enum ib_qp_state new_state)

{

	struct ib_qp_attr qp_attr;

	struct ib_qp_init_attr query_init_attr;

	int ret;



	ret = ib_query_qp(qp, &qp_attr, IB_QP_STATE, &query_init_attr);

	if (ret) {

		ipoib_warn(priv, "%s: Failed to query QP\n", __func__);

		return;

	}

	/* print according to the new-state and the previous state.*/

	if (new_state == IB_QPS_ERR && qp_attr.qp_state == IB_QPS_RESET)

		ipoib_dbg(priv, "Failed modify QP, IB_QPS_RESET to IB_QPS_ERR, acceptable\n");

	else

		ipoib_warn(priv, "Failed to modify QP to state: %d from state: %d\n",

			   new_state, qp_attr.qp_state);

}



int ipoib_ib_dev_stop_default(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = ipoib_priv(dev);
@@ -728,7 +751,7 @@ int ipoib_ib_dev_stop_default(struct net_device *dev) 
	 */

	qp_attr.qp_state = IB_QPS_ERR;

	if (ib_modify_qp(priv->qp, &qp_attr, IB_QP_STATE))

		ipoib_warn(priv, "Failed to modify QP to ERROR state\n");

		check_qp_movement_and_print(priv, priv->qp, IB_QPS_ERR);



	/* Wait for all sends and receives to complete */

	begin = jiffies;