{"id":2211261,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2211261/?format=json","web_url":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260316104209.1285962-4-poros@redhat.com/","project":{"id":46,"url":"http://patchwork.ozlabs.org/api/1.2/projects/46/?format=json","name":"Intel Wired Ethernet development","link_name":"intel-wired-lan","list_id":"intel-wired-lan.osuosl.org","list_email":"intel-wired-lan@osuosl.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260316104209.1285962-4-poros@redhat.com>","list_archive_url":null,"date":"2026-03-16T10:42:08","name":"[iwl-next,3/4] iavf: wait for PF confirmation before removing VLAN filters","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"73d8cac6324c86699c7931d18ff3fbf2c6e59478","submitter":{"id":74657,"url":"http://patchwork.ozlabs.org/api/1.2/people/74657/?format=json","name":"Petr Oros","email":"poros@redhat.com"},"delegate":{"id":109701,"url":"http://patchwork.ozlabs.org/api/1.2/users/109701/?format=json","username":"anguy11","first_name":"Anthony","last_name":"Nguyen","email":"anthony.l.nguyen@intel.com"},"mbox":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260316104209.1285962-4-poros@redhat.com/mbox/","series":[{"id":496040,"url":"http://patchwork.ozlabs.org/api/1.2/series/496040/?format=json","web_url":"http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=496040","date":"2026-03-16T10:42:06","name":"iavf: fix VLAN filter state machine races","version":1,"mbox":"http://patchwork.ozlabs.org/series/496040/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2211261/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2211261/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","intel-wired-lan@lists.osuosl.org"],"Delivered-To":["patchwork-incoming@legolas.ozlabs.org","intel-wired-lan@lists.osuosl.org"],"Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=osuosl.org header.i=@osuosl.org header.a=rsa-sha256\n header.s=default header.b=3QA6LaFl;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fZBW83j0dz1xwC\n\tfor ; Mon, 16 Mar 2026 21:42:44 +1100 (AEDT)","from localhost (localhost [127.0.0.1])\n\tby smtp3.osuosl.org (Postfix) with ESMTP id 2B74F60DEA;\n\tMon, 16 Mar 2026 10:42:43 +0000 (UTC)","from smtp3.osuosl.org ([127.0.0.1])\n by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id kBXyGRsbVqFa; Mon, 16 Mar 2026 10:42:41 +0000 (UTC)","from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp3.osuosl.org (Postfix) with ESMTP id 3EC4160E30;\n\tMon, 16 Mar 2026 10:42:41 +0000 (UTC)","from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n by lists1.osuosl.org (Postfix) with ESMTP id 6E3A4D3\n for ; Mon, 16 Mar 2026 10:42:40 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n by smtp4.osuosl.org (Postfix) with ESMTP id 546EC40996\n for ; Mon, 16 Mar 2026 10:42:40 +0000 (UTC)","from smtp4.osuosl.org ([127.0.0.1])\n by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id GVe00O-B_oUx for ;\n Mon, 16 Mar 2026 10:42:39 +0000 (UTC)","from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.133.124])\n by smtp4.osuosl.org (Postfix) with ESMTPS id 4BF8840984\n for ; Mon, 16 Mar 2026 10:42:39 +0000 (UTC)","from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-628-6K6OrgyVOT-wHzHeRSjqZA-1; Mon,\n 16 Mar 2026 06:42:31 -0400","from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 95B9D1953963; Mon, 16 Mar 2026 10:42:27 +0000 (UTC)","from ShadowPeak.redhat.com (unknown [10.45.224.235])\n by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id D49A0180035F; Mon, 16 Mar 2026 10:42:23 +0000 (UTC)"],"X-Virus-Scanned":["amavis at osuosl.org","amavis at osuosl.org"],"X-Comment":"SPF check N/A for local connections - client-ip=140.211.166.142;\n helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver= ","DKIM-Filter":["OpenDKIM Filter v2.11.0 smtp3.osuosl.org 3EC4160E30","OpenDKIM Filter v2.11.0 smtp4.osuosl.org 4BF8840984"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org;\n\ts=default; t=1773657761;\n\tbh=vG/uH1+MoWziuiYVHD5GqsUIbFKI25Uy5mOYHhl24nM=;\n\th=From:To:Date:In-Reply-To:References:Subject:List-Id:\n\t List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:\n\t Cc:From;\n\tb=3QA6LaFlgkWMzRf2GqsNn2QsSSS80wwXDSBcT8C46hF8K54I5d70mBKY2zeFpOoT7\n\t TX3MUChlPSvQd28pSOmqCLV3tWjFS9/fIDtgUZSt75tD9iHmxD3Rxu1gJO/HRE7tAo\n\t g4N048Y3s9+TBVwipbmHQD6eLa3PI0StWibVMioLhlFFWZPmKlb67ApBOAn6n4iuWa\n\t Dv0DWGlRegJ38965DzPSk7Nu1OYDs7GGhPvcs7Pwr1MgBRf5QnTaxnilvbvMB1amEk\n\t 5X1hCzz4i3JhmbS808R4BOtD2fLJcB8S9pOc5Kx7jcBKU9ARpb6V9YQ3qvTs8XbCky\n\t h8V5oZsuV+FVw==","Received-SPF":"Pass (mailfrom) identity=mailfrom; client-ip=170.10.133.124;\n helo=us-smtp-delivery-124.mimecast.com; envelope-from=poros@redhat.com;\n receiver=","DMARC-Filter":"OpenDMARC Filter v1.4.2 smtp4.osuosl.org 4BF8840984","X-MC-Unique":"6K6OrgyVOT-wHzHeRSjqZA-1","X-Mimecast-MFC-AGG-ID":"6K6OrgyVOT-wHzHeRSjqZA_1773657748","From":"Petr Oros ","To":"netdev@vger.kernel.org","Date":"Mon, 16 Mar 2026 11:42:08 +0100","Message-ID":"<20260316104209.1285962-4-poros@redhat.com>","In-Reply-To":"<20260316104209.1285962-1-poros@redhat.com>","References":"<20260316104209.1285962-1-poros@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.111","X-Mimecast-MFC-PROC-ID":"BreG0y8yLZgrfOX4oHGALl-Dvjpf8QxegEZ4NEP9460_1773657748","X-Mimecast-Originator":"redhat.com","Content-Transfer-Encoding":"8bit","content-type":"text/plain; charset=\"US-ASCII\"; x-default=true","X-Mailman-Original-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=redhat.com;\n s=mimecast20190719; t=1773657758;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=vG/uH1+MoWziuiYVHD5GqsUIbFKI25Uy5mOYHhl24nM=;\n b=cLCIfuebyWOV5QHt6ptv/cuNx+q+o5nLLjs8O3Y0CtrELY550pJLIEsOcLGSVhgGOyol9B\n 0RErzVISEcZz3gnqTeBvXo9R/n5uEagLKtGrGyPdBMRn8OJ8cJ9vaeD8NRSWkyUs2N4bZz\n GHukxolmPi3G/KCKjaDtnbQxGd4OtK4=","X-Mailman-Original-Authentication-Results":["smtp4.osuosl.org;\n dmarc=pass (p=quarantine dis=none)\n header.from=redhat.com","smtp4.osuosl.org;\n dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com\n header.a=rsa-sha256 header.s=mimecast20190719 header.b=cLCIfueb"],"Subject":"[Intel-wired-lan] [PATCH iwl-next 3/4] iavf: wait for PF\n confirmation before removing VLAN filters","X-BeenThere":"intel-wired-lan@osuosl.org","X-Mailman-Version":"2.1.30","Precedence":"list","List-Id":"Intel Wired Ethernet Linux Kernel Driver Development\n ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Cc":"Przemek Kitszel ,\n Eric Dumazet , linux-kernel@vger.kernel.org,\n Andrew Lunn ,\n Tony Nguyen ,\n intel-wired-lan@lists.osuosl.org, jacob.e.keller@intel.com,\n Jakub Kicinski , Paolo Abeni ,\n \"David S. Miller\" ","Errors-To":"intel-wired-lan-bounces@osuosl.org","Sender":"\"Intel-wired-lan\" "},"content":"The VLAN filter DELETE path was asymmetric with the ADD path: ADD\nwaits for PF confirmation (ADD -> ADDING -> ACTIVE), but DELETE\nimmediately frees the filter struct after sending the DEL message\nwithout waiting for the PF response.\n\nThis is problematic because:\n - If the PF rejects the DEL, the filter remains in HW but the driver\n has already freed the tracking structure, losing sync.\n - Race conditions between DEL pending and other operations\n (add, reset) cannot be properly resolved if the filter struct\n is already gone.\n\nAdd IAVF_VLAN_REMOVING state to make the DELETE path symmetric:\n\n REMOVE -> REMOVING (send DEL) -> PF confirms -> kfree\n -> PF rejects -> ACTIVE\n\nIn iavf_del_vlans(), transition filters from REMOVE to REMOVING\ninstead of immediately freeing them. The new DEL completion handler\nin iavf_virtchnl_completion() frees filters on success or reverts\nthem to ACTIVE on error.\n\nUpdate iavf_add_vlan() to handle the REMOVING state: if a DEL is\npending and the user re-adds the same VLAN, queue it for ADD so\nit gets re-programmed after the PF processes the DEL.\n\nThe !VLAN_FILTERING_ALLOWED early-exit path still frees filters\ndirectly since no PF message is sent in that case.\n\nSigned-off-by: Petr Oros \n---\n drivers/net/ethernet/intel/iavf/iavf.h | 1 +\n drivers/net/ethernet/intel/iavf/iavf_main.c | 9 +++--\n .../net/ethernet/intel/iavf/iavf_virtchnl.c | 37 +++++++++++++------\n 3 files changed, 32 insertions(+), 15 deletions(-)","diff":"diff --git a/drivers/net/ethernet/intel/iavf/iavf.h b/drivers/net/ethernet/intel/iavf/iavf.h\nindex 1ad00690622c8e..f9ad814d18b1da 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf.h\n@@ -161,6 +161,7 @@ enum iavf_vlan_state_t {\n \tIAVF_VLAN_ADDING,\t/* ADD sent to PF, waiting for response */\n \tIAVF_VLAN_ACTIVE,\t/* PF confirmed, filter is in HW */\n \tIAVF_VLAN_REMOVE,\t/* filter queued for DEL from PF */\n+\tIAVF_VLAN_REMOVING,\t/* DEL sent to PF, waiting for response */\n };\n \n struct iavf_vlan_filter {\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c\nindex b38ce496a95c75..89e5aae20d5573 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_main.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c\n@@ -782,10 +782,13 @@ iavf_vlan_filter *iavf_add_vlan(struct iavf_adapter *adapter,\n \t\tadapter->num_vlan_filters++;\n \t\tiavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_ADD_VLAN_FILTER);\n \t} else if (f->state == IAVF_VLAN_REMOVE) {\n-\t\t/* IAVF_VLAN_REMOVE means that VLAN wasn't yet removed.\n-\t\t * We can safely only change the state here.\n-\t\t */\n+\t\t/* DEL not yet sent to PF, cancel it */\n \t\tf->state = IAVF_VLAN_ACTIVE;\n+\t} else if (f->state == IAVF_VLAN_REMOVING) {\n+\t\t/* DEL already sent to PF, re-add after completion */\n+\t\tf->state = IAVF_VLAN_ADD;\n+\t\tiavf_schedule_aq_request(adapter,\n+\t\t\t\t\t IAVF_FLAG_AQ_ADD_VLAN_FILTER);\n \t}\n \n clearout:\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\nindex d62c0d6394149e..d0b7b810679399 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\n@@ -948,12 +948,10 @@ void iavf_del_vlans(struct iavf_adapter *adapter)\n \n \t\tvvfl->vsi_id = adapter->vsi_res->vsi_id;\n \t\tvvfl->num_elements = count;\n-\t\tlist_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, list) {\n+\t\tlist_for_each_entry(f, &adapter->vlan_filter_list, list) {\n \t\t\tif (f->state == IAVF_VLAN_REMOVE) {\n \t\t\t\tvvfl->vlan_id[i] = f->vlan.vid;\n-\t\t\t\tlist_del(&f->list);\n-\t\t\t\tkfree(f);\n-\t\t\t\tadapter->num_vlan_filters--;\n+\t\t\t\tf->state = IAVF_VLAN_REMOVING;\n \t\t\t\ti++;\n \t\t\t\tif (i == count)\n \t\t\t\t\tbreak;\n@@ -990,7 +988,7 @@ void iavf_del_vlans(struct iavf_adapter *adapter)\n \n \t\tvvfl_v2->vport_id = adapter->vsi_res->vsi_id;\n \t\tvvfl_v2->num_elements = count;\n-\t\tlist_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, list) {\n+\t\tlist_for_each_entry(f, &adapter->vlan_filter_list, list) {\n \t\t\tif (f->state == IAVF_VLAN_REMOVE) {\n \t\t\t\tstruct virtchnl_vlan_supported_caps *filtering_support =\n \t\t\t\t\t&adapter->vlan_v2_caps.filtering.filtering_support;\n@@ -1005,9 +1003,7 @@ void iavf_del_vlans(struct iavf_adapter *adapter)\n \t\t\t\tvlan->tci = f->vlan.vid;\n \t\t\t\tvlan->tpid = f->vlan.tpid;\n \n-\t\t\t\tlist_del(&f->list);\n-\t\t\t\tkfree(f);\n-\t\t\t\tadapter->num_vlan_filters--;\n+\t\t\t\tf->state = IAVF_VLAN_REMOVING;\n \t\t\t\ti++;\n \t\t\t\tif (i == count)\n \t\t\t\t\tbreak;\n@@ -2370,10 +2366,6 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,\n \t\t\tether_addr_copy(adapter->hw.mac.addr, netdev->dev_addr);\n \t\t\twake_up(&adapter->vc_waitqueue);\n \t\t\tbreak;\n-\t\tcase VIRTCHNL_OP_DEL_VLAN:\n-\t\t\tdev_err(&adapter->pdev->dev, \"Failed to delete VLAN filter, error %s\\n\",\n-\t\t\t\tiavf_stat_str(&adapter->hw, v_retval));\n-\t\t\tbreak;\n \t\tcase VIRTCHNL_OP_DEL_ETH_ADDR:\n \t\t\tdev_err(&adapter->pdev->dev, \"Failed to delete MAC filter, error %s\\n\",\n \t\t\t\tiavf_stat_str(&adapter->hw, v_retval));\n@@ -2896,6 +2888,27 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,\n \t\tspin_unlock_bh(&adapter->mac_vlan_list_lock);\n \t\t}\n \t\tbreak;\n+\tcase VIRTCHNL_OP_DEL_VLAN:\n+\tcase VIRTCHNL_OP_DEL_VLAN_V2: {\n+\t\tstruct iavf_vlan_filter *f, *ftmp;\n+\n+\t\tspin_lock_bh(&adapter->mac_vlan_list_lock);\n+\t\tlist_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list,\n+\t\t\t\t\t list) {\n+\t\t\tif (f->state == IAVF_VLAN_REMOVING) {\n+\t\t\t\tif (v_retval) {\n+\t\t\t\t\t/* PF rejected DEL, keep filter */\n+\t\t\t\t\tf->state = IAVF_VLAN_ACTIVE;\n+\t\t\t\t} else {\n+\t\t\t\t\tlist_del(&f->list);\n+\t\t\t\t\tkfree(f);\n+\t\t\t\t\tadapter->num_vlan_filters--;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t\tspin_unlock_bh(&adapter->mac_vlan_list_lock);\n+\t\t}\n+\t\tbreak;\n \tcase VIRTCHNL_OP_ENABLE_VLAN_STRIPPING:\n \t\t/* PF enabled vlan strip on this VF.\n \t\t * Update netdev->features if needed to be in sync with ethtool.\n","prefixes":["iwl-next","3/4"]}