From patchwork Mon Dec 19 05:58:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Wei W" X-Patchwork-Id: 9479707 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9645460237 for ; Mon, 19 Dec 2016 06:21:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 89BE12841C for ; Mon, 19 Dec 2016 06:21:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7EA6B28451; Mon, 19 Dec 2016 06:21:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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 mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2A6392841C for ; Mon, 19 Dec 2016 06:21:42 +0000 (UTC) Received: from localhost ([::1]:43571 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cIrKP-0005JP-79 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 19 Dec 2016 01:21:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cIr0N-0003Eh-5A for qemu-devel@nongnu.org; Mon, 19 Dec 2016 01:01:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cIr0M-0004ie-Dd for qemu-devel@nongnu.org; Mon, 19 Dec 2016 01:00:59 -0500 Received: from mga06.intel.com ([134.134.136.31]:33815) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cIr0M-0004Vl-5C for qemu-devel@nongnu.org; Mon, 19 Dec 2016 01:00:58 -0500 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP; 18 Dec 2016 22:00:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,372,1477983600"; d="scan'208";a="44550023" Received: from devel-ww.sh.intel.com ([10.239.48.105]) by fmsmga006.fm.intel.com with ESMTP; 18 Dec 2016 22:00:56 -0800 From: Wei Wang To: marcandre.lureau@gmail.com, mst@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org, virtio-dev@lists.oasis-open.org Date: Mon, 19 Dec 2016 13:58:56 +0800 Message-Id: <1482127152-84732-22-git-send-email-wei.w.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482127152-84732-1-git-send-email-wei.w.wang@intel.com> References: <1482127152-84732-1-git-send-email-wei.w.wang@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.31 Subject: [Qemu-devel] [RESEND Patch v1 21/37] vhost-pci-slave/msg: VHOST_USER_SET_VRING_CALL X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wei Wang Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Update the callfd to the head node in the list. This version of vhost-pci expects the master device to use polling to receive packets, so callfd is recorded here for tomorrow's implementation. Signed-off-by: Wei Wang --- hw/virtio/vhost-pci-slave.c | 18 ++++++++++++++++++ include/hw/virtio/vhost-pci-slave.h | 1 + 2 files changed, 19 insertions(+) diff --git a/hw/virtio/vhost-pci-slave.c b/hw/virtio/vhost-pci-slave.c index 1286ab6..5bb1285 100644 --- a/hw/virtio/vhost-pci-slave.c +++ b/hw/virtio/vhost-pci-slave.c @@ -238,6 +238,13 @@ static void vp_slave_set_vring_kick(int fd) pvq_node->kickfd = fd; } +static void vp_slave_set_vring_call(int fd) +{ + PeerVqNode *pvq_node = QLIST_FIRST(&vp_slave->pvq_list); + if (pvq_node) + pvq_node->callfd = fd; +} + static int vp_slave_can_read(void *opaque) { return VHOST_USER_HDR_SIZE; @@ -325,6 +332,17 @@ static void vp_slave_read(void *opaque, const uint8_t *buf, int size) */ qemu_set_nonblock(fds[0]); break; + case VHOST_USER_SET_VRING_CALL: + /* consume the fd */ + qemu_chr_fe_get_msgfds(chr_be, fds, 1); + vp_slave_set_vring_call(fds[0]); + /* + * This is a non-blocking eventfd. + * The receive function forces it to be blocking, + * so revert it back to non-blocking. + */ + qemu_set_nonblock(fds[0]); + break; default: error_report("vhost-pci-slave does not support msg request = %d", msg.request); diff --git a/include/hw/virtio/vhost-pci-slave.h b/include/hw/virtio/vhost-pci-slave.h index 4b6b213..f6206a1 100644 --- a/include/hw/virtio/vhost-pci-slave.h +++ b/include/hw/virtio/vhost-pci-slave.h @@ -11,6 +11,7 @@ typedef struct PeerVqNode { uint16_t last_avail_idx; uint32_t vring_num; int kickfd; + int callfd; struct vhost_vring_addr addr; QLIST_ENTRY(PeerVqNode) node; } PeerVqNode;