From patchwork Fri Apr 1 11:16:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 604735 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qbzcB3hvNz9sdm for ; Fri, 1 Apr 2016 22:26:50 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=0MfcoSfz; dkim-atps=neutral Received: from localhost ([::1]:43596 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alxDf-0005CR-Gl for incoming@patchwork.ozlabs.org; Fri, 01 Apr 2016 07:26:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33423) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alx4u-0006TM-60 for qemu-devel@nongnu.org; Fri, 01 Apr 2016 07:17:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1alx4r-0001rd-Jp for qemu-devel@nongnu.org; Fri, 01 Apr 2016 07:17:24 -0400 Received: from mail-qg0-x234.google.com ([2607:f8b0:400d:c04::234]:32947) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alx4r-0001rZ-Dx for qemu-devel@nongnu.org; Fri, 01 Apr 2016 07:17:21 -0400 Received: by mail-qg0-x234.google.com with SMTP id j35so93608292qge.0 for ; Fri, 01 Apr 2016 04:17:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Umcnm3pRKG4IWfFVaA5xeMUCFhLmWf2WIoxT4cFhb58=; b=0MfcoSfzHs6Ftq4c9ZpH+gOV5dC4ZaXa86R+FUVN/KQrANnondLWmkEUj4onhUwMk/ NQek735x+fvH/lwS7OGFdEhsfFuPynPVKBKNkmc3666qCQUlUYaijI8CZxOYE5ZzTrbI 1Yi9Nyp61W90ewMlcoOpCar0n63NU0Q5HijgmCAYBv0mKl7jBeWkUhd/A7t0P8jSM3dJ QufnBnMmClE3u3bs7uAnnpIo00MEKAhFFwuBzDdUHmyKSV/C/kCGlohLRgjINEghxgls WZxYLc9WEUisjaDDwKq6jN0OjoYE/LgIWyf7FDaqUhoSDsU9wk+SXkz03GdDtZ6WrO+8 eQFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Umcnm3pRKG4IWfFVaA5xeMUCFhLmWf2WIoxT4cFhb58=; b=Z9BWpffBEpWOVyqCYk0IRWHs/ltIIyTE455f200D6Dh7LmxBg9OV8VJm1JgIAde59l JHRvb3y5vW0d1EiT8BCp4inU3S/YC2r3nX2bdE/wv6lzoF7gdm52F9J+FWWT/K+EkBXQ s6TEqMXS+Vm6gSsxJJbYp0MUTZH0uN4S6CgEcn1koAmgTq1ye9Zm4xx5hWWOF+klyfa/ MRwohKtaU7J3+DdAMY67uB+H4MNNU3WhYaFfYAicGsMF1w2wReroxxnQgcqQWf+Upw3E DBzu1LmJAHKeultOXmY51fUh6Z0DXoMeL771qyBkNrgd3ED4DoyuPWB5wqb80DfYMnHj b0cA== X-Gm-Message-State: AD7BkJI4cg+Q1EXsLa1zv231ZOJ01igTite4O+nU04rVzKsGjOYVJUSTaOCD9RKUlfxzAQ== X-Received: by 10.140.19.52 with SMTP id 49mr23886623qgg.103.1459509441158; Fri, 01 Apr 2016 04:17:21 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by smtp.gmail.com with ESMTPSA id w66sm5895569qgd.26.2016.04.01.04.17.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Apr 2016 04:17:20 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Fri, 1 Apr 2016 13:16:28 +0200 Message-Id: <1459509388-6185-19-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1459509388-6185-1-git-send-email-marcandre.lureau@redhat.com> References: <1459509388-6185-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c04::234 Cc: Yuanhan Liu , "Michael S. Tsirkin" , Ilya Maximets , jonshin@cisco.com, Tetsuya Mukawa , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [Qemu-devel] [PATCH 18/18] test: add shutdown support vubr test X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Marc-André Lureau The bridge can now be interrupted with ctrl-c. Once the slave channel is up, it will request a shutdown, and wait for success reply to exit. Signed-off-by: Marc-André Lureau --- tests/vhost-user-bridge.c | 102 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 99 insertions(+), 3 deletions(-) diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c index 42450a6..ea123be 100644 --- a/tests/vhost-user-bridge.c +++ b/tests/vhost-user-bridge.c @@ -135,6 +135,9 @@ dispatcher_wait(Dispatcher *dispr, uint32_t timeout) int rc = select(dispr->max_sock + 1, &fdset, 0, 0, &tv); if (rc == -1) { + if (errno == EINTR) { + return 0; + } vubr_die("select"); } @@ -186,6 +189,7 @@ enum VhostUserProtocolFeature { VHOST_USER_PROTOCOL_F_MQ = 0, VHOST_USER_PROTOCOL_F_LOG_SHMFD = 1, VHOST_USER_PROTOCOL_F_RARP = 2, + VHOST_USER_PROTOCOL_F_SLAVE_CHANNEL = 3, VHOST_USER_PROTOCOL_F_MAX }; @@ -213,9 +217,16 @@ typedef enum VhostUserRequest { VHOST_USER_GET_QUEUE_NUM = 17, VHOST_USER_SET_VRING_ENABLE = 18, VHOST_USER_SEND_RARP = 19, + VHOST_USER_SET_SLAVE_FD = 20, VHOST_USER_MAX } VhostUserRequest; +typedef enum VhostUserSlaveRequest { + VHOST_USER_SLAVE_NONE = 0, + VHOST_USER_SLAVE_SHUTDOWN = 1, + VHOST_USER_SLAVE_MAX +} VhostUserSlaveRequest; + typedef struct VhostUserMemoryRegion { uint64_t guest_phys_addr; uint64_t memory_size; @@ -288,6 +299,8 @@ typedef struct VubrDev { int ready; uint64_t features; int hdrlen; + int slave_fd; + bool shutdown_requested; } VubrDev; static const char *vubr_request_str[] = { @@ -311,7 +324,14 @@ static const char *vubr_request_str[] = { [VHOST_USER_GET_QUEUE_NUM] = "VHOST_USER_GET_QUEUE_NUM", [VHOST_USER_SET_VRING_ENABLE] = "VHOST_USER_SET_VRING_ENABLE", [VHOST_USER_SEND_RARP] = "VHOST_USER_SEND_RARP", - [VHOST_USER_MAX] = "VHOST_USER_MAX", + [VHOST_USER_SET_SLAVE_FD] = "VHOST_USER_SET_SLAVE_FD", + [VHOST_USER_MAX] = "VHOST_USER_MAX" +}; + +static const char *vubr_slave_request_str[] = { + [VHOST_USER_SLAVE_NONE] = "VHOST_USER_SLAVE_NONE", + [VHOST_USER_SLAVE_SHUTDOWN] = "VHOST_USER_SLAVE_SHUTDOWN", + [VHOST_USER_SLAVE_MAX] = "VHOST_USER_SLAVE_MAX" }; static void @@ -638,7 +658,7 @@ vubr_process_desc(VubrDev *dev, VubrVirtq *vq) size_t buf_size = 4096; uint8_t buf[4096]; - DPRINT("Chunks: "); + DPRINT("Chunks: aidx:%d ", a_index); i = d_index; do { void *chunk_start = (void *)(uintptr_t)gpa_to_va(dev, desc[i].addr); @@ -1063,7 +1083,9 @@ vubr_set_vring_err_exec(VubrDev *dev, VhostUserMsg *vmsg) static int vubr_get_protocol_features_exec(VubrDev *dev, VhostUserMsg *vmsg) { - vmsg->payload.u64 = 1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD; + vmsg->payload.u64 = + 1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD | + 1ULL << VHOST_USER_PROTOCOL_F_SLAVE_CHANNEL; DPRINT("u64: 0x%016"PRIx64"\n", vmsg->payload.u64); vmsg->size = sizeof(vmsg->payload.u64); @@ -1105,6 +1127,46 @@ vubr_send_rarp_exec(VubrDev *dev, VhostUserMsg *vmsg) return 0; } +static void +vubr_handle_slave_reply(VhostUserMsg *vmsg) +{ + DPRINT( + "================== Vhost slave reply from QEMU ==================\n"); + DPRINT("Request: %s (%d)\n", vubr_slave_request_str[vmsg->request], + vmsg->request); + DPRINT("Flags: 0x%x\n", vmsg->flags); + DPRINT("Size: %d\n", vmsg->size); + + switch (vmsg->request) { + case VHOST_USER_SLAVE_SHUTDOWN: + DPRINT("Shutdown success: 0x%016"PRIx64"\n", vmsg->payload.u64); + if (vmsg->payload.u64 == 0) { + exit(0); + } + default: + DPRINT("Invalid slave reply"); + }; +} + +static void +slave_receive_cb(int sock, void *ctx) +{ + VhostUserMsg vmsg; + + vubr_message_read(sock, &vmsg); + vubr_handle_slave_reply(&vmsg); +} + +static int +vubr_set_slave_fd_exec(VubrDev *dev, VhostUserMsg *vmsg) +{ + assert(vmsg->fd_num == 1); + dev->slave_fd = vmsg->fds[0]; + DPRINT("Got slave_fd: %d\n", vmsg->fds[0]); + dispatcher_add(&dev->dispatcher, dev->slave_fd, dev, slave_receive_cb); + return 0; +} + static int vubr_execute_request(VubrDev *dev, VhostUserMsg *vmsg) { @@ -1166,6 +1228,8 @@ vubr_execute_request(VubrDev *dev, VhostUserMsg *vmsg) return vubr_set_vring_enable_exec(dev, vmsg); case VHOST_USER_SEND_RARP: return vubr_send_rarp_exec(dev, vmsg); + case VHOST_USER_SET_SLAVE_FD: + return vubr_set_slave_fd_exec(dev, vmsg); case VHOST_USER_MAX: assert(vmsg->request != VHOST_USER_MAX); @@ -1226,6 +1290,7 @@ vubr_new(const char *path) }; } + dev->slave_fd = -1; /* Init log */ dev->log_call_fd = -1; dev->log_size = 0; @@ -1333,12 +1398,42 @@ vubr_backend_udp_setup(VubrDev *dev, } static void +vubr_request_shutdown(VubrDev *dev) +{ + VhostUserMsg vmsg = { + .request = VHOST_USER_SLAVE_SHUTDOWN, + .flags = VHOST_USER_VERSION + }; + + DPRINT("requesting shutdown\n"); + vubr_message_write(dev->slave_fd, &vmsg); +} + +static volatile int interrupted; + +static void interrupt_handler(int dummy) +{ + interrupted = 1; +} + +static void vubr_run(VubrDev *dev) { while (1) { /* timeout 200ms */ dispatcher_wait(&dev->dispatcher, 200000); /* Here one can try polling strategy. */ + + if (interrupted) { + if (dev->slave_fd == -1) { + return; + } + + if (!dev->shutdown_requested) { + vubr_request_shutdown(dev); + dev->shutdown_requested = 1; + } + } } } @@ -1405,6 +1500,7 @@ main(int argc, char *argv[]) } vubr_backend_udp_setup(dev, lhost, lport, rhost, rport); + signal(SIGINT, interrupt_handler); vubr_run(dev); return 0;