{"id":2224526,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2224526/?format=json","web_url":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/7e03c6b17b67453f7c0c3eefce034a8fb9c40b63.1776426683.git.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":"<7e03c6b17b67453f7c0c3eefce034a8fb9c40b63.1776426683.git.poros@redhat.com>","list_archive_url":null,"date":"2026-04-17T14:29:43","name":"[iwl-net,v2,2/4] iavf: stop removing VLAN filters from PF on interface down","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b3bbecf2a2e726dec6e155bcf8fbe0d24a3defed","submitter":{"id":74657,"url":"http://patchwork.ozlabs.org/api/1.2/people/74657/?format=json","name":"Petr Oros","email":"poros@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/7e03c6b17b67453f7c0c3eefce034a8fb9c40b63.1776426683.git.poros@redhat.com/mbox/","series":[{"id":500351,"url":"http://patchwork.ozlabs.org/api/1.2/series/500351/?format=json","web_url":"http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=500351","date":"2026-04-17T14:29:41","name":"iavf: fix VLAN filter state machine races","version":2,"mbox":"http://patchwork.ozlabs.org/series/500351/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2224526/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2224526/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=85jtZS1Q;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=140.211.166.138; helo=smtp1.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138])\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 4fxy306DY4z1yCv\n\tfor ; Sat, 18 Apr 2026 00:30:20 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby smtp1.osuosl.org (Postfix) with ESMTP id 27BBA80B20;\n\tFri, 17 Apr 2026 14:30:18 +0000 (UTC)","from smtp1.osuosl.org ([127.0.0.1])\n by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id 3r2AIvTvFwkl; Fri, 17 Apr 2026 14:30:17 +0000 (UTC)","from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp1.osuosl.org (Postfix) with ESMTP id 57F4180C47;\n\tFri, 17 Apr 2026 14:30:17 +0000 (UTC)","from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n by lists1.osuosl.org (Postfix) with ESMTP id BFF0C270\n for ; Fri, 17 Apr 2026 14:30:15 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n by smtp1.osuosl.org (Postfix) with ESMTP id B1CC280A85\n for ; Fri, 17 Apr 2026 14:30:15 +0000 (UTC)","from smtp1.osuosl.org ([127.0.0.1])\n by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id b7Y6vkrveonu for ;\n Fri, 17 Apr 2026 14:30:14 +0000 (UTC)","from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.129.124])\n by smtp1.osuosl.org (Postfix) with ESMTPS id 91B7580898\n for ; Fri, 17 Apr 2026 14:30:14 +0000 (UTC)","from mx-prod-mc-05.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-117-1qz2CUZyOTmXw6lVQ5aiAA-1; Fri,\n 17 Apr 2026 10:30:05 -0400","from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93])\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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 106A91956094; Fri, 17 Apr 2026 14:30:02 +0000 (UTC)","from ShadowPeak.redhat.com (unknown [10.44.32.76])\n by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id 70271180047F; Fri, 17 Apr 2026 14:29:57 +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 smtp1.osuosl.org 57F4180C47","OpenDKIM Filter v2.11.0 smtp1.osuosl.org 91B7580898"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org;\n\ts=default; t=1776436217;\n\tbh=9yVRVn/zRQuQzeFy5xr25n7quPTdCY6cNbOdP3O2WBA=;\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=85jtZS1Q0jmWq//KLJwlZXo5b7EDc3kWq34C6elromRAlaA16UhkFbCOdo7r3Zk5b\n\t By0pxEzULrCBKIkLMC32Sv+jWYfZAc+d1yGnixCdTqmfaEeJigYxjPZmGl74X9m3ep\n\t upTvfi73z4JLW3YwTpm0RB9p9n6UnJsUfdsG2AdHE6FUWQDf+GsRxRhye7fThI4GuL\n\t mx7a0QaDwzP9f4/cdNpfvt6D3mopxZjIqWlCW6M9jsUF+fUEq+/+LSLMrNRG+AEFZm\n\t p5DMZ9iOaiZbozwBqF65EJKPFSh01MNs772Nw4DdV4rR9bLixui2lD8gxcQkpvEpPe\n\t l7GQm5uDGf5YQ==","Received-SPF":"Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124;\n helo=us-smtp-delivery-124.mimecast.com; envelope-from=poros@redhat.com;\n receiver=","DMARC-Filter":"OpenDMARC Filter v1.4.2 smtp1.osuosl.org 91B7580898","X-MC-Unique":"1qz2CUZyOTmXw6lVQ5aiAA-1","X-Mimecast-MFC-AGG-ID":"1qz2CUZyOTmXw6lVQ5aiAA_1776436202","From":"Petr Oros ","To":"netdev@vger.kernel.org","Date":"Fri, 17 Apr 2026 16:29:43 +0200","Message-ID":"\n <7e03c6b17b67453f7c0c3eefce034a8fb9c40b63.1776426683.git.poros@redhat.com>","In-Reply-To":"","References":"","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.93","X-Mimecast-MFC-PROC-ID":"vbcg1KMnSF5rfG4ibatIC1kZ6HUXP_gplgduOlpLBVE_1776436202","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=1776436213;\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=9yVRVn/zRQuQzeFy5xr25n7quPTdCY6cNbOdP3O2WBA=;\n b=e12G0E2IWkO8uR5Xw2qhZ3e7eSyjx/aTG327jz02Gyg6PLHOh9+/WcuIQyNQSVeIbOQWxu\n yjRc0DP9y4Q5TFfWG7PdT2SGSb7hseo71DSU212qcFmTxJg2NtSKJ5FyfkS1ugMbDf9ZIs\n beVf5rfloIkOvxWITggnvklv5YVR7rs=","X-Mailman-Original-Authentication-Results":["smtp1.osuosl.org;\n dmarc=pass (p=quarantine dis=none)\n header.from=redhat.com","smtp1.osuosl.org;\n dkim=pass (1024-bit key,\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=e12G0E2I"],"Subject":"[Intel-wired-lan] [PATCH iwl-net v2 2/4] iavf: stop removing VLAN\n filters from PF on interface down","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":"Przemyslaw Patynowski ,\n Aaron Brown ,\n Przemek Kitszel ,\n Mitch Williams ,\n Eric Dumazet , \"David S. Miller\" ,\n Aleksandr Loktionov ,\n Andrew Lunn ,\n Tony Nguyen ,\n Jesse Brandeburg , jacob.e.keller@intel.com,\n Jakub Kicinski ,\n Jedrzej Jagielski ,\n Paolo Abeni ,\n Rafal Romanowski ,\n linux-kernel@vger.kernel.org, intel-wired-lan@lists.osuosl.org","Errors-To":"intel-wired-lan-bounces@osuosl.org","Sender":"\"Intel-wired-lan\" "},"content":"When a VF goes down, the driver currently sends DEL_VLAN to the PF for\nevery VLAN filter (ACTIVE -> DISABLE -> send DEL -> INACTIVE), then\nre-adds them all on UP (INACTIVE -> ADD -> send ADD -> ADDING ->\nACTIVE). This round-trip is unnecessary because:\n\n 1. The PF disables the VF's queues via VIRTCHNL_OP_DISABLE_QUEUES,\n which already prevents all RX/TX traffic regardless of VLAN filter\n state.\n\n 2. The VLAN filters remaining in PF HW while the VF is down is\n harmless - packets matching those filters have nowhere to go with\n queues disabled.\n\n 3. The DEL+ADD cycle during down/up creates race windows where the\n VLAN filter list is incomplete. With spoofcheck enabled, the PF\n enables TX VLAN filtering on the first non-zero VLAN add, blocking\n traffic for any VLANs not yet re-added.\n\nRemove the entire DISABLE/INACTIVE state machinery:\n - Remove IAVF_VLAN_DISABLE and IAVF_VLAN_INACTIVE enum values\n - Remove iavf_restore_filters() and its call from iavf_open()\n - Remove VLAN filter handling from iavf_clear_mac_vlan_filters(),\n rename it to iavf_clear_mac_filters()\n - Remove DEL_VLAN_FILTER scheduling from iavf_down()\n - Remove all DISABLE/INACTIVE handling from iavf_del_vlans()\n\nVLAN filters now stay ACTIVE across down/up cycles. Only explicit\nuser removal (ndo_vlan_rx_kill_vid) or PF/VF reset triggers VLAN\nfilter deletion/re-addition.\n\nFixes: ed1f5b58ea01 (\"i40evf: remove VLAN filters on close\")\nSigned-off-by: Petr Oros \nReviewed-by: Aleksandr Loktionov \nTested-by: Rafal Romanowski \n---\n drivers/net/ethernet/intel/iavf/iavf.h | 6 +--\n drivers/net/ethernet/intel/iavf/iavf_main.c | 39 ++-----------------\n .../net/ethernet/intel/iavf/iavf_virtchnl.c | 33 +++-------------\n 3 files changed, 12 insertions(+), 66 deletions(-)","diff":"diff --git a/drivers/net/ethernet/intel/iavf/iavf.h b/drivers/net/ethernet/intel/iavf/iavf.h\nindex 47a862ca5e2c3f..5765715914d6b2 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf.h\n@@ -159,10 +159,8 @@ enum iavf_vlan_state_t {\n \tIAVF_VLAN_INVALID,\n \tIAVF_VLAN_ADD,\t\t/* filter needs to be added */\n \tIAVF_VLAN_ADDING,\t/* ADD sent to PF, waiting for response */\n-\tIAVF_VLAN_ACTIVE,\t/* filter is accepted by PF */\n-\tIAVF_VLAN_DISABLE,\t/* filter needs to be deleted by PF, then marked INACTIVE */\n-\tIAVF_VLAN_INACTIVE,\t/* filter is inactive, we are in IFF_DOWN */\n-\tIAVF_VLAN_REMOVE,\t/* filter needs to be removed from list */\n+\tIAVF_VLAN_ACTIVE,\t/* PF confirmed, filter is in HW */\n+\tIAVF_VLAN_REMOVE,\t/* filter queued for DEL from PF */\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 dad001abc9086b..12e102506011a6 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_main.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c\n@@ -801,27 +801,6 @@ static void iavf_del_vlan(struct iavf_adapter *adapter, struct iavf_vlan vlan)\n \tspin_unlock_bh(&adapter->mac_vlan_list_lock);\n }\n \n-/**\n- * iavf_restore_filters\n- * @adapter: board private structure\n- *\n- * Restore existing non MAC filters when VF netdev comes back up\n- **/\n-static void iavf_restore_filters(struct iavf_adapter *adapter)\n-{\n-\tstruct iavf_vlan_filter *f;\n-\n-\t/* re-add all VLAN filters */\n-\tspin_lock_bh(&adapter->mac_vlan_list_lock);\n-\n-\tlist_for_each_entry(f, &adapter->vlan_filter_list, list) {\n-\t\tif (f->state == IAVF_VLAN_INACTIVE)\n-\t\t\tf->state = IAVF_VLAN_ADD;\n-\t}\n-\n-\tspin_unlock_bh(&adapter->mac_vlan_list_lock);\n-\tadapter->aq_required |= IAVF_FLAG_AQ_ADD_VLAN_FILTER;\n-}\n \n /**\n * iavf_get_num_vlans_added - get number of VLANs added\n@@ -1240,13 +1219,12 @@ static void iavf_up_complete(struct iavf_adapter *adapter)\n }\n \n /**\n- * iavf_clear_mac_vlan_filters - Remove mac and vlan filters not sent to PF\n- * yet and mark other to be removed.\n+ * iavf_clear_mac_filters - Remove MAC filters not sent to PF yet and mark\n+ * others to be removed.\n * @adapter: board private structure\n **/\n-static void iavf_clear_mac_vlan_filters(struct iavf_adapter *adapter)\n+static void iavf_clear_mac_filters(struct iavf_adapter *adapter)\n {\n-\tstruct iavf_vlan_filter *vlf, *vlftmp;\n \tstruct iavf_mac_filter *f, *ftmp;\n \n \tspin_lock_bh(&adapter->mac_vlan_list_lock);\n@@ -1265,11 +1243,6 @@ static void iavf_clear_mac_vlan_filters(struct iavf_adapter *adapter)\n \t\t}\n \t}\n \n-\t/* disable all VLAN filters */\n-\tlist_for_each_entry_safe(vlf, vlftmp, &adapter->vlan_filter_list,\n-\t\t\t\t list)\n-\t\tvlf->state = IAVF_VLAN_DISABLE;\n-\n \tspin_unlock_bh(&adapter->mac_vlan_list_lock);\n }\n \n@@ -1365,7 +1338,7 @@ void iavf_down(struct iavf_adapter *adapter)\n \tiavf_napi_disable_all(adapter);\n \tiavf_irq_disable(adapter);\n \n-\tiavf_clear_mac_vlan_filters(adapter);\n+\tiavf_clear_mac_filters(adapter);\n \tiavf_clear_cloud_filters(adapter);\n \tiavf_clear_fdir_filters(adapter);\n \tiavf_clear_adv_rss_conf(adapter);\n@@ -1382,8 +1355,6 @@ void iavf_down(struct iavf_adapter *adapter)\n \t\t */\n \t\tif (!list_empty(&adapter->mac_filter_list))\n \t\t\tadapter->aq_required |= IAVF_FLAG_AQ_DEL_MAC_FILTER;\n-\t\tif (!list_empty(&adapter->vlan_filter_list))\n-\t\t\tadapter->aq_required |= IAVF_FLAG_AQ_DEL_VLAN_FILTER;\n \t\tif (!list_empty(&adapter->cloud_filter_list))\n \t\t\tadapter->aq_required |= IAVF_FLAG_AQ_DEL_CLOUD_FILTER;\n \t\tif (!list_empty(&adapter->fdir_list_head))\n@@ -4488,8 +4459,6 @@ static int iavf_open(struct net_device *netdev)\n \tiavf_add_filter(adapter, adapter->hw.mac.addr);\n \tspin_unlock_bh(&adapter->mac_vlan_list_lock);\n \n-\t/* Restore filters that were removed with IFF_DOWN */\n-\tiavf_restore_filters(adapter);\n \tiavf_restore_fdir_filters(adapter);\n \n \tiavf_configure(adapter);\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\nindex 6b06ae872a0cdf..4f197d908124e6 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\n@@ -911,22 +911,12 @@ void iavf_del_vlans(struct iavf_adapter *adapter)\n \tspin_lock_bh(&adapter->mac_vlan_list_lock);\n \n \tlist_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, list) {\n-\t\t/* since VLAN capabilities are not allowed, we dont want to send\n-\t\t * a VLAN delete request because it will most likely fail and\n-\t\t * create unnecessary errors/noise, so just free the VLAN\n-\t\t * filters marked for removal to enable bailing out before\n-\t\t * sending a virtchnl message\n-\t\t */\n \t\tif (f->state == IAVF_VLAN_REMOVE &&\n \t\t !VLAN_FILTERING_ALLOWED(adapter)) {\n \t\t\tlist_del(&f->list);\n \t\t\tkfree(f);\n \t\t\tadapter->num_vlan_filters--;\n-\t\t} else if (f->state == IAVF_VLAN_DISABLE &&\n-\t\t !VLAN_FILTERING_ALLOWED(adapter)) {\n-\t\t\tf->state = IAVF_VLAN_INACTIVE;\n-\t\t} else if (f->state == IAVF_VLAN_REMOVE ||\n-\t\t\t f->state == IAVF_VLAN_DISABLE) {\n+\t\t} else if (f->state == IAVF_VLAN_REMOVE) {\n \t\t\tcount++;\n \t\t}\n \t}\n@@ -959,13 +949,7 @@ void iavf_del_vlans(struct iavf_adapter *adapter)\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\t\tif (f->state == IAVF_VLAN_DISABLE) {\n-\t\t\t\tvvfl->vlan_id[i] = f->vlan.vid;\n-\t\t\t\tf->state = IAVF_VLAN_INACTIVE;\n-\t\t\t\ti++;\n-\t\t\t\tif (i == count)\n-\t\t\t\t\tbreak;\n-\t\t\t} else if (f->state == IAVF_VLAN_REMOVE) {\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@@ -1007,8 +991,7 @@ void iavf_del_vlans(struct iavf_adapter *adapter)\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\t\tif (f->state == IAVF_VLAN_DISABLE ||\n-\t\t\t f->state == IAVF_VLAN_REMOVE) {\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 \t\t\t\tstruct virtchnl_vlan *vlan;\n@@ -1022,13 +1005,9 @@ 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\tif (f->state == IAVF_VLAN_DISABLE) {\n-\t\t\t\t\tf->state = IAVF_VLAN_INACTIVE;\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\tlist_del(&f->list);\n+\t\t\t\tkfree(f);\n+\t\t\t\tadapter->num_vlan_filters--;\n \t\t\t\ti++;\n \t\t\t\tif (i == count)\n \t\t\t\t\tbreak;\n","prefixes":["iwl-net","v2","2/4"]}