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.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 441793CF02C for ; Wed, 29 Apr 2026 10:24:45 +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=1777458286; cv=none; b=OEQYlojrqbMEYU419MXYS3nwBOOIc2kR3U40deSHFDdlqQUwCmNDoFHrOtTWVGbIzYZ0dtMrFnQy6K410o9+p6m6w++x5dkdD18AJWsAy0zAO8U7qTqXt4reFNgcUF+Lx5L1LaM8Dsc95KOiF9KE2qWz2vIH3K6tQR/urQd0ji4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777458286; c=relaxed/simple; bh=BYuDmXCOk9N/FvPuYoK2N01TCQPBnf3BYfIYP+o3f7Q=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=YqomvgKnHKYWXVAZXTs9vNZHAuwCW0ZzHJj1v5ls2kvCUzdpRCJITHJdOTeLtl0K60RiMFO6QRdMg9LC5VEjMz5TxbWwvqMqZFi4HLeG0wG2G6jQwukut1BdR3SMxnR7KUdwQQqmyphy0myWWmW9LEosbwtFNr4/5o5GGpiINJw= 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=FZLxq+j1; 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="FZLxq+j1" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777458284; 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=s4/ocltsdKGrNok+Bb2drR6q6Frk6P/w/JMLntC0yx4=; b=FZLxq+j1EvdQzsjaUqxhYtacsqe4CH7DtYm4J44StGIkz6EkU2AyyqGKu2bQFKEwfleP79 KKSaS10q7ghtJWvNSkonhTSGdzAacvHRRaqVSN0iOVwhZtOoDvaaHLl8T48DuwZJeZf3bf rwNEeMRnLK9P1+vTf4ZSB/OtztKgPlA= 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-663-VWiKo8V7O2CwKrTqlLZ0vg-1; Wed, 29 Apr 2026 06:24:40 -0400 X-MC-Unique: VWiKo8V7O2CwKrTqlLZ0vg-1 X-Mimecast-MFC-AGG-ID: VWiKo8V7O2CwKrTqlLZ0vg_1777458279 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 D2341180049F; Wed, 29 Apr 2026 10:24:38 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.44.32.45]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1F6EA1800347; Wed, 29 Apr 2026 10:24:32 +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 v5 0/4] Fix i40e/ice/iavf VF bonding after netdev lock changes Date: Wed, 29 Apr 2026 12:24:22 +0200 Message-ID: <20260429102426.210750-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.4.1 on 10.30.177.111 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 (reset only if revoking trust and VF has advanced features configured). 3. Fixes lock contention by polling admin queue synchronously 4. Eliminates unnecessary VF reset when setting trust in ice, (reset only if revoking trust and VF has advanced features configured). 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. 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 --- v5: - No changes to patch 1 from v4 - For the new functions or with changes in the prototypes, kdoc should end with '*/' not '**/', patch 2, 3 and 4 - For patch 2 and patch 4, after the comments from AI review (sashiko.dev) from Simon Horman, adopt a conservative approach checking multiple conditions before skipping the reset - Complete patch 3 with the comments from Przemek Kitszel and AI review from Simon Horman. v4: https://lore.kernel.org/all/20260423130405.139568-1-jtornosm@redhat.com/ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 38 ++++++++++++++++++++++++++++---------- drivers/net/ethernet/intel/iavf/iavf.h | 10 ++++++++-- drivers/net/ethernet/intel/iavf/iavf_main.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------ drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------- drivers/net/ethernet/intel/ice/ice_sriov.c | 33 +++++++++++++++++++++++++++++---- 5 files changed, 211 insertions(+), 44 deletions(-) -- 2.43.0