From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 23F4621D3DC for ; Fri, 27 Jun 2025 20:19:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751055590; cv=none; b=Mrv89mx2RldghaYUGzS+VktTOOmotnlxjv3YFPl9QL0ZGPWaOxXcbeFQmN3FI9F5PEJeJJr2jiYSLV00Bv9KG/hQ8tFBJSQMp6ERM/rgFeFe0zM7XOOLXaPDGr0EiyvZ6zuk7dZ60JLqVkZBYi9nTI+tXABISS63bSvDnecDt54= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751055590; c=relaxed/simple; bh=lUxOCA0nHeRH+v2IJ1Tk8IRl+fdjEyNorUizXfQBTvk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mkWzvYHCrIlsgwa9TgOKU5X/3naq64ym2KOCYl9cm9QXoy9r2Ddw7J7hmlSniIdbR9QD0R/6RV+te9TCk4zU0LmcIcwX97TPHT2pYerBriA7+I2Rr2cBtDko6s0vhLYcOJEwESFmi9GekX/K2Wu3Fd8yfieIjbxMBBVfHOLjuRg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=us.ibm.com; spf=none smtp.mailfrom=linux.vnet.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=FnIH53WO; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=us.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.vnet.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="FnIH53WO" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55RJve1v000924; Fri, 27 Jun 2025 20:19:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=2aNJhryHHZbK4k4+B 5P2I2AnOfX1Qklil+REv1SOxqw=; b=FnIH53WOvCWM6cbv9mRd/L4OxEq71c5Qx JCA5/W24Ps1fe6aDojmega5EryZoqOXH50mQqMZ5WjS1uQhvT6wgqDKtNWGh1NtE unaEU0202HUoBc8+7HARktoyK2PQ8cZwFdE9UWeyTDQGYb6lfvDRP0S2UEJGN7nt QLiudyM7HRmqkyCV/be6kY4OhG2yoYgoGUjpwpnqv8QtsmRiaVyG49LJRuWPZRw/ RVrA76n5znCOwQ8geHjhM4xp8XEdkrQ5XZ20jK0xw4k0Dn/zMn/FoVl7HqblxvjA bUDuct/x2aBlXNpER6P5GcDlipwkH4aJetujKdMM6po8upWxubmAw== Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 47dj5ufpjt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 27 Jun 2025 20:19:42 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 55RJnfY0014987; Fri, 27 Jun 2025 20:19:42 GMT Received: from smtprelay04.wdc07v.mail.ibm.com ([172.16.1.71]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 47e72u64d5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 27 Jun 2025 20:19:42 +0000 Received: from smtpav04.dal12v.mail.ibm.com (smtpav04.dal12v.mail.ibm.com [10.241.53.103]) by smtprelay04.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 55RKJd7561669702 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jun 2025 20:19:40 GMT Received: from smtpav04.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D439A58056; Fri, 27 Jun 2025 20:19:39 +0000 (GMT) Received: from smtpav04.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A625058052; Fri, 27 Jun 2025 20:19:39 +0000 (GMT) Received: from localhost (unknown [9.61.49.21]) by smtpav04.dal12v.mail.ibm.com (Postfix) with ESMTP; Fri, 27 Jun 2025 20:19:39 +0000 (GMT) From: David Wilder To: netdev@vger.kernel.org Cc: jv@jvosburgh.net, wilder@us.ibm.com, pradeeps@linux.vnet.ibm.com, pradeep@us.ibm.com, i.maximets@ovn.org, amorenoz@redhat.com, haliu@redhat.com Subject: [PATCH net-next v4 5/7] bonding: Update to bond_arp_send_all() to use supplied vlan tags Date: Fri, 27 Jun 2025 13:17:18 -0700 Message-ID: <20250627201914.1791186-6-wilder@us.ibm.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250627201914.1791186-1-wilder@us.ibm.com> References: <20250627201914.1791186-1-wilder@us.ibm.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-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: okXw87rsUAFDyNEBOxY4Rd6LY8K0btXY X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI3MDE2NCBTYWx0ZWRfX4jpj/dy0afhx cUrUY/OT3H6eE7rKe9GqDcD9ZoLNJmgKN7Zu0U4xZFEorzoWZHLDq6xxqaoG/s1MLRSsA0pqSDg XrmGh1Yj86EDF2z7zpdNPyCgOHIriX0oPKlPKFYVBg7BwZqsBqWbkpPor0gYfkHVzu/u5SftOwl fxGB1/c9AHh4kRyMyC+hyOjvjiWCw7TmCVo7iPU0+f2Usp0SHhbLRoU7HBncFFkv6fVrgms3ADp hPk88p51FwiRXCoMnBx+gjqjrkFie5fzAkaXp/mwp0K12hPUO7kojia/G6pXUPfBh0REHTUJhBp VBmlsob81D3p8FiqM4y2j0Rp0YmR9BDYwxO01XsvM7wt1tKLh8h24U3imDNFdWaQUBg725fRKdq X6F4SSGCwIARGVuLZk0UEkeQp5g1GQiIj/w8SSixdVg1BGD4yfkxePehbHm37i8Ersk+crlH X-Authority-Analysis: v=2.4 cv=MshS63ae c=1 sm=1 tr=0 ts=685efcde cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=6IFa9wvqVegA:10 a=VnNF1IyMAAAA:8 a=ZKn5ET9WYz78Zcf0JJ0A:9 X-Proofpoint-GUID: okXw87rsUAFDyNEBOxY4Rd6LY8K0btXY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-06-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 bulkscore=0 lowpriorityscore=0 spamscore=0 mlxlogscore=999 impostorscore=0 clxscore=1015 phishscore=0 malwarescore=0 suspectscore=0 adultscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506270164 bond_arp_send_all() will pass the vlan tags supplied by the user to bond_arp_send(). If vlan tags have not been supplied the vlans in the path to the target will be discovered by bond_verify_device_path(). The discovered vlan tags are then saved to be used on future calls to bond_arp_send(). bonding_exit() is also updated to free vlan tags when a bond is destroyed. Signed-off-by: David Wilder --- drivers/net/bonding/bond_main.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index ac654b384ea1..92c64030b432 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -3144,18 +3144,19 @@ struct bond_vlan_tag *bond_verify_device_path(struct net_device *start_dev, static void bond_arp_send_all(struct bonding *bond, struct slave *slave) { - struct rtable *rt; - struct bond_vlan_tag *tags; struct bond_arp_target *targets = bond->params.arp_targets; + char pbuf[BOND_OPTION_STRING_MAX_SIZE]; + struct bond_vlan_tag *tags; __be32 target_ip, addr; + struct rtable *rt; int i; for (i = 0; i < BOND_MAX_ARP_TARGETS && targets[i].target_ip; i++) { target_ip = targets[i].target_ip; tags = targets[i].tags; - slave_dbg(bond->dev, slave->dev, "%s: target %pI4\n", - __func__, &target_ip); + slave_dbg(bond->dev, slave->dev, "%s: target %s\n", __func__, + bond_arp_target_to_string(&targets[i], pbuf, sizeof(pbuf))); /* Find out through which dev should the packet go */ rt = ip_route_output(dev_net(bond->dev), target_ip, 0, 0, 0, @@ -3177,9 +3178,13 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave) if (rt->dst.dev == bond->dev) goto found; - rcu_read_lock(); - tags = bond_verify_device_path(bond->dev, rt->dst.dev, 0); - rcu_read_unlock(); + if (!tags) { + rcu_read_lock(); + tags = bond_verify_device_path(bond->dev, rt->dst.dev, 0); + /* cache the tags */ + targets[i].tags = tags; + rcu_read_unlock(); + } if (!IS_ERR_OR_NULL(tags)) goto found; @@ -3195,7 +3200,6 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave) addr = bond_confirm_addr(rt->dst.dev, target_ip, 0); ip_rt_put(rt); bond_arp_send(slave, ARPOP_REQUEST, target_ip, addr, tags); - kfree(tags); } } @@ -6663,7 +6667,7 @@ static void __exit bonding_exit(void) bond_netlink_fini(); unregister_pernet_subsys(&bond_net_ops); - + bond_free_vlan_tags(bonding_defaults.arp_targets); bond_destroy_debugfs(); #ifdef CONFIG_NET_POLL_CONTROLLER -- 2.43.5