Commit a2f3bde8 authored by Doug Ledford's avatar Doug Ledford
Browse files

Merge branch 'tid-read' into hfi1-tid 

This is the series for adding TID RDMA read. Kaike put in a lot of
effort into making this more consumable for review so special thanks to
him.

Allocating resources and tracing are separated out followed by patches
which build up the read request. Then we have the patches to receive
incoming TID RDMA read requests and handle integration with the RC
protocol.

See the cover letter of the original posting for more of a detailed
overview of TID.

https://www.spinics.net/lists/linux-rdma/msg66611.html



* tid-read:
  IB/hfi1: Add static trace for TID RDMA READ protocol
  IB/hfi1: Enable TID RDMA READ protocol
  IB/hfi1: Add interlock between a TID RDMA request and other requests
  IB/hfi1: Integrate TID RDMA READ protocol into RC protocol
  IB/hfi1: Increment the retry timeout value for TID RDMA READ request
  IB/hfi1: Add functions for restarting TID RDMA READ request
  IB/hfi1: Add TID RDMA handlers
  IB/hfi1: Add functions to receive TID RDMA READ response
  IB/hfi1: Add a function to build TID RDMA READ response
  IB/hfi1: Add functions to receive TID RDMA READ request
  IB/hfi1: Set PbcInsertHcrc for TID RDMA packets
  IB/hfi1: Add functions to build TID RDMA READ request
  IB/hfi1: Add static trace for flow and TID management functions
  IB/hfi1: Add the counter n_tidwait
  IB/hfi1: TID RDMA RcvArray programming and TID allocation
  IB/hfi1: TID RDMA flow allocation
  IB/hfi: Move RC functions into a header file

Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parents 2a642396 3ce5daa2

drivers/infiniband/hw/hfi1/chip.c

+2 −0
Original line number Diff line number Diff line
@@ -4253,6 +4253,8 @@ static struct cntr_entry dev_cntrs[DEV_CNTR_LAST] = { 
			    access_sw_pio_drain),

[C_SW_KMEM_WAIT] = CNTR_ELEM("KmemWait", 0, 0, CNTR_NORMAL,

			    access_sw_kmem_wait),

[C_SW_TID_WAIT] = CNTR_ELEM("TidWait", 0, 0, CNTR_NORMAL,

			    hfi1_access_sw_tid_wait),

[C_SW_SEND_SCHED] = CNTR_ELEM("SendSched", 0, 0, CNTR_NORMAL,

			    access_sw_send_schedule),

[C_SDMA_DESC_FETCHED_CNT] = CNTR_ELEM("SDEDscFdCn",

drivers/infiniband/hw/hfi1/chip.h

+1 −0
Original line number Diff line number Diff line
@@ -927,6 +927,7 @@ enum { 
	C_SW_PIO_WAIT,

	C_SW_PIO_DRAIN,

	C_SW_KMEM_WAIT,

	C_SW_TID_WAIT,

	C_SW_SEND_SCHED,

	C_SDMA_DESC_FETCHED_CNT,

	C_SDMA_INT_CNT,

drivers/infiniband/hw/hfi1/common.h

+4 −0
Original line number Diff line number Diff line
@@ -340,6 +340,10 @@ struct diag_pkt { 


#define HFI1_PSM_IOC_BASE_SEQ 0x0



/* Number of BTH.PSN bits used for sequence number in expected rcvs */

#define HFI1_KDETH_BTH_SEQ_SHIFT 11

#define HFI1_KDETH_BTH_SEQ_MASK (BIT(HFI1_KDETH_BTH_SEQ_SHIFT) - 1)



static inline __u64 rhf_to_cpu(const __le32 *rbuf)

{

	return __le64_to_cpu(*((__le64 *)rbuf));

drivers/infiniband/hw/hfi1/driver.c

+37 −21
Original line number Diff line number Diff line
@@ -1575,13 +1575,11 @@ drop: 
	return -EINVAL;

}



void handle_eflags(struct hfi1_packet *packet)

static void show_eflags_errs(struct hfi1_packet *packet)

{

	struct hfi1_ctxtdata *rcd = packet->rcd;

	u32 rte = rhf_rcv_type_err(packet->rhf);



	rcv_hdrerr(rcd, rcd->ppd, packet);

	if (rhf_err_flags(packet->rhf))

	dd_dev_err(rcd->dd,

		   "receive context %d: rhf 0x%016llx, errs [ %s%s%s%s%s%s%s%s] rte 0x%x\n",

		   rcd->ctxt, packet->rhf,
@@ -1596,6 +1594,15 @@ void handle_eflags(struct hfi1_packet *packet) 
		   rte);

}



void handle_eflags(struct hfi1_packet *packet)

{

	struct hfi1_ctxtdata *rcd = packet->rcd;



	rcv_hdrerr(rcd, rcd->ppd, packet);

	if (rhf_err_flags(packet->rhf))

		show_eflags_errs(packet);

}



/*

 * The following functions are called by the interrupt handler. They are type

 * specific handlers for each packet type.
@@ -1699,11 +1706,14 @@ static int kdeth_process_expected(struct hfi1_packet *packet) 
	if (unlikely(hfi1_dbg_should_fault_rx(packet)))

		return RHF_RCV_CONTINUE;



	if (unlikely(rhf_err_flags(packet->rhf)))

		handle_eflags(packet);

	if (unlikely(rhf_err_flags(packet->rhf))) {

		struct hfi1_ctxtdata *rcd = packet->rcd;



	dd_dev_err(packet->rcd->dd,

		   "Unhandled expected packet received. Dropping.\n");

		if (hfi1_handle_kdeth_eflags(rcd, rcd->ppd, packet))

			return RHF_RCV_CONTINUE;

	}



	hfi1_kdeth_expected_rcv(packet);

	return RHF_RCV_CONTINUE;

}
@@ -1712,11 +1722,17 @@ static int kdeth_process_eager(struct hfi1_packet *packet) 
	hfi1_setup_9B_packet(packet);

	if (unlikely(hfi1_dbg_should_fault_rx(packet)))

		return RHF_RCV_CONTINUE;

	if (unlikely(rhf_err_flags(packet->rhf)))

		handle_eflags(packet);



	dd_dev_err(packet->rcd->dd,

		   "Unhandled eager packet received. Dropping.\n");

	trace_hfi1_rcvhdr(packet);

	if (unlikely(rhf_err_flags(packet->rhf))) {

		struct hfi1_ctxtdata *rcd = packet->rcd;



		show_eflags_errs(packet);

		if (hfi1_handle_kdeth_eflags(rcd, rcd->ppd, packet))

			return RHF_RCV_CONTINUE;

	}



	hfi1_kdeth_eager_rcv(packet);

	return RHF_RCV_CONTINUE;

}

drivers/infiniband/hw/hfi1/hfi.h

+18 −1
Original line number Diff line number Diff line
@@ -198,6 +198,14 @@ struct exp_tid_set { 
};



typedef int (*rhf_rcv_function_ptr)(struct hfi1_packet *packet);



struct tid_queue {

	struct list_head queue_head;

			/* queue head for QP TID resource waiters */

	u32 enqueue;	/* count of tid enqueues */

	u32 dequeue;	/* count of tid dequeues */

};



struct hfi1_ctxtdata {

	/* rcvhdrq base, needs mmap before useful */

	void *rcvhdrq;
@@ -291,6 +299,12 @@ struct hfi1_ctxtdata { 
	/* PSM Specific fields */

	/* lock protecting all Expected TID data */

	struct mutex exp_mutex;

	/* lock protecting all Expected TID data of kernel contexts */

	spinlock_t exp_lock;

	/* Queue for QP's waiting for HW TID flows */

	struct tid_queue flow_queue;

	/* Queue for QP's waiting for HW receive array entries */

	struct tid_queue rarr_queue;

	/* when waiting for rcv or pioavail */

	wait_queue_head_t wait;

	/* uuid from PSM */
@@ -323,6 +337,9 @@ struct hfi1_ctxtdata { 
	 */

	u8 subctxt_cnt;



	/* Bit mask to track free TID RDMA HW flows */

	unsigned long flow_mask;

	struct tid_flow_state flows[RXE_NUM_TID_FLOWS];

};



/**
@@ -2103,7 +2120,7 @@ static inline u64 hfi1_pkt_default_send_ctxt_mask(struct hfi1_devdata *dd, 
			SEND_CTXT_CHECK_ENABLE_DISALLOW_PBC_TEST_SMASK |

#endif

			HFI1_PKT_USER_SC_INTEGRITY;

	else

	else if (ctxt_type != SC_KERNEL)

		base_sc_integrity |= HFI1_PKT_KERNEL_SC_INTEGRITY;



	/* turn on send-side job key checks if !A0 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE