qedr: consider dscp prio for vlan tag and update tos
v2 cover qedr: consider dscp prio for vlan tag and update tos
From: Prabhakar Kushwaha <[email protected]>
Add functions to check get/set dscp priority in qed and these functions are further used in deciding vlan priority based on dscp state.
Also update RDMA CM TOS.
Changes for v2:
- incorporated Leon Romanovsky's comments
Prabhakar Kushwaha (3):
qed: add get and set support for dscp priority
qedr: Consider dscp priority for vlan priority
qedr: Use grh layer traffic_class as RDMA CM TOS
drivers/infiniband/hw/qedr/qedr_roce_cm.c | 13 +++- drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 71 ++++++++++++++++++++++ drivers/net/ethernet/qlogic/qed/qed_dcbx.h | 10 +++ drivers/net/ethernet/qlogic/qed/qed_rdma.c | 25 ++++++++ include/linux/qed/qed_if.h | 6 ++ include/linux/qed/qed_rdma_if.h | 7 +++ 6 files changed, 130 insertions(+), 2 deletions(-)
Signature · 1 line
2.24.1
PATCH v2 1/3 qed: add get and set support for dscp priority
From: Prabhakar Kushwaha <[email protected]>
This patch add support of get or set priority value for a given dscp index.
---
Changes for v2:
- incorporated Leon Romanovsky's comments
drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 64 ++++++++++++++++++++++ drivers/net/ethernet/qlogic/qed/qed_dcbx.h | 9 +++ include/linux/qed/qed_if.h | 6 ++ 3 files changed, 79 insertions(+)
drivers/net/ethernet/qlogic/qed/qed_dcbx.c +64 -0
@@ -1280,6 +1280,70 @@ int qed_dcbx_get_config_params(struct qed_hwfn *p_hwfn,return 0 ; } +int qed_dcbx_get_dscp_priority (struct qed_hwfn *p_hwfn,u8 dscp_index, +u8 *p_dscp_pri) +{ +struct qed_dcbx_get *p_dcbx_info; +int rc; + +if (IS_VF (p_hwfn->cdev)) { +DP_ERR (p_hwfn->cdev, +"qed rdma get dscp priority not supported for VF.\n" ); +return -EINVAL ; + } + +if (dscp_index >=QED_DCBX_DSCP_SIZE ) { +DP_ERR (p_hwfn,"Invalid dscp index %d\n" , dscp_index); +return -EINVAL ; + } + + p_dcbx_info =kzalloc (sizeof (*p_dcbx_info),GFP_KERNEL ); +if (!p_dcbx_info) +return -ENOMEM ; + + rc =qed_dcbx_query_params (p_hwfn, p_dcbx_info, +QED_DCBX_OPERATIONAL_MIB ); +if (rc) { +kfree (p_dcbx_info); +return rc; + } + + *p_dscp_pri = p_dcbx_info->dscp.dscp_pri_map[dscp_index]; +kfree (p_dcbx_info); + +return 0 ; +} + +int qed_dcbx_set_dscp_priority (struct qed_hwfn *p_hwfn,struct qed_ptt *p_ptt, +u8 dscp_index,u8 pri_val) +{ +struct qed_dcbx_set dcbx_set; +int rc; + +if (IS_VF (p_hwfn->cdev)) { +DP_ERR (p_hwfn->cdev, +"qed rdma set dscp priority not supported for VF.\n" ); +return -EINVAL ; + } + +if (dscp_index >=QED_DCBX_DSCP_SIZE || + pri_val >=QED_MAX_PFC_PRIORITIES ) { +DP_ERR (p_hwfn,"Invalid dscp params: index = %d pri = %d\n" , + dscp_index, pri_val); +return -EINVAL ; + } + +memset (&dcbx_set,0 ,sizeof (dcbx_set)); + rc =qed_dcbx_get_config_params (p_hwfn, &dcbx_set); +if (rc) +return rc; + + dcbx_set.override_flags =QED_DCBX_OVERRIDE_DSCP_CFG ; + dcbx_set.dscp.dscp_pri_map[dscp_index] = pri_val; + +return qed_dcbx_config_params (p_hwfn, p_ptt, &dcbx_set,1 ); +} +static struct qed_dcbx_get *qed_dcbnl_get_dcbx (struct qed_hwfn *hwfn,enum qed_mib_read_type type) {
drivers/net/ethernet/qlogic/qed/qed_dcbx.h +9 -0
@@ -46,6 +46,7 @@ struct qed_dcbx_set {bool enabled;struct qed_dcbx_admin_params config;u32 ver_num; +struct qed_dcbx_dscp_params dscp; };struct qed_dcbx_results {
@@ -100,6 +101,14 @@ void qed_dcbx_info_free(struct qed_hwfn *p_hwfn);void qed_dcbx_set_pf_update_params (struct qed_dcbx_results *p_src,struct pf_update_ramrod_data *p_dest); +/* Returns priority value for a given dscp index */ +int qed_dcbx_get_dscp_priority (struct qed_hwfn *p_hwfn,u8 dscp_index, +u8 *p_dscp_pri); + +/* Sets priority value for a given dscp index */ +int qed_dcbx_set_dscp_priority (struct qed_hwfn *p_hwfn,struct qed_ptt *p_ptt, +u8 dscp_index,u8 pri_val); +#define QED_DCBX_DEFAULT_TC 0u8 qed_dcbx_get_priority_tc (struct qed_hwfn *p_hwfn,u8 pri);
include/linux/qed/qed_if.h +6 -0
@@ -124,12 +124,18 @@ struct qed_dcbx_operational_params {u32 err; }; +struct qed_dcbx_dscp_params { +bool enabled; +u8 dscp_pri_map[QED_DCBX_DSCP_SIZE ]; +}; +struct qed_dcbx_get {struct qed_dcbx_operational_params operational;struct qed_dcbx_lldp_remote lldp_remote;struct qed_dcbx_lldp_local lldp_local;struct qed_dcbx_remote_params remote;struct qed_dcbx_admin_params local; +struct qed_dcbx_dscp_params dscp; };enum qed_nvm_images {
Signature · 1 line
2.24.1
PATCH v2 2/3 qedr: Consider dscp priority for vlan priority
In reply to Shai MalinFrom: Prabhakar Kushwaha <[email protected]>
if dscp is enabled, consider its priority while deciding vlan priority.
---
Changes for v2:
- none
drivers/infiniband/hw/qedr/qedr_roce_cm.c | 11 +++++++++- drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 7 ++++++ drivers/net/ethernet/qlogic/qed/qed_dcbx.h | 5 +++-- drivers/net/ethernet/qlogic/qed/qed_rdma.c | 25 ++++++++++++++++++++++ include/linux/qed/qed_rdma_if.h | 7 ++++++ 5 files changed, 52 insertions(+), 3 deletions(-)
drivers/infiniband/hw/qedr/qedr_roce_cm.c +10 -1
@@ -389,6 +389,7 @@ static inline int qedr_gsi_build_header(struct qedr_dev *dev,const struct ib_global_route *grh =rdma_ah_read_grh (ah_attr);const struct ib_gid_attr *sgid_attr = grh->sgid_attr;int send_size =0 ; +u8 vlan_pri, dscp;u16 vlan_id =0 ;u16 ether_type;int rc;
@@ -437,8 +438,16 @@ static inline int qedr_gsi_build_header(struct qedr_dev *dev,ether_addr_copy (udh->eth.dmac_h, ah_attr->roce.dmac);ether_addr_copy (udh->eth.smac_h, dev->ndev->dev_addr);if (has_vlan) { - udh->eth.type =htons (ETH_P_8021Q ); + dscp =GET_FIELD (grh->traffic_class,QED_RDMA_TC_TOS_DSCP ); + +/* get the vlan priority associated with the dscp value */ +if (!dev->ops->rdma_get_dscp_priority (dev->rdma_ctx, dscp, + &vlan_pri)) + vlan_id |= vlan_pri <<VLAN_PRIO_SHIFT ; + udh->vlan.tag =htons (vlan_id); + + udh->eth.type =htons (ETH_P_8021Q ); udh->vlan.type =htons (ether_type); }else { udh->eth.type =htons (ether_type);
drivers/net/ethernet/qlogic/qed/qed_dcbx.c +7 -0
@@ -973,6 +973,13 @@ void qed_dcbx_set_pf_update_params(struct qed_dcbx_results *p_src,qed_dcbx_update_protocol_data (p_dcb_data, p_src,DCBX_PROTOCOL_ETH ); } +bool qed_dcbx_get_dscp_state (struct qed_hwfn *p_hwfn) +{ +struct qed_dcbx_get *p_dcbx_info = &p_hwfn->p_dcbx_info->get; + +return p_dcbx_info->dscp.enabled; +} +u8 qed_dcbx_get_priority_tc (struct qed_hwfn *p_hwfn,u8 pri) {struct qed_dcbx_get *dcbx_info = &p_hwfn->p_dcbx_info->get;
drivers/net/ethernet/qlogic/qed/qed_dcbx.h +3 -2
@@ -102,8 +102,7 @@ void qed_dcbx_set_pf_update_params(struct qed_dcbx_results *p_src, struct pf_update_ramrod_data *p_dest);/* Returns priority value for a given dscp index */ -int qed_dcbx_get_dscp_priority (struct qed_hwfn *p_hwfn,u8 dscp_index, -u8 *p_dscp_pri); +int qed_dcbx_get_dscp_priority (struct qed_hwfn *p_hwfn,u8 dscp_index,u8 *pri);/* Sets priority value for a given dscp index */ int qed_dcbx_set_dscp_priority(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt,
@@ -112,4 +111,6 @@ int qed_dcbx_set_dscp_priority(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt,#define QED_DCBX_DEFAULT_TC 0u8 qed_dcbx_get_priority_tc (struct qed_hwfn *p_hwfn,u8 pri); + +bool qed_dcbx_get_dscp_state (struct qed_hwfn *p_hwfn);#endif
drivers/net/ethernet/qlogic/qed/qed_rdma.c +25 -0
@@ -32,6 +32,7 @@#include "qed_rdma.h" #include "qed_roce.h" #include "qed_sp.h" +#include "qed_dcbx.h" int qed_rdma_bmap_alloc(struct qed_hwfn *p_hwfn,
@@ -1965,6 +1966,29 @@ static void qed_rdma_remove_user(void *rdma_cxt, u16 dpi)spin_unlock_bh (&p_hwfn->p_rdma_info->lock); } +#ifdef CONFIG_DCB +static int qed_rdma_get_dscp_priority (void *rdma_cxt,u8 dscp_index,u8 *pri) +{ +struct qed_hwfn *p_hwfn = (struct qed_hwfn *)rdma_cxt; +int rc = -EINVAL ; + +if (qed_dcbx_get_dscp_state (p_hwfn)) { + rc =qed_dcbx_get_dscp_priority (p_hwfn, dscp_index, pri); +if (rc) +DP_INFO (p_hwfn, +"Failed to get priority val for dscp idx %d\n" , + dscp_index); + } + +return rc; +} +#else +static int qed_rdma_get_dscp_priority (void *rdma_cxt,u8 dscp_index,u8 *pri) +{ +return -EINVAL ; +} +#endif +static int qed_roce_ll2_set_mac_filter (struct qed_dev *cdev,u8 *old_mac_address,u8 *new_mac_address)
@@ -2045,6 +2069,7 @@ static const struct qed_rdma_ops qed_rdma_ops_pass = { .rdma_create_srq = &qed_rdma_create_srq, .rdma_modify_srq = &qed_rdma_modify_srq, .rdma_destroy_srq = &qed_rdma_destroy_srq, + .rdma_get_dscp_priority = &qed_rdma_get_dscp_priority, .ll2_acquire_connection = &qed_ll2_acquire_connection, .ll2_establish_connection = &qed_ll2_establish_connection, .ll2_terminate_connection = &qed_ll2_terminate_connection,
include/linux/qed/qed_rdma_if.h +7 -0
@@ -363,6 +363,10 @@ struct qed_rdma_modify_qp_in_params {u32 dest_qp;bool lb_indication;u16 mtu; +#define QED_RDMA_TC_TOS_ECN_SHIFT 0 +#define QED_RDMA_TC_TOS_ECN_MASK 0x3 +#define QED_RDMA_TC_TOS_DSCP_SHIFT 2 +#define QED_RDMA_TC_TOS_DSCP_MASK 0x3fu8 traffic_class_tos;u8 hop_limit_ttl;u32 flow_label;
@@ -639,6 +643,9 @@ struct qed_rdma_ops {int (*rdma_modify_srq)(void *rdma_cxt,struct qed_rdma_modify_srq_in_params *iparams); +int (*rdma_get_dscp_priority)(void *rdma_cxt,u8 dscp_index, +u8 *p_dscp_pri); +int (*ll2_acquire_connection)(void *rdma_cxt,struct qed_ll2_acquire_data *data);
Signature · 1 line
2.24.1
PATCH v2 3/3 qedr: Use grh layer traffic_class as RDMA CM TOS
In reply to Shai MalinFrom: Prabhakar Kushwaha <[email protected]>
Instead of grh flow label use grh layer traffic_class as RDMA CM TOS.
---
Changes for v2:
- none
drivers/infiniband/hw/qedr/qedr_roce_cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/qedr/qedr_roce_cm.c +1 -1
@@ -477,7 +477,7 @@ static inline int qedr_gsi_build_header(struct qedr_dev *dev,u32 ipv4_addr; udh->ip4.protocol =IPPROTO_UDP ; - udh->ip4.tos =htonl (grh->flow_label); + udh->ip4.tos = grh->traffic_class; udh->ip4.frag_off =htons (IP_DF ); udh->ip4.ttl = grh->hop_limit;
Signature · 1 line
2.24.1
Jason Gunthorpe
maintainerQuoted 15 lines · Shai Malin
From: Prabhakar Kushwaha <[email protected]>
Add functions to check get/set dscp priority in qed and these functions are further used in deciding vlan priority based on dscp state.
Also update RDMA CM TOS.
Changes for v2:
- incorporated Leon Romanovsky's commentsPrabhakar Kushwaha (3):
qed: add get and set support for dscp priority
qedr: Consider dscp priority for vlan priority
qedr: Use grh layertraffic_classas RDMA CM TOS
Quoted 7 lines
drivers/infiniband/hw/qedr/qedr_roce_cm.c | 13 +++- drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 71 ++++++++++++++++++++++ drivers/net/ethernet/qlogic/qed/qed_dcbx.h | 10 +++ drivers/net/ethernet/qlogic/qed/qed_rdma.c | 25 ++++++++ include/linux/qed/qed_if.h | 6 ++ include/linux/qed/qed_rdma_if.h | 7 +++ 6 files changed, 130 insertions(+), 2 deletions(-)
Since this is mostly netdev stuff can someone from netdev ack this if you want it to go through the rdma tree?
Have you checked that there are no conflicts with things in net-next?
Thanks,
Jason
Jakub Kicinski
maintainerQuoted 2 lines · On Fri, 20 Aug 2021 14:49:44 -0300 Jason Gunthorpe wrote:
Since this is mostly netdev stuff can someone from netdev ack this if you want it to go through the rdma tree?
It'd be great to get it CCed to netdev@ for that.
Jason Gunthorpe
maintainerQuoted 5 lines · Jakub Kicinski
Quoted 2 lines · On Fri, 20 Aug 2021 14:49:44 -0300 Jason Gunthorpe wrote:
Since this is mostly netdev stuff can someone from netdev ack this if you want it to go through the rdma tree?
It'd be great to get it CCed to netdev@ for that.
Indeed, Shai please respost it.
Jason