Commit 4b860c91 authored by Mustafa Ismail's avatar Mustafa Ismail Committed by Jason Gunthorpe
Browse files

RDMA/irdma: Add support for DSCP 

Add DSCP support for the Intel Ethernet 800 Series devices.  Setup VSI
DSCP info when PCI driver indicates DSCP mode during driver probe or as
notification event.

Link: https://lore.kernel.org/r/20220202191921.1638-4-shiraz.saleem@intel.com


Signed-off-by: default avatarMustafa Ismail <mustafa.ismail@intel.com>
Signed-off-by: default avatarShiraz Saleem <shiraz.saleem@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 83483055

drivers/infiniband/hw/irdma/cm.c

+16 −4
Original line number Diff line number Diff line
@@ -2209,8 +2209,12 @@ irdma_make_cm_node(struct irdma_cm_core *cm_core, struct irdma_device *iwdev, 
			ibdev_warn(&iwdev->ibdev,

				   "application TOS[%d] and remote client TOS[%d] mismatch\n",

				   listener->tos, cm_info->tos);

		if (iwdev->vsi.dscp_mode) {

			cm_node->user_pri = listener->user_pri;

		} else {

			cm_node->tos = max(listener->tos, cm_info->tos);

			cm_node->user_pri = rt_tos2priority(cm_node->tos);

		}

		ibdev_dbg(&iwdev->ibdev,

			  "DCB: listener: TOS:[%d] UP:[%d]\n", cm_node->tos,

			  cm_node->user_pri);
@@ -3835,6 +3839,10 @@ int irdma_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
	cm_info.cm_id = cm_id;

	cm_info.qh_qpid = iwdev->vsi.ilq->qp_id;

	cm_info.tos = cm_id->tos;

	if (iwdev->vsi.dscp_mode)

		cm_info.user_pri =

			iwqp->sc_qp.vsi->dscp_map[irdma_tos2dscp(cm_info.tos)];

	else

		cm_info.user_pri = rt_tos2priority(cm_id->tos);



	if (iwqp->sc_qp.dev->ws_add(iwqp->sc_qp.vsi, cm_info.user_pri))
@@ -3977,6 +3985,10 @@ int irdma_create_listen(struct iw_cm_id *cm_id, int backlog) 
	cm_id->provider_data = cm_listen_node;



	cm_listen_node->tos = cm_id->tos;

	if (iwdev->vsi.dscp_mode)

		cm_listen_node->user_pri =

			iwdev->vsi.dscp_map[irdma_tos2dscp(cm_id->tos)];

	else

		cm_listen_node->user_pri = rt_tos2priority(cm_id->tos);

	cm_info.user_pri = cm_listen_node->user_pri;

	if (!cm_listen_node->reused_node) {

drivers/infiniband/hw/irdma/cm.h

+7 −0
Original line number Diff line number Diff line
@@ -384,6 +384,13 @@ int irdma_schedule_cm_timer(struct irdma_cm_node *cm_node, 
			    struct irdma_puda_buf *sqbuf,

			    enum irdma_timer_type type, int send_retrans,

			    int close_when_complete);



static inline u8 irdma_tos2dscp(u8 tos)

{

#define IRDMA_DSCP_VAL GENMASK(7, 2)

	return (u8)FIELD_GET(IRDMA_DSCP_VAL, tos);

}



int irdma_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param);

int irdma_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len);

int irdma_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param);

drivers/infiniband/hw/irdma/ctrl.c

+6 −0
Original line number Diff line number Diff line
@@ -77,6 +77,12 @@ static void irdma_set_qos_info(struct irdma_sc_vsi *vsi, 


	vsi->qos_rel_bw = l2p->vsi_rel_bw;

	vsi->qos_prio_type = l2p->vsi_prio_type;

	vsi->dscp_mode = l2p->dscp_mode;

	if (l2p->dscp_mode) {

		memcpy(vsi->dscp_map, l2p->dscp_map, sizeof(vsi->dscp_map));

		for (i = 0; i < IRDMA_MAX_USER_PRIORITY; i++)

			l2p->up2tc[i] = i;

	}

	for (i = 0; i < IRDMA_MAX_USER_PRIORITY; i++) {

		if (vsi->dev->hw_attrs.uk_attrs.hw_rev == IRDMA_GEN_1)

			vsi->qos[i].qs_handle = l2p->qs_handle_list[i];

drivers/infiniband/hw/irdma/main.c

+6 −2
Original line number Diff line number Diff line
@@ -79,6 +79,10 @@ static void irdma_fill_qos_info(struct irdma_l2params *l2params, 
	}

	for (i = 0; i < IIDC_MAX_USER_PRIORITY; i++)

		l2params->up2tc[i] = qos_info->up2tc[i];

	if (qos_info->pfc_mode == IIDC_DSCP_PFC_MODE) {

		l2params->dscp_mode = true;

		memcpy(l2params->dscp_map, qos_info->dscp_map, sizeof(l2params->dscp_map));

	}

}



static void irdma_iidc_event_handler(struct ice_pf *pf, struct iidc_event *event)
@@ -110,7 +114,7 @@ static void irdma_iidc_event_handler(struct ice_pf *pf, struct iidc_event *event 
		ice_get_qos_params(pf, &qos_info);

		irdma_fill_qos_info(&l2params, &qos_info);

		if (iwdev->rf->protocol_used != IRDMA_IWARP_PROTOCOL_ONLY)

			iwdev->dcb_vlan_mode = qos_info.num_tc > 1;

			iwdev->dcb_vlan_mode = qos_info.num_tc > 1 && !l2params.dscp_mode;

		irdma_change_l2params(&iwdev->vsi, &l2params);

	} else if (*event->type & BIT(IIDC_EVENT_CRIT_ERR)) {

		ibdev_warn(&iwdev->ibdev, "ICE OICR event notification: oicr = 0x%08x\n",
@@ -285,7 +289,7 @@ static int irdma_probe(struct auxiliary_device *aux_dev, const struct auxiliary_ 
	ice_get_qos_params(pf, &qos_info);

	irdma_fill_qos_info(&l2params, &qos_info);

	if (iwdev->rf->protocol_used != IRDMA_IWARP_PROTOCOL_ONLY)

		iwdev->dcb_vlan_mode = l2params.num_tc > 1;

		iwdev->dcb_vlan_mode = l2params.num_tc > 1 && !l2params.dscp_mode;



	if (irdma_rt_init_hw(iwdev, &l2params)) {

		err = -EIO;

drivers/infiniband/hw/irdma/osdep.h

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


#include <linux/pci.h>

#include <linux/bitfield.h>

#include <linux/net/intel/iidc.h>

#include <crypto/hash.h>

#include <rdma/ib_verbs.h>