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

prov/cxi: Allow fi_close() to complete without error #10671

Closed
wants to merge 1 commit into from
Closed

prov/cxi: Allow fi_close() to complete without error #10671

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
7 changes: 5 additions & 2 deletions prov/cxi/src/cxip_av.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,9 +504,12 @@ static int cxip_av_close(struct fid *fid)
{
struct cxip_av *av = container_of(fid, struct cxip_av, av_fid.fid);
struct cxip_domain *dom = av->domain;
int count;

if (ofi_atomic_get32(&av->ref))
return -FI_EBUSY;
count = ofi_atomic_get32(&av->ref);
if (count) {
CXIP_WARN("AV refcount non-zero: %d\n", count);
}

HASH_CLEAR(hh, av->auth_key_entry_hash);
ofi_bufpool_destroy(av->auth_key_entry_pool);
Expand Down
1 change: 0 additions & 1 deletion prov/cxi/src/cxip_ep.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,6 @@ int cxip_free_endpoint(struct cxip_ep *ep)
count = ofi_atomic_get32(&ep_obj->coll.num_mc);
if (count) {
CXIP_WARN("EP num_mc non-zero: %d\n", count);
return -FI_EBUSY;
}

if (ep_obj->av)
Expand Down
10 changes: 8 additions & 2 deletions prov/util/src/util_buf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,12 +282,18 @@ void ofi_bufpool_destroy(struct ofi_bufpool *pool)
{
struct ofi_bufpool_region *buf_region;
size_t i;
int count;

for (i = 0; i < pool->region_cnt; i++) {
buf_region = pool->region_table[i];

assert((pool->attr.flags & OFI_BUFPOOL_NO_TRACK) ||
!ofi_atomic_get32(&buf_region->use_cnt));
if (!(pool->attr.flags & OFI_BUFPOOL_NO_TRACK)) {
count = ofi_atomic_get32(&buf_region->use_cnt);
if (count) {
Copy link
Contributor

Choose a reason for hiding this comment

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

If you want to suppress the error, shouldn't you create the buffer pool with OFI_BUFPOOL_NO_TRACK, or manually warn and clean them in your ep close?

FI_WARN(&core_prov, FI_LOG_CORE,
"Bufpool use_cnt non-zero: %d\n", count);
}
}
if (pool->attr.free_fn)
pool->attr.free_fn(buf_region);

Expand Down
13 changes: 11 additions & 2 deletions prov/util/src/util_mr_cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,8 +499,17 @@ void ofi_mr_cache_cleanup(struct ofi_mr_cache *cache)
if (cache->domain)
ofi_atomic_dec32(&cache->domain->ref);
ofi_bufpool_destroy(cache->entry_pool);
assert(cache->cached_cnt == 0);
assert(cache->cached_size == 0);

if (cache->cached_cnt) {
FI_WARN(&core_prov, FI_LOG_CORE,
"MR cache cached_cnt non-zero: %lu\n",
cache->cached_cnt);
}
if (cache->cached_size) {
FI_WARN(&core_prov, FI_LOG_CORE,
"MR cache cached_size non-zero: %lu\n",
cache->cached_size);
}
assert(cache->uncached_cnt == 0);
assert(cache->uncached_size == 0);
}
Expand Down
Loading