{"id":2211264,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2211264/?format=json","web_url":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260316104209.1285962-5-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-5-poros@redhat.com>","list_archive_url":null,"date":"2026-03-16T10:42:09","name":"[iwl-next,4/4] iavf: harden VLAN filter state machine race handling","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"5768f571384f9b9c2e6d813973db5e4611ae4aa4","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-5-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/2211264/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2211264/checks/","tags":{},"related":[],"headers":{"Return-Path":"<intel-wired-lan-bounces@osuosl.org>","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=5AXzCiny;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=2605:bc80:3010::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 [IPv6:2605:bc80:3010::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 4fZBWC0Nkbz1xwC\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 16 Mar 2026 21:42:47 +1100 (AEDT)","from localhost (localhost [127.0.0.1])\n\tby smtp1.osuosl.org (Postfix) with ESMTP id AF2918227B;\n\tMon, 16 Mar 2026 10:42:45 +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 OkKmQ2Ffiogd; Mon, 16 Mar 2026 10:42:45 +0000 (UTC)","from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp1.osuosl.org (Postfix) with ESMTP id E36C08223D;\n\tMon, 16 Mar 2026 10:42:44 +0000 (UTC)","from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136])\n by lists1.osuosl.org (Postfix) with ESMTP id 2EB5C1B4\n for <intel-wired-lan@lists.osuosl.org>; Mon, 16 Mar 2026 10:42:43 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n by smtp3.osuosl.org (Postfix) with ESMTP id 208DC60E3E\n for <intel-wired-lan@lists.osuosl.org>; Mon, 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 HCdesku_B8g6 for <intel-wired-lan@lists.osuosl.org>;\n Mon, 16 Mar 2026 10:42:41 +0000 (UTC)","from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.129.124])\n by smtp3.osuosl.org (Postfix) with ESMTPS id ED6C960DEA\n for <intel-wired-lan@lists.osuosl.org>; Mon, 16 Mar 2026 10:42:40 +0000 (UTC)","from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-277-54-iBjSePL26S8rctg4q0A-1; Mon,\n 16 Mar 2026 06:42:36 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 98A7D180AA95; Mon, 16 Mar 2026 10:42:31 +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 116131800351; Mon, 16 Mar 2026 10:42:27 +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=<UNKNOWN> ","DKIM-Filter":["OpenDKIM Filter v2.11.0 smtp1.osuosl.org E36C08223D","OpenDKIM Filter v2.11.0 smtp3.osuosl.org ED6C960DEA"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org;\n\ts=default; t=1773657764;\n\tbh=TcCvlNKS2FtWNY/zDB/0qSw6naZ8LMZekz/Sa7hhVBQ=;\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=5AXzCinyDpYuWNvS9PNZPLoIib93IR8kbXe73jp5kA6mpFNv3pjaWMRy4gFMica7+\n\t nbT2HcS20FKTrUiQPVeXKuYh3U4nvvCK+57NQMK4SC34qyL0tifr99Udk3UbgHjFwx\n\t 5nli3MJ4uNrsBu320agZ3DTka9cc69SjryuzNoB4iOEPZJo2oADCvIVEs2we3V40q7\n\t LShnv6CNbaTUE30ZIcJeUfRmKHIC43sGiZ2tRvp89o+iqneqQugh59Au/YHawduGaR\n\t Lrba1YW6bJh7UF2RDuRQh1TKc01IOWnoFQsbG5XatKmfiOGKxyog5CChi+5WPzsdOw\n\t kOyjZF0/P6Xkw==","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=<UNKNOWN>","DMARC-Filter":"OpenDMARC Filter v1.4.2 smtp3.osuosl.org ED6C960DEA","X-MC-Unique":"54-iBjSePL26S8rctg4q0A-1","X-Mimecast-MFC-AGG-ID":"54-iBjSePL26S8rctg4q0A_1773657754","From":"Petr Oros <poros@redhat.com>","To":"netdev@vger.kernel.org","Date":"Mon, 16 Mar 2026 11:42:09 +0100","Message-ID":"<20260316104209.1285962-5-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":"Fv0ZFxJ-8JN6LJRn0pugArUdPKDXL0svkaa7uQX-EHE_1773657754","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=1773657759;\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=TcCvlNKS2FtWNY/zDB/0qSw6naZ8LMZekz/Sa7hhVBQ=;\n b=S75+5bYgh7GeuQUeMSXnAfl6iqAcO09i4IaJI5vej6uDHxQiqaYjtSfGG3IL5mLuaqMw/e\n B8wThpmMDYJQl5g5TxE9Id3gVuEfXtgLd/Oj4T0QogBIIY1eiRt4tEJsXlhC7puwF0iXQp\n yViE3rTSK81SmkwIz95ST4NEr1juTFM=","X-Mailman-Original-Authentication-Results":["smtp3.osuosl.org;\n dmarc=pass (p=quarantine dis=none)\n header.from=redhat.com","smtp3.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=S75+5bYg"],"Subject":"[Intel-wired-lan] [PATCH iwl-next 4/4] iavf: harden VLAN filter\n state machine race handling","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 <intel-wired-lan.osuosl.org>","List-Unsubscribe":"<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>","List-Archive":"<http://lists.osuosl.org/pipermail/intel-wired-lan/>","List-Post":"<mailto:intel-wired-lan@osuosl.org>","List-Help":"<mailto:intel-wired-lan-request@osuosl.org?subject=help>","List-Subscribe":"<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>","Cc":"Przemek Kitszel <przemyslaw.kitszel@intel.com>,\n Eric Dumazet <edumazet@google.com>, linux-kernel@vger.kernel.org,\n Andrew Lunn <andrew+netdev@lunn.ch>,\n Tony Nguyen <anthony.l.nguyen@intel.com>,\n intel-wired-lan@lists.osuosl.org, jacob.e.keller@intel.com,\n Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,\n \"David S. Miller\" <davem@davemloft.net>","Errors-To":"intel-wired-lan-bounces@osuosl.org","Sender":"\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>"},"content":"Address remaining race windows in the VLAN filter state machine that\nwere identified during cross-state analysis of ADD and DEL paths.\n\n1. Add VIRTCHNL_OP_ADD_VLAN to the success completion handler.\n\n   The V1 ADD_VLAN opcode had no success handler -- filters sent via V1\n   stayed in ADDING state permanently.  Add a fallthrough case so V1\n   filters also transition ADDING -> ACTIVE on PF confirmation.\n\n   Critically, add an `if (v_retval) break` guard: the error switch\n   in iavf_virtchnl_completion() does NOT return after handling errors,\n   it falls through to the success switch.  Without this guard, a\n   PF-rejected ADD would incorrectly mark ADDING filters as ACTIVE,\n   creating a driver/HW mismatch where the driver believes the filter\n   is installed but the PF never accepted it.\n\n   For V2, this is harmless: iavf_vlan_add_reject() in the error\n   block already kfree'd all ADDING filters, so the success handler\n   finds nothing to transition.\n\n2. Skip DEL on filters already in REMOVING state.\n\n   In iavf_del_vlan(), if a filter is in IAVF_VLAN_REMOVING (DEL\n   already sent to PF, waiting for response), do not overwrite to\n   REMOVE and schedule a redundant DEL.  The pending DEL's\n   completion handler will either kfree the filter (PF confirms)\n   or revert to ACTIVE (PF rejects).\n\n   Without this, the sequence DEL(pending) -> user-del -> second DEL\n   could result in PF returning an error for the second DEL (filter\n   already gone), causing the completion handler to incorrectly revert\n   a deleted filter back to ACTIVE.\n\nSigned-off-by: Petr Oros <poros@redhat.com>\n---\n drivers/net/ethernet/intel/iavf/iavf_main.c     | 5 ++++-\n drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 4 ++++\n 2 files changed, 8 insertions(+), 1 deletion(-)","diff":"diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c\nindex 89e5aae20d5573..1ffc0ce3f35602 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_main.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c\n@@ -816,11 +816,14 @@ static void iavf_del_vlan(struct iavf_adapter *adapter, struct iavf_vlan vlan)\n \t\t\tlist_del(&f->list);\n \t\t\tkfree(f);\n \t\t\tadapter->num_vlan_filters--;\n-\t\t} else {\n+\t\t} else if (f->state != IAVF_VLAN_REMOVING) {\n \t\t\tf->state = IAVF_VLAN_REMOVE;\n \t\t\tiavf_schedule_aq_request(adapter,\n \t\t\t\t\t\t IAVF_FLAG_AQ_DEL_VLAN_FILTER);\n \t\t}\n+\t\t/* If REMOVING, DEL is already sent to PF; completion\n+\t\t * handler will free the filter when PF confirms.\n+\t\t */\n \t}\n \n \tspin_unlock_bh(&adapter->mac_vlan_list_lock);\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\nindex d0b7b810679399..147adb76f64141 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\n@@ -2877,9 +2877,13 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,\n \t\tspin_unlock_bh(&adapter->adv_rss_lock);\n \t\t}\n \t\tbreak;\n+\tcase VIRTCHNL_OP_ADD_VLAN:\n \tcase VIRTCHNL_OP_ADD_VLAN_V2: {\n \t\tstruct iavf_vlan_filter *f;\n \n+\t\tif (v_retval)\n+\t\t\tbreak;\n+\n \t\tspin_lock_bh(&adapter->mac_vlan_list_lock);\n \t\tlist_for_each_entry(f, &adapter->vlan_filter_list, list) {\n \t\t\tif (f->state == IAVF_VLAN_ADDING)\n","prefixes":["iwl-next","4/4"]}