Commit 0754417f authored by Alexey Marchuk's avatar Alexey Marchuk Committed by Darek Stojaczyk
Browse files

rdma: Use optimal ceiling integer division 



This form of the celinig division allows to remove an extra condition

Change-Id: I8a2de792172ec9115563e7fb914745c476f16e8d
Signed-off-by: default avatarAlexey Marchuk <alexeymar@mellanox.com>
Signed-off-by: default avatarSasha Kotchubievsky <sashakot@mellanox.com>
Signed-off-by: default avatarEvgenii Kochetov <evgeniik@mellanox.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/462198


Reviewed-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent de1d0f8f

include/spdk/util.h

+5 −2
Original line number Diff line number Diff line 
/*-

 *   BSD LICENSE

 *

 *   Copyright (c) Intel Corporation.

 *   All rights reserved.

 *   Copyright (c) Intel Corporation. All rights reserved.

 *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.

 *

 *   Redistribution and use in source and binary forms, with or without

 *   modification, are permitted provided that the following conditions
@@ -54,6 +54,9 @@ extern "C" { 
#define SPDK_SEC_TO_USEC 1000000ULL

#define SPDK_SEC_TO_NSEC 1000000000ULL



/* Ceiling division of unsigned integers */

#define SPDK_CEIL_DIV(x,y) (((x)+(y)-1)/(y))



static inline uint32_t

spdk_u32log2(uint32_t x)

{

lib/nvmf/rdma.c

+2 −8
Original line number Diff line number Diff line
@@ -1574,10 +1574,7 @@ spdk_nvmf_rdma_request_fill_iovs(struct spdk_nvmf_rdma_transport *rtransport, 
	rgroup = rqpair->poller->group;

	rdma_req->req.iovcnt = 0;



	num_buffers = rdma_req->req.length / rtransport->transport.opts.io_unit_size;

	if (rdma_req->req.length % rtransport->transport.opts.io_unit_size) {

		num_buffers++;

	}

	num_buffers = SPDK_CEIL_DIV(rdma_req->req.length, rtransport->transport.opts.io_unit_size);



	if (nvmf_rdma_request_get_buffers(rdma_req, &rgroup->group, &rtransport->transport, num_buffers)) {

		return -ENOMEM;
@@ -1636,10 +1633,7 @@ nvmf_rdma_request_fill_iovs_multi_sgl(struct spdk_nvmf_rdma_transport *rtranspor 
	desc = (struct spdk_nvme_sgl_descriptor *)rdma_req->recv->buf + inline_segment->address;



	for (i = 0; i < num_sgl_descriptors; i++) {

		num_buffers += desc->keyed.length / rtransport->transport.opts.io_unit_size;

		if (desc->keyed.length % rtransport->transport.opts.io_unit_size) {

			num_buffers++;

		}

		num_buffers += SPDK_CEIL_DIV(desc->keyed.length, rtransport->transport.opts.io_unit_size);

		desc++;

	}

	/* If the number of buffers is too large, then we know the I/O is larger than allowed. Fail it. */