Message ID | 1434481584-1275-2-git-send-email-antonio@meshcoding.com (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers |
Return-Path: <antonio@meshcoding.com> Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=5.148.176.57; helo=s1.neomailbox.net; envelope-from=antonio@meshcoding.com; receiver=b.a.t.m.a.n@lists.open-mesh.org Received: from s1.neomailbox.net (s1.neomailbox.net [5.148.176.57]) by open-mesh.org (Postfix) with ESMTPS id EA5B0600681 for <b.a.t.m.a.n@lists.open-mesh.org>; Tue, 16 Jun 2015 21:08:41 +0200 (CEST) From: Antonio Quartulli <antonio@meshcoding.com> To: davem@davemloft.net Date: Tue, 16 Jun 2015 21:06:23 +0200 Message-Id: <1434481584-1275-2-git-send-email-antonio@meshcoding.com> In-Reply-To: <1434481584-1275-1-git-send-email-antonio@meshcoding.com> References: <1434481584-1275-1-git-send-email-antonio@meshcoding.com> Cc: Ruben Wisniewsi <ruben@vfn-nrw.de>, Marek Lindner <mareklindner@neomailbox.ch>, netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, Antonio Quartulli <antonio@meshcoding.com> Subject: [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Avoid u32 overflow during gateway select X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n@lists.open-mesh.org> List-Id: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n.lists.open-mesh.org> List-Unsubscribe: <https://lists.open-mesh.org/mm/options/b.a.t.m.a.n>, <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=unsubscribe> List-Archive: <http://lists.open-mesh.org/pipermail/b.a.t.m.a.n/> List-Post: <mailto:b.a.t.m.a.n@lists.open-mesh.org> List-Help: <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=help> List-Subscribe: <https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n>, <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=subscribe> X-List-Received-Date: Tue, 16 Jun 2015 19:08:42 -0000 |
Commit Message
Antonio Quartulli
June 16, 2015, 7:06 p.m. UTC
From: Ruben Wisniewski <ruben@freifunk-nrw.de> The gateway selection based on fast connections is using a single value calculated from the average tq (0-255) and the download bandwidth (in 100Kibit). The formula for the first step (tq ** 2 * 10000 * bandwidth) tends to overflow a u32 with low bandwidth settings like 50 [100KiBit] and a tq value of over 92. Changing this to a 64 bit unsigned integer allows to support a bandwidth_down with up to ~2.8e10 [100KiBit] and a perfect tq of 255. This is ~6.6 times higher than the maximum possible value of the gateway announcement TVLV. This problem only affects the non-default gw_sel_class 1. Signed-off-by: Ruben Wisniewsi <ruben@vfn-nrw.de> [sven@narfation.org: rewritten commit message, changed to kernel type] Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch> Signed-off-by: Antonio Quartulli <antonio@meshcoding.com> --- net/batman-adv/gateway_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Comments
From: Antonio Quartulli <antonio@meshcoding.com> Date: Tue, 16 Jun 2015 21:06:23 +0200 > @@ -133,7 +133,7 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv) > struct batadv_neigh_node *router; > struct batadv_neigh_ifinfo *router_ifinfo; > struct batadv_gw_node *gw_node, *curr_gw = NULL; > - uint32_t max_gw_factor = 0, tmp_gw_factor = 0; > + uint64_t max_gw_factor = 0, tmp_gw_factor = 0; > uint32_t gw_divisor; Divides are performed using these variables, so if you make them 64-bit the build will fail. You have to use one of the routines in include/linux/math64.h in this situation, but realize that this operation is now going to be quite expensive.
On Sunday 21 June 2015 09:37:13 David Miller wrote: > From: Antonio Quartulli <antonio@meshcoding.com> > Date: Tue, 16 Jun 2015 21:06:23 +0200 > > > @@ -133,7 +133,7 @@ batadv_gw_get_best_gw_node(struct batadv_priv > > *bat_priv)> > > struct batadv_neigh_node *router; > > struct batadv_neigh_ifinfo *router_ifinfo; > > struct batadv_gw_node *gw_node, *curr_gw = NULL; > > > > - uint32_t max_gw_factor = 0, tmp_gw_factor = 0; > > + uint64_t max_gw_factor = 0, tmp_gw_factor = 0; > > > > uint32_t gw_divisor; > > Divides are performed using these variables, so if you make > them 64-bit the build will fail. You have to use one of the > routines in include/linux/math64.h in this situation, but > realize that this operation is now going to be quite expensive. Just a minor comment: The division is currently "max_gw_factor >> 18" which the compiler also outputs as such (shrd + shr on i586). This is the reason why it currently also works on architectures without a native 64 bit div. Kind regards, Sven
On 21/06/15 20:27, Sven Eckelmann wrote: > On Sunday 21 June 2015 09:37:13 David Miller wrote: >> From: Antonio Quartulli <antonio@meshcoding.com> >> Date: Tue, 16 Jun 2015 21:06:23 +0200 >> >>> @@ -133,7 +133,7 @@ batadv_gw_get_best_gw_node(struct batadv_priv >>> *bat_priv)> >>> struct batadv_neigh_node *router; >>> struct batadv_neigh_ifinfo *router_ifinfo; >>> struct batadv_gw_node *gw_node, *curr_gw = NULL; >>> >>> - uint32_t max_gw_factor = 0, tmp_gw_factor = 0; >>> + uint64_t max_gw_factor = 0, tmp_gw_factor = 0; >>> >>> uint32_t gw_divisor; >> >> Divides are performed using these variables, so if you make >> them 64-bit the build will fail. You have to use one of the >> routines in include/linux/math64.h in this situation, but >> realize that this operation is now going to be quite expensive. > > Just a minor comment: The division is currently "max_gw_factor >> 18" which > the compiler also outputs as such (shrd + shr on i586). This is the reason why > it currently also works on architectures without a native 64 bit div. Thanks for the comment David and Sven. David you can drop this pull request. I'll send a new one later with a modified patch that explicitly introduces the shift. Thanks!
diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 090828c..ca734f8 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -133,7 +133,7 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv) struct batadv_neigh_node *router; struct batadv_neigh_ifinfo *router_ifinfo; struct batadv_gw_node *gw_node, *curr_gw = NULL; - uint32_t max_gw_factor = 0, tmp_gw_factor = 0; + uint64_t max_gw_factor = 0, tmp_gw_factor = 0; uint32_t gw_divisor; uint8_t max_tq = 0; uint8_t tq_avg;