From patchwork Sat Nov 20 12:40:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 18426 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from diktynna.open-mesh.org (localhost [IPv6:::1]) by diktynna.open-mesh.org (Postfix) with ESMTP id 6DC1A8448F; Sat, 20 Nov 2021 13:40:52 +0100 (CET) Received: from dvalin.narfation.org (dvalin.narfation.org [IPv6:2a00:17d8:100::8b1]) by diktynna.open-mesh.org (Postfix) with ESMTPS id 8F2C084480 for ; Sat, 20 Nov 2021 13:40:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=narfation.org; s=20121; t=1637412047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3lm6nqq2xu4SpmySi5wgAUdKKMbNpugMRhaz/YZ0vxs=; b=rmr9RPZJZ52Kx10xV/ErVknNZ2n59UK+XoCabnqC0UbXQRcI3V7wHbEjTMJsf3gQzeXsZo 0vGzkeK0qlOfpkQc6VW+yXFuxF9huMO80HX5wzoAZmGyJbBeV6Tj3Zanz1ql0BYgUtX7nl FhoKspuFXBiW7f+FKE+sYPy6xNiayQA= From: Sven Eckelmann To: stable@vger.kernel.org Subject: [PATCH 4.19 2/4] batman-adv: Consider fragmentation for needed_headroom Date: Sat, 20 Nov 2021 13:40:42 +0100 Message-Id: <20211120124044.261086-3-sven@narfation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211120124044.261086-1-sven@narfation.org> References: <20211120124044.261086-1-sven@narfation.org> MIME-Version: 1.0 ARC-Seal: i=1; s=20121; d=open-mesh.org; t=1637412047; a=rsa-sha256; cv=none; b=o9r3z79D7ekbGTf0PPSrn1jOiedBsDU0mY4Za9s7ZklLmuYl9UiF4/IK6kGe3Wet5VKq+m YzMIheNzCl2lyd71U1Ubnrm4wknsTfJDALfQ/sViw3YfGI50gESXoxHjy2eLGzWvYWS99a Ra7IQTM5gE+GilJO8Qzr4vZF19XVgDg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1637412047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=3lm6nqq2xu4SpmySi5wgAUdKKMbNpugMRhaz/YZ0vxs=; b=yfVNJig3vZR/XqEaM/X1+67XkC+SjLcIf1vkSLJ5nLzVB7l7l/PW/HBnj0wZwiGnrY+b7u EnOyFC0BzhgyY9ujqF5zqTlcneJWNdE2bXAppv/TX9VB24pHxQnt/D5WMYItlELdWXFAk2 WY7yOchVT6LeijluCkKlqLC4gLugOEA= ARC-Authentication-Results: i=1; diktynna.open-mesh.org; dkim=pass header.d=narfation.org header.s=20121 header.b=rmr9RPZJ; spf=pass (diktynna.open-mesh.org: domain of sven@narfation.org designates 2a00:17d8:100::8b1 as permitted sender) smtp.mailfrom=sven@narfation.org; dmarc=pass (policy=none) header.from=narfation.org Message-ID-Hash: SNQKN62SR5VILRNG4E7RPCSOPHDPEHRG X-Message-ID-Hash: SNQKN62SR5VILRNG4E7RPCSOPHDPEHRG X-MailFrom: sven@narfation.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-b.a.t.m.a.n.lists.open-mesh.org-0; header-match-b.a.t.m.a.n.lists.open-mesh.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 3.2.1 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: commit 4ca23e2c2074465bff55ea14221175fecdf63c5f upstream. If a batman-adv packets has to be fragmented, then the original batman-adv packet header is not stripped away. Instead, only a new header is added in front of the packet after it was split. This size must be considered to avoid cost intensive reallocations during the transmission through the various device layers. Fixes: 7bca68c7844b ("batman-adv: Add lower layer needed_(head|tail)room to own ones") Reported-by: Linus Lüssing Signed-off-by: Sven Eckelmann Signed-off-by: Simon Wunderlich --- net/batman-adv/hard-interface.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index c4e0435c952d..fc732b78daf7 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -565,6 +565,9 @@ static void batadv_hardif_recalc_extra_skbroom(struct net_device *soft_iface) needed_headroom = lower_headroom + (lower_header_len - ETH_HLEN); needed_headroom += batadv_max_header_len(); + /* fragmentation headers don't strip the unicast/... header */ + needed_headroom += sizeof(struct batadv_frag_packet); + soft_iface->needed_headroom = needed_headroom; soft_iface->needed_tailroom = lower_tailroom; }