Skip to content

DAOS-18524 csum: power of 2 csum_chunk_size values #17552

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
kccain wants to merge 1 commit into
base: master
Choose a base branch
from
+216 −151
Open

DAOS-18524 csum: power of 2 csum_chunk_size values #17552

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
6 changes: 3 additions & 3 deletions src/common/prop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* (C) Copyright 2019-2023 Intel Corporation.
* (C) Copyright 2025 Hewlett Packard Enterprise Development LP
* (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*/
Expand Down Expand Up @@ -454,8 +454,8 @@ daos_prop_valid(daos_prop_t *prop, bool pool, bool input)
case DAOS_PROP_CO_CSUM_CHUNK_SIZE:
/** Chunk size is encoded on 32 bits */
val = prop->dpp_entries[i].dpe_val;
if (val >= (1ULL << 32)) {
D_ERROR("invalid chunk size " DF_U64 ". Should be < 2GiB\n", val);
if (val > (1ULL << 31)) {
D_ERROR("invalid chunk size " DF_U64 ". Should be <= 2GiB\n", val);
return false;
}
break;
Expand Down
37 changes: 36 additions & 1 deletion src/container/srv_container.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,22 @@ cont_create_existence_check(struct rdb_tx *tx, struct cont_svc *svc, uuid_t puui
return -DER_INVAL;
}

static uint64_t
snap_csum_chunk_size_to_next_pow2(uint64_t csum_chunk_sz_in)
{
int nlz;

if (csum_chunk_sz_in == 0)
return DAOS_PROP_CO_CSUM_CHUNK_SIZE_DEFAULT;
else if (csum_chunk_sz_in == 1)
return 1;
else if (csum_chunk_sz_in >= (1ULL << 31))
return 1ULL << 31; /* 2GiB max according to daos_prop_is_valid() */

nlz = __builtin_clzll(csum_chunk_sz_in - 1);
return 1ULL << (64 - nlz);
}

/* copy \a prop to \a prop_def (duplicated default prop) for cont_create */
static int
cont_create_prop_prepare(struct ds_pool_hdl *pool_hdl,
Expand Down Expand Up @@ -671,7 +687,6 @@ cont_create_prop_prepare(struct ds_pool_hdl *pool_hdl,
case DAOS_PROP_CO_LAYOUT_TYPE:
case DAOS_PROP_CO_LAYOUT_VER:
case DAOS_PROP_CO_CSUM:
case DAOS_PROP_CO_CSUM_CHUNK_SIZE:
case DAOS_PROP_CO_CSUM_SERVER_VERIFY:
case DAOS_PROP_CO_REDUN_LVL:
case DAOS_PROP_CO_SNAPSHOT_MAX:
Expand All @@ -687,6 +702,14 @@ cont_create_prop_prepare(struct ds_pool_hdl *pool_hdl,
case DAOS_PROP_CO_SCRUBBER_DISABLED:
entry_def->dpe_val = entry->dpe_val;
break;
case DAOS_PROP_CO_CSUM_CHUNK_SIZE:
entry_def->dpe_val = snap_csum_chunk_size_to_next_pow2(entry->dpe_val);
if (entry_def->dpe_val != entry->dpe_val) {
D_DEBUG(DB_MD,
"csum_chunk_size adjusted from " DF_U64 " to " DF_U64 "\n",
entry->dpe_val, entry_def->dpe_val);
}
break;
case DAOS_PROP_CO_REDUN_FAC:
inherit_redunc_fac = false;
entry_def->dpe_val = entry->dpe_val;
Expand Down Expand Up @@ -4030,6 +4053,18 @@ set_prop(struct rdb_tx *tx, struct ds_pool *pool, struct cont *cont, uint64_t se
D_GOTO(out, rc = -DER_INVAL);
}

entry = daos_prop_entry_get(prop_in, DAOS_PROP_CO_CSUM_CHUNK_SIZE);
if (entry) {
uint64_t csum_chunk_sz_in = entry->dpe_val;

entry->dpe_val = snap_csum_chunk_size_to_next_pow2(csum_chunk_sz_in);
if (entry->dpe_val != csum_chunk_sz_in)
D_DEBUG(
DB_MD,
DF_CONT ": csum_chunk_size adjusted from " DF_U64 " to " DF_U64 "\n",
DP_CONT(pool->sp_uuid, cont->c_uuid), csum_chunk_sz_in, entry->dpe_val);
}

if (!daos_prop_valid(prop_in, false, true))
D_GOTO(out, rc = -DER_INVAL);

Expand Down
Loading
Loading