From patchwork Mon Jun 6 16:45:01 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: 9158887 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 D89DE60572 for ; Mon, 6 Jun 2016 17:11:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C7A1327B13 for ; Mon, 6 Jun 2016 17:11:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BBB6A2834C; Mon, 6 Jun 2016 17:11:52 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 31EAF27B13 for ; Mon, 6 Jun 2016 17:11:51 +0000 (UTC) Received: from localhost ([::1]:44013 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9y46-0007xA-GO for patchwork-qemu-devel@patchwork.kernel.org; Mon, 06 Jun 2016 13:11:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9xeY-0004F9-Jw for qemu-devel@nongnu.org; Mon, 06 Jun 2016 12:45:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9xeV-0005Yj-DE for qemu-devel@nongnu.org; Mon, 06 Jun 2016 12:45:26 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:35704) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9xeV-0005Yf-8z for qemu-devel@nongnu.org; Mon, 06 Jun 2016 12:45:23 -0400 Received: by mail-qt0-x241.google.com with SMTP id 37so1669700qtc.2 for ; Mon, 06 Jun 2016 09:45:23 -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=SQow0QA0GljDgtVpzK7tK0LdT3EsAAZIaKmVOEOZkkw=; b=y7UKD9C3OYLsbeIlsw9RIOetnHsduvE7vVarll6abuh6OffWgw8TgASlffgtgslZi5 Se1iVZy4FLqLIN2fMiNHPcMa1al/wCtlMTSFYJFN3ECwjSDRnCzeWiAcuykHtX7bhAuY OZGw9F0UEz9B25atVPVSEnGDh3JnO7lsSSglZRh0GYshq/NVumtyiBPPY6v+7j+8x7BN HPuX0aOWvsKqianHrROM+8pNscftywdO8gnJRDWS7fVWVERbtIs53W1AfBg3vl+cRTHK CtZJh4RxhIDZiJ+IQ/5njhxI4f44Xz5iOYsSWAbx3egPXN/NglL4ZNDaMIuNpduf1+kL OydA== 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=SQow0QA0GljDgtVpzK7tK0LdT3EsAAZIaKmVOEOZkkw=; b=BrlsMpH47iEnGIGdazJq2OAynddkdnGqa17XIQCSy3O6qOCVyDP1y6aZuLCmfC8MoL djc9uOK65Oa9Vgv6wSRS2oVtOtGqANvG0TRRjvvJpQtX+3weaXCP+rMnTn63mFTqZXi/ /R5YWZS6ICuNqKOBo06UTC/eoMtMX1eqNEzMaOxoB65x+2Rynj6ILaCVoOexN9mFPabj Vnz9TA+HZtHbE+gY4u/0KcFu+j0XZ7ZzDnNxiBT/D26MgFrE2PF0qVDNeZTskaLGsE6O rwsj5fhRXCsYQ7N+R0y7aUrtNIEbjUpA4xi0HgcbaE8ay7409elOy5N+2P+hPEkPRB7S 5WwQ== X-Gm-Message-State: ALyK8tJ3uiEAAktTTh0TYwk3RiEn5OUZb/+MTt6Sh3MK1Clc43/YopZiKVe3ZVVjXtBALA== X-Received: by 10.200.33.229 with SMTP id 34mr16906548qtz.100.1465231522812; Mon, 06 Jun 2016 09:45:22 -0700 (PDT) Received: from localhost (APoitiers-110-1-1-130.w193-248.abo.wanadoo.fr. [193.248.103.130]) by smtp.gmail.com with ESMTPSA id w47sm5396376qgw.11.2016.06.06.09.45.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jun 2016 09:45:22 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Mon, 6 Jun 2016 18:45:01 +0200 Message-Id: <1465231508-30183-4-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1465231508-30183-1-git-send-email-marcandre.lureau@redhat.com> References: <1465231508-30183-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:c0d::241 Subject: [Qemu-devel] [PATCH 03/10] tests/vhost-user-bridge: workaround stale vring base 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: Yuanhan Liu , "Michael S . Tsirkin" , Ilya Maximets , jonshin@cisco.com, Tetsuya Mukawa , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Marc-André Lureau This patch is a similar solution to what Yuanhan Liu/Huawei Xie have suggested for DPDK. When vubr quits (killed or crashed), a restart of vubr would get stale vring base from QEMU. That would break the kernel virtio net completely, making it non-work any more, unless a driver reset is done. So, instead of getting the stale vring base from QEMU, Huawei suggested we could get a proper one from used->idx. This works because the queues packets are processed in order. Signed-off-by: Marc-André Lureau Tested-by: Yuanhan Liu Reviewed-by: Yuanhan Liu --- tests/vhost-user-bridge.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c index f907ce7..38963e4 100644 --- a/tests/vhost-user-bridge.c +++ b/tests/vhost-user-bridge.c @@ -946,6 +946,13 @@ vubr_set_vring_addr_exec(VubrDev *dev, VhostUserMsg *vmsg) DPRINT(" vring_avail at %p\n", vq->avail); vq->last_used_index = vq->used->idx; + + if (vq->last_avail_index != vq->used->idx) { + DPRINT("Last avail index != used index: %d != %d, resuming", + vq->last_avail_index, vq->used->idx); + vq->last_avail_index = vq->used->idx; + } + return 0; }