From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92297C433E1 for ; Thu, 14 May 2020 18:55:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 657AC206DC for ; Thu, 14 May 2020 18:55:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589482526; bh=zd6aUnCIA4Yjpf84Uurs8gQ29QfEltSX3ZdTt+vzEJE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WvERNpMhUNZYxkYcBeGKI7DzlnPL+9CxVvv5qnn8NzVpuk3imxDWzAd9ROanNdQLh WH+BNGk2ma6yaqmcP1vnbU/pzGR1q9QFJRBkYqd6S0exg/EAO3bWTu75hQkWm5SyZw nK7MnantxNQ/pTTzc9R/gvp7173b+InVMPv4Q9k8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729371AbgENSzY (ORCPT ); Thu, 14 May 2020 14:55:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:55934 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729358AbgENSzW (ORCPT ); Thu, 14 May 2020 14:55:22 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D466B206F1; Thu, 14 May 2020 18:55:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589482521; bh=zd6aUnCIA4Yjpf84Uurs8gQ29QfEltSX3ZdTt+vzEJE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dyAHURI/N4hxKjyZ+1X4x6tTUtRCjfmgi7FbXpxM7HReZPDrMa332Z1GBxHwPZWoe rexCfxf5F/4WjHq0gJJYw2XZNlkA2WZha8DtQiXLhri+j1EIn9S43WCbPC3Pa5z20t vtK03FV7WAYVCIBry/aaHHZvZpI8KkeA18nZfQOY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Stefano Garzarella , "David S . Miller" , Sasha Levin , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 17/39] vhost/vsock: fix packet delivery order to monitoring devices Date: Thu, 14 May 2020 14:54:34 -0400 Message-Id: <20200514185456.21060-17-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200514185456.21060-1-sashal@kernel.org> References: <20200514185456.21060-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Stefano Garzarella [ Upstream commit 107bc0766b9feb5113074c753735a3f115c2141f ] We want to deliver packets to monitoring devices before it is put in the virtqueue, to avoid that replies can appear in the packet capture before the transmitted packet. Signed-off-by: Stefano Garzarella Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/vhost/vsock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index 834e88e20550f..3f2f34ebf51f5 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -182,14 +182,14 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, break; } - vhost_add_used(vq, head, sizeof(pkt->hdr) + payload_len); - added = true; - - /* Deliver to monitoring devices all correctly transmitted - * packets. + /* Deliver to monitoring devices all packets that we + * will transmit. */ virtio_transport_deliver_tap_pkt(pkt); + vhost_add_used(vq, head, sizeof(pkt->hdr) + payload_len); + added = true; + pkt->off += payload_len; total_len += payload_len; -- 2.20.1