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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 2371BC282CC for ; Mon, 4 Feb 2019 11:00:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DDD182073D for ; Mon, 4 Feb 2019 11:00:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549278049; bh=N2OzGpLypM5Cn/j7LfCtdRjGklBd8xXCMacgkGHtDx8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LPpepD3MUchTC78I939QFgX8LPoZKplgck/TawWbsklY3iI7Gv8D17H6sE5hj1Vh2 D4Cejy0OosX7KUR6Ne1XMUZCjCYeTgPNnCIrMVyzly62mJXToUUoR/wSt8z3SvLpIa eOUpfxlydfydpSU0cbKfaZrepx64vCjkhUQ5qGu8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729063AbfBDLAs (ORCPT ); Mon, 4 Feb 2019 06:00:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:46618 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731871AbfBDKsi (ORCPT ); Mon, 4 Feb 2019 05:48:38 -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 0AA912070C; Mon, 4 Feb 2019 10:48:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549277317; bh=N2OzGpLypM5Cn/j7LfCtdRjGklBd8xXCMacgkGHtDx8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DFqDwgkbm1V+b0JRU0RpjPd5faZ1M94Bww4/xa1viIbojp2CM0jAPNst0t0nQlR4x 1JWSU5wdW+1vT7/j4Sm6G2remdc/7ru+FzDXSc/UJFRhaHkN0cqKQN1+Nu8okyXV+s hjpuzO9AsXBQLhWyny1LUJnA6jSt+cUjidAIzSNs= 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.19 28/74] virtio_net: Fix not restoring real_num_rx_queues Date: Mon, 4 Feb 2019 11:36:41 +0100 Message-Id: <20190204103623.216589004@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190204103619.714714157@linuxfoundation.org> References: <20190204103619.714714157@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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.19-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 @@ -2377,10 +2377,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++) {