From patchwork Sat Nov 20 12:40:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 18421 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 506CF84477; Sat, 20 Nov 2021 13:40:24 +0100 (CET) Received: from dvalin.narfation.org (dvalin.narfation.org [IPv6:2a00:17d8:100::8b1]) by diktynna.open-mesh.org (Postfix) with ESMTPS id E371883EF9 for ; Sat, 20 Nov 2021 13:40:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=narfation.org; s=20121; t=1637412021; 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=pW7PtnZzaAcEwNOsXVYRcA1xTiaV5lGlyhKRGzQOQvs=; b=c75zRP+8+yXXxYFPlMVdEQu3t8PaKvtn1L6lYZbnirAkTOFtZQwGxP7ZVDAnWVIykohXvq f/TZIQ8c5hGE+0T0NSIzGT9VkCtPU0ysoC6f8xgWLlXJwcGYrokUcDlbyed2VtMeo1E0YV NkFqY58ckpqdM+2nXsOz0SIVqiXw5fw= From: Sven Eckelmann To: stable@vger.kernel.org Subject: [PATCH 4.14 3/5] batman-adv: Consider fragmentation for needed_headroom Date: Sat, 20 Nov 2021 13:40:16 +0100 Message-Id: <20211120124018.260907-4-sven@narfation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211120124018.260907-1-sven@narfation.org> References: <20211120124018.260907-1-sven@narfation.org> MIME-Version: 1.0 ARC-Seal: i=1; s=20121; d=open-mesh.org; t=1637412021; a=rsa-sha256; cv=none; b=nINbRnCCwWqWwpPvm8YCSdT0AstTFcfg42qIh8jOIoJRxX8x0UlGV8EcqxHWNrYogGDQtP 0FCrdVdeFtIQ4T7IleWuv+goUmMCppjJy38UTMLo6hsmzjZWOIKdOiYWhG+EAVErSqivM3 DLxdIzLJ09F0fy8BO7j4LM78EYazZbA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1637412021; 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=pW7PtnZzaAcEwNOsXVYRcA1xTiaV5lGlyhKRGzQOQvs=; b=v8C0eLq3gmZmz9ur+7n/k1CkeNyrxGBvIdzlgXBToH/YOI627jN2c+g3PcRc8bOYVx2qq5 MizuUL7Ok2WVO8FhjdFMBajzRr1C0pgUVhV0Y+S4Gafo5nnHsLRwiC1GJw6N3fCeXiACGi r2Fd8uJ6LdkKS33ovVAcuQec6UiS9oI= ARC-Authentication-Results: i=1; diktynna.open-mesh.org; dkim=pass header.d=narfation.org header.s=20121 header.b=c75zRP+8; 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: FA5FGZKDRP2XFH3R5EZSJTL3NEMHTJHI X-Message-ID-Hash: FA5FGZKDRP2XFH3R5EZSJTL3NEMHTJHI 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 Signed-off-by: Sven Eckelmann --- 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 9fdfa9984f02..7bdc5f26442e 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -558,6 +558,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; }