Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/ucp/am/eager_single.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ ucp_am_eager_short_probe_common(const ucp_proto_init_params_t *init_params,
.super.flags = UCP_PROTO_COMMON_INIT_FLAG_SINGLE_FRAG |
UCP_PROTO_COMMON_INIT_FLAG_CAP_SEG_SIZE |
UCP_PROTO_COMMON_INIT_FLAG_ERR_HANDLING,
.super.exclude_map = 0,
.super.exclude_map = ~UCP_MAX_FAST_PATH_LANES_MASK,
.super.reg_mem_info = ucp_mem_info_unknown,
.lane_type = UCP_LANE_TYPE_AM,
.tl_cap_flags = UCT_IFACE_FLAG_AM_SHORT
Expand Down Expand Up @@ -242,7 +242,7 @@ static void ucp_am_eager_single_bcopy_probe_common(
.super.flags = UCP_PROTO_COMMON_INIT_FLAG_SINGLE_FRAG |
UCP_PROTO_COMMON_INIT_FLAG_CAP_SEG_SIZE |
UCP_PROTO_COMMON_INIT_FLAG_ERR_HANDLING,
.super.exclude_map = 0,
.super.exclude_map = ~UCP_MAX_FAST_PATH_LANES_MASK,
.super.reg_mem_info = ucp_mem_info_unknown,
.lane_type = UCP_LANE_TYPE_AM,
.tl_cap_flags = UCT_IFACE_FLAG_AM_BCOPY
Expand Down Expand Up @@ -335,7 +335,7 @@ static void ucp_am_eager_single_zcopy_probe_common(
UCP_PROTO_COMMON_INIT_FLAG_SINGLE_FRAG |
UCP_PROTO_COMMON_INIT_FLAG_CAP_SEG_SIZE |
UCP_PROTO_COMMON_INIT_FLAG_ERR_HANDLING,
.super.exclude_map = 0,
.super.exclude_map = ~UCP_MAX_FAST_PATH_LANES_MASK,
.super.reg_mem_info = ucp_proto_common_select_param_mem_info(
init_params->select_param),
.lane_type = UCP_LANE_TYPE_AM,
Expand Down
1 change: 1 addition & 0 deletions src/ucp/core/ucp_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ UCP_UINT_TYPE(UCP_MD_INDEX_BITS) ucp_md_map_t;
#define UCP_MAX_LANES_LEGACY 16
#define UCP_MAX_LANES 64
#define UCP_MAX_FAST_PATH_LANES 5
#define UCP_MAX_FAST_PATH_LANES_MASK UCS_MASK(UCP_MAX_FAST_PATH_LANES)

#define UCP_NULL_LANE ((ucp_lane_index_t)-1)
typedef uint8_t ucp_lane_index_t;
Expand Down
2 changes: 1 addition & 1 deletion src/ucp/rma/amo_offload.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ static void ucp_proto_amo_probe(const ucp_proto_init_params_t *init_params,
.super.flags = UCP_PROTO_COMMON_INIT_FLAG_REMOTE_ACCESS |
UCP_PROTO_COMMON_INIT_FLAG_RECV_ZCOPY |
UCP_PROTO_COMMON_INIT_FLAG_SINGLE_FRAG,
.super.exclude_map = 0,
.super.exclude_map = ~UCP_MAX_FAST_PATH_LANES_MASK,
.super.reg_mem_info = ucp_mem_info_unknown,
.lane_type = UCP_LANE_TYPE_AMO,
.tl_cap_flags = 0
Expand Down
2 changes: 1 addition & 1 deletion src/ucp/rma/amo_sw.c
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ static void ucp_proto_amo_sw_probe(const ucp_proto_init_params_t *init_params,
.super.memtype_op = UCT_EP_OP_GET_SHORT,
.super.flags = flags | UCP_PROTO_COMMON_INIT_FLAG_SINGLE_FRAG |
UCP_PROTO_COMMON_INIT_FLAG_CAP_SEG_SIZE,
.super.exclude_map = 0,
.super.exclude_map = ~UCP_MAX_FAST_PATH_LANES_MASK,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

amo_sw is lane_type = AM. If all AM lanes < 5 have failed and the only
survivor is a promoted am_bw lane >= 5, AMO now has no protocol at all instead
of using that lane. Clean error or fatal?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

the same as fast path AM, SW AMO accesses only fast lane:

req->send.lane = ucp_ep_get_am_lane(req->send.ep);

.super.reg_mem_info = ucp_mem_info_unknown,
.lane_type = UCP_LANE_TYPE_AM,
.tl_cap_flags = 0
Expand Down
2 changes: 1 addition & 1 deletion src/ucp/rma/put_offload.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ ucp_proto_put_offload_short_probe(const ucp_proto_init_params_t *init_params)
UCP_PROTO_COMMON_INIT_FLAG_REMOTE_ACCESS |
UCP_PROTO_COMMON_INIT_FLAG_SINGLE_FRAG |
UCP_PROTO_COMMON_INIT_FLAG_ERR_HANDLING,
.super.exclude_map = 0,
.super.exclude_map = ~UCP_MAX_FAST_PATH_LANES_MASK,
.super.reg_mem_info = ucp_mem_info_unknown,
.lane_type = UCP_LANE_TYPE_RMA,
.tl_cap_flags = UCT_IFACE_FLAG_PUT_SHORT
Expand Down
6 changes: 3 additions & 3 deletions src/ucp/tag/eager_single.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ ucp_proto_eager_short_probe(const ucp_proto_init_params_t *init_params)
.super.flags = UCP_PROTO_COMMON_INIT_FLAG_SINGLE_FRAG |
UCP_PROTO_COMMON_INIT_FLAG_CAP_SEG_SIZE |
UCP_PROTO_COMMON_INIT_FLAG_ERR_HANDLING,
.super.exclude_map = 0,
.super.exclude_map = ~UCP_MAX_FAST_PATH_LANES_MASK,
.super.reg_mem_info = ucp_mem_info_unknown,
.lane_type = UCP_LANE_TYPE_AM,
.tl_cap_flags = UCT_IFACE_FLAG_AM_SHORT
Expand Down Expand Up @@ -141,7 +141,7 @@ ucp_proto_eager_bcopy_single_probe(const ucp_proto_init_params_t *init_params)
.super.flags = UCP_PROTO_COMMON_INIT_FLAG_SINGLE_FRAG |
UCP_PROTO_COMMON_INIT_FLAG_CAP_SEG_SIZE |
UCP_PROTO_COMMON_INIT_FLAG_ERR_HANDLING,
.super.exclude_map = 0,
.super.exclude_map = ~UCP_MAX_FAST_PATH_LANES_MASK,
.super.reg_mem_info = ucp_mem_info_unknown,
.lane_type = UCP_LANE_TYPE_AM,
.tl_cap_flags = UCT_IFACE_FLAG_AM_BCOPY
Expand Down Expand Up @@ -190,7 +190,7 @@ ucp_proto_eager_zcopy_single_probe(const ucp_proto_init_params_t *init_params)
UCP_PROTO_COMMON_INIT_FLAG_SINGLE_FRAG |
UCP_PROTO_COMMON_INIT_FLAG_CAP_SEG_SIZE |
UCP_PROTO_COMMON_INIT_FLAG_ERR_HANDLING,
.super.exclude_map = 0,
.super.exclude_map = ~UCP_MAX_FAST_PATH_LANES_MASK,
.super.reg_mem_info = ucp_proto_common_select_param_mem_info(
init_params->select_param),
.lane_type = UCP_LANE_TYPE_AM,
Expand Down
6 changes: 3 additions & 3 deletions src/ucp/tag/offload/eager.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ static void ucp_proto_eager_tag_offload_short_probe(
.super.flags = UCP_PROTO_COMMON_INIT_FLAG_SINGLE_FRAG |
UCP_PROTO_COMMON_INIT_FLAG_RECV_ZCOPY |
UCP_PROTO_COMMON_INIT_FLAG_CAP_SEG_SIZE,
.super.exclude_map = 0,
.super.exclude_map = ~UCP_MAX_FAST_PATH_LANES_MASK,
.super.reg_mem_info = ucp_mem_info_unknown,
.lane_type = UCP_LANE_TYPE_TAG,
.tl_cap_flags = UCT_IFACE_FLAG_TAG_EAGER_SHORT
Expand Down Expand Up @@ -140,7 +140,7 @@ static void ucp_proto_eager_tag_offload_bcopy_probe_common(
.super.flags = UCP_PROTO_COMMON_INIT_FLAG_SINGLE_FRAG |
UCP_PROTO_COMMON_INIT_FLAG_RECV_ZCOPY |
UCP_PROTO_COMMON_INIT_FLAG_CAP_SEG_SIZE,
.super.exclude_map = 0,
.super.exclude_map = ~UCP_MAX_FAST_PATH_LANES_MASK,
.super.reg_mem_info = ucp_mem_info_unknown,
.lane_type = UCP_LANE_TYPE_TAG,
.tl_cap_flags = UCT_IFACE_FLAG_TAG_EAGER_BCOPY
Expand Down Expand Up @@ -253,7 +253,7 @@ static void ucp_proto_eager_tag_offload_zcopy_probe_common(
UCP_PROTO_COMMON_INIT_FLAG_RECV_ZCOPY |
UCP_PROTO_COMMON_INIT_FLAG_SINGLE_FRAG |
UCP_PROTO_COMMON_INIT_FLAG_CAP_SEG_SIZE,
.super.exclude_map = 0,
.super.exclude_map = ~UCP_MAX_FAST_PATH_LANES_MASK,
.super.reg_mem_info = ucp_proto_common_select_param_mem_info(
init_params->select_param),
.lane_type = UCP_LANE_TYPE_TAG,
Expand Down
2 changes: 1 addition & 1 deletion src/ucp/tag/offload/rndv.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ucp_tag_rndv_offload_proto_probe(const ucp_proto_init_params_t *init_params)
.super.flags = UCP_PROTO_COMMON_INIT_FLAG_SEND_ZCOPY |
UCP_PROTO_COMMON_INIT_FLAG_RECV_ZCOPY |
UCP_PROTO_COMMON_INIT_FLAG_SINGLE_FRAG,
.super.exclude_map = 0,
.super.exclude_map = ~UCP_MAX_FAST_PATH_LANES_MASK,
.super.reg_mem_info = ucp_proto_common_select_param_mem_info(
init_params->select_param),
.lane_type = UCP_LANE_TYPE_TAG,
Expand Down
Loading