mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nbd: support feature negotiation

Browse Source 
nbd supports writing flags in bytes 24...27 of the header,
and uses that for the read-only flag.  Add support for it
in qemu-nbd.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Paolo Bonzini 2011-09-08 17:24:54 +02:00 committed by Kevin Wolf
parent 530889ff95
commit b90fb4b8f5
4 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/nbd.c
View File

@ -48,6 +48,7 @@
typedef struct BDRVNBDState { typedef struct BDRVNBDState {
int sock; int sock;
uint32_t nbdflags;
off_t size; off_t size;
size_t blocksize; size_t blocksize;
char *export_name; /* An NBD server may export several devices */ char *export_name; /* An NBD server may export several devices */
@ -111,7 +112,6 @@ static int nbd_establish_connection(BlockDriverState *bs)
int ret; int ret;
off_t size; off_t size;
size_t blocksize; size_t blocksize;
uint32_t nbdflags;
if (s->host_spec[0] == '/') { if (s->host_spec[0] == '/') {
sock = unix_socket_outgoing(s->host_spec); sock = unix_socket_outgoing(s->host_spec);
@ -126,7 +126,7 @@ static int nbd_establish_connection(BlockDriverState *bs)
} }
/* NBD handshake */ /* NBD handshake */
ret = nbd_receive_negotiate(sock, s->export_name, &nbdflags, &size, ret = nbd_receive_negotiate(sock, s->export_name, &s->nbdflags, &size,
&blocksize); &blocksize);
if (ret == -1) { if (ret == -1) {
logout("Failed to negotiate with the NBD server\n"); logout("Failed to negotiate with the NBD server\n");

32
nbd.c
View File

@ -30,6 +30,10 @@
#include <ctype.h> #include <ctype.h>
#include <inttypes.h> #include <inttypes.h>
#ifdef __linux__
#include <linux/fs.h>
#endif
#include "qemu_socket.h" #include "qemu_socket.h"
//#define DEBUG_NBD //#define DEBUG_NBD
@ -172,7 +176,7 @@ int unix_socket_outgoing(const char *path)
Request (type == 2) Request (type == 2)
*/ */
int nbd_negotiate(int csock, off_t size) int nbd_negotiate(int csock, off_t size, uint32_t flags)
{ {
char buf[8 + 8 + 8 + 128]; char buf[8 + 8 + 8 + 128];
@ -180,14 +184,16 @@ int nbd_negotiate(int csock, off_t size)
[ 0 .. 7] passwd ("NBDMAGIC") [ 0 .. 7] passwd ("NBDMAGIC")
[ 8 .. 15] magic (0x00420281861253) [ 8 .. 15] magic (0x00420281861253)
[16 .. 23] size [16 .. 23] size
[24 .. 151] reserved (0) [24 .. 27] flags
[28 .. 151] reserved (0)
*/ */
TRACE("Beginning negotiation."); TRACE("Beginning negotiation.");
memcpy(buf, "NBDMAGIC", 8); memcpy(buf, "NBDMAGIC", 8);
cpu_to_be64w((uint64_t*)(buf + 8), 0x00420281861253LL); cpu_to_be64w((uint64_t*)(buf + 8), 0x00420281861253LL);
cpu_to_be64w((uint64_t*)(buf + 16), size); cpu_to_be64w((uint64_t*)(buf + 16), size);
memset(buf + 24, 0, 128); cpu_to_be32w((uint32_t*)(buf + 24), flags | NBD_FLAG_HAS_FLAGS);
memset(buf + 28, 0, 124);
if (write_sync(csock, buf, sizeof(buf)) != sizeof(buf)) { if (write_sync(csock, buf, sizeof(buf)) != sizeof(buf)) {
LOG("write failed"); LOG("write failed");
@ -337,8 +343,8 @@ int nbd_receive_negotiate(int csock, const char *name, uint32_t *flags,
return 0; return 0;
} }
#ifndef _WIN32 #ifdef __linux__
int nbd_init(int fd, int csock, off_t size, size_t blocksize) int nbd_init(int fd, int csock, uint32_t flags, off_t size, size_t blocksize)
{ {
TRACE("Setting block size to %lu", (unsigned long)blocksize); TRACE("Setting block size to %lu", (unsigned long)blocksize);
@ -358,6 +364,18 @@ int nbd_init(int fd, int csock, off_t size, size_t blocksize)
return -1; return -1;
} }
if (flags & NBD_FLAG_READ_ONLY) {
int read_only = 1;
TRACE("Setting readonly attribute");
if (ioctl(fd, BLKROSET, (unsigned long) &read_only) < 0) {
int serrno = errno;
LOG("Failed setting read-only attribute");
errno = serrno;
return -1;
}
}
TRACE("Clearing NBD socket"); TRACE("Clearing NBD socket");
if (ioctl(fd, NBD_CLEAR_SOCK) == -1) { if (ioctl(fd, NBD_CLEAR_SOCK) == -1) {
@ -548,7 +566,7 @@ static int nbd_send_reply(int csock, struct nbd_reply *reply)
} }
int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset,
off_t *offset, bool readonly, uint8_t *data, int data_size) off_t *offset, uint32_t nbdflags, uint8_t *data, int data_size)
{ {
struct nbd_request request; struct nbd_request request;
struct nbd_reply reply; struct nbd_reply reply;
@ -632,7 +650,7 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset,
return -1; return -1;
} }
if (readonly) { if (nbdflags & NBD_FLAG_READ_ONLY) {
TRACE("Server is read-only, return error"); TRACE("Server is read-only, return error");
reply.error = 1; reply.error = 1;
} else { } else {

9
nbd.h
View File

@ -37,6 +37,9 @@ struct nbd_reply {
uint64_t handle; uint64_t handle;
} QEMU_PACKED; } QEMU_PACKED;
#define NBD_FLAG_HAS_FLAGS (1 << 0) /* Flags are there */
#define NBD_FLAG_READ_ONLY (1 << 1) /* Device is read-only */
enum { enum {
NBD_CMD_READ = 0, NBD_CMD_READ = 0,
NBD_CMD_WRITE = 1, NBD_CMD_WRITE = 1,
@ -53,14 +56,14 @@ int tcp_socket_incoming_spec(const char *address_and_port);
int unix_socket_outgoing(const char *path); int unix_socket_outgoing(const char *path);
int unix_socket_incoming(const char *path); int unix_socket_incoming(const char *path);
int nbd_negotiate(int csock, off_t size); int nbd_negotiate(int csock, off_t size, uint32_t flags);
int nbd_receive_negotiate(int csock, const char *name, uint32_t *flags, int nbd_receive_negotiate(int csock, const char *name, uint32_t *flags,
off_t *size, size_t *blocksize); off_t *size, size_t *blocksize);
int nbd_init(int fd, int csock, off_t size, size_t blocksize); int nbd_init(int fd, int csock, uint32_t flags, off_t size, size_t blocksize);
int nbd_send_request(int csock, struct nbd_request *request); int nbd_send_request(int csock, struct nbd_request *request);
int nbd_receive_reply(int csock, struct nbd_reply *reply); int nbd_receive_reply(int csock, struct nbd_reply *reply);
int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset,
off_t *offset, bool readonly, uint8_t *data, int data_size); off_t *offset, uint32_t nbdflags, uint8_t *data, int data_size);
int nbd_client(int fd); int nbd_client(int fd);
int nbd_disconnect(int fd); int nbd_disconnect(int fd);

13
qemu-nbd.c
View File

@ -185,7 +185,7 @@ int main(int argc, char **argv)
BlockDriverState *bs; BlockDriverState *bs;
off_t dev_offset = 0; off_t dev_offset = 0;
off_t offset = 0; off_t offset = 0;
bool readonly = false; uint32_t nbdflags = 0;
bool disconnect = false; bool disconnect = false;
const char *bindto = "0.0.0.0"; const char *bindto = "0.0.0.0";
int port = NBD_DEFAULT_PORT; int port = NBD_DEFAULT_PORT;
@ -230,7 +230,6 @@ int main(int argc, char **argv)
int nb_fds = 0; int nb_fds = 0;
int max_fd; int max_fd;
int persistent = 0; int persistent = 0;
uint32_t nbdflags;
while ((ch = getopt_long(argc, argv, sopt, lopt, &opt_ind)) != -1) { while ((ch = getopt_long(argc, argv, sopt, lopt, &opt_ind)) != -1) {
switch (ch) { switch (ch) {
@ -263,7 +262,7 @@ int main(int argc, char **argv)
} }
break; break;
case 'r': case 'r':
readonly = true; nbdflags |= NBD_FLAG_READ_ONLY;
flags &= ~BDRV_O_RDWR; flags &= ~BDRV_O_RDWR;
break; break;
case 'P': case 'P':
@ -398,13 +397,13 @@ int main(int argc, char **argv)
} }
ret = nbd_receive_negotiate(sock, NULL, &nbdflags, ret = nbd_receive_negotiate(sock, NULL, &nbdflags,
&size, &blocksize); &size, &blocksize);
if (ret == -1) { if (ret == -1) {
ret = 1; ret = 1;
goto out; goto out;
} }
ret = nbd_init(fd, sock, size, blocksize); ret = nbd_init(fd, sock, nbdflags, size, blocksize);
if (ret == -1) { if (ret == -1) {
ret = 1; ret = 1;
goto out; goto out;
@ -463,7 +462,7 @@ int main(int argc, char **argv)
for (i = 1; i < nb_fds && ret; i++) { for (i = 1; i < nb_fds && ret; i++) {
if (FD_ISSET(sharing_fds[i], &fds)) { if (FD_ISSET(sharing_fds[i], &fds)) {
if (nbd_trip(bs, sharing_fds[i], fd_size, dev_offset, if (nbd_trip(bs, sharing_fds[i], fd_size, dev_offset,
&offset, readonly, data, NBD_BUFFER_SIZE) != 0) { &offset, nbdflags, data, NBD_BUFFER_SIZE) != 0) {
close(sharing_fds[i]); close(sharing_fds[i]);
nb_fds--; nb_fds--;
sharing_fds[i] = sharing_fds[nb_fds]; sharing_fds[i] = sharing_fds[nb_fds];
@ -479,7 +478,7 @@ int main(int argc, char **argv)
(struct sockaddr *)&addr, (struct sockaddr *)&addr,
&addr_len); &addr_len);
if (sharing_fds[nb_fds] != -1 && if (sharing_fds[nb_fds] != -1 &&
nbd_negotiate(sharing_fds[nb_fds], fd_size) != -1) { nbd_negotiate(sharing_fds[nb_fds], fd_size, nbdflags) != -1) {
if (sharing_fds[nb_fds] > max_fd) if (sharing_fds[nb_fds] > max_fd)
max_fd = sharing_fds[nb_fds]; max_fd = sharing_fds[nb_fds];
nb_fds++; nb_fds++;