From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 573D32459D1; Thu, 28 May 2026 20:18:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779999531; cv=none; b=jN+eK5ilaDJCZMQlgmrcThUDQA4vQjL3+ufZBdog0Jy6pgM7VFtEe6bNQ2bbH/WL+v3e+J6Yv1rlsdfLyzWmGb/B/vt+p04aY+FOs2A7WIEL1gsc81XhApNAb1ECIXciZs4/7kNx/vknqZo607Jp05EdYsvMmPCGIkDwTzO+XSQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779999531; c=relaxed/simple; bh=dCAMf+HTaq6fGApItkgXKNw98b7odY8ROuFoXSNofj0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cQ8QV/Xylzfle6N49PycXwFJqFEVCPp6Yz8KuF6cEsHgIrEdks14GeXAc+Qp2KOuWbV3UHrmReqf3yREFLz4SH0Tj+adr8tz1VO2C2/sK+YD/aFiKW6LFYvfd+4tuTewLjOOtTXCNTB3y9apM0IS43gFWKKbnNygNK6TDoLFLAA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dEKb6unW; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="dEKb6unW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4CE1C1F000E9; Thu, 28 May 2026 20:18:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779999529; bh=Y1QEkjInVzOjMg2lJSyuOsZAkihGXd3UbYy4xWWDQAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dEKb6unW+7rrG3lA1JPpBUCpH35ZmAdkuGebueLBjqze6xTpjLvx7mv7dsnmEBVSJ S3RvjAtMmasJ0X//SbZaAsvxY+sGkvHYkaVUe49fWDy5yhB+e+VgDrk+M1+KZ2G/fl BzG1zoQPhoojiQgt/OtUkSp8ybkgvb7pTMQbZQ70= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Marcin Szycik , Aleksandr Loktionov , Simon Horman , Tony Nguyen , Jakub Kicinski , Rinitha S Subject: [PATCH 6.18 099/377] ice: fix setting promisc mode while adding VID filter Date: Thu, 28 May 2026 21:45:37 +0200 Message-ID: <20260528194641.217655423@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194638.371537336@linuxfoundation.org> References: <20260528194638.371537336@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marcin Szycik commit ebc8de716c9ec2be384abdc2dd866da26c6580d1 upstream. There are at least two paths through which VSI promiscuous mode can be independently configured via ice_fltr_set_vsi_promisc(): - ice_vlan_rx_add_vid() (netdev op) - ice_service_task() -> ... -> ice_set_promisc() Both paths may try to program promiscuous mode concurrently. One such scenario is: 1. Add ice netdev to bond 2. Add the bond netdev to bridge 3. ice netdev enters allmulticast mode (IFF_ALLMULTI) 4. Service task programs promisc mode filter 5. Bridge -> bond calls ice_vlan_rx_add_vid() Crucially, ice_vlan_rx_add_vid() fails if ice_fltr_set_vsi_promisc() returns any error, including -EEXIST. This causes VLAN filtering setup to fail on the bond interface. ice_set_promisc() already handles -EEXIST correctly. Fix by adding the same -EEXIST check to ice_vlan_rx_add_vid(): if the promisc filter is already programmed, continue without returning error. Fixes: 1273f89578f2 ("ice: Fix broken IFF_ALLMULTI handling") Cc: stable@vger.kernel.org Signed-off-by: Marcin Szycik Signed-off-by: Aleksandr Loktionov Reviewed-by: Simon Horman Tested-by: Rinitha S (A Contingent worker at Intel) Signed-off-by: Tony Nguyen Link: https://patch.msgid.link/20260515182419.1597859-4-anthony.l.nguyen@intel.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/intel/ice/ice_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -3764,7 +3764,7 @@ int ice_vlan_rx_add_vid(struct net_devic ret = ice_fltr_set_vsi_promisc(&vsi->back->hw, vsi->idx, ICE_MCAST_VLAN_PROMISC_BITS, vid); - if (ret) + if (ret && ret != -EEXIST) goto finish; }