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

DAOS-16488 chk: take sd_lock before accessing VOS sys_db #15207

Merged
merged 1 commit into from
Oct 8, 2024
Merged

DAOS-16488 chk: take sd_lock before accessing VOS sys_db #15207

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
67 changes: 37 additions & 30 deletions src/chk/chk_vos.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,20 @@ chk_db_fetch(char *key, int key_size, void *val, int val_size)
{
d_iov_t key_iov;
d_iov_t val_iov;
int rc;

d_iov_set(&key_iov, key, key_size);
d_iov_set(&val_iov, val, val_size);

return chk_db->sd_fetch(chk_db, CHK_DB_TABLE, &key_iov, &val_iov);
if (chk_db->sd_lock)
chk_db->sd_lock(chk_db);

rc = chk_db->sd_fetch(chk_db, CHK_DB_TABLE, &key_iov, &val_iov);

if (chk_db->sd_unlock)
chk_db->sd_unlock(chk_db);

return rc;
}

static int
Expand All @@ -33,21 +42,17 @@ chk_db_update(char *key, int key_size, void *val, int val_size)
d_iov_t val_iov;
int rc;

if (chk_db->sd_tx_begin) {
rc = chk_db->sd_tx_begin(chk_db);
if (rc != 0)
goto out;
}

d_iov_set(&key_iov, key, key_size);
d_iov_set(&val_iov, val, val_size);

if (chk_db->sd_lock)
chk_db->sd_lock(chk_db);

rc = chk_db->sd_upsert(chk_db, CHK_DB_TABLE, &key_iov, &val_iov);

if (chk_db->sd_tx_end)
rc = chk_db->sd_tx_end(chk_db, rc);
if (chk_db->sd_unlock)
chk_db->sd_unlock(chk_db);

out:
return rc;
}

Expand All @@ -57,27 +62,33 @@ chk_db_delete(char *key, int key_size)
d_iov_t key_iov;
int rc;

if (chk_db->sd_tx_begin) {
rc = chk_db->sd_tx_begin(chk_db);
if (rc != 0)
goto out;
}

d_iov_set(&key_iov, key, key_size);

if (chk_db->sd_lock)
chk_db->sd_lock(chk_db);

rc = chk_db->sd_delete(chk_db, CHK_DB_TABLE, &key_iov);

if (chk_db->sd_tx_end)
rc = chk_db->sd_tx_end(chk_db, rc);
if (chk_db->sd_unlock)
chk_db->sd_unlock(chk_db);

out:
return rc;
}

static int
chk_db_traverse(sys_db_trav_cb_t cb, void *args)
{
return chk_db->sd_traverse(chk_db, CHK_DB_TABLE, cb, args);
int rc;

if (chk_db->sd_lock)
chk_db->sd_lock(chk_db);

rc = chk_db->sd_traverse(chk_db, CHK_DB_TABLE, cb, args);

if (chk_db->sd_unlock)
chk_db->sd_unlock(chk_db);

return rc;
}

int
Expand Down Expand Up @@ -243,11 +254,8 @@ chk_prop_update(struct chk_property *cpp, d_rank_list_t *rank_list)
d_iov_t val_iov;
int rc;

if (chk_db->sd_tx_begin) {
rc = chk_db->sd_tx_begin(chk_db);
if (rc != 0)
goto out;
}
if (chk_db->sd_lock)
chk_db->sd_lock(chk_db);

if (cpp->cp_rank_nr != 0 && rank_list != NULL) {
D_ASSERTF(cpp->cp_rank_nr == rank_list->rl_nr, "Invalid rank nr %u/%u\n",
Expand All @@ -259,19 +267,18 @@ chk_prop_update(struct chk_property *cpp, d_rank_list_t *rank_list)

rc = chk_db->sd_upsert(chk_db, CHK_DB_TABLE, &key_iov, &val_iov);
if (rc != 0)
goto end;
goto out;
}

d_iov_set(&key_iov, CHK_PROPERTY, strlen(CHK_PROPERTY));
d_iov_set(&val_iov, cpp, sizeof(*cpp));

rc = chk_db->sd_upsert(chk_db, CHK_DB_TABLE, &key_iov, &val_iov);

end:
if (chk_db->sd_tx_end)
rc = chk_db->sd_tx_end(chk_db, rc);

out:
if (chk_db->sd_unlock)
chk_db->sd_unlock(chk_db);

if (rc != 0)
D_ERROR("Failed to update check property on rank %u: "DF_RC"\n",
dss_self_rank(), DP_RC(rc));
Expand Down
4 changes: 3 additions & 1 deletion src/common/lru.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,9 @@ void
daos_lru_ref_release(struct daos_lru_cache *lcache, struct daos_llink *llink)
{
D_ASSERT(lcache != NULL && llink != NULL && llink->ll_ref > 1);
D_ASSERT(d_list_empty(&llink->ll_qlink));
D_ASSERTF(d_list_empty(&llink->ll_qlink),
"May hit corrupted item in LRU cache %p: llink %p, refs %d, prev %p, next %p\n",
lcache, llink, llink->ll_ref, llink->ll_qlink.prev, llink->ll_qlink.next);

lru_hop_rec_decref(&lcache->dlc_htable, &llink->ll_link);

Expand Down
Loading