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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 8F23EC11F68 for ; Sat, 10 Jul 2021 23:54:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 79099613D0 for ; Sat, 10 Jul 2021 23:54:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233127AbhGJX5l (ORCPT ); Sat, 10 Jul 2021 19:57:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:40226 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234114AbhGJX4H (ORCPT ); Sat, 10 Jul 2021 19:56:07 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1266361407; Sat, 10 Jul 2021 23:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625961130; bh=AtQ45QQQqHhh/34OBA8KypqyY7xs+UXYwL35LOhT1eA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TfcMkmxJQzfydkdm2C44xbOb21Sy38uzBmIq9Q/r0NdD7Bl4dUcz2zuRc2Mh9RMvC lurgPJhyjEq7PGl/7L+RkcTA0ibmEt0i1wpHNbsYN9VV2c22Z3/1VfPH1aAq/sqhYo Xoxxrkwnw9qf3ICDp69gXGfk7TvQ01YhhqA8fOajzMhjezQ4x+qBV9RnW90T927D7j 4KConvfak4q45goO4JR15TZgemJdS5kX2E/bOc3hx9fUK5h2zOr0LpqEIBa/+QwjBl 6NLH6DZaTRm/32mR7jVOzFn9mliGCFt7cp/7eMrYFTGCLK3kSLH/c67u9eUe2PD6LH Le2fm27zK5e+Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xie Yongji , Jason Wang , "Michael S . Tsirkin" , Sasha Levin , virtualization@lists.linux-foundation.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 21/22] virtio_net: Fix error handling in virtnet_restore() Date: Sat, 10 Jul 2021 19:51:42 -0400 Message-Id: <20210710235143.3222129-21-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210710235143.3222129-1-sashal@kernel.org> References: <20210710235143.3222129-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xie Yongji [ Upstream commit 3f2869cace829fb4b80fc53b3ddaa7f4ba9acbf1 ] Do some cleanups in virtnet_restore() when virtnet_cpu_notif_add() failed. Signed-off-by: Xie Yongji Link: https://lore.kernel.org/r/20210517084516.332-1-xieyongji@bytedance.com Acked-by: Jason Wang Signed-off-by: Michael S. Tsirkin Signed-off-by: Sasha Levin --- drivers/net/virtio_net.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 0b1c6a8906b9..61cc69a8de2d 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -3199,8 +3199,11 @@ static __maybe_unused int virtnet_restore(struct virtio_device *vdev) virtnet_set_queues(vi, vi->curr_queue_pairs); err = virtnet_cpu_notif_add(vi); - if (err) + if (err) { + virtnet_freeze_down(vdev); + remove_vq_common(vi); return err; + } return 0; } -- 2.30.2