falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nbd/server: refactor nbd_co_receive_request 

Move function tail, about receiving next request out of the function.
Error path is simplified and nbd_co_receive_request becomes more
corresponding to its name.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170602150150.258222-8-vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2017-06-02 18:01:45 +03:00 committed by Paolo Bonzini
parent 2a6e128bfa
commit ee898b870f
1 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
nbd/server.c
View File

@ -1006,14 +1006,11 @@ static int nbd_co_send_reply(NBDRequestData *req, NBDReply *reply, int len)
static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request) static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request)
{ {
NBDClient *client = req->client; NBDClient *client = req->client;
int rc;
g_assert(qemu_in_coroutine()); g_assert(qemu_in_coroutine());
assert(client->recv_coroutine == qemu_coroutine_self()); assert(client->recv_coroutine == qemu_coroutine_self());
rc = nbd_receive_request(client->ioc, request); if (nbd_receive_request(client->ioc, request) < 0) {
if (rc < 0) { return -EIO;
rc = -EIO;
goto out;
} }
TRACE("Decoding type"); TRACE("Decoding type");
@ -1027,8 +1024,7 @@ static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request)
/* Special case: we're going to disconnect without a reply, /* Special case: we're going to disconnect without a reply,
* whether or not flags, from, or len are bogus */ * whether or not flags, from, or len are bogus */
TRACE("Request type is DISCONNECT"); TRACE("Request type is DISCONNECT");
rc = -EIO; return -EIO;
goto out;
} }
/* Check for sanity in the parameters, part 1. Defer as many /* Check for sanity in the parameters, part 1. Defer as many
@ -1036,22 +1032,19 @@ static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request)
* payload, so we can try and keep the connection alive. */ * payload, so we can try and keep the connection alive. */
if ((request->from + request->len) < request->from) { if ((request->from + request->len) < request->from) {
LOG("integer overflow detected, you're probably being attacked"); LOG("integer overflow detected, you're probably being attacked");
rc = -EINVAL; return -EINVAL;
goto out;
} }
if (request->type == NBD_CMD_READ || request->type == NBD_CMD_WRITE) { if (request->type == NBD_CMD_READ || request->type == NBD_CMD_WRITE) {
if (request->len > NBD_MAX_BUFFER_SIZE) { if (request->len > NBD_MAX_BUFFER_SIZE) {
LOG("len (%" PRIu32" ) is larger than max len (%u)", LOG("len (%" PRIu32" ) is larger than max len (%u)",
request->len, NBD_MAX_BUFFER_SIZE); request->len, NBD_MAX_BUFFER_SIZE);
rc = -EINVAL; return -EINVAL;
goto out;
} }
req->data = blk_try_blockalign(client->exp->blk, request->len); req->data = blk_try_blockalign(client->exp->blk, request->len);
if (req->data == NULL) { if (req->data == NULL) {
rc = -ENOMEM; return -ENOMEM;
goto out;
} }
} }
if (request->type == NBD_CMD_WRITE) { if (request->type == NBD_CMD_WRITE) {
@ -1059,8 +1052,7 @@ static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request)
if (nbd_read(client->ioc, req->data, request->len, NULL) < 0) { if (nbd_read(client->ioc, req->data, request->len, NULL) < 0) {
LOG("reading from socket failed"); LOG("reading from socket failed");
rc = -EIO; return -EIO;
goto out;
} }
req->complete = true; req->complete = true;
} }
@ -1070,28 +1062,19 @@ static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request)
LOG("operation past EOF; From: %" PRIu64 ", Len: %" PRIu32 LOG("operation past EOF; From: %" PRIu64 ", Len: %" PRIu32
", Size: %" PRIu64, request->from, request->len, ", Size: %" PRIu64, request->from, request->len,
(uint64_t)client->exp->size); (uint64_t)client->exp->size);
rc = request->type == NBD_CMD_WRITE ? -ENOSPC : -EINVAL; return request->type == NBD_CMD_WRITE ? -ENOSPC : -EINVAL;
goto out;
} }
if (request->flags & ~(NBD_CMD_FLAG_FUA | NBD_CMD_FLAG_NO_HOLE)) { if (request->flags & ~(NBD_CMD_FLAG_FUA | NBD_CMD_FLAG_NO_HOLE)) {
LOG("unsupported flags (got 0x%x)", request->flags); LOG("unsupported flags (got 0x%x)", request->flags);
rc = -EINVAL; return -EINVAL;
goto out;
} }
if (request->type != NBD_CMD_WRITE_ZEROES && if (request->type != NBD_CMD_WRITE_ZEROES &&
(request->flags & NBD_CMD_FLAG_NO_HOLE)) { (request->flags & NBD_CMD_FLAG_NO_HOLE)) {
LOG("unexpected flags (got 0x%x)", request->flags); LOG("unexpected flags (got 0x%x)", request->flags);
rc = -EINVAL; return -EINVAL;
goto out;
} }
rc = 0; return 0;
out:
client->recv_coroutine = NULL;
nbd_client_receive_next_request(client);
return rc;
} }
/* Owns a reference to the NBDClient passed as opaque. */ /* Owns a reference to the NBDClient passed as opaque. */
@ -1113,6 +1096,8 @@ static coroutine_fn void nbd_trip(void *opaque)
req = nbd_request_get(client); req = nbd_request_get(client);
ret = nbd_co_receive_request(req, &request); ret = nbd_co_receive_request(req, &request);
client->recv_coroutine = NULL;
nbd_client_receive_next_request(client);
if (ret == -EIO) { if (ret == -EIO) {
goto out; goto out;
} }