From patchwork Tue Mar 17 10:54:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 229246 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.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 DCCD2C10F29 for ; Tue, 17 Mar 2020 11:16:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AAB0E20658 for ; Tue, 17 Mar 2020 11:16:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584443810; bh=nWLuPFOQVOPLikwVQh7fKPutOMPbZCw7WgkfAD8CmnE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=b7nUHGgk9siB2dNwSMABjtu6U3qAQBRf82G7xuaLeuoaJLZrT0QIMjyQ23bg3MP0F UsXZcFL4SM97RpWLboskKfkJ3qVa1ane/bYok/uZ6FqdvSv1RSwb+KduMKSOFYX1fU hsrqNb3FZkfm4PeOuo3ZlXQ0U1DJQOQ6K0znoUZA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728683AbgCQLIs (ORCPT ); Tue, 17 Mar 2020 07:08:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:50686 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728877AbgCQLIo (ORCPT ); Tue, 17 Mar 2020 07:08:44 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 81E3F20658; Tue, 17 Mar 2020 11:08:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584443324; bh=nWLuPFOQVOPLikwVQh7fKPutOMPbZCw7WgkfAD8CmnE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A3x1WzuvDBNmT7BXpGSKPk4u1EdCXoSp9lJ3C4Tr73ljuLF/CMlYxaRaZ6U7lhO0m OE4i2LRku1Yj1xpZmmzh0QWcibyUO9/s/9R9Rvc9fQSufb+IQjFIUAe56RnVgqwNNZ GmYveYXsh5GXz9Wq1POkmS7UBDwjpqTDJ8Eyn97g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jian Shen , Huazhong Tan , "David S. Miller" Subject: [PATCH 5.5 045/151] net: hns3: clear port base VLAN when unload PF Date: Tue, 17 Mar 2020 11:54:15 +0100 Message-Id: <20200317103329.807375517@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317103326.593639086@linuxfoundation.org> References: <20200317103326.593639086@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jian Shen [ Upstream commit 59359fc8a2f7af062777692e6a7aae73483729ec ] Currently, PF missed to clear the port base VLAN for VF when unload. In this case, the VLAN id will remain in the VLAN table. This patch fixes it. Fixes: 92f11ea177cd ("net: hns3: fix set port based VLAN issue for VF") Signed-off-by: Jian Shen Signed-off-by: Huazhong Tan Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 23 ++++++++++++++++ 1 file changed, 23 insertions(+) --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -8486,6 +8486,28 @@ static int hclge_set_vf_vlan_filter(stru } } +static void hclge_clear_vf_vlan(struct hclge_dev *hdev) +{ + struct hclge_vlan_info *vlan_info; + struct hclge_vport *vport; + int ret; + int vf; + + /* clear port base vlan for all vf */ + for (vf = HCLGE_VF_VPORT_START_NUM; vf < hdev->num_alloc_vport; vf++) { + vport = &hdev->vport[vf]; + vlan_info = &vport->port_base_vlan_cfg.vlan_info; + + ret = hclge_set_vlan_filter_hw(hdev, htons(ETH_P_8021Q), + vport->vport_id, + vlan_info->vlan_tag, true); + if (ret) + dev_err(&hdev->pdev->dev, + "failed to clear vf vlan for vf%d, ret = %d\n", + vf - HCLGE_VF_VPORT_START_NUM, ret); + } +} + int hclge_set_vlan_filter(struct hnae3_handle *handle, __be16 proto, u16 vlan_id, bool is_kill) { @@ -9895,6 +9917,7 @@ static void hclge_uninit_ae_dev(struct h struct hclge_mac *mac = &hdev->hw.mac; hclge_reset_vf_rate(hdev); + hclge_clear_vf_vlan(hdev); hclge_misc_affinity_teardown(hdev); hclge_state_uninit(hdev);