From nobody Tue Apr 7 04:20:29 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C15FA38D6A9 for ; Mon, 16 Mar 2026 10:42:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773657749; cv=none; b=dZ0DlXKgH4y4KZx6919hG94e4gg/kpUxzJfV196Xed3qb47pgzFX9tmVlkeSjWDzaYEH0YY41bcf+u9Rszw443DZzvj/CEGyfnoUTUTxZZq+a2Bf0OVdJX4Gd6ouj3Krjkc6fEfmkzNeikzI+YiGUGcSFr7nKI0K/GfqvGYcgiw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773657749; c=relaxed/simple; bh=c2KF/gaurLuOL9n21+yl+uvd1IemrDLGiIKtJu0QIBg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Gr7HxduTW4cushtwt/c6zeaFy9AoMioBlfGSB3GvFGb4DNNZMP6RXyP3R6cufGylCku32zi8vcosNYzM/3k7/iJMx6HMo0QFF86BaAvIzJKgCyoRPcuchIJt5SiUMKbanlWGs6SP9WwQTSsju7EgEx9lSJv7m20yuu/E8ybAFC4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=UBheTNUA; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="UBheTNUA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773657747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ncsRh6apqUu7E9HPi27BmsmzD0caQNYcAoNEUyrUMUo=; b=UBheTNUAzPemebpGLYqHnV7DpEktMOlHBgHDC4i6GQKOeDU9U0PZm7xUQRlhyyrUD8Q2bd Ke/EVZ62dtVLTUnL0eartVmLYhEqS97L8OXJMOJ93dHOOEUfcnHflzWOnoCDL1OpzV/wg5 zPmXxqNsfSH/ikaHC4M8NjJD/68QhoY= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-663-k1oUlIuWOZai5fgpmNXITQ-1; Mon, 16 Mar 2026 06:42:21 -0400 X-MC-Unique: k1oUlIuWOZai5fgpmNXITQ-1 X-Mimecast-MFC-AGG-ID: k1oUlIuWOZai5fgpmNXITQ_1773657740 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CE89D1956065; Mon, 16 Mar 2026 10:42:19 +0000 (UTC) Received: from ShadowPeak.redhat.com (unknown [10.45.224.235]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6D859180035F; Mon, 16 Mar 2026 10:42:16 +0000 (UTC) From: Petr Oros To: netdev@vger.kernel.org Cc: jacob.e.keller@intel.com, Petr Oros , Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , intel-wired-lan@lists.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH iwl-next 1/4] iavf: rename IAVF_VLAN_IS_NEW to IAVF_VLAN_ADDING Date: Mon, 16 Mar 2026 11:42:06 +0100 Message-ID: <20260316104209.1285962-2-poros@redhat.com> In-Reply-To: <20260316104209.1285962-1-poros@redhat.com> References: <20260316104209.1285962-1-poros@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" Rename the IAVF_VLAN_IS_NEW state to IAVF_VLAN_ADDING to better describe what the state represents: an ADD request has been sent to the PF and is waiting for a response. This is a pure rename with no behavioral change, preparing for a cleanup of the VLAN filter state machine. Signed-off-by: Petr Oros Reviewed-by: Simon Horman --- drivers/net/ethernet/intel/iavf/iavf.h | 2 +- drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/intel/iavf/iavf.h b/drivers/net/ethernet/= intel/iavf/iavf.h index a87e0c6d4017ad..8e6db72828ae14 100644 --- a/drivers/net/ethernet/intel/iavf/iavf.h +++ b/drivers/net/ethernet/intel/iavf/iavf.h @@ -158,7 +158,7 @@ struct iavf_vlan { enum iavf_vlan_state_t { IAVF_VLAN_INVALID, IAVF_VLAN_ADD, /* filter needs to be added */ - IAVF_VLAN_IS_NEW, /* filter is new, wait for PF answer */ + IAVF_VLAN_ADDING, /* ADD sent to PF, waiting for response */ IAVF_VLAN_ACTIVE, /* filter is accepted by PF */ IAVF_VLAN_DISABLE, /* filter needs to be deleted by PF, then marked INACT= IVE */ IAVF_VLAN_INACTIVE, /* filter is inactive, we are in IFF_DOWN */ diff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c b/drivers/net/= ethernet/intel/iavf/iavf_virtchnl.c index 88156082a41da6..5114934fe81fa6 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c @@ -746,7 +746,7 @@ static void iavf_vlan_add_reject(struct iavf_adapter *a= dapter) =20 spin_lock_bh(&adapter->mac_vlan_list_lock); list_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, list) { - if (f->state =3D=3D IAVF_VLAN_IS_NEW) { + if (f->state =3D=3D IAVF_VLAN_ADDING) { list_del(&f->list); kfree(f); adapter->num_vlan_filters--; @@ -812,7 +812,7 @@ void iavf_add_vlans(struct iavf_adapter *adapter) if (f->state =3D=3D IAVF_VLAN_ADD) { vvfl->vlan_id[i] =3D f->vlan.vid; i++; - f->state =3D IAVF_VLAN_IS_NEW; + f->state =3D IAVF_VLAN_ADDING; if (i =3D=3D count) break; } @@ -874,7 +874,7 @@ void iavf_add_vlans(struct iavf_adapter *adapter) vlan->tpid =3D f->vlan.tpid; =20 i++; - f->state =3D IAVF_VLAN_IS_NEW; + f->state =3D IAVF_VLAN_ADDING; } } =20 @@ -2911,7 +2911,7 @@ void iavf_virtchnl_completion(struct iavf_adapter *ad= apter, =20 spin_lock_bh(&adapter->mac_vlan_list_lock); list_for_each_entry(f, &adapter->vlan_filter_list, list) { - if (f->state =3D=3D IAVF_VLAN_IS_NEW) + if (f->state =3D=3D IAVF_VLAN_ADDING) f->state =3D IAVF_VLAN_ACTIVE; } spin_unlock_bh(&adapter->mac_vlan_list_lock); --=20 2.52.0 From nobody Tue Apr 7 04:20:29 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1F0B638E5C5 for ; Mon, 16 Mar 2026 10:42:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773657749; cv=none; b=cLtV2SMFMv2Jfe0dVfUF4GTALFWU64CQKpwfX/08EvWxj0g/pPbyiOWAi/9QgvQXblFxQItTz7cwMxhkykdRxp+InkyG2Wkbol28AHUgrLTouAHPRoFm3m741Jjbfd6NmIIUXBuFMLi5aOJ+BTA+l2p3nsQfFl0DZn0If1rio1g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773657749; c=relaxed/simple; bh=e00ffS2h4LZXn5Z3LLSp4GjEsqe2NexSt3xV3IVBjic=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qFl9Vxt2rpsCxFGbg+dmGLFtYWpBjWfapPEM3rbK2Is9omal9ASk+h4ERdiMv4NDXUVlu/MJYWv/VzZi+SvrZ6g6Bijstkp4buUZ9VssLiDd1j8y2P1iavKVqgc9doYRV1fuVWzWGH2+g48J7tV7TW24RRVxPH9rujelbWs3eY0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=NH17DnfX; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="NH17DnfX" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773657747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HbUia9ToJ4Em68ifvsDotsjzFpaTuyfg9MsB1jiwYJs=; b=NH17DnfXzxpzM9vqHUr1QNCI8Jgbj2FcVn6/GRnlzwPJT3f+vFhzIpeXjUUNwPxPfaYA18 WvtD858XPov9IT/etWFR8DisR5bSIm8yakptPWONV0RLy+UswtCm96LfoDl2VY1VSXOfqs ZefL0rMLUF7ATBMUCz2FnXv6go2yfIc= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-607-UGzni3mnM6y881BySK1cmQ-1; Mon, 16 Mar 2026 06:42:25 -0400 X-MC-Unique: UGzni3mnM6y881BySK1cmQ-1 X-Mimecast-MFC-AGG-ID: UGzni3mnM6y881BySK1cmQ_1773657743 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 656F618002CA; Mon, 16 Mar 2026 10:42:23 +0000 (UTC) Received: from ShadowPeak.redhat.com (unknown [10.45.224.235]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 592A7180035F; Mon, 16 Mar 2026 10:42:20 +0000 (UTC) From: Petr Oros To: netdev@vger.kernel.org Cc: jacob.e.keller@intel.com, Petr Oros , Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , intel-wired-lan@lists.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH iwl-next 2/4] iavf: stop removing VLAN filters from PF on interface down Date: Mon, 16 Mar 2026 11:42:07 +0100 Message-ID: <20260316104209.1285962-3-poros@redhat.com> In-Reply-To: <20260316104209.1285962-1-poros@redhat.com> References: <20260316104209.1285962-1-poros@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" When a VF goes down, the driver currently sends DEL_VLAN to the PF for every VLAN filter (ACTIVE -> DISABLE -> send DEL -> INACTIVE), then re-adds them all on UP (INACTIVE -> ADD -> send ADD -> ADDING -> ACTIVE). This round-trip is unnecessary because: 1. The PF disables the VF's queues via VIRTCHNL_OP_DISABLE_QUEUES, which already prevents all RX/TX traffic regardless of VLAN filter state. 2. The VLAN filters remaining in PF HW while the VF is down is harmless - packets matching those filters have nowhere to go with queues disabled. 3. The DEL+ADD cycle during down/up creates race windows where the VLAN filter list is incomplete. With spoofcheck enabled, the PF enables TX VLAN filtering on the first non-zero VLAN add, blocking traffic for any VLANs not yet re-added. Remove the entire DISABLE/INACTIVE state machinery: - Remove IAVF_VLAN_DISABLE and IAVF_VLAN_INACTIVE enum values - Remove iavf_restore_filters() and its call from iavf_open() - Remove VLAN filter handling from iavf_clear_mac_vlan_filters(), rename it to iavf_clear_mac_filters() - Remove DEL_VLAN_FILTER scheduling from iavf_down() - Remove all DISABLE/INACTIVE handling from iavf_del_vlans() VLAN filters now stay ACTIVE across down/up cycles. Only explicit user removal (ndo_vlan_rx_kill_vid) or PF/VF reset triggers VLAN filter deletion/re-addition. Signed-off-by: Petr Oros Reviewed-by: Simon Horman --- drivers/net/ethernet/intel/iavf/iavf.h | 6 +-- drivers/net/ethernet/intel/iavf/iavf_main.c | 39 ++----------------- .../net/ethernet/intel/iavf/iavf_virtchnl.c | 33 +++------------- 3 files changed, 12 insertions(+), 66 deletions(-) diff --git a/drivers/net/ethernet/intel/iavf/iavf.h b/drivers/net/ethernet/= intel/iavf/iavf.h index 8e6db72828ae14..1ad00690622c8e 100644 --- a/drivers/net/ethernet/intel/iavf/iavf.h +++ b/drivers/net/ethernet/intel/iavf/iavf.h @@ -159,10 +159,8 @@ enum iavf_vlan_state_t { IAVF_VLAN_INVALID, IAVF_VLAN_ADD, /* filter needs to be added */ IAVF_VLAN_ADDING, /* ADD sent to PF, waiting for response */ - IAVF_VLAN_ACTIVE, /* filter is accepted by PF */ - IAVF_VLAN_DISABLE, /* filter needs to be deleted by PF, then marked INACT= IVE */ - IAVF_VLAN_INACTIVE, /* filter is inactive, we are in IFF_DOWN */ - IAVF_VLAN_REMOVE, /* filter needs to be removed from list */ + IAVF_VLAN_ACTIVE, /* PF confirmed, filter is in HW */ + IAVF_VLAN_REMOVE, /* filter queued for DEL from PF */ }; =20 struct iavf_vlan_filter { diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethe= rnet/intel/iavf/iavf_main.c index 86c1964f42e101..b38ce496a95c75 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_main.c +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c @@ -823,27 +823,6 @@ static void iavf_del_vlan(struct iavf_adapter *adapter= , struct iavf_vlan vlan) spin_unlock_bh(&adapter->mac_vlan_list_lock); } =20 -/** - * iavf_restore_filters - * @adapter: board private structure - * - * Restore existing non MAC filters when VF netdev comes back up - **/ -static void iavf_restore_filters(struct iavf_adapter *adapter) -{ - struct iavf_vlan_filter *f; - - /* re-add all VLAN filters */ - spin_lock_bh(&adapter->mac_vlan_list_lock); - - list_for_each_entry(f, &adapter->vlan_filter_list, list) { - if (f->state =3D=3D IAVF_VLAN_INACTIVE) - f->state =3D IAVF_VLAN_ADD; - } - - spin_unlock_bh(&adapter->mac_vlan_list_lock); - adapter->aq_required |=3D IAVF_FLAG_AQ_ADD_VLAN_FILTER; -} =20 /** * iavf_get_num_vlans_added - get number of VLANs added @@ -1262,13 +1241,12 @@ static void iavf_up_complete(struct iavf_adapter *a= dapter) } =20 /** - * iavf_clear_mac_vlan_filters - Remove mac and vlan filters not sent to PF - * yet and mark other to be removed. + * iavf_clear_mac_filters - Remove MAC filters not sent to PF yet and mark + * others to be removed. * @adapter: board private structure **/ -static void iavf_clear_mac_vlan_filters(struct iavf_adapter *adapter) +static void iavf_clear_mac_filters(struct iavf_adapter *adapter) { - struct iavf_vlan_filter *vlf, *vlftmp; struct iavf_mac_filter *f, *ftmp; =20 spin_lock_bh(&adapter->mac_vlan_list_lock); @@ -1287,11 +1265,6 @@ static void iavf_clear_mac_vlan_filters(struct iavf_= adapter *adapter) } } =20 - /* disable all VLAN filters */ - list_for_each_entry_safe(vlf, vlftmp, &adapter->vlan_filter_list, - list) - vlf->state =3D IAVF_VLAN_DISABLE; - spin_unlock_bh(&adapter->mac_vlan_list_lock); } =20 @@ -1387,7 +1360,7 @@ void iavf_down(struct iavf_adapter *adapter) iavf_napi_disable_all(adapter); iavf_irq_disable(adapter); =20 - iavf_clear_mac_vlan_filters(adapter); + iavf_clear_mac_filters(adapter); iavf_clear_cloud_filters(adapter); iavf_clear_fdir_filters(adapter); iavf_clear_adv_rss_conf(adapter); @@ -1404,8 +1377,6 @@ void iavf_down(struct iavf_adapter *adapter) */ if (!list_empty(&adapter->mac_filter_list)) adapter->aq_required |=3D IAVF_FLAG_AQ_DEL_MAC_FILTER; - if (!list_empty(&adapter->vlan_filter_list)) - adapter->aq_required |=3D IAVF_FLAG_AQ_DEL_VLAN_FILTER; if (!list_empty(&adapter->cloud_filter_list)) adapter->aq_required |=3D IAVF_FLAG_AQ_DEL_CLOUD_FILTER; if (!list_empty(&adapter->fdir_list_head)) @@ -4502,8 +4473,6 @@ static int iavf_open(struct net_device *netdev) iavf_add_filter(adapter, adapter->hw.mac.addr); spin_unlock_bh(&adapter->mac_vlan_list_lock); =20 - /* Restore filters that were removed with IFF_DOWN */ - iavf_restore_filters(adapter); iavf_restore_fdir_filters(adapter); =20 iavf_configure(adapter); diff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c b/drivers/net/= ethernet/intel/iavf/iavf_virtchnl.c index 5114934fe81fa6..d62c0d6394149e 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c @@ -911,22 +911,12 @@ void iavf_del_vlans(struct iavf_adapter *adapter) spin_lock_bh(&adapter->mac_vlan_list_lock); =20 list_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, list) { - /* since VLAN capabilities are not allowed, we dont want to send - * a VLAN delete request because it will most likely fail and - * create unnecessary errors/noise, so just free the VLAN - * filters marked for removal to enable bailing out before - * sending a virtchnl message - */ if (f->state =3D=3D IAVF_VLAN_REMOVE && !VLAN_FILTERING_ALLOWED(adapter)) { list_del(&f->list); kfree(f); adapter->num_vlan_filters--; - } else if (f->state =3D=3D IAVF_VLAN_DISABLE && - !VLAN_FILTERING_ALLOWED(adapter)) { - f->state =3D IAVF_VLAN_INACTIVE; - } else if (f->state =3D=3D IAVF_VLAN_REMOVE || - f->state =3D=3D IAVF_VLAN_DISABLE) { + } else if (f->state =3D=3D IAVF_VLAN_REMOVE) { count++; } } @@ -959,13 +949,7 @@ void iavf_del_vlans(struct iavf_adapter *adapter) vvfl->vsi_id =3D adapter->vsi_res->vsi_id; vvfl->num_elements =3D count; list_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, list) { - if (f->state =3D=3D IAVF_VLAN_DISABLE) { - vvfl->vlan_id[i] =3D f->vlan.vid; - f->state =3D IAVF_VLAN_INACTIVE; - i++; - if (i =3D=3D count) - break; - } else if (f->state =3D=3D IAVF_VLAN_REMOVE) { + if (f->state =3D=3D IAVF_VLAN_REMOVE) { vvfl->vlan_id[i] =3D f->vlan.vid; list_del(&f->list); kfree(f); @@ -1007,8 +991,7 @@ void iavf_del_vlans(struct iavf_adapter *adapter) vvfl_v2->vport_id =3D adapter->vsi_res->vsi_id; vvfl_v2->num_elements =3D count; list_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, list) { - if (f->state =3D=3D IAVF_VLAN_DISABLE || - f->state =3D=3D IAVF_VLAN_REMOVE) { + if (f->state =3D=3D IAVF_VLAN_REMOVE) { struct virtchnl_vlan_supported_caps *filtering_support =3D &adapter->vlan_v2_caps.filtering.filtering_support; struct virtchnl_vlan *vlan; @@ -1022,13 +1005,9 @@ void iavf_del_vlans(struct iavf_adapter *adapter) vlan->tci =3D f->vlan.vid; vlan->tpid =3D f->vlan.tpid; =20 - if (f->state =3D=3D IAVF_VLAN_DISABLE) { - f->state =3D IAVF_VLAN_INACTIVE; - } else { - list_del(&f->list); - kfree(f); - adapter->num_vlan_filters--; - } + list_del(&f->list); + kfree(f); + adapter->num_vlan_filters--; i++; if (i =3D=3D count) break; --=20 2.52.0 From nobody Tue Apr 7 04:20:29 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AFCF338F95D for ; Mon, 16 Mar 2026 10:42:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773657758; cv=none; b=b1/JU4wUq6J1/EG25jM8knXNfMwMHnyPrmiciehAXFUfiYuutHoZPFZgUm/rqvLKaYkFhM5+/tMaeeOpB1+ejncYlVEj63qncxdUrqxT10vprvhKJwQoQasdTTeUwEycWKdB+Ri6UGYzpwObX8Xb5cNWAgTlMYQWb1JG9GH3NO0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773657758; c=relaxed/simple; bh=Z23iiIUboMOopgrGLq2MzlaGaSWgZb9psd3YQCeMYhs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tB4/fw5HPfi0YZ34IIgcOvSdqk/i4d73kvaPis2zHW/lXIly5sayD3YM59q9RBKHwtqw0q2ae82orUHCzBZNX7C2ulDsQZNb8YNolM7U3NlljGjUgQ91CPrPpFiwYELRKRqOio8PYgTVRg+HM0GXb7Z/6scUrg/lLTyC2cunflY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=YSX+dt6x; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YSX+dt6x" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773657755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vG/uH1+MoWziuiYVHD5GqsUIbFKI25Uy5mOYHhl24nM=; b=YSX+dt6xpYeFT90b2ptUI0fsHQMWk7MMnNF42RUxKRKZAFmnfJhnemb0gNmuajpvQOLkhZ m11NjtKOfak9F+f6xuFYIpiP0z/+iRpwrhjHgGb9C7stpGA93qR87mbfEOZLGIGCKL0AjL C3ZcCMY+s1VLkUCRMKe5XVc4O0TsrJo= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-628-6K6OrgyVOT-wHzHeRSjqZA-1; Mon, 16 Mar 2026 06:42:31 -0400 X-MC-Unique: 6K6OrgyVOT-wHzHeRSjqZA-1 X-Mimecast-MFC-AGG-ID: 6K6OrgyVOT-wHzHeRSjqZA_1773657748 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 95B9D1953963; Mon, 16 Mar 2026 10:42:27 +0000 (UTC) Received: from ShadowPeak.redhat.com (unknown [10.45.224.235]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D49A0180035F; Mon, 16 Mar 2026 10:42:23 +0000 (UTC) From: Petr Oros To: netdev@vger.kernel.org Cc: jacob.e.keller@intel.com, Petr Oros , Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , intel-wired-lan@lists.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH iwl-next 3/4] iavf: wait for PF confirmation before removing VLAN filters 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" The VLAN filter DELETE path was asymmetric with the ADD path: ADD waits for PF confirmation (ADD -> ADDING -> ACTIVE), but DELETE immediately frees the filter struct after sending the DEL message without waiting for the PF response. This is problematic because: - If the PF rejects the DEL, the filter remains in HW but the driver has already freed the tracking structure, losing sync. - Race conditions between DEL pending and other operations (add, reset) cannot be properly resolved if the filter struct is already gone. Add IAVF_VLAN_REMOVING state to make the DELETE path symmetric: REMOVE -> REMOVING (send DEL) -> PF confirms -> kfree -> PF rejects -> ACTIVE In iavf_del_vlans(), transition filters from REMOVE to REMOVING instead of immediately freeing them. The new DEL completion handler in iavf_virtchnl_completion() frees filters on success or reverts them to ACTIVE on error. Update iavf_add_vlan() to handle the REMOVING state: if a DEL is pending and the user re-adds the same VLAN, queue it for ADD so it gets re-programmed after the PF processes the DEL. The !VLAN_FILTERING_ALLOWED early-exit path still frees filters directly since no PF message is sent in that case. Signed-off-by: Petr Oros Reviewed-by: Simon Horman --- drivers/net/ethernet/intel/iavf/iavf.h | 1 + drivers/net/ethernet/intel/iavf/iavf_main.c | 9 +++-- .../net/ethernet/intel/iavf/iavf_virtchnl.c | 37 +++++++++++++------ 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/intel/iavf/iavf.h b/drivers/net/ethernet/= intel/iavf/iavf.h index 1ad00690622c8e..f9ad814d18b1da 100644 --- a/drivers/net/ethernet/intel/iavf/iavf.h +++ b/drivers/net/ethernet/intel/iavf/iavf.h @@ -161,6 +161,7 @@ enum iavf_vlan_state_t { IAVF_VLAN_ADDING, /* ADD sent to PF, waiting for response */ IAVF_VLAN_ACTIVE, /* PF confirmed, filter is in HW */ IAVF_VLAN_REMOVE, /* filter queued for DEL from PF */ + IAVF_VLAN_REMOVING, /* DEL sent to PF, waiting for response */ }; =20 struct iavf_vlan_filter { diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethe= rnet/intel/iavf/iavf_main.c index b38ce496a95c75..89e5aae20d5573 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_main.c +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c @@ -782,10 +782,13 @@ iavf_vlan_filter *iavf_add_vlan(struct iavf_adapter *= adapter, adapter->num_vlan_filters++; iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_ADD_VLAN_FILTER); } else if (f->state =3D=3D IAVF_VLAN_REMOVE) { - /* IAVF_VLAN_REMOVE means that VLAN wasn't yet removed. - * We can safely only change the state here. - */ + /* DEL not yet sent to PF, cancel it */ f->state =3D IAVF_VLAN_ACTIVE; + } else if (f->state =3D=3D IAVF_VLAN_REMOVING) { + /* DEL already sent to PF, re-add after completion */ + f->state =3D IAVF_VLAN_ADD; + iavf_schedule_aq_request(adapter, + IAVF_FLAG_AQ_ADD_VLAN_FILTER); } =20 clearout: diff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c b/drivers/net/= ethernet/intel/iavf/iavf_virtchnl.c index d62c0d6394149e..d0b7b810679399 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c @@ -948,12 +948,10 @@ void iavf_del_vlans(struct iavf_adapter *adapter) =20 vvfl->vsi_id =3D adapter->vsi_res->vsi_id; vvfl->num_elements =3D count; - list_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, list) { + list_for_each_entry(f, &adapter->vlan_filter_list, list) { if (f->state =3D=3D IAVF_VLAN_REMOVE) { vvfl->vlan_id[i] =3D f->vlan.vid; - list_del(&f->list); - kfree(f); - adapter->num_vlan_filters--; + f->state =3D IAVF_VLAN_REMOVING; i++; if (i =3D=3D count) break; @@ -990,7 +988,7 @@ void iavf_del_vlans(struct iavf_adapter *adapter) =20 vvfl_v2->vport_id =3D adapter->vsi_res->vsi_id; vvfl_v2->num_elements =3D count; - list_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, list) { + list_for_each_entry(f, &adapter->vlan_filter_list, list) { if (f->state =3D=3D IAVF_VLAN_REMOVE) { struct virtchnl_vlan_supported_caps *filtering_support =3D &adapter->vlan_v2_caps.filtering.filtering_support; @@ -1005,9 +1003,7 @@ void iavf_del_vlans(struct iavf_adapter *adapter) vlan->tci =3D f->vlan.vid; vlan->tpid =3D f->vlan.tpid; =20 - list_del(&f->list); - kfree(f); - adapter->num_vlan_filters--; + f->state =3D IAVF_VLAN_REMOVING; i++; if (i =3D=3D count) break; @@ -2370,10 +2366,6 @@ void iavf_virtchnl_completion(struct iavf_adapter *a= dapter, ether_addr_copy(adapter->hw.mac.addr, netdev->dev_addr); wake_up(&adapter->vc_waitqueue); break; - case VIRTCHNL_OP_DEL_VLAN: - dev_err(&adapter->pdev->dev, "Failed to delete VLAN filter, error %s\n", - iavf_stat_str(&adapter->hw, v_retval)); - break; case VIRTCHNL_OP_DEL_ETH_ADDR: dev_err(&adapter->pdev->dev, "Failed to delete MAC filter, error %s\n", iavf_stat_str(&adapter->hw, v_retval)); @@ -2896,6 +2888,27 @@ void iavf_virtchnl_completion(struct iavf_adapter *a= dapter, spin_unlock_bh(&adapter->mac_vlan_list_lock); } break; + case VIRTCHNL_OP_DEL_VLAN: + case VIRTCHNL_OP_DEL_VLAN_V2: { + struct iavf_vlan_filter *f, *ftmp; + + spin_lock_bh(&adapter->mac_vlan_list_lock); + list_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, + list) { + if (f->state =3D=3D IAVF_VLAN_REMOVING) { + if (v_retval) { + /* PF rejected DEL, keep filter */ + f->state =3D IAVF_VLAN_ACTIVE; + } else { + list_del(&f->list); + kfree(f); + adapter->num_vlan_filters--; + } + } + } + spin_unlock_bh(&adapter->mac_vlan_list_lock); + } + break; case VIRTCHNL_OP_ENABLE_VLAN_STRIPPING: /* PF enabled vlan strip on this VF. * Update netdev->features if needed to be in sync with ethtool. --=20 2.52.0 From nobody Tue Apr 7 04:20:29 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 016EE38F953 for ; Mon, 16 Mar 2026 10:42:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773657761; cv=none; b=DVwjh5mETyGMwP9ITUV+vUzdz75K7qJXSxd86X6iV60oJWGzCsPsxDqMQEd64yRmIseT2OnBm9GxRVlcQTigrRbIjH37y+E99xYg8QFMdkdPwR7uYSIDfdtpvYj5DkSwf5rahQ2+kXR4wxAPYuD1Vv1K97qc/eyoqxVW9xwxvVw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773657761; c=relaxed/simple; bh=JCHvrEojksVEpHjmb8f0l8T6uIGVkerMflt9zKrQE80=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Fb9FP9Welu2Kw+y3v4TL4eaNUlG5KEtyKEbZWFi0+1ZrGOfWBpfmfLidkT6Ds4WsxKTiDUYHhDDtOfB7Yi+Jrei6eTg2O5gM5Blqaz/6p1t0QsUcvwJWMYJi0QOjSTrgsuiLf3d+XG6KTDs2QofUgyBRE3vPopQZveeO5dyBcIo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Q3C/GVeC; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Q3C/GVeC" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773657759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TcCvlNKS2FtWNY/zDB/0qSw6naZ8LMZekz/Sa7hhVBQ=; b=Q3C/GVeC4ihebBe4eEKAGH7+ngIO61JJ5c+RoE/k4yso6w724p97Po99l3MllEF7QzETFl sff1PYaZnhT25rnVxtmvVCqDq8erFZplLOV2AQBvrXV+XsFNdWoWQ1EfS3Dm6U4VOKPsXA afVp+Ze7MvSpjJXJEtENfqm+2uEqN/c= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-277-54-iBjSePL26S8rctg4q0A-1; Mon, 16 Mar 2026 06:42:36 -0400 X-MC-Unique: 54-iBjSePL26S8rctg4q0A-1 X-Mimecast-MFC-AGG-ID: 54-iBjSePL26S8rctg4q0A_1773657754 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 98A7D180AA95; Mon, 16 Mar 2026 10:42:31 +0000 (UTC) Received: from ShadowPeak.redhat.com (unknown [10.45.224.235]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 116131800351; Mon, 16 Mar 2026 10:42:27 +0000 (UTC) From: Petr Oros To: netdev@vger.kernel.org Cc: jacob.e.keller@intel.com, Petr Oros , Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , intel-wired-lan@lists.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH iwl-next 4/4] iavf: harden VLAN filter state machine race handling 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" Address remaining race windows in the VLAN filter state machine that were identified during cross-state analysis of ADD and DEL paths. 1. Add VIRTCHNL_OP_ADD_VLAN to the success completion handler. The V1 ADD_VLAN opcode had no success handler -- filters sent via V1 stayed in ADDING state permanently. Add a fallthrough case so V1 filters also transition ADDING -> ACTIVE on PF confirmation. Critically, add an `if (v_retval) break` guard: the error switch in iavf_virtchnl_completion() does NOT return after handling errors, it falls through to the success switch. Without this guard, a PF-rejected ADD would incorrectly mark ADDING filters as ACTIVE, creating a driver/HW mismatch where the driver believes the filter is installed but the PF never accepted it. For V2, this is harmless: iavf_vlan_add_reject() in the error block already kfree'd all ADDING filters, so the success handler finds nothing to transition. 2. Skip DEL on filters already in REMOVING state. In iavf_del_vlan(), if a filter is in IAVF_VLAN_REMOVING (DEL already sent to PF, waiting for response), do not overwrite to REMOVE and schedule a redundant DEL. The pending DEL's completion handler will either kfree the filter (PF confirms) or revert to ACTIVE (PF rejects). Without this, the sequence DEL(pending) -> user-del -> second DEL could result in PF returning an error for the second DEL (filter already gone), causing the completion handler to incorrectly revert a deleted filter back to ACTIVE. Signed-off-by: Petr Oros Reviewed-by: Aleksandr Loktionov Reviewed-by: Simon Horman --- drivers/net/ethernet/intel/iavf/iavf_main.c | 5 ++++- drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethe= rnet/intel/iavf/iavf_main.c index 89e5aae20d5573..1ffc0ce3f35602 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_main.c +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c @@ -816,11 +816,14 @@ static void iavf_del_vlan(struct iavf_adapter *adapte= r, struct iavf_vlan vlan) list_del(&f->list); kfree(f); adapter->num_vlan_filters--; - } else { + } else if (f->state !=3D IAVF_VLAN_REMOVING) { f->state =3D IAVF_VLAN_REMOVE; iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_DEL_VLAN_FILTER); } + /* If REMOVING, DEL is already sent to PF; completion + * handler will free the filter when PF confirms. + */ } =20 spin_unlock_bh(&adapter->mac_vlan_list_lock); diff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c b/drivers/net/= ethernet/intel/iavf/iavf_virtchnl.c index d0b7b810679399..147adb76f64141 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c @@ -2877,9 +2877,13 @@ void iavf_virtchnl_completion(struct iavf_adapter *a= dapter, spin_unlock_bh(&adapter->adv_rss_lock); } break; + case VIRTCHNL_OP_ADD_VLAN: case VIRTCHNL_OP_ADD_VLAN_V2: { struct iavf_vlan_filter *f; =20 + if (v_retval) + break; + spin_lock_bh(&adapter->mac_vlan_list_lock); list_for_each_entry(f, &adapter->vlan_filter_list, list) { if (f->state =3D=3D IAVF_VLAN_ADDING) --=20 2.52.0