Commit d23c36a1 authored by paul luse's avatar paul luse Committed by Darek Stojaczyk
Browse files

lib/reduce: eliminate two more memcpy operations 



For callers of _reduce_vol_compress_chunk()

Signed-off-by: default avatarpaul luse <paul.e.luse@intel.com>
Change-Id: I9ac1da8f9bcfd902fe58e4c5ffc20ce16e9bafcd
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459863


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent 89a9a504

lib/reduce/reduce.c

+48 −17
Original line number Diff line number Diff line
@@ -1058,10 +1058,8 @@ _reduce_vol_compress_chunk(struct spdk_reduce_vol_request *req, reduce_request_f 
	req->backing_cb_args.cb_arg = req;

	req->comp_buf_iov[0].iov_base = req->comp_buf;

	req->comp_buf_iov[0].iov_len = vol->params.chunk_size;

	req->decomp_buf_iov[0].iov_base = req->decomp_buf;

	req->decomp_buf_iov[0].iov_len = vol->params.chunk_size;

	vol->backing_dev->compress(vol->backing_dev,

				   req->decomp_buf_iov, 1, req->comp_buf_iov, 1,

				   &req->decomp_iov[0], req->decomp_iovcnt, req->comp_buf_iov, 1,

				   &req->backing_cb_args);

}
@@ -1116,8 +1114,7 @@ _write_decompress_done(void *_req, int reduce_errno) 
{

	struct spdk_reduce_vol_request *req = _req;

	struct spdk_reduce_vol *vol = req->vol;

	uint64_t chunk_offset;

	uint8_t *buf;

	uint64_t chunk_offset, ttl_len = 0;

	int i;



	/* Negative reduce_errno indicates failure for compression operations. */
@@ -1135,12 +1132,30 @@ _write_decompress_done(void *_req, int reduce_errno) 
		return;

	}



	req->decomp_iovcnt = 0;

	chunk_offset = req->offset % vol->logical_blocks_per_chunk;

	buf = req->decomp_buf + chunk_offset * vol->params.logical_block_size;



	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++) {

		memcpy(buf, req->iov[i].iov_base, req->iov[i].iov_len);

		buf += req->iov[i].iov_len;

		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++;

	}



	if (ttl_len < req->vol->params.chunk_size) {

		req->decomp_iov[req->decomp_iovcnt].iov_base = req->decomp_buf + ttl_len;

		req->decomp_iov[req->decomp_iovcnt].iov_len = req->vol->params.chunk_size - ttl_len;

		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);

}
@@ -1341,10 +1356,10 @@ static void 
_start_writev_request(struct spdk_reduce_vol_request *req)

{

	struct spdk_reduce_vol *vol = req->vol;

	uint64_t chunk_offset;

	uint64_t chunk_offset, ttl_len = 0;

	uint64_t remainder = 0;

	uint32_t lbsize, lb_per_chunk;

	int i;

	uint8_t *buf;



	TAILQ_INSERT_TAIL(&req->vol->executing_requests, req, tailq);

	if (vol->pm_logical_map[req->logical_map_index] != REDUCE_EMPTY_MAP_ENTRY) {
@@ -1356,23 +1371,39 @@ _start_writev_request(struct spdk_reduce_vol_request *req) 
		return;

	}



	buf = req->decomp_buf;

	lbsize = vol->params.logical_block_size;

	lb_per_chunk = vol->logical_blocks_per_chunk;

	/* Note: we must zero out parts of req->buf not specified by this write operation. */

	req->decomp_iovcnt = 0;



	/* Note: we must zero out parts of req->decomp_buf not specified by this write operation. */

	chunk_offset = req->offset % lb_per_chunk;

	if (chunk_offset != 0) {

		memset(buf, 0, chunk_offset * lbsize);

		buf += chunk_offset * lbsize;

		memset(req->decomp_buf, 0, chunk_offset * lbsize);

		ttl_len += chunk_offset * lbsize;

		req->decomp_iov[0].iov_base = req->decomp_buf;

		req->decomp_iov[0].iov_len = ttl_len;

		req->decomp_iovcnt = 1;

	}



	/* now the user data iov, direct to the user buffer */

	for (i = 0; i < req->iovcnt; i++) {

		memcpy(buf, req->iov[i].iov_base, req->iov[i].iov_len);

		buf += req->iov[i].iov_len;

		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++;

	}



	chunk_offset += req->length;

	if (chunk_offset != lb_per_chunk) {

		memset(buf, 0, (lb_per_chunk - chunk_offset) * lbsize);

		remainder = (lb_per_chunk - chunk_offset) * lbsize;

		memset(req->decomp_buf + ttl_len, 0, 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 == req->vol->params.chunk_size);



	_reduce_vol_compress_chunk(req, _write_compress_done);

}