Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp521709pxu; Thu, 26 Nov 2020 04:56:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJyae+5gl0O6HqSCh1sJIMH+0Lw5/MaLUjO6MslU3khCBw3PqCKtG8awqSZQwBo2s3fHd92+ X-Received: by 2002:a17:906:1148:: with SMTP id i8mr2489808eja.233.1606395396929; Thu, 26 Nov 2020 04:56:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606395396; cv=none; d=google.com; s=arc-20160816; b=LBCS8jgXCl1/NvQSxRidz5phzRrrObyQpf5MyiwUtT9N0VmCAOXzaJKm6mRY17R35u dgVS2MYOnQvxsDMJPFd4Hwa/rzJ3U1C3cLBfqrz/hcOqZ7Zs7GaMTztHC1c39aam3pw5 NU2Q/UWu7Wn2HkgjZdBrvVQmUGWXOIP1ouVFASOWlzHMS7imCoOzWNiHCMLVKaJMj5ED F6hZLgh1Pk+J4c2UQhpzezVbu8QD4IFdbFSE7EoM9Uvysp0wogpLojqVtBXwTHpY6pDf 9QojpCivYqdtkbaYUwEsjMDmjPHv0CaJNs3kAf8XWoAk/lZz5NWoxUytqQfUxowdKhGP IwKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zV9ZqDHzPB9d6PtOImamgvuZOteIZ+VW/oQO+TRb7O4=; b=oOGvx/qrKw4LBtQhi70r4PtUpoJhI6NEpelPBm2c/PfbShGvEFM7ylowqyNA9kcrHE 6I4EyZfo0V9/jMRiKEgSTHfBurCqLaJfQXFFhGY/2+qqIbNVg0diN3rdd1/53UPjxT6v nd9Hx4uI/hiO4/j0Pd4PSlRLSjxnLskh5dZw6rAHqAD5siDqSMaC78pQHH0kzglarDGt Sn0kd6EBFlvq/xEyVX+Q08n7IGI51rmEvAFPOX7ZUetj1Op6blC8DXlDydnwLkmS/GZv UAcMOl/VtECN8kgp+F6msNt0TtVJAWPKx8Vd3mY7tlMASJV0NWu8I1z3R8HRaguDFQZh ZAAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@narfation.org header.s=20121 header.b=sq37VNJc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=narfation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e16si3032731ejh.379.2020.11.26.04.56.14; Thu, 26 Nov 2020 04:56:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@narfation.org header.s=20121 header.b=sq37VNJc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=narfation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389743AbgKZMxX (ORCPT + 99 others); Thu, 26 Nov 2020 07:53:23 -0500 Received: from dvalin.narfation.org ([213.160.73.56]:39320 "EHLO dvalin.narfation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389703AbgKZMxW (ORCPT ); Thu, 26 Nov 2020 07:53:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=narfation.org; s=20121; t=1606395200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zV9ZqDHzPB9d6PtOImamgvuZOteIZ+VW/oQO+TRb7O4=; b=sq37VNJcpPUyveuutj+PATo+Uq9ER3tH2NTmSO/Ymq+2rWJByIjSZsbSO3D8KnbeAYSOWD h+vj9d0RVPDjKVJ0uhAJRD+YuvDCUJqL4ZjMfwgPbGnW+nKoBe6bm1Bgi/U0Mair7BtMBH yj656QvWwdBxWj/6VXVP6WZpcZmAl9A= From: Sven Eckelmann To: netdev@vger.kernel.org Cc: b.a.t.m.a.n@lists.open-mesh.org, linux-kernel@vger.kernel.org, Sven Eckelmann Subject: [PATCH 2/2] vxlan: Copy needed_tailroom from lowerdev Date: Thu, 26 Nov 2020 13:52:47 +0100 Message-Id: <20201126125247.1047977-2-sven@narfation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201126125247.1047977-1-sven@narfation.org> References: <20201126125247.1047977-1-sven@narfation.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org While vxlan doesn't need any extra tailroom, the lowerdev might need it. In that case, copy it over to reduce the chance for additional (re)allocations in the transmit path. Signed-off-by: Sven Eckelmann --- drivers/net/vxlan.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 25b5b5a2dfea..44bb02122526 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -3801,6 +3801,8 @@ static void vxlan_config_apply(struct net_device *dev, needed_headroom = lowerdev->hard_header_len; needed_headroom += lowerdev->needed_headroom; + dev->needed_tailroom = lowerdev->needed_tailroom; + max_mtu = lowerdev->mtu - (use_ipv6 ? VXLAN6_HEADROOM : VXLAN_HEADROOM); if (max_mtu < ETH_MIN_MTU) -- 2.29.2