Various fixes for ggatec and ggated
Dynamically size buffers in ggatec. Instead of static size on the stack. Add flush support. Submitted by: Johannes Totz <jo@bruelltuete.com> MFC after: 2 weeks Reviewed by: asomers Differential Revision: https://reviews.freebsd.org/D31722
This commit is contained in:
parent
7776d3ccd1
commit
6226477a46
@ -74,6 +74,7 @@ static int sendfd, recvfd;
|
|||||||
static uint32_t token;
|
static uint32_t token;
|
||||||
static pthread_t sendtd, recvtd;
|
static pthread_t sendtd, recvtd;
|
||||||
static int reconnect;
|
static int reconnect;
|
||||||
|
static int initialbuffersize = 131072;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
usage(void)
|
usage(void)
|
||||||
@ -94,18 +95,25 @@ send_thread(void *arg __unused)
|
|||||||
{
|
{
|
||||||
struct g_gate_ctl_io ggio;
|
struct g_gate_ctl_io ggio;
|
||||||
struct g_gate_hdr hdr;
|
struct g_gate_hdr hdr;
|
||||||
char buf[MAXPHYS];
|
size_t buf_capacity;
|
||||||
ssize_t data;
|
ssize_t numbytesprocd;
|
||||||
int error;
|
int error;
|
||||||
|
char *newbuf;
|
||||||
|
|
||||||
g_gate_log(LOG_NOTICE, "%s: started!", __func__);
|
g_gate_log(LOG_NOTICE, "%s: started!", __func__);
|
||||||
|
|
||||||
|
buf_capacity = initialbuffersize;
|
||||||
|
|
||||||
ggio.gctl_version = G_GATE_VERSION;
|
ggio.gctl_version = G_GATE_VERSION;
|
||||||
ggio.gctl_unit = unit;
|
ggio.gctl_unit = unit;
|
||||||
ggio.gctl_data = buf;
|
ggio.gctl_data = malloc(buf_capacity);
|
||||||
|
if (ggio.gctl_data == NULL) {
|
||||||
|
g_gate_log(LOG_ERR, "%s: Cannot alloc buffer.", __func__);
|
||||||
|
pthread_exit(NULL);
|
||||||
|
}
|
||||||
|
|
||||||
for (;;) {
|
for (;;) {
|
||||||
ggio.gctl_length = sizeof(buf);
|
ggio.gctl_length = buf_capacity;
|
||||||
ggio.gctl_error = 0;
|
ggio.gctl_error = 0;
|
||||||
g_gate_ioctl(G_GATE_CMD_START, &ggio);
|
g_gate_ioctl(G_GATE_CMD_START, &ggio);
|
||||||
error = ggio.gctl_error;
|
error = ggio.gctl_error;
|
||||||
@ -118,17 +126,22 @@ send_thread(void *arg __unused)
|
|||||||
/* Exit gracefully. */
|
/* Exit gracefully. */
|
||||||
g_gate_close_device();
|
g_gate_close_device();
|
||||||
exit(EXIT_SUCCESS);
|
exit(EXIT_SUCCESS);
|
||||||
#if 0
|
|
||||||
case ENOMEM:
|
case ENOMEM:
|
||||||
|
{
|
||||||
/* Buffer too small. */
|
/* Buffer too small. */
|
||||||
ggio.gctl_data = realloc(ggio.gctl_data,
|
g_gate_log(LOG_DEBUG, "buffer too small. new size: %u",
|
||||||
ggio.gctl_length);
|
ggio.gctl_length);
|
||||||
if (ggio.gctl_data != NULL) {
|
newbuf = malloc(ggio.gctl_length);
|
||||||
bsize = ggio.gctl_length;
|
if (newbuf != NULL) {
|
||||||
goto once_again;
|
free(ggio.gctl_data);
|
||||||
|
ggio.gctl_data = newbuf;
|
||||||
|
buf_capacity = ggio.gctl_length;
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
/* FALLTHROUGH */
|
/* FALLTHROUGH */
|
||||||
#endif
|
}
|
||||||
|
|
||||||
case ENXIO:
|
case ENXIO:
|
||||||
default:
|
default:
|
||||||
g_gate_xlog("ioctl(/dev/%s): %s.", G_GATE_CTL_NAME,
|
g_gate_xlog("ioctl(/dev/%s): %s.", G_GATE_CTL_NAME,
|
||||||
@ -145,16 +158,12 @@ send_thread(void *arg __unused)
|
|||||||
case BIO_WRITE:
|
case BIO_WRITE:
|
||||||
hdr.gh_cmd = GGATE_CMD_WRITE;
|
hdr.gh_cmd = GGATE_CMD_WRITE;
|
||||||
break;
|
break;
|
||||||
|
case BIO_FLUSH:
|
||||||
|
hdr.gh_cmd = GGATE_CMD_FLUSH;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
g_gate_log(LOG_NOTICE, "Unknown gctl_cmd: %i", ggio.gctl_cmd);
|
g_gate_log(LOG_NOTICE, "Unknown gctl_cmd: %i",
|
||||||
ggio.gctl_error = EOPNOTSUPP;
|
ggio.gctl_cmd);
|
||||||
g_gate_ioctl(G_GATE_CMD_DONE, &ggio);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Don't send requests for more data than we can handle the response for! */
|
|
||||||
if (ggio.gctl_length > MAXPHYS) {
|
|
||||||
g_gate_log(LOG_ERR, "Request too big: %zd", ggio.gctl_length);
|
|
||||||
ggio.gctl_error = EOPNOTSUPP;
|
ggio.gctl_error = EOPNOTSUPP;
|
||||||
g_gate_ioctl(G_GATE_CMD_DONE, &ggio);
|
g_gate_ioctl(G_GATE_CMD_DONE, &ggio);
|
||||||
continue;
|
continue;
|
||||||
@ -166,12 +175,12 @@ send_thread(void *arg __unused)
|
|||||||
hdr.gh_error = 0;
|
hdr.gh_error = 0;
|
||||||
g_gate_swap2n_hdr(&hdr);
|
g_gate_swap2n_hdr(&hdr);
|
||||||
|
|
||||||
data = g_gate_send(sendfd, &hdr, sizeof(hdr), MSG_NOSIGNAL);
|
numbytesprocd = g_gate_send(sendfd, &hdr, sizeof(hdr), MSG_NOSIGNAL);
|
||||||
g_gate_log(LOG_DEBUG, "Sent hdr packet.");
|
g_gate_log(LOG_DEBUG, "Sent hdr packet.");
|
||||||
g_gate_swap2h_hdr(&hdr);
|
g_gate_swap2h_hdr(&hdr);
|
||||||
if (reconnect)
|
if (reconnect)
|
||||||
break;
|
break;
|
||||||
if (data != sizeof(hdr)) {
|
if (numbytesprocd != sizeof(hdr)) {
|
||||||
g_gate_log(LOG_ERR, "Lost connection 1.");
|
g_gate_log(LOG_ERR, "Lost connection 1.");
|
||||||
reconnect = 1;
|
reconnect = 1;
|
||||||
pthread_kill(recvtd, SIGUSR1);
|
pthread_kill(recvtd, SIGUSR1);
|
||||||
@ -179,18 +188,19 @@ send_thread(void *arg __unused)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (hdr.gh_cmd == GGATE_CMD_WRITE) {
|
if (hdr.gh_cmd == GGATE_CMD_WRITE) {
|
||||||
data = g_gate_send(sendfd, ggio.gctl_data,
|
numbytesprocd = g_gate_send(sendfd, ggio.gctl_data,
|
||||||
ggio.gctl_length, MSG_NOSIGNAL);
|
ggio.gctl_length, MSG_NOSIGNAL);
|
||||||
if (reconnect)
|
if (reconnect)
|
||||||
break;
|
break;
|
||||||
if (data != ggio.gctl_length) {
|
if (numbytesprocd != ggio.gctl_length) {
|
||||||
g_gate_log(LOG_ERR, "Lost connection 2 (%zd != %zd).", data, (ssize_t)ggio.gctl_length);
|
g_gate_log(LOG_ERR, "Lost connection 2 (%zd != %zd).",
|
||||||
|
numbytesprocd, (ssize_t)ggio.gctl_length);
|
||||||
reconnect = 1;
|
reconnect = 1;
|
||||||
pthread_kill(recvtd, SIGUSR1);
|
pthread_kill(recvtd, SIGUSR1);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
g_gate_log(LOG_DEBUG, "Sent %zd bytes (offset=%"
|
g_gate_log(LOG_DEBUG, "Sent %zd bytes (offset=%"
|
||||||
PRIu64 ", length=%" PRIu32 ").", data,
|
PRIu64 ", length=%" PRIu32 ").", numbytesprocd,
|
||||||
hdr.gh_offset, hdr.gh_length);
|
hdr.gh_offset, hdr.gh_length);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -203,22 +213,29 @@ recv_thread(void *arg __unused)
|
|||||||
{
|
{
|
||||||
struct g_gate_ctl_io ggio;
|
struct g_gate_ctl_io ggio;
|
||||||
struct g_gate_hdr hdr;
|
struct g_gate_hdr hdr;
|
||||||
char buf[MAXPHYS];
|
ssize_t buf_capacity;
|
||||||
ssize_t data;
|
ssize_t numbytesprocd;
|
||||||
|
char *newbuf;
|
||||||
|
|
||||||
g_gate_log(LOG_NOTICE, "%s: started!", __func__);
|
g_gate_log(LOG_NOTICE, "%s: started!", __func__);
|
||||||
|
|
||||||
|
buf_capacity = initialbuffersize;
|
||||||
|
|
||||||
ggio.gctl_version = G_GATE_VERSION;
|
ggio.gctl_version = G_GATE_VERSION;
|
||||||
ggio.gctl_unit = unit;
|
ggio.gctl_unit = unit;
|
||||||
ggio.gctl_data = buf;
|
ggio.gctl_data = malloc(buf_capacity);
|
||||||
|
if (ggio.gctl_data == NULL) {
|
||||||
|
g_gate_log(LOG_ERR, "%s: Cannot alloc buffer.", __func__);
|
||||||
|
pthread_exit(NULL);
|
||||||
|
}
|
||||||
|
|
||||||
for (;;) {
|
for (;;) {
|
||||||
data = g_gate_recv(recvfd, &hdr, sizeof(hdr), MSG_WAITALL);
|
numbytesprocd = g_gate_recv(recvfd, &hdr, sizeof(hdr), MSG_WAITALL);
|
||||||
if (reconnect)
|
if (reconnect)
|
||||||
break;
|
break;
|
||||||
g_gate_swap2h_hdr(&hdr);
|
g_gate_swap2h_hdr(&hdr);
|
||||||
if (data != sizeof(hdr)) {
|
if (numbytesprocd != sizeof(hdr)) {
|
||||||
if (data == -1 && errno == EAGAIN)
|
if (numbytesprocd == -1 && errno == EAGAIN)
|
||||||
continue;
|
continue;
|
||||||
g_gate_log(LOG_ERR, "Lost connection 3.");
|
g_gate_log(LOG_ERR, "Lost connection 3.");
|
||||||
reconnect = 1;
|
reconnect = 1;
|
||||||
@ -233,26 +250,33 @@ recv_thread(void *arg __unused)
|
|||||||
ggio.gctl_length = hdr.gh_length;
|
ggio.gctl_length = hdr.gh_length;
|
||||||
ggio.gctl_error = hdr.gh_error;
|
ggio.gctl_error = hdr.gh_error;
|
||||||
|
|
||||||
/* Do not overflow our buffer if there is a bogus response. */
|
if (ggio.gctl_length > buf_capacity) {
|
||||||
if (ggio.gctl_length > (off_t) sizeof(buf)) {
|
newbuf = malloc(ggio.gctl_length);
|
||||||
g_gate_log(LOG_ERR, "Received too big response: %zd", ggio.gctl_length);
|
if (newbuf != NULL) {
|
||||||
break;
|
free(ggio.gctl_data);
|
||||||
|
ggio.gctl_data = newbuf;
|
||||||
|
buf_capacity = ggio.gctl_length;
|
||||||
|
} else {
|
||||||
|
g_gate_log(LOG_ERR, "Received too big response: %zd",
|
||||||
|
ggio.gctl_length);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ggio.gctl_error == 0 && ggio.gctl_cmd == GGATE_CMD_READ) {
|
if (ggio.gctl_error == 0 && ggio.gctl_cmd == GGATE_CMD_READ) {
|
||||||
data = g_gate_recv(recvfd, ggio.gctl_data,
|
numbytesprocd = g_gate_recv(recvfd, ggio.gctl_data,
|
||||||
ggio.gctl_length, MSG_WAITALL);
|
ggio.gctl_length, MSG_WAITALL);
|
||||||
if (reconnect)
|
if (reconnect)
|
||||||
break;
|
break;
|
||||||
g_gate_log(LOG_DEBUG, "Received data packet.");
|
g_gate_log(LOG_DEBUG, "Received data packet.");
|
||||||
if (data != ggio.gctl_length) {
|
if (numbytesprocd != ggio.gctl_length) {
|
||||||
g_gate_log(LOG_ERR, "Lost connection 4.");
|
g_gate_log(LOG_ERR, "Lost connection 4.");
|
||||||
reconnect = 1;
|
reconnect = 1;
|
||||||
pthread_kill(sendtd, SIGUSR1);
|
pthread_kill(sendtd, SIGUSR1);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
g_gate_log(LOG_DEBUG, "Received %d bytes (offset=%"
|
g_gate_log(LOG_DEBUG, "Received %d bytes (offset=%"
|
||||||
PRIu64 ", length=%" PRIu32 ").", data,
|
PRIu64 ", length=%" PRIu32 ").", numbytesprocd,
|
||||||
hdr.gh_offset, hdr.gh_length);
|
hdr.gh_offset, hdr.gh_length);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -509,6 +533,16 @@ g_gatec_rescue(void)
|
|||||||
g_gatec_loop();
|
g_gatec_loop();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
init_initial_buffer_size()
|
||||||
|
{
|
||||||
|
int value;
|
||||||
|
size_t intsize;
|
||||||
|
intsize = sizeof(initialbuffersize);
|
||||||
|
if (sysctlbyname("kern.maxphys", &value, &intsize, NULL, 0) == 0)
|
||||||
|
initialbuffersize = value;
|
||||||
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
main(int argc, char *argv[])
|
main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
@ -624,6 +658,8 @@ main(int argc, char *argv[])
|
|||||||
argc -= optind;
|
argc -= optind;
|
||||||
argv += optind;
|
argv += optind;
|
||||||
|
|
||||||
|
init_initial_buffer_size();
|
||||||
|
|
||||||
switch (action) {
|
switch (action) {
|
||||||
case CREATE:
|
case CREATE:
|
||||||
if (argc != 2)
|
if (argc != 2)
|
||||||
|
@ -726,7 +726,6 @@ disk_thread(void *arg)
|
|||||||
/*
|
/*
|
||||||
* Check the request.
|
* Check the request.
|
||||||
*/
|
*/
|
||||||
assert(req->r_cmd == GGATE_CMD_READ || req->r_cmd == GGATE_CMD_WRITE);
|
|
||||||
assert(req->r_offset + req->r_length <= (uintmax_t)conn->c_mediasize);
|
assert(req->r_offset + req->r_length <= (uintmax_t)conn->c_mediasize);
|
||||||
assert((req->r_offset % conn->c_sectorsize) == 0);
|
assert((req->r_offset % conn->c_sectorsize) == 0);
|
||||||
assert((req->r_length % conn->c_sectorsize) == 0);
|
assert((req->r_length % conn->c_sectorsize) == 0);
|
||||||
@ -750,6 +749,19 @@ disk_thread(void *arg)
|
|||||||
free(req->r_data);
|
free(req->r_data);
|
||||||
req->r_data = NULL;
|
req->r_data = NULL;
|
||||||
break;
|
break;
|
||||||
|
case GGATE_CMD_FLUSH:
|
||||||
|
data = fsync(fd);
|
||||||
|
if (data != 0)
|
||||||
|
req->r_error = errno;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
g_gate_log(LOG_DEBUG, "Unsupported request: %i", req->r_cmd);
|
||||||
|
req->r_error = EOPNOTSUPP;
|
||||||
|
if (req->r_data != NULL) {
|
||||||
|
free(req->r_data);
|
||||||
|
req->r_data = NULL;
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
if (data != (ssize_t)req->r_length) {
|
if (data != (ssize_t)req->r_length) {
|
||||||
/* Report short reads/writes as I/O errors. */
|
/* Report short reads/writes as I/O errors. */
|
||||||
|
@ -57,6 +57,7 @@
|
|||||||
|
|
||||||
#define GGATE_CMD_READ 0
|
#define GGATE_CMD_READ 0
|
||||||
#define GGATE_CMD_WRITE 1
|
#define GGATE_CMD_WRITE 1
|
||||||
|
#define GGATE_CMD_FLUSH 3
|
||||||
|
|
||||||
extern int g_gate_devfd;
|
extern int g_gate_devfd;
|
||||||
extern int g_gate_verbose;
|
extern int g_gate_verbose;
|
||||||
|
Loading…
Reference in New Issue
Block a user