Skip to content

Commit c8bfa12

Browse files
Yuval Shaiajfvogel
authored andcommitted
IB/mlx4: Do not generate random node_guid for VFs
Exadata fast node detection and fail-over mechanism(s) relies on the fact that node GUID in guest is the same as in dom0. Orabug: 22145330 Signed-off-by: Yuval Shaia <[email protected]> Reviewed-by: Santosh Shilimkar <[email protected]> Reviewed-by: Qing Huang <[email protected]> Orabug: 27510511 (cherry picked from commit d8af2ef) cherry-pick-repo=linux-uek.git Signed-off-by: Qing Huang <[email protected]> Signed-off-by: Aron Silverton <[email protected]> Signed-off-by: Somasundaram Krishnasamy <[email protected]> Orabug: 31620959 UEK5 => UEK6 (cherry picked from commit 3a166d3) cherry-pick-repo=UEK/production/linux-uek.git unmodified-from-upstream: 3a166d3 Signed-off-by: Qing Huang <[email protected]> Reviewed-by: Sharath Srinivasan <[email protected]> Signed-off-by: Aron Silverton <[email protected]> Orabug: 31620960 UEK6 => LUCI (cherry picked from commit 4c8735e) cherry-pick-repo=UEK/production/linux-uek.git unmodified-from-upstream: 4c8735e Signed-off-by: Sharath Srinivasan <[email protected]> Reviewed-by: Sharon Liu <[email protected]> Signed-off-by: Aron Silverton <[email protected]
1 parent 22e27c2 commit c8bfa12

File tree

1 file changed

+6
-0
lines changed
  • drivers/infiniband/hw/mlx4

1 file changed

+6
-0
lines changed

drivers/infiniband/hw/mlx4/mad.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2315,12 +2315,18 @@ int mlx4_ib_init_sriov(struct mlx4_ib_dev *dev)
23152315
return 0;
23162316
}
23172317

2318+
#ifdef WITHOUT_ORACLE_EXTENSIONS
23182319
for (i = 0; i < dev->dev->caps.sqp_demux; i++) {
23192320
if (i == mlx4_master_func_num(dev->dev))
23202321
mlx4_put_slave_node_guid(dev->dev, i, dev->ib_dev.node_guid);
23212322
else
23222323
mlx4_put_slave_node_guid(dev->dev, i, mlx4_ib_gen_node_guid());
23232324
}
2325+
#else
2326+
/* VF's node GUID is PF node GUID */
2327+
for (i = 0; i < dev->dev->caps.sqp_demux; i++)
2328+
mlx4_put_slave_node_guid(dev->dev, i, dev->ib_dev.node_guid);
2329+
#endif /* WITHOUT_ORACLE_EXTENSIONS */
23242330

23252331
err = mlx4_ib_init_alias_guid_service(dev);
23262332
if (err) {

0 commit comments

Comments
 (0)