Skip to content

prov/sockets: fix rx_buffered arrived befor fi_av_insert #11037

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 1 commit into
base: main
Choose a base branch
from
+10 −0
Open

prov/sockets: fix rx_buffered arrived befor fi_av_insert #11037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions prov/sockets/include/sock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,7 @@ struct sock_rx_entry {
uint64_t flags;
uint64_t context;
uint64_t addr;
union ofi_sock_ip sock_addr;
uint64_t data;
uint64_t tag;
uint64_t ignore;
Expand Down
9 changes: 9 additions & 0 deletions prov/sockets/src/sock_progress.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1216,6 +1216,12 @@ static int sock_pe_progress_buffered_rx(struct sock_rx_ctx *rx_ctx,
if (!rx_buffered->is_complete || rx_buffered->is_claimed)
continue;

if (rx_buffered->addr == FI_ADDR_NOTAVAIL) {
rx_buffered->addr = sock_av_get_addr_index(rx_ctx->av, &rx_buffered->sock_addr);
if (rx_buffered->addr == FI_ADDR_NOTAVAIL) {
continue;
}
}
rx_posted = sock_rx_get_entry(rx_ctx, rx_buffered->addr,
rx_buffered->tag,
rx_buffered->is_tagged);
Copy link
Contributor Author

@hzhou hzhou May 16, 2025

Choose a reason for hiding this comment

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

Question: do we allow FI_ADDR_NOTAVAIL to be matched? If so, what is the use case?

Copy link
Contributor

@j-xiong j-xiong May 19, 2025

Choose a reason for hiding this comment

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

It should be allowed. The posted recv may not care who the sender is (i.e. rx_entry->addr == FI_ADDR_UNSPEC).

Expand Down Expand Up @@ -1375,6 +1381,9 @@ static int sock_pe_process_rx_send(struct sock_pe *pe,
}

rx_entry->addr = pe_entry->addr;
if (rx_entry->addr == FI_ADDR_NOTAVAIL) {
rx_entry->sock_addr = pe_entry->conn->addr;
}
rx_entry->tag = pe_entry->tag;
rx_entry->data = pe_entry->data;
rx_entry->ignore = 0;
Expand Down