Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp2156197iob; Thu, 5 May 2022 17:25:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6SNMGzPZT1JPILUxKXrAeUliPWDpb+AmysqWuWC5nJ+NeSjqHpe3DSUIirfcv921qvKhB X-Received: by 2002:aa7:ce87:0:b0:425:d88c:bc92 with SMTP id y7-20020aa7ce87000000b00425d88cbc92mr836439edv.147.1651796758166; Thu, 05 May 2022 17:25:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651796758; cv=none; d=google.com; s=arc-20160816; b=wVjgolwh0dzWh7GVxfjq0qvul2V0c1vSf2OqypzVP7DO1DVjutZEpHXSmAwoowkz7k mMBZ9GmIFuZav5gvMiz9Sbl5YsoUKq2D0o1XF/dmEzHIG6N+5p+YPXtos3d5Q1YKOeBq bgoGy2Ki3ixCv/gWt1WRmzOpYN0PuQxVN7u8+EGjw1Po/rEtzQueWarlh2WZWpDGlqMk hgDaJ5UlKfYZCTN+kztwdLHrHUVUkZyF44+71vUVRRLevqqSOSZwDbpRbdzsa4Lpcb9u +ciMNOEYHJl312wXFtTMbcqDoKeJbUxAVdef7kf6gGHmQyC2I1WEDpYCcbwCWlYdVZjx AHxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=eG403qp54JKl3AgAykyZDG40oovDJF41uQSpnanfqlo=; b=m/ePTzA5CuScJRCNwB/LEnAiMVsCLtLVayq+UTIVbCoOYQDEJmdgUwaIlmNGdGAT4v 4mA6yqPay8ceFxsgqiOCR5+1K7RR9+1+pyHfCiptuqAZPS5luk9bpCrd+Ds7zSzpDtJP QWnPzDX1n0m64mzsjGLnDvg0uK9DlKpEUMqxSOnMHWkl4jvyJchlyt2vbAeEdT8vD+Pb xU0ncKPEYDNzTYxLSst0StUVuxZL/jSvulbcXlT374lgRKwUSNYoyTBfGJtAMh/sr03q kQbmtHGgF3woGNn6BtphqlhP+gUlRQkeTCsLwPVTVfZLSrCRt3rycXJDgAVpAYZKeG+O BIqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ItclEZ3G; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id do13-20020a170906c10d00b006f3a202b991si3838999ejc.990.2022.05.05.17.25.25; Thu, 05 May 2022 17:25:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ItclEZ3G; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358831AbiEDRn2 (ORCPT + 99 others); Wed, 4 May 2022 13:43:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354937AbiEDRLe (ORCPT ); Wed, 4 May 2022 13:11:34 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69E874B842; Wed, 4 May 2022 09:57:35 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E0A24B82737; Wed, 4 May 2022 16:57:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93389C385AA; Wed, 4 May 2022 16:57:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683451; bh=d8aBkKFvDCEcM+/vDNEOn7RvlX+nP+BcdMllvbGZQzc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ItclEZ3G2akTNEeql2+/J1yyrwjasR+5GSNMUI73zQFFWF+x4SVkUaFHArMIP4uLf p64AsMBul0pgnDheHAw2bCNnmSwCbRx3QpdHoDrkUNeWUOz21Vb8bMHs4sQ5xjwAPX Gbppdh8SApwHwHqFg3xNZE2+U/K+yepsQWC4EorE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jian Shen , Guangbin Huang , "David S. Miller" , Sasha Levin Subject: [PATCH 5.17 114/225] net: hns3: clear inited state and stop client after failed to register netdev Date: Wed, 4 May 2022 18:45:52 +0200 Message-Id: <20220504153120.744668252@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jian Shen [ Upstream commit e98365afc1e94ea1609268866a44112b3572c58b ] If failed to register netdev, it needs to clear INITED state and stop client in case of cause problem when concurrency with uninitialized process of driver. Fixes: a289a7e5c1d4 ("net: hns3: put off calling register_netdev() until client initialize complete") Signed-off-by: Jian Shen Signed-off-by: Guangbin Huang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index f6082be7481c..f33b4c351a70 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -5132,6 +5132,13 @@ static void hns3_state_init(struct hnae3_handle *handle) set_bit(HNS3_NIC_STATE_RXD_ADV_LAYOUT_ENABLE, &priv->state); } +static void hns3_state_uninit(struct hnae3_handle *handle) +{ + struct hns3_nic_priv *priv = handle->priv; + + clear_bit(HNS3_NIC_STATE_INITED, &priv->state); +} + static int hns3_client_init(struct hnae3_handle *handle) { struct pci_dev *pdev = handle->pdev; @@ -5249,7 +5256,9 @@ static int hns3_client_init(struct hnae3_handle *handle) return ret; out_reg_netdev_fail: + hns3_state_uninit(handle); hns3_dbg_uninit(handle); + hns3_client_stop(handle); out_client_start: hns3_free_rx_cpu_rmap(netdev); hns3_nic_uninit_irq(priv); -- 2.35.1