Block pull request
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJTIypeAAoJEJykq7OBq3PIPz8IAJJUKeKqWfLblbkhLRP4xkez rV8/uN1br+vB2Epo1opRdf9zvKi3xD+W0cUdNyiZaVqftUSHNr2jUcLrC5D91bjR zUfPnOL4+D5jiqbVUEjZmo2bqGC7kx098qsRaeol7pPnQ7pyTveq4FHA/km+3Q08 lbUkH1LBuUhDSR5T5mHVFZf+SZA5AdZzmZDLxA7AsuVjiU+bBCr/EvTBzCeG7fLZ Rg7eONcpSZd8rt7CJhd1NfOsYPJroeP+Y1xVU9Zl8j2nJupkZGRoRenKQfzrWUCl HECYDPNzpVyo91R1NyLpeB1VSq98m07DzhcA7V2z4zTLGDIfpkEQ2kRezhoeWIA= =7Ozk -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging Block pull request # gpg: Signature made Fri 14 Mar 2014 16:12:14 GMT using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/block-pull-request: qemu-iotests: remove 085 and 087 from 'quick' group qemu-iotests: add 083 NBD client disconnect tests tests: add nbd-fault-injector.py utility nbd: close socket if connection breaks block: Explicitly specify 'unsigned long long' for VHDX 64-bit constants blockdev: Refuse to open encrypted image unless paused Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
4191d0eb41
9
block.c
9
block.c
@ -1388,12 +1388,19 @@ done:
|
||||
ret = -EINVAL;
|
||||
goto close_and_fail;
|
||||
}
|
||||
QDECREF(options);
|
||||
|
||||
if (!bdrv_key_required(bs)) {
|
||||
bdrv_dev_change_media_cb(bs, true);
|
||||
} else if (!runstate_check(RUN_STATE_PRELAUNCH)
|
||||
&& !runstate_check(RUN_STATE_INMIGRATE)
|
||||
&& !runstate_check(RUN_STATE_PAUSED)) { /* HACK */
|
||||
error_setg(errp,
|
||||
"Guest must be stopped for opening of encrypted image");
|
||||
ret = -EBUSY;
|
||||
goto close_and_fail;
|
||||
}
|
||||
|
||||
QDECREF(options);
|
||||
*pbs = bs;
|
||||
return 0;
|
||||
|
||||
|
||||
@ -43,6 +43,17 @@ static void nbd_recv_coroutines_enter_all(NbdClientSession *s)
|
||||
}
|
||||
}
|
||||
|
||||
static void nbd_teardown_connection(NbdClientSession *client)
|
||||
{
|
||||
/* finish any pending coroutines */
|
||||
shutdown(client->sock, 2);
|
||||
nbd_recv_coroutines_enter_all(client);
|
||||
|
||||
qemu_aio_set_fd_handler(client->sock, NULL, NULL, NULL);
|
||||
closesocket(client->sock);
|
||||
client->sock = -1;
|
||||
}
|
||||
|
||||
static void nbd_reply_ready(void *opaque)
|
||||
{
|
||||
NbdClientSession *s = opaque;
|
||||
@ -78,7 +89,7 @@ static void nbd_reply_ready(void *opaque)
|
||||
}
|
||||
|
||||
fail:
|
||||
nbd_recv_coroutines_enter_all(s);
|
||||
nbd_teardown_connection(s);
|
||||
}
|
||||
|
||||
static void nbd_restart_write(void *opaque)
|
||||
@ -324,7 +335,7 @@ int nbd_client_session_co_discard(NbdClientSession *client, int64_t sector_num,
|
||||
|
||||
}
|
||||
|
||||
static void nbd_teardown_connection(NbdClientSession *client)
|
||||
void nbd_client_session_close(NbdClientSession *client)
|
||||
{
|
||||
struct nbd_request request = {
|
||||
.type = NBD_CMD_DISC,
|
||||
@ -332,22 +343,14 @@ static void nbd_teardown_connection(NbdClientSession *client)
|
||||
.len = 0
|
||||
};
|
||||
|
||||
nbd_send_request(client->sock, &request);
|
||||
|
||||
/* finish any pending coroutines */
|
||||
shutdown(client->sock, 2);
|
||||
nbd_recv_coroutines_enter_all(client);
|
||||
|
||||
qemu_aio_set_fd_handler(client->sock, NULL, NULL, NULL);
|
||||
closesocket(client->sock);
|
||||
client->sock = -1;
|
||||
}
|
||||
|
||||
void nbd_client_session_close(NbdClientSession *client)
|
||||
{
|
||||
if (!client->bs) {
|
||||
return;
|
||||
}
|
||||
if (client->sock == -1) {
|
||||
return;
|
||||
}
|
||||
|
||||
nbd_send_request(client->sock, &request);
|
||||
|
||||
nbd_teardown_connection(client);
|
||||
client->bs = NULL;
|
||||
|
||||
@ -61,7 +61,7 @@
|
||||
/* These structures are ones that are defined in the VHDX specification
|
||||
* document */
|
||||
|
||||
#define VHDX_FILE_SIGNATURE 0x656C696678646876 /* "vhdxfile" in ASCII */
|
||||
#define VHDX_FILE_SIGNATURE 0x656C696678646876ULL /* "vhdxfile" in ASCII */
|
||||
typedef struct VHDXFileIdentifier {
|
||||
uint64_t signature; /* "vhdxfile" in ASCII */
|
||||
uint16_t creator[256]; /* optional; utf-16 string to identify
|
||||
@ -238,7 +238,7 @@ typedef struct QEMU_PACKED VHDXLogDataSector {
|
||||
/* upper 44 bits are the file offset in 1MB units lower 3 bits are the state
|
||||
other bits are reserved */
|
||||
#define VHDX_BAT_STATE_BIT_MASK 0x07
|
||||
#define VHDX_BAT_FILE_OFF_MASK 0xFFFFFFFFFFF00000 /* upper 44 bits */
|
||||
#define VHDX_BAT_FILE_OFF_MASK 0xFFFFFFFFFFF00000ULL /* upper 44 bits */
|
||||
typedef uint64_t VHDXBatEntry;
|
||||
|
||||
/* ---- METADATA REGION STRUCTURES ---- */
|
||||
@ -247,7 +247,7 @@ typedef uint64_t VHDXBatEntry;
|
||||
#define VHDX_METADATA_MAX_ENTRIES 2047 /* not including the header */
|
||||
#define VHDX_METADATA_TABLE_MAX_SIZE \
|
||||
(VHDX_METADATA_ENTRY_SIZE * (VHDX_METADATA_MAX_ENTRIES+1))
|
||||
#define VHDX_METADATA_SIGNATURE 0x617461646174656D /* "metadata" in ASCII */
|
||||
#define VHDX_METADATA_SIGNATURE 0x617461646174656DULL /* "metadata" in ASCII */
|
||||
typedef struct QEMU_PACKED VHDXMetadataTableHeader {
|
||||
uint64_t signature; /* "metadata" in ASCII */
|
||||
uint16_t reserved;
|
||||
|
||||
@ -20,6 +20,7 @@ stub-obj-y += mon-set-error.o
|
||||
stub-obj-y += pci-drive-hot-add.o
|
||||
stub-obj-y += qtest.o
|
||||
stub-obj-y += reset.o
|
||||
stub-obj-y += runstate-check.o
|
||||
stub-obj-y += set-fd-handler.o
|
||||
stub-obj-y += slirp.o
|
||||
stub-obj-y += sysbus.o
|
||||
|
||||
6
stubs/runstate-check.c
Normal file
6
stubs/runstate-check.c
Normal file
@ -0,0 +1,6 @@
|
||||
#include "sysemu/sysemu.h"
|
||||
|
||||
bool runstate_check(RunState state)
|
||||
{
|
||||
return state == RUN_STATE_PRELAUNCH;
|
||||
}
|
||||
129
tests/qemu-iotests/083
Executable file
129
tests/qemu-iotests/083
Executable file
@ -0,0 +1,129 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Test NBD client unexpected disconnect
|
||||
#
|
||||
# Copyright Red Hat, Inc. 2014
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
# creator
|
||||
owner=stefanha@redhat.com
|
||||
|
||||
seq=`basename $0`
|
||||
echo "QA output created by $seq"
|
||||
|
||||
here=`pwd`
|
||||
tmp=/tmp/$$
|
||||
status=1 # failure is the default!
|
||||
|
||||
# get standard environment, filters and checks
|
||||
. ./common.rc
|
||||
. ./common.filter
|
||||
|
||||
_supported_fmt generic
|
||||
_supported_proto nbd
|
||||
_supported_os Linux
|
||||
|
||||
# Pick a TCP port based on our pid. This way multiple instances of this test
|
||||
# can run in parallel without conflicting.
|
||||
choose_tcp_port() {
|
||||
echo $((($$ % 31744) + 1024)) # 1024 <= port < 32768
|
||||
}
|
||||
|
||||
wait_for_tcp_port() {
|
||||
while ! (netstat --tcp --listening --numeric | \
|
||||
grep "$1.*0.0.0.0:\*.*LISTEN") 2>&1 >/dev/null; do
|
||||
sleep 0.1
|
||||
done
|
||||
}
|
||||
|
||||
filter_nbd() {
|
||||
# nbd.c error messages contain function names and line numbers that are prone
|
||||
# to change. Message ordering depends on timing between send and receive
|
||||
# callbacks sometimes, making them unreliable.
|
||||
#
|
||||
# Filter out the TCP port number since this changes between runs.
|
||||
sed -e 's#^nbd.c:.*##g' \
|
||||
-e 's#nbd:127.0.0.1:[^:]*:#nbd:127.0.0.1:PORT:#g'
|
||||
}
|
||||
|
||||
check_disconnect() {
|
||||
event=$1
|
||||
when=$2
|
||||
negotiation=$3
|
||||
echo "=== Check disconnect $when $event ==="
|
||||
echo
|
||||
|
||||
port=$(choose_tcp_port)
|
||||
|
||||
cat > "$TEST_DIR/nbd-fault-injector.conf" <<EOF
|
||||
[inject-error]
|
||||
event=$event
|
||||
when=$when
|
||||
EOF
|
||||
|
||||
if [ "$negotiation" = "--classic-negotiation" ]; then
|
||||
extra_args=--classic-negotiation
|
||||
nbd_url="nbd:127.0.0.1:$port"
|
||||
else
|
||||
nbd_url="nbd:127.0.0.1:$port:exportname=foo"
|
||||
fi
|
||||
|
||||
./nbd-fault-injector.py $extra_args "127.0.0.1:$port" "$TEST_DIR/nbd-fault-injector.conf" 2>&1 >/dev/null &
|
||||
wait_for_tcp_port "127.0.0.1:$port"
|
||||
$QEMU_IO -c "read 0 512" "$nbd_url" 2>&1 | _filter_qemu_io | filter_nbd
|
||||
|
||||
echo
|
||||
}
|
||||
|
||||
for event in neg1 "export" neg2 request reply data; do
|
||||
for when in before after; do
|
||||
check_disconnect "$event" "$when"
|
||||
done
|
||||
|
||||
# Also inject short replies from the NBD server
|
||||
case "$event" in
|
||||
neg1)
|
||||
for when in 8 16; do
|
||||
check_disconnect "$event" "$when"
|
||||
done
|
||||
;;
|
||||
"export")
|
||||
for when in 4 12 16; do
|
||||
check_disconnect "$event" "$when"
|
||||
done
|
||||
;;
|
||||
neg2)
|
||||
for when in 8 10; do
|
||||
check_disconnect "$event" "$when"
|
||||
done
|
||||
;;
|
||||
reply)
|
||||
for when in 4 8; do
|
||||
check_disconnect "$event" "$when"
|
||||
done
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Also check classic negotiation without export information
|
||||
for when in before 8 16 24 28 after; do
|
||||
check_disconnect "neg-classic" "$when" --classic-negotiation
|
||||
done
|
||||
|
||||
# success, all done
|
||||
echo "*** done"
|
||||
rm -f $seq.full
|
||||
status=0
|
||||
163
tests/qemu-iotests/083.out
Normal file
163
tests/qemu-iotests/083.out
Normal file
@ -0,0 +1,163 @@
|
||||
QA output created by 083
|
||||
=== Check disconnect before neg1 ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not open image: Invalid argument
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect after neg1 ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not open image: Invalid argument
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect 8 neg1 ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not open image: Invalid argument
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect 16 neg1 ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not open image: Invalid argument
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect before export ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not open image: Invalid argument
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect after export ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not open image: Invalid argument
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect 4 export ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not open image: Invalid argument
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect 12 export ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not open image: Invalid argument
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect 16 export ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not open image: Invalid argument
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect before neg2 ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not open image: Invalid argument
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect after neg2 ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not read image for determining its format: Input/output error
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect 8 neg2 ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not open image: Invalid argument
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect 10 neg2 ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not open image: Invalid argument
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect before request ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not read image for determining its format: Input/output error
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect after request ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not read image for determining its format: Input/output error
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect before reply ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not read image for determining its format: Input/output error
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect after reply ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not read image for determining its format: Input/output error
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect 4 reply ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not read image for determining its format: Input/output error
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect 8 reply ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not read image for determining its format: Input/output error
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect before data ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not read image for determining its format: Input/output error
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect after data ===
|
||||
|
||||
|
||||
read failed: Input/output error
|
||||
|
||||
=== Check disconnect before neg-classic ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT: Could not open image: Invalid argument
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect 8 neg-classic ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT: Could not open image: Invalid argument
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect 16 neg-classic ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT: Could not open image: Invalid argument
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect 24 neg-classic ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT: Could not open image: Invalid argument
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect 28 neg-classic ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT: Could not open image: Invalid argument
|
||||
no file open, try 'help open'
|
||||
|
||||
=== Check disconnect after neg-classic ===
|
||||
|
||||
|
||||
qemu-io: can't open device nbd:127.0.0.1:PORT: Could not read image for determining its format: Input/output error
|
||||
no file open, try 'help open'
|
||||
|
||||
*** done
|
||||
@ -99,6 +99,23 @@ echo === Encrypted image ===
|
||||
echo
|
||||
|
||||
_make_test_img -o encryption=on $size
|
||||
run_qemu -S <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "blockdev-add",
|
||||
"arguments": {
|
||||
"options": {
|
||||
"driver": "$IMGFMT",
|
||||
"id": "disk",
|
||||
"file": {
|
||||
"driver": "file",
|
||||
"filename": "$TEST_IMG"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
{ "execute": "quit" }
|
||||
EOF
|
||||
|
||||
run_qemu <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "blockdev-add",
|
||||
|
||||
@ -28,7 +28,7 @@ QMP_VERSION
|
||||
=== Encrypted image ===
|
||||
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on
|
||||
Testing:
|
||||
Testing: -S
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"error": {"class": "GenericError", "desc": "blockdev-add doesn't support encrypted devices"}}
|
||||
@ -37,4 +37,13 @@ QMP_VERSION
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": true}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "floppy0", "tray-open": true}}
|
||||
|
||||
Testing:
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"error": {"class": "GenericError", "desc": "could not open disk image disk: Guest must be stopped for opening of encrypted image"}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN"}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": true}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "floppy0", "tray-open": true}}
|
||||
|
||||
*** done
|
||||
|
||||
@ -85,6 +85,7 @@
|
||||
079 rw auto
|
||||
081 rw auto
|
||||
082 rw auto quick
|
||||
085 rw auto quick
|
||||
083 rw auto
|
||||
085 rw auto
|
||||
086 rw auto quick
|
||||
087 rw auto quick
|
||||
087 rw auto
|
||||
|
||||
264
tests/qemu-iotests/nbd-fault-injector.py
Executable file
264
tests/qemu-iotests/nbd-fault-injector.py
Executable file
@ -0,0 +1,264 @@
|
||||
#!/usr/bin/env python
|
||||
# NBD server - fault injection utility
|
||||
#
|
||||
# Configuration file syntax:
|
||||
# [inject-error "disconnect-neg1"]
|
||||
# event=neg1
|
||||
# io=readwrite
|
||||
# when=before
|
||||
#
|
||||
# Note that Python's ConfigParser squashes together all sections with the same
|
||||
# name, so give each [inject-error] a unique name.
|
||||
#
|
||||
# inject-error options:
|
||||
# event - name of the trigger event
|
||||
# "neg1" - first part of negotiation struct
|
||||
# "export" - export struct
|
||||
# "neg2" - second part of negotiation struct
|
||||
# "request" - NBD request struct
|
||||
# "reply" - NBD reply struct
|
||||
# "data" - request/reply data
|
||||
# io - I/O direction that triggers this rule:
|
||||
# "read", "write", or "readwrite"
|
||||
# default: readwrite
|
||||
# when - after how many bytes to inject the fault
|
||||
# -1 - inject error after I/O
|
||||
# 0 - inject error before I/O
|
||||
# integer - inject error after integer bytes
|
||||
# "before" - alias for 0
|
||||
# "after" - alias for -1
|
||||
# default: before
|
||||
#
|
||||
# Currently the only error injection action is to terminate the server process.
|
||||
# This resets the TCP connection and thus forces the client to handle
|
||||
# unexpected connection termination.
|
||||
#
|
||||
# Other error injection actions could be added in the future.
|
||||
#
|
||||
# Copyright Red Hat, Inc. 2014
|
||||
#
|
||||
# Authors:
|
||||
# Stefan Hajnoczi <stefanha@redhat.com>
|
||||
#
|
||||
# This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||
# See the COPYING file in the top-level directory.
|
||||
|
||||
import sys
|
||||
import socket
|
||||
import struct
|
||||
import collections
|
||||
import ConfigParser
|
||||
|
||||
FAKE_DISK_SIZE = 8 * 1024 * 1024 * 1024 # 8 GB
|
||||
|
||||
# Protocol constants
|
||||
NBD_CMD_READ = 0
|
||||
NBD_CMD_WRITE = 1
|
||||
NBD_CMD_DISC = 2
|
||||
NBD_REQUEST_MAGIC = 0x25609513
|
||||
NBD_REPLY_MAGIC = 0x67446698
|
||||
NBD_PASSWD = 0x4e42444d41474943
|
||||
NBD_OPTS_MAGIC = 0x49484156454F5054
|
||||
NBD_CLIENT_MAGIC = 0x0000420281861253
|
||||
NBD_OPT_EXPORT_NAME = 1 << 0
|
||||
|
||||
# Protocol structs
|
||||
neg_classic_struct = struct.Struct('>QQQI124x')
|
||||
neg1_struct = struct.Struct('>QQH')
|
||||
export_tuple = collections.namedtuple('Export', 'reserved magic opt len')
|
||||
export_struct = struct.Struct('>IQII')
|
||||
neg2_struct = struct.Struct('>QH124x')
|
||||
request_tuple = collections.namedtuple('Request', 'magic type handle from_ len')
|
||||
request_struct = struct.Struct('>IIQQI')
|
||||
reply_struct = struct.Struct('>IIQ')
|
||||
|
||||
def err(msg):
|
||||
sys.stderr.write(msg + '\n')
|
||||
sys.exit(1)
|
||||
|
||||
def recvall(sock, bufsize):
|
||||
received = 0
|
||||
chunks = []
|
||||
while received < bufsize:
|
||||
chunk = sock.recv(bufsize - received)
|
||||
if len(chunk) == 0:
|
||||
raise Exception('unexpected disconnect')
|
||||
chunks.append(chunk)
|
||||
received += len(chunk)
|
||||
return ''.join(chunks)
|
||||
|
||||
class Rule(object):
|
||||
def __init__(self, name, event, io, when):
|
||||
self.name = name
|
||||
self.event = event
|
||||
self.io = io
|
||||
self.when = when
|
||||
|
||||
def match(self, event, io):
|
||||
if event != self.event:
|
||||
return False
|
||||
if io != self.io and self.io != 'readwrite':
|
||||
return False
|
||||
return True
|
||||
|
||||
class FaultInjectionSocket(object):
|
||||
def __init__(self, sock, rules):
|
||||
self.sock = sock
|
||||
self.rules = rules
|
||||
|
||||
def check(self, event, io, bufsize=None):
|
||||
for rule in self.rules:
|
||||
if rule.match(event, io):
|
||||
if rule.when == 0 or bufsize is None:
|
||||
print 'Closing connection on rule match %s' % rule.name
|
||||
sys.exit(0)
|
||||
if rule.when != -1:
|
||||
return rule.when
|
||||
return bufsize
|
||||
|
||||
def send(self, buf, event):
|
||||
bufsize = self.check(event, 'write', bufsize=len(buf))
|
||||
self.sock.sendall(buf[:bufsize])
|
||||
self.check(event, 'write')
|
||||
|
||||
def recv(self, bufsize, event):
|
||||
bufsize = self.check(event, 'read', bufsize=bufsize)
|
||||
data = recvall(self.sock, bufsize)
|
||||
self.check(event, 'read')
|
||||
return data
|
||||
|
||||
def close(self):
|
||||
self.sock.close()
|
||||
|
||||
def negotiate_classic(conn):
|
||||
buf = neg_classic_struct.pack(NBD_PASSWD, NBD_CLIENT_MAGIC,
|
||||
FAKE_DISK_SIZE, 0)
|
||||
conn.send(buf, event='neg-classic')
|
||||
|
||||
def negotiate_export(conn):
|
||||
# Send negotiation part 1
|
||||
buf = neg1_struct.pack(NBD_PASSWD, NBD_OPTS_MAGIC, 0)
|
||||
conn.send(buf, event='neg1')
|
||||
|
||||
# Receive export option
|
||||
buf = conn.recv(export_struct.size, event='export')
|
||||
export = export_tuple._make(export_struct.unpack(buf))
|
||||
assert export.magic == NBD_OPTS_MAGIC
|
||||
assert export.opt == NBD_OPT_EXPORT_NAME
|
||||
name = conn.recv(export.len, event='export-name')
|
||||
|
||||
# Send negotiation part 2
|
||||
buf = neg2_struct.pack(FAKE_DISK_SIZE, 0)
|
||||
conn.send(buf, event='neg2')
|
||||
|
||||
def negotiate(conn, use_export):
|
||||
'''Negotiate export with client'''
|
||||
if use_export:
|
||||
negotiate_export(conn)
|
||||
else:
|
||||
negotiate_classic(conn)
|
||||
|
||||
def read_request(conn):
|
||||
'''Parse NBD request from client'''
|
||||
buf = conn.recv(request_struct.size, event='request')
|
||||
req = request_tuple._make(request_struct.unpack(buf))
|
||||
assert req.magic == NBD_REQUEST_MAGIC
|
||||
return req
|
||||
|
||||
def write_reply(conn, error, handle):
|
||||
buf = reply_struct.pack(NBD_REPLY_MAGIC, error, handle)
|
||||
conn.send(buf, event='reply')
|
||||
|
||||
def handle_connection(conn, use_export):
|
||||
negotiate(conn, use_export)
|
||||
while True:
|
||||
req = read_request(conn)
|
||||
if req.type == NBD_CMD_READ:
|
||||
write_reply(conn, 0, req.handle)
|
||||
conn.send('\0' * req.len, event='data')
|
||||
elif req.type == NBD_CMD_WRITE:
|
||||
_ = conn.recv(req.len, event='data')
|
||||
write_reply(conn, 0, req.handle)
|
||||
elif req.type == NBD_CMD_DISC:
|
||||
break
|
||||
else:
|
||||
print 'unrecognized command type %#02x' % req.type
|
||||
break
|
||||
conn.close()
|
||||
|
||||
def run_server(sock, rules, use_export):
|
||||
while True:
|
||||
conn, _ = sock.accept()
|
||||
handle_connection(FaultInjectionSocket(conn, rules), use_export)
|
||||
|
||||
def parse_inject_error(name, options):
|
||||
if 'event' not in options:
|
||||
err('missing \"event\" option in %s' % name)
|
||||
event = options['event']
|
||||
if event not in ('neg-classic', 'neg1', 'export', 'neg2', 'request', 'reply', 'data'):
|
||||
err('invalid \"event\" option value \"%s\" in %s' % (event, name))
|
||||
io = options.get('io', 'readwrite')
|
||||
if io not in ('read', 'write', 'readwrite'):
|
||||
err('invalid \"io\" option value \"%s\" in %s' % (io, name))
|
||||
when = options.get('when', 'before')
|
||||
try:
|
||||
when = int(when)
|
||||
except ValueError:
|
||||
if when == 'before':
|
||||
when = 0
|
||||
elif when == 'after':
|
||||
when = -1
|
||||
else:
|
||||
err('invalid \"when\" option value \"%s\" in %s' % (when, name))
|
||||
return Rule(name, event, io, when)
|
||||
|
||||
def parse_config(config):
|
||||
rules = []
|
||||
for name in config.sections():
|
||||
if name.startswith('inject-error'):
|
||||
options = dict(config.items(name))
|
||||
rules.append(parse_inject_error(name, options))
|
||||
else:
|
||||
err('invalid config section name: %s' % name)
|
||||
return rules
|
||||
|
||||
def load_rules(filename):
|
||||
config = ConfigParser.RawConfigParser()
|
||||
with open(filename, 'rt') as f:
|
||||
config.readfp(f, filename)
|
||||
return parse_config(config)
|
||||
|
||||
def open_socket(path):
|
||||
'''Open a TCP or UNIX domain listen socket'''
|
||||
if ':' in path:
|
||||
host, port = path.split(':', 1)
|
||||
sock = socket.socket()
|
||||
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||
sock.bind((host, int(port)))
|
||||
else:
|
||||
sock = socket.socket(socket.AF_UNIX)
|
||||
sock.bind(path)
|
||||
sock.listen(0)
|
||||
print 'Listening on %s' % path
|
||||
return sock
|
||||
|
||||
def usage(args):
|
||||
sys.stderr.write('usage: %s [--classic-negotiation] <tcp-port>|<unix-path> <config-file>\n' % args[0])
|
||||
sys.stderr.write('Run an fault injector NBD server with rules defined in a config file.\n')
|
||||
sys.exit(1)
|
||||
|
||||
def main(args):
|
||||
if len(args) != 3 and len(args) != 4:
|
||||
usage(args)
|
||||
use_export = True
|
||||
if args[1] == '--classic-negotiation':
|
||||
use_export = False
|
||||
elif len(args) == 4:
|
||||
usage(args)
|
||||
sock = open_socket(args[1 if use_export else 2])
|
||||
rules = load_rules(args[2 if use_export else 3])
|
||||
run_server(sock, rules, use_export)
|
||||
return 0
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(main(sys.argv))
|
||||
Loading…
Reference in New Issue
Block a user