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 3A49D379EEC for ; Tue, 23 Jun 2026 10:18:12 +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=1782209894; cv=none; b=V3RkcsBB6yH4Dlz8rXEk93jZj2XccjYqifSDWDF0HxJQYXcmpG/gjCegY4f8Q48nhVyIFy5c8vI8qldHXhMBfqqvRnmqcluDohY6x2s362UrdHMxOUdZL69TUIosk2CLgVSoRdkfN4mvs9hdpMVYAKUGuzD5nlFWOOOSapUd+eI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782209894; c=relaxed/simple; bh=sV+74P3B6q7jThheYlYtGhAPjSD65BbqU5JkFQIUClk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=RkIhUMjub4Jwgeo3kuc4sTO+JfEoRYcHyLmNoWT1GfLUB6u/dIUPYSThfMH4Dbx354CXDq4QQPAHaybMO3H0n8H3gB61OthuSO/1jnQZ3+K95zd2QaL6LrCQbiXMfK6uU84f/V52u4UUxmTk3wem/AHlki5UKgiJQIbU6SUzG/8= 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=A2C5MH2M; 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="A2C5MH2M" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782209892; 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=qx6g68unrdRQVtSYPAZf1nYu6kY6LgtEicHSfdsFgYg=; b=A2C5MH2MX+aedMxOLhuRjraXC0Fvh4r5Lb6dJjAY2MKmIHtaSNZbEajdY+MzrI9h7T3ahA c6NPO7Ir0wo3bM8VEM3WFr3OlzWeb25wFXPRvNEYGtmKZdyW6mOyf0ACde9BitPVhTKkMc wA8KPXByvXVI8SoirUFREjkyi+ozE/s= 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-377-39ACVkMmNMmDCjs1Ie7Dvw-1; Tue, 23 Jun 2026 06:18:10 -0400 X-MC-Unique: 39ACVkMmNMmDCjs1Ie7Dvw-1 X-Mimecast-MFC-AGG-ID: 39ACVkMmNMmDCjs1Ie7Dvw_1782209889 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 D7DC31955F73; Tue, 23 Jun 2026 10:18:08 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.44.48.11]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9AA80180059C; Tue, 23 Jun 2026 10:18:04 +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, anthony.l.nguyen@intel.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, Jose Ignacio Tornos Martinez Subject: [PATCH net v7 0/4] Fix i40e/ice/iavf VF bonding after netdev lock changes Date: Tue, 23 Jun 2026 12:17:56 +0200 Message-ID: <20260623101800.991293-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.93 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 All patches tested successfully with bonding setup. --- v7: - Patches 1/4, 2/4 and 4/4: No changes from v6 - Patch 3/4: Rebase on current net tree Remove the multi-batch processing loop from version 6 according to Przemek Kitszel review: the loop cannot work without polling between iterations since the second call would fail the current_op check. Multi-batch scenario is extremely rare; send first batch and let watchdog handle remainder as v5 did v6: https://lore.kernel.org/all/20260619061321.8554-1-jtornosm@redhat.com/ -- 2.43.0