From patchwork Thu May 12 13:43:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 9081401 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 19E7E9F1C1 for ; Thu, 12 May 2016 13:59:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 46A3720204 for ; Thu, 12 May 2016 13:59:12 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 78F75201F2 for ; Thu, 12 May 2016 13:59:10 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b0r6j-000575-GO; Thu, 12 May 2016 13:56:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b0r6h-00056x-In for xen-devel@lists.xenproject.org; Thu, 12 May 2016 13:56:51 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 97/37-03606-2AB84375; Thu, 12 May 2016 13:56:50 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpgkeJIrShJLcpLzFFi42JxWrohUndRt0m 4wfyvQhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aE3ldMBRfZK3adzG9gPMnWxcjBISHgL3G9 qaKLkZODTUBHYurTS6wgtoiAncS5nvesICXMAp4SPbfMQcLCAj4SR3suMIHYLAKqEs+2b2QBs XkF3CQ+7FzODmJLCMhJnD/+kxnEFhJQkVg/dRYbRI2gxMmZT8DqmQUkJA6+eMEMcQG3xN9u+w mMPLOQVM1CUrWAkWkVo3pxalFZapGuhV5SUWZ6RkluYmaOrqGBsV5uanFxYnpqTmJSsV5yfu4 mRmBoMADBDsYL7c6HGCU5mJREefmqTcKF+JLyUyozEosz4otKc1KLDzHKcHAoSfB2dwHlBItS 01Mr0jJzgEEKk5bg4FES4W0CSfMWFyTmFmemQ6ROMepyLPhxey2TEEtefl6qlDhvH0iRAEhRR mke3AhYxFxilJUS5mUEOkqIpyC1KDezBFX+FaM4B6OSMK81yBSezLwSuE2vgI5gAjqi+roRyB EliQgpqQZGx4+8khfrn5Wv7Np6ImXJvUXOD2MeJm7X/ChWfbjLOXTJT4EJK179t/o013Persv Xu5/IF7q+2aFy5FHU/aV2Mw+/35D2cHpX7Jme1dbLzxwVkPfdFFJ6cVJ1x+fCT4t058/dJ6NZ ttMi6f4Rpi/Sm7LrZ796dMbmctgi5WsrYg9ld+/KVf28YKYSS3FGoqEWc1FxIgAal0ahkwIAA A== X-Env-Sender: prvs=93348a90f=Paul.Durrant@citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1463061407!30155047!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49572 invoked from network); 12 May 2016 13:56:49 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-4.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 12 May 2016 13:56:49 -0000 X-IronPort-AV: E=Sophos;i="5.24,610,1454976000"; d="scan'208";a="353483017" From: Paul Durrant To: , Date: Thu, 12 May 2016 14:43:03 +0100 Message-ID: <1463060583-7524-1-git-send-email-paul.durrant@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-DLP: MIA1 Cc: Paul Durrant , Wei Liu Subject: [Xen-devel] [PATCH net] xen-netback: fix extra_info handling in xenvif_tx_err() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Patch 562abd39 "xen-netback: support multiple extra info fragments passed from frontend" contained a mistake which can result in an in- correct number of responses being generated when handling errors encountered when processing packets containing extra info fragments. This patch fixes the problem. Signed-off-by: Paul Durrant Reported-by: Jan Beulich Cc: Wei Liu Acked-by: Wei Liu --- drivers/net/xen-netback/netback.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index b42f260..4412a57 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c @@ -711,6 +711,7 @@ static void xenvif_tx_err(struct xenvif_queue *queue, if (cons == end) break; RING_COPY_REQUEST(&queue->tx, cons++, txp); + extra_count = 0; /* only the first frag can have extras */ } while (1); queue->tx.req_cons = cons; }