Skip to content

UCT/IB/ROCE: Use ipv6 non link-local GID in priority #10939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+19 −7
Open

UCT/IB/ROCE: Use ipv6 non link-local GID in priority #10939

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31f4a6b
UCT/IB/ROCE: Use ipv6 non link-local GID in priority
tvegas1 Oct 7, 2025
2c492c4
UCT: CR fixes p1
brminich Oct 17, 2025
c1425b4
UCT: CR fixes p2
brminich Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/uct/ib/base/ib_device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,6 +849,11 @@ const char *uct_ib_gid_str(const union ibv_gid *gid, char *str, size_t max_size)
return str;
}

static int uct_ib_gid_is_ipv6_ll(const union ibv_gid *gid)
{
Copy link
Contributor

@yosefe yosefe Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can reuse IN6_IS_ADDR_LINKLOCAL?

Copy link
Contributor

@brminich brminich Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

return ((gid->raw[0] == 0xfe) && ((gid->raw[1] & 0xc0) == 0x80));
}

static int uct_ib_device_is_addr_ipv4_mcast(const struct in6_addr *raw,
const uint32_t addr_last_bits)
{
Expand Down Expand Up @@ -1074,11 +1079,16 @@ uct_ib_device_select_gid(uct_ib_device_t *dev, uint8_t port_num,
uct_ib_device_gid_info_t *gid_info)
{
static const size_t max_str_len = 200;
static const uct_ib_roce_version_info_t roce_prio[] = {
{UCT_IB_DEVICE_ROCE_V2, AF_INET},
{UCT_IB_DEVICE_ROCE_V2, AF_INET6},
{UCT_IB_DEVICE_ROCE_V1, AF_INET},
{UCT_IB_DEVICE_ROCE_V1, AF_INET6}
struct {
uct_ib_roce_version_info_t info;
int skip_ll; /* link-local not allowed when true */
Copy link
Contributor

@yosefe yosefe Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. maybe inverse to simplify - "allow_ll" or "is_ll"
  2. i'd explicitly initialize this value to 0 when applicable (line 1086, 1088 etc)

Copy link
Contributor

@brminich brminich Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

} roce_prio[] = {
{{UCT_IB_DEVICE_ROCE_V2, AF_INET}},
{{UCT_IB_DEVICE_ROCE_V2, AF_INET6}, 1},
{{UCT_IB_DEVICE_ROCE_V2, AF_INET6}},
{{UCT_IB_DEVICE_ROCE_V1, AF_INET}},
{{UCT_IB_DEVICE_ROCE_V2, AF_INET6}, 1},
{{UCT_IB_DEVICE_ROCE_V1, AF_INET6}}
};
int gid_tbl_len = uct_ib_device_port_attr(dev, port_num)->gid_tbl_len;
ucs_status_t status = UCS_OK;
Expand Down Expand Up @@ -1108,8 +1118,9 @@ uct_ib_device_select_gid(uct_ib_device_t *dev, uint8_t port_num,
goto out;
}

if ((roce_prio[prio_idx].ver == gid_info_tmp.roce_info.ver) &&
(roce_prio[prio_idx].addr_family == gid_info_tmp.roce_info.addr_family) &&
if ((roce_prio[prio_idx].info.ver == gid_info_tmp.roce_info.ver) &&
(roce_prio[prio_idx].info.addr_family == gid_info_tmp.roce_info.addr_family) &&
(!roce_prio[prio_idx].skip_ll || !uct_ib_gid_is_ipv6_ll(&gid_info_tmp.gid)) &&
uct_ib_device_test_roce_gid_index(dev, port_num, &gid_info_tmp.gid, i) &&
uct_ib_device_match_roce_subnet(&gid_info_tmp, &subnets,
subnet_strs->mode)) {
Expand Down
Loading