From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mta1.migadu.com (out-172.mta1.migadu.com [95.215.58.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 615001D63F3 for ; Tue, 25 Aug 2026 01:02:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787619728; cv=none; b=FmwNYbV7HGD31pOjp4xqSYyhUMp0A7AfQhK155l7gt9NmVg5jPew/5zp3j3bZMgYmfEasTByJ5R6XmXhPNpZzB/K1KZAdrdulgfzQy0hWFWGr26dNQ8Bn1+d1nWQJRnhebndidizkEja25yM2zxUOM+TeKgIT3VGYCR74mIrZW4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787619728; c=relaxed/simple; bh=Yyt0kO2zJ1JirMOwK56pHnm/TWr/UmxyxweM7ZJg9/s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IHLJ6decDdtGB9L/MfCI5Xz7RAvhJ/fuTpgoGHsLJ0rl+1a16eJwoMgPSD6aCDn8UNbXq7C+EvUEHBASzzbzykc7IN7wqvo+augBIsO30IauuQ3Bv2NKzWmW5nC5FOdI6LKv0uv+Zj3/Q/wJ0MtypXxMVcjPOTF962vU1yjNrSI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=MahRiDOr; arc=none smtp.client-ip=95.215.58.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="MahRiDOr" X-Envelope-To: netdev@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=Yyt0kO2zJ1JirMOwK56pHnm/TWr/UmxyxweM7ZJg9/s=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1787619724; v=1; x=1788224524; b=MahRiDOrnIHYYuJkcNOrqhElUgHV03dQNxUzz7xUJgt60wGFDQvoMoRoW248ys3eVu24xEzy S6ZcfsE684bRx+B+5uYj7DoRwffxn3gUsga3v2HAoI+q4Tu7Y6IjamKytcm8wK9ZUEvlTLBIjmo d1+MxkJACDvp8ghYLMo3VSqM= X-Envelope-To: netdev@vger.kernel.org Received: from [192.168.110.119] (216.236.36.147) by smtp.migadu.com with ESMTPS id 1a78be79355e13a0; Tue, 25 Aug 2026 01:02:04 +0000 X-Mizu-Trace-ID: 1a78be79355e13a0 X-Migadu-Flow: FLOW_OUT From: Hangbin Liu Date: Tue, 25 Aug 2026 09:01:29 +0800 Subject: [PATCH net v5 1/2] bonding: convert unbalanced_load to per-cpu state Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260825-bond_overflow-v5-1-7a800de133f1@kylinos.cn> References: <20260825-bond_overflow-v5-0-7a800de133f1@kylinos.cn> In-Reply-To: <20260825-bond_overflow-v5-0-7a800de133f1@kylinos.cn> To: Jay Vosburgh , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Nikolay Aleksandrov Cc: Hangbin Liu , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Hangbin Liu X-Mailer: b4 0.14.3 From: Hangbin Liu A later patch widens the bonding TLB tx counters from u32 to u64. The unbalanced_load counter sits in the transmit hot path, and cross-CPU synchronization of a u64 would introduce measurable overhead. Convert unbalanced_load to a per-cpu counter first so that the subsequent widening only touches per-cpu data local to each CPU. Introduce struct unbalanced_load_stats to hold the per-cpu counter, and move the aggregation into a helper, reset_unbalanced_load(), which sums all per-cpu instances. Use the delta of current total load vs variable prev_total_unbalanced to calculate the loading. Signed-off-by: Hangbin Liu --- drivers/net/bonding/bond_alb.c | 37 ++++++++++++++++++++++++++++++------- include/net/bond_alb.h | 7 ++++++- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index 839f7482dc18..0afed2c39231 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c @@ -133,6 +133,10 @@ static int tlb_initialize(struct bonding *bond) if (!new_hashtbl) return -ENOMEM; + bond_info->unbalanced_load = alloc_percpu(struct unbalanced_load_stats); + if (!bond_info->unbalanced_load) + goto out; + spin_lock_bh(&bond->mode_lock); bond_info->tx_hashtbl = new_hashtbl; @@ -143,6 +147,10 @@ static int tlb_initialize(struct bonding *bond) spin_unlock_bh(&bond->mode_lock); return 0; + +out: + kfree(new_hashtbl); + return -ENOMEM; } /* Must be called only after all slaves have been released */ @@ -154,6 +162,8 @@ static void tlb_deinitialize(struct bonding *bond) kfree(bond_info->tx_hashtbl); bond_info->tx_hashtbl = NULL; + free_percpu(bond_info->unbalanced_load); + bond_info->prev_total_unbalanced = 0; spin_unlock_bh(&bond->mode_lock); } @@ -1345,7 +1355,7 @@ static netdev_tx_t bond_do_alb_xmit(struct sk_buff *skb, struct bonding *bond, /* unbalanced or unassigned, send through primary */ tx_slave = rcu_dereference(bond->curr_active_slave); if (bond->params.tlb_dynamic_lb) - bond_info->unbalanced_load += skb->len; + this_cpu_add(bond_info->unbalanced_load->tx_bytes, skb->len); } if (tx_slave && bond_slave_can_tx(tx_slave)) { @@ -1529,6 +1539,23 @@ netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev) return bond_do_alb_xmit(skb, bond, tx_slave); } +static u32 reset_unbalanced_load(struct alb_bond_info *bond_info) +{ + struct unbalanced_load_stats *p; + u32 delta, total_bytes = 0; + int i; + + for_each_possible_cpu(i) { + p = per_cpu_ptr(bond_info->unbalanced_load, i); + total_bytes += READ_ONCE(p->tx_bytes); + } + + delta = total_bytes - bond_info->prev_total_unbalanced; + bond_info->prev_total_unbalanced = total_bytes; + + return delta / BOND_TLB_REBALANCE_INTERVAL; +} + void bond_alb_monitor(struct work_struct *work) { struct bonding *bond = container_of(work, struct bonding, @@ -1570,12 +1597,8 @@ void bond_alb_monitor(struct work_struct *work) if (atomic_read(&bond_info->tx_rebalance_counter) >= BOND_TLB_REBALANCE_TICKS) { bond_for_each_slave_rcu(bond, slave, iter) { tlb_clear_slave(bond, slave, 1); - if (slave == rcu_access_pointer(bond->curr_active_slave)) { - SLAVE_TLB_INFO(slave).load = - bond_info->unbalanced_load / - BOND_TLB_REBALANCE_INTERVAL; - bond_info->unbalanced_load = 0; - } + if (slave == rcu_access_pointer(bond->curr_active_slave)) + SLAVE_TLB_INFO(slave).load = reset_unbalanced_load(bond_info); } atomic_set(&bond_info->tx_rebalance_counter, 0); } diff --git a/include/net/bond_alb.h b/include/net/bond_alb.h index e5945427f38d..6fb09b4fc7e2 100644 --- a/include/net/bond_alb.h +++ b/include/net/bond_alb.h @@ -123,9 +123,14 @@ struct tlb_slave_info { */ }; +struct unbalanced_load_stats { + u32 tx_bytes; +}; + struct alb_bond_info { struct tlb_client_info *tx_hashtbl; /* Dynamically allocated */ - u32 unbalanced_load; + struct unbalanced_load_stats __percpu *unbalanced_load; + u32 prev_total_unbalanced; atomic_t tx_rebalance_counter; int lp_counter; /* -------- rlb parameters -------- */ -- 2.55.0