Skip to content
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

Jump to bottom

06 of 10 LNX series - Add FI_PEER as a capability #10030

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+59 −22
Open

06 of 10 LNX series - Add FI_PEER as a capability #10030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
71eb274
util: Consider provider exclusion
amirshehataornl Dec 29, 2022
bcc5181
include/rdma: Add address matching call back to peer_srx
amirshehataornl Apr 25, 2024
3ddf85f
include/rdma: new fi_peer_match structure
amirshehataornl May 2, 2024
293275d
srx: Add memory registration cb to fi_ops_srx_peer
amirshehataornl May 2, 2024
5f915c9
fabric: Add FI_PEER capability
amirshehataornl May 2, 2024
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
23 changes: 19 additions & 4 deletions include/rdma/providers/fi_peer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,16 +173,28 @@ struct fi_peer_rx_entry {
size_t count;
void **desc;
void *peer_context;
void *peer_md;
void *owner_context;
struct iovec *iov;
uint32_t match_id;
};

struct fi_peer_match {
fi_addr_t addr;
uint64_t tag;
size_t size;
void *context;
uint32_t match_id;
};

struct fi_ops_srx_owner {
size_t size;
int (*get_msg)(struct fid_peer_srx *srx, fi_addr_t addr,
size_t size, struct fi_peer_rx_entry **entry);
int (*get_tag)(struct fid_peer_srx *srx, fi_addr_t addr,
uint64_t tag, struct fi_peer_rx_entry **entry);
int (*get_msg)(struct fid_peer_srx *srx,
struct fi_peer_match *match,
struct fi_peer_rx_entry **entry);
int (*get_tag)(struct fid_peer_srx *srx,
struct fi_peer_match *match,
struct fi_peer_rx_entry **entry);
int (*queue_msg)(struct fi_peer_rx_entry *entry);
int (*queue_tag)(struct fi_peer_rx_entry *entry);
void (*foreach_unspec_addr)(struct fid_peer_srx *srx,
Expand All @@ -197,6 +209,9 @@ struct fi_ops_srx_peer {
int (*start_tag)(struct fi_peer_rx_entry *entry);
int (*discard_msg)(struct fi_peer_rx_entry *entry);
int (*discard_tag)(struct fi_peer_rx_entry *entry);
int (*addr_match)(fi_addr_t addr, struct fi_peer_match *match);
int (*mem_reg)(struct fid_ep *ep, struct iovec *iov, fi_addr_t addr,
void **md, uint32_t *match_id);
};

struct fid_peer_srx {
Expand Down
14 changes: 10 additions & 4 deletions prov/efa/src/rdm/efa_rdm_msg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,7 @@ struct efa_rdm_ope *efa_rdm_msg_alloc_rxe_for_msgrtm(struct efa_rdm_ep *ep,
size_t data_size;
int ret;
int pkt_type;
struct fi_peer_match match = {0};

if ((*pkt_entry_ptr)->alloc_type == EFA_RDM_PKE_FROM_USER_BUFFER) {
/* If a pkt_entry is constructred from user supplied buffer,
Expand All @@ -782,7 +783,10 @@ struct efa_rdm_ope *efa_rdm_msg_alloc_rxe_for_msgrtm(struct efa_rdm_ep *ep,
peer_srx = util_get_peer_srx(ep->peer_srx_ep);
data_size = efa_rdm_pke_get_rtm_msg_length(*pkt_entry_ptr);

ret = peer_srx->owner_ops->get_msg(peer_srx, (*pkt_entry_ptr)->addr, data_size, &peer_rxe);
match.addr = (*pkt_entry_ptr)->addr;
match.size = data_size;

ret = peer_srx->owner_ops->get_msg(peer_srx, &match, &peer_rxe);

if (ret == FI_SUCCESS) { /* A matched rxe is found */
rxe = efa_rdm_msg_alloc_matched_rxe_for_rtm(ep, *pkt_entry_ptr, peer_rxe, ofi_op_msg);
Expand Down Expand Up @@ -844,12 +848,14 @@ struct efa_rdm_ope *efa_rdm_msg_alloc_rxe_for_tagrtm(struct efa_rdm_ep *ep,
struct efa_rdm_ope *rxe;
int ret;
int pkt_type;
struct fi_peer_match match = {0};

peer_srx = util_get_peer_srx(ep->peer_srx_ep);

ret = peer_srx->owner_ops->get_tag(peer_srx, (*pkt_entry_ptr)->addr,
efa_rdm_pke_get_rtm_tag(*pkt_entry_ptr),
&peer_rxe);
match.addr = (*pkt_entry_ptr)->addr;
match.tag = efa_rdm_pke_get_rtm_tag(*pkt_entry_ptr);

ret = peer_srx->owner_ops->get_tag(peer_srx, &match, &peer_rxe);

if (ret == FI_SUCCESS) { /* A matched rxe is found */
rxe = efa_rdm_msg_alloc_matched_rxe_for_rtm(ep, *pkt_entry_ptr, peer_rxe, ofi_op_tagged);
Expand Down
16 changes: 10 additions & 6 deletions prov/shm/src/smr_progress.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,13 +987,16 @@ static int smr_progress_cmd_msg(struct smr_ep *ep, struct smr_cmd *cmd)
{
struct fid_peer_srx *peer_srx = smr_get_peer_srx(ep);
struct fi_peer_rx_entry *rx_entry;
fi_addr_t addr;
struct fi_peer_match match_info = {0};
int ret;

addr = ep->region->map->peers[cmd->msg.hdr.id].fiaddr;
match_info.addr = ep->region->map->peers[cmd->msg.hdr.id].fiaddr;
match_info.context = NULL;

if (cmd->msg.hdr.op == ofi_op_tagged) {
ret = peer_srx->owner_ops->get_tag(peer_srx, addr,
cmd->msg.hdr.tag, &rx_entry);
match_info.tag = cmd->msg.hdr.tag;
ret = peer_srx->owner_ops->get_tag(peer_srx, &match_info,
&rx_entry);
if (ret == -FI_ENOENT) {
ret = smr_alloc_cmd_ctx(ep, rx_entry, cmd);
if (ret) {
Expand All @@ -1009,8 +1012,9 @@ static int smr_progress_cmd_msg(struct smr_ep *ep, struct smr_cmd *cmd)
goto out;
}
} else {
ret = peer_srx->owner_ops->get_msg(peer_srx, addr,
cmd->msg.hdr.size, &rx_entry);
match_info.size = cmd->msg.hdr.size;
ret = peer_srx->owner_ops->get_msg(peer_srx, &match_info,
&rx_entry);
if (ret == -FI_ENOENT) {
ret = smr_alloc_cmd_ctx(ep, rx_entry, cmd);
if (ret) {
Expand Down
12 changes: 8 additions & 4 deletions prov/sm2/src/sm2_progress.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,7 @@ static int sm2_progress_recv_msg(struct sm2_ep *ep,
{
struct fid_peer_srx *peer_srx = sm2_get_peer_srx(ep);
struct fi_peer_rx_entry *rx_entry;
struct fi_peer_match match;
struct sm2_av *sm2_av;
fi_addr_t addr;
int ret = 0;
Expand All @@ -540,9 +541,12 @@ static int sm2_progress_recv_msg(struct sm2_ep *ep,
sm2_av = container_of(ep->util_ep.av, struct sm2_av, util_av);
addr = sm2_av->reverse_lookup[xfer_entry->hdr.sender_gid];

memset(&match, 0, sizeof(match));
match.addr = addr;

if (xfer_entry->hdr.op == ofi_op_tagged) {
ret = peer_srx->owner_ops->get_tag(
peer_srx, addr, xfer_entry->hdr.tag, &rx_entry);
match.tag = xfer_entry->hdr.tag;
ret = peer_srx->owner_ops->get_tag(peer_srx, &match, &rx_entry);
if (ret == -FI_ENOENT) {
xfer_entry->hdr.proto_flags |= SM2_UNEXP;
ret = sm2_alloc_xfer_entry_ctx(ep, rx_entry,
Expand All @@ -557,8 +561,8 @@ static int sm2_progress_recv_msg(struct sm2_ep *ep,
goto out;
}
} else {
ret = peer_srx->owner_ops->get_msg(
peer_srx, addr, xfer_entry->hdr.size, &rx_entry);
match.size = xfer_entry->hdr.size;
ret = peer_srx->owner_ops->get_msg(peer_srx, &match, &rx_entry);
if (ret == -FI_ENOENT) {
xfer_entry->hdr.proto_flags |= SM2_UNEXP;
ret = sm2_alloc_xfer_entry_ctx(ep, rx_entry,
Expand Down
1 change: 1 addition & 0 deletions prov/util/src/util_attr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,7 @@ int ofi_check_fabric_attr(const struct fi_provider *prov,
* user's hints, if one is specified.
*/
if (prov_attr->prov_name && user_attr->prov_name &&
user_attr->prov_name[0] != '^' &&
!strcasestr(user_attr->prov_name, prov_attr->prov_name)) {
FI_INFO(prov, FI_LOG_CORE,
"Requesting provider %s, skipping %s\n",
Expand Down
14 changes: 10 additions & 4 deletions prov/util/src/util_srx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,12 +194,15 @@ static int util_match_msg(struct fid_peer_srx *srx, fi_addr_t addr, size_t size,
return ret;
}

static int util_get_msg(struct fid_peer_srx *srx, fi_addr_t addr,
size_t size, struct fi_peer_rx_entry **rx_entry)
static int util_get_msg(struct fid_peer_srx *srx,
struct fi_peer_match *match_info,
struct fi_peer_rx_entry **rx_entry)
{
struct util_srx_ctx *srx_ctx;
struct util_rx_entry *util_entry, *any_entry;
struct slist *queue;
fi_addr_t addr = match_info->addr;
size_t size = match_info->size;

srx_ctx = srx->ep_fid.fid.context;
assert(ofi_genlock_held(srx_ctx->lock));
Expand Down Expand Up @@ -269,14 +272,17 @@ static int util_match_tag(struct fid_peer_srx *srx, fi_addr_t addr,
return ret;
}

static int util_get_tag(struct fid_peer_srx *srx, fi_addr_t addr,
uint64_t tag, struct fi_peer_rx_entry **rx_entry)
static int util_get_tag(struct fid_peer_srx *srx,
struct fi_peer_match *match_info,
struct fi_peer_rx_entry **rx_entry)
{
struct util_srx_ctx *srx_ctx;
struct slist *queue;
struct slist_entry *any_item, *any_prev;
struct slist_entry *item, *prev;
struct util_rx_entry *util_entry, *any_entry;
uint64_t tag = match_info->tag;
fi_addr_t addr = match_info->addr;
int ret = FI_SUCCESS;

srx_ctx = srx->ep_fid.fid.context;
Expand Down
1 change: 1 addition & 0 deletions src/fi_tostr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ static void ofi_tostr_caps(char *buf, size_t len, uint64_t caps)
IFFLAGSTRN(caps, FI_NAMED_RX_CTX, len);
IFFLAGSTRN(caps, FI_DIRECTED_RECV, len);
IFFLAGSTRN(caps, FI_HMEM, len);
IFFLAGSTRN(caps, FI_PEER, len);

ofi_remove_comma(buf);
}
Expand Down
Loading