Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

IB/{core,hw}: Add constant for node_desc

Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

authored by

Yuval Shaia and committed by
Doug Ledford
bd99fdea 32f7451d

+26 -16
+1 -1
drivers/infiniband/core/sysfs.c
··· 1193 1193 if (!dev->modify_device) 1194 1194 return -EIO; 1195 1195 1196 - memcpy(desc.node_desc, buf, min_t(int, count, 64)); 1196 + memcpy(desc.node_desc, buf, min_t(int, count, IB_DEVICE_NODE_DESC_MAX)); 1197 1197 ret = ib_modify_device(dev, IB_DEVICE_MODIFY_NODE_DESC, &desc); 1198 1198 if (ret) 1199 1199 return ret;
+1
drivers/infiniband/hw/cxgb3/iwch_provider.c
··· 1396 1396 (1ull << IB_USER_VERBS_CMD_POST_SEND) | 1397 1397 (1ull << IB_USER_VERBS_CMD_POST_RECV); 1398 1398 dev->ibdev.node_type = RDMA_NODE_RNIC; 1399 + BUILD_BUG_ON(sizeof(IWCH_NODE_DESC) > IB_DEVICE_NODE_DESC_MAX); 1399 1400 memcpy(dev->ibdev.node_desc, IWCH_NODE_DESC, sizeof(IWCH_NODE_DESC)); 1400 1401 dev->ibdev.phys_port_cnt = dev->rdev.port_info.nports; 1401 1402 dev->ibdev.num_comp_vectors = 1;
+1
drivers/infiniband/hw/cxgb4/provider.c
··· 563 563 (1ull << IB_USER_VERBS_CMD_POST_SEND) | 564 564 (1ull << IB_USER_VERBS_CMD_POST_RECV); 565 565 dev->ibdev.node_type = RDMA_NODE_RNIC; 566 + BUILD_BUG_ON(sizeof(C4IW_NODE_DESC) > IB_DEVICE_NODE_DESC_MAX); 566 567 memcpy(dev->ibdev.node_desc, C4IW_NODE_DESC, sizeof(C4IW_NODE_DESC)); 567 568 dev->ibdev.phys_port_cnt = dev->rdev.lldi.nports; 568 569 dev->ibdev.num_comp_vectors = dev->rdev.lldi.nciq;
+2 -1
drivers/infiniband/hw/hfi1/verbs.c
··· 1423 1423 } 1424 1424 1425 1425 if (device_modify_mask & IB_DEVICE_MODIFY_NODE_DESC) { 1426 - memcpy(device->node_desc, device_modify->node_desc, 64); 1426 + memcpy(device->node_desc, device_modify->node_desc, 1427 + IB_DEVICE_NODE_DESC_MAX); 1427 1428 for (i = 0; i < dd->num_pports; i++) { 1428 1429 struct hfi1_ibport *ibp = &dd->pport[i].ibport_data; 1429 1430
+2 -1
drivers/infiniband/hw/mlx4/mad.c
··· 345 345 mad->mad_hdr.method == IB_MGMT_METHOD_GET_RESP && 346 346 mad->mad_hdr.attr_id == IB_SMP_ATTR_NODE_DESC) { 347 347 spin_lock_irqsave(&to_mdev(dev)->sm_lock, flags); 348 - memcpy(((struct ib_smp *) mad)->data, dev->node_desc, 64); 348 + memcpy(((struct ib_smp *) mad)->data, dev->node_desc, 349 + IB_DEVICE_NODE_DESC_MAX); 349 350 spin_unlock_irqrestore(&to_mdev(dev)->sm_lock, flags); 350 351 } 351 352 }
+3 -3
drivers/infiniband/hw/mlx4/main.c
··· 886 886 return -EOPNOTSUPP; 887 887 888 888 spin_lock_irqsave(&to_mdev(ibdev)->sm_lock, flags); 889 - memcpy(ibdev->node_desc, props->node_desc, 64); 889 + memcpy(ibdev->node_desc, props->node_desc, IB_DEVICE_NODE_DESC_MAX); 890 890 spin_unlock_irqrestore(&to_mdev(ibdev)->sm_lock, flags); 891 891 892 892 /* ··· 897 897 if (IS_ERR(mailbox)) 898 898 return 0; 899 899 900 - memcpy(mailbox->buf, props->node_desc, 64); 900 + memcpy(mailbox->buf, props->node_desc, IB_DEVICE_NODE_DESC_MAX); 901 901 mlx4_cmd(to_mdev(ibdev)->dev, mailbox->dma, 1, 0, 902 902 MLX4_CMD_SET_NODE, MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE); 903 903 ··· 2025 2025 if (err) 2026 2026 goto out; 2027 2027 2028 - memcpy(dev->ib_dev.node_desc, out_mad->data, 64); 2028 + memcpy(dev->ib_dev.node_desc, out_mad->data, IB_DEVICE_NODE_DESC_MAX); 2029 2029 2030 2030 in_mad->attr_id = IB_SMP_ATTR_NODE_INFO; 2031 2031
+1 -1
drivers/infiniband/hw/mlx5/mad.c
··· 394 394 if (err) 395 395 goto out; 396 396 397 - memcpy(node_desc, out_mad->data, 64); 397 + memcpy(node_desc, out_mad->data, IB_DEVICE_NODE_DESC_MAX); 398 398 out: 399 399 kfree(in_mad); 400 400 kfree(out_mad);
+3 -3
drivers/infiniband/hw/mlx5/main.c
··· 472 472 } 473 473 474 474 struct mlx5_reg_node_desc { 475 - u8 desc[64]; 475 + u8 desc[IB_DEVICE_NODE_DESC_MAX]; 476 476 }; 477 477 478 478 static int mlx5_query_node_desc(struct mlx5_ib_dev *dev, char *node_desc) ··· 920 920 * If possible, pass node desc to FW, so it can generate 921 921 * a 144 trap. If cmd fails, just ignore. 922 922 */ 923 - memcpy(&in, props->node_desc, 64); 923 + memcpy(&in, props->node_desc, IB_DEVICE_NODE_DESC_MAX); 924 924 err = mlx5_core_access_reg(dev->mdev, &in, sizeof(in), &out, 925 925 sizeof(out), MLX5_REG_NODE_DESC, 0, 1); 926 926 if (err) 927 927 return err; 928 928 929 - memcpy(ibdev->node_desc, props->node_desc, 64); 929 + memcpy(ibdev->node_desc, props->node_desc, IB_DEVICE_NODE_DESC_MAX); 930 930 931 931 return err; 932 932 }
+2 -1
drivers/infiniband/hw/mthca/mthca_mad.c
··· 153 153 mad->mad_hdr.method == IB_MGMT_METHOD_GET_RESP && 154 154 mad->mad_hdr.attr_id == IB_SMP_ATTR_NODE_DESC) { 155 155 mutex_lock(&to_mdev(dev)->cap_mask_mutex); 156 - memcpy(((struct ib_smp *) mad)->data, dev->node_desc, 64); 156 + memcpy(((struct ib_smp *) mad)->data, dev->node_desc, 157 + IB_DEVICE_NODE_DESC_MAX); 157 158 mutex_unlock(&to_mdev(dev)->cap_mask_mutex); 158 159 } 159 160 }
+3 -2
drivers/infiniband/hw/mthca/mthca_provider.c
··· 193 193 if (mask & IB_DEVICE_MODIFY_NODE_DESC) { 194 194 if (mutex_lock_interruptible(&to_mdev(ibdev)->cap_mask_mutex)) 195 195 return -ERESTARTSYS; 196 - memcpy(ibdev->node_desc, props->node_desc, 64); 196 + memcpy(ibdev->node_desc, props->node_desc, 197 + IB_DEVICE_NODE_DESC_MAX); 197 198 mutex_unlock(&to_mdev(ibdev)->cap_mask_mutex); 198 199 } 199 200 ··· 1139 1138 if (err) 1140 1139 goto out; 1141 1140 1142 - memcpy(dev->ib_dev.node_desc, out_mad->data, 64); 1141 + memcpy(dev->ib_dev.node_desc, out_mad->data, IB_DEVICE_NODE_DESC_MAX); 1143 1142 1144 1143 in_mad->attr_id = IB_SMP_ATTR_NODE_INFO; 1145 1144
+1
drivers/infiniband/hw/ocrdma/ocrdma_main.c
··· 119 119 { 120 120 strlcpy(dev->ibdev.name, "ocrdma%d", IB_DEVICE_NAME_MAX); 121 121 ocrdma_get_guid(dev, (u8 *)&dev->ibdev.node_guid); 122 + BUILD_BUG_ON(sizeof(OCRDMA_NODE_DESC) > IB_DEVICE_NODE_DESC_MAX); 122 123 memcpy(dev->ibdev.node_desc, OCRDMA_NODE_DESC, 123 124 sizeof(OCRDMA_NODE_DESC)); 124 125 dev->ibdev.owner = THIS_MODULE;
+2 -1
drivers/infiniband/hw/qib/qib_verbs.c
··· 1370 1370 } 1371 1371 1372 1372 if (device_modify_mask & IB_DEVICE_MODIFY_NODE_DESC) { 1373 - memcpy(device->node_desc, device_modify->node_desc, 64); 1373 + memcpy(device->node_desc, device_modify->node_desc, 1374 + IB_DEVICE_NODE_DESC_MAX); 1374 1375 for (i = 0; i < dd->num_pports; i++) { 1375 1376 struct qib_ibport *ibp = &dd->pport[i].ibport_data; 1376 1377
+4 -2
include/rdma/ib_verbs.h
··· 537 537 IB_DEVICE_MODIFY_NODE_DESC = 1 << 1 538 538 }; 539 539 540 + #define IB_DEVICE_NODE_DESC_MAX 64 541 + 540 542 struct ib_device_modify { 541 543 u64 sys_image_guid; 542 - char node_desc[64]; 544 + char node_desc[IB_DEVICE_NODE_DESC_MAX]; 543 545 }; 544 546 545 547 enum ib_port_modify_flags { ··· 2079 2077 u64 uverbs_cmd_mask; 2080 2078 u64 uverbs_ex_cmd_mask; 2081 2079 2082 - char node_desc[64]; 2080 + char node_desc[IB_DEVICE_NODE_DESC_MAX]; 2083 2081 __be64 node_guid; 2084 2082 u32 local_dma_lkey; 2085 2083 u16 is_switch:1;