Received: by 2002:ac0:8c9a:0:0:0:0:0 with SMTP id r26csp3647052ima; Mon, 4 Feb 2019 02:45:46 -0800 (PST) X-Google-Smtp-Source: ALg8bN7oUiG2y0BQth388HeI4zGCHCmz9+4wdP2zAcdU6fCfp5V8FkoTKPqo/UQM4fOmggnu8gOC X-Received: by 2002:a17:902:fa2:: with SMTP id 31mr51302014plz.75.1549277146554; Mon, 04 Feb 2019 02:45:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549277146; cv=none; d=google.com; s=arc-20160816; b=vWxmcECxJWqSkeND+Hzx8nfo9hRe+U7x2O7MNZHwukpd682YUDErMPXszjG6AXsraw GSFnHKRhc/J1DX6t3211jGTZspfJxUzWQ02rTD4dtDu90oQCkxWR/JxQhIhHWa4q1QN8 Srs+BHYalWboLxh3IXG4UGRW2x0TxDjE+5NeLJ0nqoMMyaP8Md8QYQj/lUmbgH9lTLO6 Iirm7PLT8iqDejBPetRLOJAscgvLQUj3S87PDFJuiIqcbm6GDSUmVmJ61aI82zA+SF4+ 9XMxYuq/gKDyxmTnwyU/Po+up3/RrrmEvpPZ3OEnM7cqmRXQBRsaBGRB7E9hDM576VHe L6pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DvhOd6iiCoxH4a42r7D0/rU4sHIX51tuC/wIo4pWbCQ=; b=NV6pqLg3kjSAFODUiEWV//+GRa6Q5iRqDQ8bqJswL0rp80IUEjFnaMBWJdBlFzooMz PZBz9ebACquX79x1KqTIFkejAJm7gX1JonACqjGSYYcIaoFDapQXxeze0Y6b6yMcm2Q0 WR6PICIgPshfp2NBpDtl6373RxiVyb7YXL6z4b0Hmf5HLvMfSNljFSNRAIlBimlU+KV3 LneV/Td4tcU1DyUjfuu/UvJTCIwkF+BSm0tFes2fSyg9cOgfE6mat+GqXdxonhxrtJZd RpVKQbxMMXyfD02BnfdnAJ6nogmaKmeV0Zp6nLaLnPv4SRZ5zRLbMbEi/jGKQhdumbxI BKYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BWb10m08; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t20si16600554plj.94.2019.02.04.02.45.30; Mon, 04 Feb 2019 02:45:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BWb10m08; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731045AbfBDKoi (ORCPT + 99 others); Mon, 4 Feb 2019 05:44:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:42454 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731037AbfBDKoh (ORCPT ); Mon, 4 Feb 2019 05:44:37 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E81792070C; Mon, 4 Feb 2019 10:44:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549277076; bh=FegBfmSuUWa5hJFftPkBj0mQTOIHo7HNVlD3rJnTSJQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BWb10m08D+6av/dLTNWkBjA1LDPoUpQUCSkT9CtbvGfdRswpxwqlB8Y9b/KTgd3oX lzZuxNzSaF9El33iFdJrm/RcR0HPZkzpoScWaY5qQ4C5EvwI3qHW8Hwj6Ew9SNUJ84 uke6vSmFMuNiujQ35Z5poir0QU21fxL57JZr8634= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Toshiaki Makita , Jason Wang , "Michael S. Tsirkin" , "David S. Miller" Subject: [PATCH 4.14 14/46] virtio_net: Fix not restoring real_num_rx_queues Date: Mon, 4 Feb 2019 11:36:45 +0100 Message-Id: <20190204103611.151448514@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190204103608.651205056@linuxfoundation.org> References: <20190204103608.651205056@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Toshiaki Makita [ Upstream commit 188313c137c4f76afd0862f50dbc185b198b9e2a ] When _virtnet_set_queues() failed we did not restore real_num_rx_queues. Fix this by placing the change of real_num_rx_queues after _virtnet_set_queues(). This order is also in line with virtnet_set_channels(). Fixes: 4941d472bf95 ("virtio-net: do not reset during XDP set") Signed-off-by: Toshiaki Makita Acked-by: Jason Wang Acked-by: Michael S. Tsirkin Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/virtio_net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2031,10 +2031,10 @@ static int virtnet_xdp_set(struct net_de } } - netif_set_real_num_rx_queues(dev, curr_qp + xdp_qp); err = _virtnet_set_queues(vi, curr_qp + xdp_qp); if (err) goto err; + netif_set_real_num_rx_queues(dev, curr_qp + xdp_qp); vi->xdp_queue_pairs = xdp_qp; for (i = 0; i < vi->max_queue_pairs; i++) {