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

Commit e10db791 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma 

Pull rdma fixes from Doug Ledford:
 "We have 5 small fixes for this pull request. One is a performance
  regression, so not necessarily strictly a fix, but it was small and
  reasonable and claimed to avoid thrashing in the scheduler, so I took
  it. The remaining are all legitimate fixes that match the "we take
  fixes any time" criteria.

  Summary:

   - One performance regression for hfi1

   - One kasan fix for hfi1

   - A couple mlx5 fixes

   - A core oops fix"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  IB/core: Fix oops in netdev_next_upper_dev_rcu()
  IB/mlx5: Block DEVX umem from the non applicable cases
  IB/mlx5: Fix implicit ODP interrupted page fault
  IB/hfi1: Fix an out-of-bounds access in get_hw_stats
  IB/hfi1: Fix a latency issue for small messages
parents e861e11c 37fbd834

drivers/infiniband/core/roce_gid_mgmt.c

+3 −0
Original line number Diff line number Diff line
@@ -267,6 +267,9 @@ is_upper_ndev_bond_master_filter(struct ib_device *ib_dev, u8 port, 
	struct net_device *cookie_ndev = cookie;

	bool match = false;



	if (!rdma_ndev)

		return false;



	rcu_read_lock();

	if (netif_is_bond_master(cookie_ndev) &&

	    rdma_is_upper_dev_rcu(rdma_ndev, cookie_ndev))

drivers/infiniband/hw/hfi1/chip.c

+2 −1
Original line number Diff line number Diff line
@@ -12500,7 +12500,8 @@ static int init_cntrs(struct hfi1_devdata *dd) 
	}



	/* allocate space for the counter values */

	dd->cntrs = kcalloc(dd->ndevcntrs, sizeof(u64), GFP_KERNEL);

	dd->cntrs = kcalloc(dd->ndevcntrs + num_driver_cntrs, sizeof(u64),

			    GFP_KERNEL);

	if (!dd->cntrs)

		goto bail;

drivers/infiniband/hw/hfi1/hfi.h

+2 −0
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ struct hfi1_ib_stats { 
extern struct hfi1_ib_stats hfi1_stats;

extern const struct pci_error_handlers hfi1_pci_err_handler;



extern int num_driver_cntrs;



/*

 * First-cut criterion for "device is active" is

 * two thousand dwords combined Tx, Rx traffic per

drivers/infiniband/hw/hfi1/qp.c

+7 −0
Original line number Diff line number Diff line
@@ -340,6 +340,13 @@ int hfi1_setup_wqe(struct rvt_qp *qp, struct rvt_swqe *wqe, bool *call_send) 
	default:

		break;

	}



	/*

	 * System latency between send and schedule is large enough that

	 * forcing call_send to true for piothreshold packets is necessary.

	 */

	if (wqe->length <= piothreshold)

		*call_send = true;

	return 0;

}

drivers/infiniband/hw/hfi1/verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -1479,7 +1479,7 @@ static const char * const driver_cntr_names[] = { 
static DEFINE_MUTEX(cntr_names_lock); /* protects the *_cntr_names bufers */

static const char **dev_cntr_names;

static const char **port_cntr_names;

static int num_driver_cntrs = ARRAY_SIZE(driver_cntr_names);

int num_driver_cntrs = ARRAY_SIZE(driver_cntr_names);

static int num_dev_cntrs;

static int num_port_cntrs;

static int cntr_names_initialized;