From mboxrd@z Thu Jan 1 00:00:00 1970 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 AADB82FE071 for ; Thu, 23 Apr 2026 13:04:21 +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=1776949463; cv=none; b=sDEUSjR1t6b95BtcFmgg1q+YqBAJ6RIGdEJRgXSYd2oE5gBrCgnE8k8gjzednJzwd+wgYxnPH+MEjN6uMn0zh2ZzyI6iM5MIA39ct24dWzC6QQL2zXlm3gYApjrQ7deU1BMTX4ICx19my+GNHGoeO+PoTIoNh8LNQkgZAwb16b8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776949463; c=relaxed/simple; bh=H22N2lkEBz97g/HoICisUJuLl3xNE55NRKCp02n57k0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=XpaaiZLhPqSrRq6TQPYPbZDAWJcuI7EzytjIrjHuQsuo7/HTcJKL66/NM7ov/4YtUPtrOsHNMi90wsgH9tVlG7mh9doagmCkzMavTlwE+qmhnGlMzwNQuTnU4l6H5wuq5m89zPG4vkUYqgaQQO+mgI3qpH5jU3Mz+UEcS2PXoz8= 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=GNh0OAdT; 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="GNh0OAdT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1776949460; 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; bh=VtiyJlvs5EwHGsCQK4dQU/qFxQZSwSancLkxNqodEyA=; b=GNh0OAdTeYWk+qSXa5mA9LUdem4FpA+O2+2/XVl3pXkre5kKBPpsm4UdcfRf/WFBIv+U/f Zo0YN18BASC3jqCeOk3qjSBCKC7+c4AGQADcL/HWMQKqlJvCBXRKOwdn0FO3zc6uWWJfmJ iutyEq6snSAz1H6Z51M5B0c3PFwn1Sw= 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-612-KVaxLk0AOguFjvtsdQIPoQ-1; Thu, 23 Apr 2026 09:04:18 -0400 X-MC-Unique: KVaxLk0AOguFjvtsdQIPoQ-1 X-Mimecast-MFC-AGG-ID: KVaxLk0AOguFjvtsdQIPoQ_1776949456 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 88DF41954B0F; Thu, 23 Apr 2026 13:04:16 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.44.32.35]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B284A19560AB; Thu, 23 Apr 2026 13:04:09 +0000 (UTC) From: Jose Ignacio Tornos Martinez To: netdev@vger.kernel.org Cc: intel-wired-lan@lists.osuosl.org, przemyslaw.kitszel@intel.com, aleksandr.loktionov@intel.com, jacob.e.keller@intel.com, horms@kernel.org, jesse.brandeburg@intel.com, anthony.l.nguyen@intel.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, Jose Ignacio Tornos Martinez Subject: [PATCH net v4 0/4] Fix i40e/ice/iavf VF bonding after netdev lock changes Date: Thu, 23 Apr 2026 15:04:01 +0200 Message-ID: <20260423130405.139568-1-jtornosm@redhat.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 This series fixes VF bonding failures introduced by commit ad7c7b2172c3 ("net: hold netdev instance lock during sysfs operations"). When adding VFs to a bond immediately after setting trust mode, MAC address changes fail with -EAGAIN, preventing bonding setup. This affects both i40e (700-series) and ice (800-series) Intel NICs. The core issue is lock contention: iavf_set_mac() is now called with the netdev lock held and waits for MAC change completion while holding it. However, both the watchdog task that sends the request and the adminq_task that processes PF responses also need this lock, creating a deadlock where neither can run, causing timeouts. Additionally, setting VF trust triggers an unnecessary ~10 second VF reset in i40e driver that delays bonding setup, even though filter synchronization happens naturally during normal VF operation. For ice driver, the delay is not so big, but in the same way the operation is not necessary. This series: 1. Adds safety guard to prevent MAC changes during reset or early initialization (before VF is ready) 2. Eliminates unnecessary VF reset when setting trust in i40e, resetting only when ADQ cloud filters need cleanup 3. Fixes lock contention by polling admin queue synchronously 4. Eliminates unnecessary VF reset when setting trust in ice, resetting only when MAC LLDP filters need cleanup The key fix (patch 3/4) implements a synchronous MAC change operation similar to the approach used for ndo_change_mtu deadlock fix: https://lore.kernel.org/intel-wired-lan/20260211191855.1532226-1-poros@redhat.com/ Instead of scheduling work and waiting, it: - Sends the virtchnl message directly (not via watchdog) - Polls the admin queue hardware directly for responses - Processes all messages inline (including non-MAC messages) - Returns when complete or times out This allows the operation to complete synchronously while holding netdev_lock, without relying on watchdog or adminq_task. The function can sleep for up to 2.5 seconds polling hardware, but this is acceptable since netdev_lock is per-device and only serializes operations on the same interface. Testing shows VF bonding now works reliably in ~5 seconds vs 15+ seconds before (i40e), without timeouts or errors (i40e and ice). Tested on Intel 700-series (i40e) and 800-series (ice) dual-port NICs with iavf driver. Thanks to Jan Tluka and Yuying Ma for reporting the issues. Note: The refactoring suggested in v2 review to unify polling functions and call iavf_virtchnl_completion() for all messages will be submitted separately to net-next after this fix merges. Jose Ignacio Tornos Martinez (4): iavf: return EBUSY if reset in progress or not ready during MAC change i40e: skip unnecessary VF reset when setting trust iavf: send MAC change request synchronously ice: skip unnecessary VF reset when setting trust --- v4: - No changes to patch 1 from v3 - Complete patch 2 with AI review (sashiko.dev) from Simon Horman. - Complete patch 3 with the comments from Przemek Kitszel and AI review from Simon Horman. - Complete patch 4 with AI review (sashiko.dev) from Simon Horman and issues addressed when comparing with i40e. - Drop patch 5 from v3 (refactoring is postponed) v3: https://lore.kernel.org/netdev/20260414110006.124286-1-jtornosm@redhat.com/ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 42 ++++++++++++++++++++++++++++++++---------- drivers/net/ethernet/intel/iavf/iavf.h | 10 ++++++++-- drivers/net/ethernet/intel/iavf/iavf_main.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------ drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- drivers/net/ethernet/intel/ice/ice_sriov.c | 41 +++++++++++++++++++++++++++++++++++++---- drivers/net/ethernet/intel/ice/ice_vf_lib.c | 2 +- drivers/net/ethernet/intel/ice/ice_vf_lib.h | 1 + 7 files changed, 225 insertions(+), 43 deletions(-) -- 2.43.0