ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/reduce: Factor out decomp_iov configuration

Browse Source 
Functions _start_writev_request and _write_decompress_done
have very similar decomp_iov configuration code, the only
difference is whether to fill gaps with zeroes or with
decompressed data. Move this code to a common function,
that will reduce amount of changes in the next patch

Signed-off-by: Alexey Marchuk <alexeymar@mellanox.com>
Change-Id: I14509a17a12156b25ceab85a98b4dbd6fb11c732
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11969
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Alexey Marchuk 2022-03-16 16:06:14 +04:00 committed by Tomasz Zawadzki
parent 8d48071a3e
commit 9587ded299
1 changed files with 44 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
lib/reduce/reduce.c
View File

@ -1214,13 +1214,51 @@ _reduce_vol_decompress_chunk(struct spdk_reduce_vol_request *req, reduce_request
&req->backing_cb_args); &req->backing_cb_args);
} }
/* This function can be called when we are compressing a new data or in case of read-modify-write
* In the first case possible paddings should be filled with zeroes, in the second case the paddings
* should point to already read and decompressed buffer */
static inline void
_prepare_compress_chunk(struct spdk_reduce_vol_request *req, bool zero_paddings)
{
struct spdk_reduce_vol *vol = req->vol;
char *padding_buffer = zero_paddings ? g_zero_buf : req->decomp_buf;
uint64_t chunk_offset, ttl_len = 0;
uint64_t remainder = 0;
uint32_t lbsize = vol->params.logical_block_size;
int i;
req->decomp_iovcnt = 0;
chunk_offset = req->offset % vol->logical_blocks_per_chunk;
if (chunk_offset != 0) {
ttl_len += chunk_offset * lbsize;
req->decomp_iov[0].iov_base = padding_buffer;
req->decomp_iov[0].iov_len = ttl_len;
req->decomp_iovcnt = 1;
}
/* now the user data iov, direct from the user buffer */
for (i = 0; i < req->iovcnt; i++) {
req->decomp_iov[i + req->decomp_iovcnt].iov_base = req->iov[i].iov_base;
req->decomp_iov[i + req->decomp_iovcnt].iov_len = req->iov[i].iov_len;
ttl_len += req->iov[i].iov_len;
}
req->decomp_iovcnt += req->iovcnt;
remainder = vol->params.chunk_size - ttl_len;
if (remainder) {
req->decomp_iov[req->decomp_iovcnt].iov_base = padding_buffer + ttl_len;
req->decomp_iov[req->decomp_iovcnt].iov_len = remainder;
req->decomp_iovcnt++;
ttl_len += remainder;
}
assert(ttl_len == req->vol->params.chunk_size);
}
static void static void
_write_decompress_done(void *_req, int reduce_errno) _write_decompress_done(void *_req, int reduce_errno)
{ {
struct spdk_reduce_vol_request *req = _req; struct spdk_reduce_vol_request *req = _req;
struct spdk_reduce_vol *vol = req->vol;
uint64_t chunk_offset, remainder, ttl_len = 0;
int i;
/* Negative reduce_errno indicates failure for compression operations. */ /* Negative reduce_errno indicates failure for compression operations. */
if (reduce_errno < 0) { if (reduce_errno < 0) {
@ -1232,37 +1270,12 @@ _write_decompress_done(void *_req, int reduce_errno)
* buffer. This should equal the chunk size - otherwise that's another * buffer. This should equal the chunk size - otherwise that's another
* type of failure. * type of failure.
*/ */
if ((uint32_t)reduce_errno != vol->params.chunk_size) { if ((uint32_t)reduce_errno != req->vol->params.chunk_size) {
_reduce_vol_complete_req(req, -EIO); _reduce_vol_complete_req(req, -EIO);
return; return;
} }
req->decomp_iovcnt = 0; _prepare_compress_chunk(req, false);
chunk_offset = req->offset % vol->logical_blocks_per_chunk;
if (chunk_offset) {
req->decomp_iov[0].iov_base = req->decomp_buf;
req->decomp_iov[0].iov_len = chunk_offset * vol->params.logical_block_size;
ttl_len += req->decomp_iov[0].iov_len;
req->decomp_iovcnt = 1;
}
for (i = 0; i < req->iovcnt; i++) {
req->decomp_iov[i + req->decomp_iovcnt].iov_base = req->iov[i].iov_base;
req->decomp_iov[i + req->decomp_iovcnt].iov_len = req->iov[i].iov_len;
ttl_len += req->decomp_iov[i + req->decomp_iovcnt].iov_len;
}
req->decomp_iovcnt += req->iovcnt;
remainder = vol->params.chunk_size - ttl_len;
if (remainder) {
req->decomp_iov[req->decomp_iovcnt].iov_base = req->decomp_buf + ttl_len;
req->decomp_iov[req->decomp_iovcnt].iov_len = remainder;
ttl_len += req->decomp_iov[req->decomp_iovcnt].iov_len;
req->decomp_iovcnt++;
}
assert(ttl_len == vol->params.chunk_size);
_reduce_vol_compress_chunk(req, _write_compress_done); _reduce_vol_compress_chunk(req, _write_compress_done);
} }
@ -1480,10 +1493,6 @@ static void
_start_writev_request(struct spdk_reduce_vol_request *req) _start_writev_request(struct spdk_reduce_vol_request *req)
{ {
struct spdk_reduce_vol *vol = req->vol; struct spdk_reduce_vol *vol = req->vol;
uint64_t chunk_offset, ttl_len = 0;
uint64_t remainder = 0;
uint32_t lbsize;
int i;
TAILQ_INSERT_TAIL(&req->vol->executing_requests, req, tailq); TAILQ_INSERT_TAIL(&req->vol->executing_requests, req, tailq);
if (vol->pm_logical_map[req->logical_map_index] != REDUCE_EMPTY_MAP_ENTRY) { if (vol->pm_logical_map[req->logical_map_index] != REDUCE_EMPTY_MAP_ENTRY) {
@ -1497,36 +1506,9 @@ _start_writev_request(struct spdk_reduce_vol_request *req)
} }
} }
lbsize = vol->params.logical_block_size;
req->decomp_iovcnt = 0;
req->rmw = false; req->rmw = false;
/* Note: point to our zero buf for offset into the chunk. */ _prepare_compress_chunk(req, true);
chunk_offset = req->offset % vol->logical_blocks_per_chunk;
if (chunk_offset != 0) {
ttl_len += chunk_offset * lbsize;
req->decomp_iov[0].iov_base = g_zero_buf;
req->decomp_iov[0].iov_len = ttl_len;
req->decomp_iovcnt = 1;
}
/* now the user data iov, direct from the user buffer */
for (i = 0; i < req->iovcnt; i++) {
req->decomp_iov[i + req->decomp_iovcnt].iov_base = req->iov[i].iov_base;
req->decomp_iov[i + req->decomp_iovcnt].iov_len = req->iov[i].iov_len;
ttl_len += req->decomp_iov[i + req->decomp_iovcnt].iov_len;
}
req->decomp_iovcnt += req->iovcnt;
remainder = vol->params.chunk_size - ttl_len;
if (remainder) {
req->decomp_iov[req->decomp_iovcnt].iov_base = g_zero_buf;
req->decomp_iov[req->decomp_iovcnt].iov_len = remainder;
ttl_len += req->decomp_iov[req->decomp_iovcnt].iov_len;
req->decomp_iovcnt++;
}
assert(ttl_len == req->vol->params.chunk_size);
_reduce_vol_compress_chunk(req, _write_compress_done); _reduce_vol_compress_chunk(req, _write_compress_done);
} }