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

Commit 0f0bee8b authored by Faisal Latif's avatar Faisal Latif Committed by Roland Dreier
Browse files

RDMA/nes: Support for Packed And Unaligned fpdus 



Support for Packed and Unaligned (PAU) FPDUs is needed for
interoperability between NES and non-NES nodes. When the NES hardware
detects a PAU frame, it will pass it to the driver to process the
frame.  NES driver creates a new frame for each FPDU and forwards it
to the hardware to be sent to its associated qp.

Signed-off-by: default avatarTatyana Nikolova <Tatyana.E.Nikolova@intel.com>
Signed-off-by: default avatarFaisal Latif <Faisal.Latif@intel.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 6224c7ee

drivers/infiniband/hw/nes/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_INFINIBAND_NES) += iw_nes.o



iw_nes-objs := nes.o nes_hw.o nes_nic.o nes_utils.o nes_verbs.o nes_cm.o
 
iw_nes-objs := nes.o nes_hw.o nes_nic.o nes_utils.o nes_verbs.o nes_cm.o nes_mgt.o

drivers/infiniband/hw/nes/nes.c

+4 −4
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ module_param(send_first, int, 0644); 
MODULE_PARM_DESC(send_first, "Send RDMA Message First on Active Connection");





unsigned int nes_drv_opt = 0;

unsigned int nes_drv_opt = NES_DRV_OPT_DISABLE_INT_MOD | NES_DRV_OPT_ENABLE_PAU;

module_param(nes_drv_opt, int, 0644);

MODULE_PARM_DESC(nes_drv_opt, "Driver option parameters");
@@ -130,9 +130,6 @@ static struct notifier_block nes_net_notifier = { 
	.notifier_call = nes_net_event

};









/**

 * nes_inetaddr_event

 */
@@ -321,6 +318,9 @@ void nes_rem_ref(struct ib_qp *ibqp) 
	}



	if (atomic_dec_and_test(&nesqp->refcount)) {

		if (nesqp->pau_mode)

			nes_destroy_pau_qp(nesdev, nesqp);



		/* Destroy the QP */

		cqp_request = nes_get_cqp_request(nesdev);

		if (cqp_request == NULL) {

drivers/infiniband/hw/nes/nes.h

+15 −2
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ 
#define NES_DRV_OPT_NO_INLINE_DATA       0x00000080

#define NES_DRV_OPT_DISABLE_INT_MOD      0x00000100

#define NES_DRV_OPT_DISABLE_VIRT_WQ      0x00000200

#define NES_DRV_OPT_ENABLE_PAU           0x00000400



#define NES_AEQ_EVENT_TIMEOUT         2500

#define NES_DISCONNECT_EVENT_TIMEOUT  2000
@@ -128,6 +129,7 @@ 
#define NES_DBG_IW_RX       0x00020000

#define NES_DBG_IW_TX       0x00040000

#define NES_DBG_SHUTDOWN    0x00080000

#define NES_DBG_PAU         0x00100000

#define NES_DBG_RSVD1       0x10000000

#define NES_DBG_RSVD2       0x20000000

#define NES_DBG_RSVD3       0x40000000
@@ -162,6 +164,7 @@ do { \ 
#include "nes_context.h"

#include "nes_user.h"

#include "nes_cm.h"

#include "nes_mgt.h"



extern int max_mtu;

#define max_frame_len (max_mtu+ETH_HLEN)
@@ -202,6 +205,8 @@ extern atomic_t cm_nodes_created; 
extern atomic_t cm_nodes_destroyed;

extern atomic_t cm_accel_dropped_pkts;

extern atomic_t cm_resets_recvd;

extern atomic_t pau_qps_created;

extern atomic_t pau_qps_destroyed;



extern u32 int_mod_timer_init;

extern u32 int_mod_cq_depth_256;
@@ -273,6 +278,14 @@ struct nes_device { 
	u8                     link_recheck;

};



/* Receive skb private area - must fit in skb->cb area */

struct nes_rskb_cb {

	u64                    busaddr;

	u32                    maplen;

	u32                    seqnum;

	u8                     *data_start;

	struct nes_qp          *nesqp;

};



static inline __le32 get_crc_value(struct nes_v4_quad *nes_quad)

{
@@ -305,8 +318,8 @@ set_wqe_32bit_value(__le32 *wqe_words, u32 index, u32 value) 
static inline void

nes_fill_init_cqp_wqe(struct nes_hw_cqp_wqe *cqp_wqe, struct nes_device *nesdev)

{

	set_wqe_64bit_value(cqp_wqe->wqe_words, NES_CQP_WQE_COMP_CTX_LOW_IDX,

			(u64)((unsigned long) &nesdev->cqp));

	cqp_wqe->wqe_words[NES_CQP_WQE_COMP_CTX_LOW_IDX]       = 0;

	cqp_wqe->wqe_words[NES_CQP_WQE_COMP_CTX_HIGH_IDX]      = 0;

	cqp_wqe->wqe_words[NES_CQP_WQE_COMP_SCRATCH_LOW_IDX]   = 0;

	cqp_wqe->wqe_words[NES_CQP_WQE_COMP_SCRATCH_HIGH_IDX]  = 0;

	cqp_wqe->wqe_words[NES_CQP_STAG_WQE_PBL_BLK_COUNT_IDX] = 0;

drivers/infiniband/hw/nes/nes_cm.c

+16 −3
Original line number Diff line number Diff line
@@ -159,6 +159,15 @@ atomic_t cm_connecteds; 
atomic_t cm_connect_reqs;

atomic_t cm_rejects;



int nes_add_ref_cm_node(struct nes_cm_node *cm_node)

{

	return add_ref_cm_node(cm_node);

}



int nes_rem_ref_cm_node(struct nes_cm_node *cm_node)

{

	return rem_ref_cm_node(cm_node->cm_core, cm_node);

}



/**

 * create_event
@@ -2331,9 +2340,13 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core, 
			}

			add_ref_cm_node(cm_node);

		} else if (cm_node->state == NES_CM_STATE_TSA) {

			if (cm_node->nesqp->pau_mode)

				nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);

			else {

				rem_ref_cm_node(cm_core, cm_node);

				atomic_inc(&cm_accel_dropped_pkts);

				dev_kfree_skb_any(skb);

			}

			break;

		}

		skb_reset_network_header(skb);

drivers/infiniband/hw/nes/nes_cm.h

+2 −0
Original line number Diff line number Diff line
@@ -422,5 +422,7 @@ int nes_destroy_listen(struct iw_cm_id *); 
int nes_cm_recv(struct sk_buff *, struct net_device *);

int nes_cm_start(void);

int nes_cm_stop(void);

int nes_add_ref_cm_node(struct nes_cm_node *cm_node);

int nes_rem_ref_cm_node(struct nes_cm_node *cm_node);



#endif			/* NES_CM_H */