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-15276 object: refine sgl valid check #14176

Merged
merged 2 commits into from
May 13, 2024
Merged

DAOS-15276 object: refine sgl valid check #14176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25cca27
DAOS-15276 object: refine sgl valid check
liuxuezhao Apr 17, 2024
fa264fb
DAOS-15276 object: log refine
liuxuezhao May 7, 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
10 changes: 8 additions & 2 deletions src/client/dfs/xattr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ dfs_setxattr(dfs_t *dfs, dfs_obj_t *obj, const char *name, const void *value, da
iods[0].iod_recxs = NULL;
iods[0].iod_type = DAOS_IOD_SINGLE;
iods[0].iod_size = size;
d_iov_set(&sg_iovs[0], (void *)value, size);
if (value == NULL)
d_iov_set(&sg_iovs[0], NULL, 0);
else
d_iov_set(&sg_iovs[0], (void *)value, size);
sgls[0].sg_nr = 1;
sgls[0].sg_nr_out = 0;
sgls[0].sg_iovs = &sg_iovs[0];
Expand Down Expand Up @@ -168,7 +171,10 @@ dfs_getxattr(dfs_t *dfs, dfs_obj_t *obj, const char *name, void *value, daos_siz
iod.iod_size = *size;

/** set sgl for fetch */
d_iov_set(&sg_iov, value, *size);
if (value == NULL)
d_iov_set(&sg_iov, NULL, 0);
else
d_iov_set(&sg_iov, value, *size);
sgl.sg_nr = 1;
sgl.sg_nr_out = 0;
sgl.sg_iovs = &sg_iov;
Expand Down
16 changes: 16 additions & 0 deletions src/object/cli_obj.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2216,6 +2216,22 @@ obj_iod_sgl_valid(daos_obj_id_t oid, unsigned int nr, daos_iod_t *iods,
return -DER_INVAL;
}
}
if (sgls != NULL && sgls[i].sg_nr > 0) {
Copy link
Contributor

Choose a reason for hiding this comment

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

"if (sgls != NULL) {" seems enough.

d_sg_list_t *sg = &sgls[i];
d_iov_t *iov;

for (j = 0; j < sg->sg_nr; j++) {
iov = sg->sg_iovs + j;
if (iov == NULL || (iov->iov_buf_len > 0 && iov->iov_buf == NULL)) {
if (iov == NULL)
D_ERROR("Bad iov - j %d, NULL iov\n", j);
else
D_ERROR("Bad iov - j %d, NULL iov_buf, "
"bul_len %zu\n", j, iov->iov_buf_len);
return -DER_INVAL;
}
}
}

switch (iods[i].iod_type) {
default:
Expand Down
13 changes: 12 additions & 1 deletion src/tests/suite/daos_obj.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2431,7 +2431,7 @@ fetch_size(void **state)
char *akey[NUM_AKEYS];
const char *akey_fmt = "akey%d";
int i, rc;
daos_size_t size = 131071;
daos_size_t size = 131071, tmp_sz;

/** open object */
oid = daos_test_oid_gen(arg->coh, dts_obj_class, 0, 0, arg->myrank);
Expand Down Expand Up @@ -2480,6 +2480,17 @@ fetch_size(void **state)
for (i = 0; i < NUM_AKEYS; i++)
assert_int_equal(iod[i].iod_size, size * (i+1));

print_message("fetch with invalid sgl - NULL sg_iovs with non-zero sg_nr\n");
sgl->sg_iovs = NULL;
tmp_sz = iod->iod_size;
iod->iod_size = 0;
rc = daos_obj_fetch(oh, DAOS_TX_NONE, 0, &dkey, NUM_AKEYS, iod, sgl,
NULL, NULL);
assert_rc_equal(rc, -DER_INVAL);

iod->iod_size = tmp_sz;
for (i = 0; i < NUM_AKEYS; i++)
sgl[i].sg_iovs = &sg_iov[i];
print_message("fetch with unknown iod_size and less buffer\n");
for (i = 0; i < NUM_AKEYS; i++) {
d_iov_set(&sg_iov[i], buf[i], size * (i+1) - 1);
Expand Down
3 changes: 2 additions & 1 deletion src/tests/suite/dfs_unit_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2449,10 +2449,10 @@ dfs_test_xattrs(void **state)
0, 0, NULL, &obj);
assert_int_equal(rc, 0);

size = 0;
rc = dfs_getxattr(dfs_mt, obj, xname1, NULL, &size);
assert_int_equal(rc, ENODATA);

size = 0;
rc = dfs_setxattr(dfs_mt, obj, xname1, NULL, size, 0);
assert_int_equal(rc, 0);

Expand All @@ -2461,6 +2461,7 @@ dfs_test_xattrs(void **state)
assert_int_equal(rc, 0);
assert_int_equal(size, 0);

size = 0;
rc = dfs_getxattr(dfs_mt, obj, xname2, NULL, &size);
assert_int_equal(rc, ENODATA);

Expand Down
Loading