From patchwork Thu Jan 2 22:07:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 234755 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A5ABC3276C for ; Thu, 2 Jan 2020 22:22:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C30D620866 for ; Thu, 2 Jan 2020 22:22:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578003757; bh=ZjUObq3nlAjR3r0rrLR5jrSnyaPlZhsIyeLxybNfWYA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Yne2D4LWYKgneTU2cpYmGqtGttm1Z3FdOqZSGS63tBML1DM4ptEldjecxCLbgJOgn dC/KtBtvIFOVlgwBYnN0femsrT09zu0tx1iG4lpZRU/MWADoAf3VkDwq4/geoa8Cn8 sYz8EXdXqWEWB7X0dWwNLDF/RvCFOSZGQIxd2IYc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729008AbgABWWg (ORCPT ); Thu, 2 Jan 2020 17:22:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:43282 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729155AbgABWWf (ORCPT ); Thu, 2 Jan 2020 17:22:35 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2F0B020866; Thu, 2 Jan 2020 22:22:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578003754; bh=ZjUObq3nlAjR3r0rrLR5jrSnyaPlZhsIyeLxybNfWYA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ufmMvDQuCTF36tXFwgKcmB3loatzjX/YJi5T1rAfuUkKiL+oOEY3FFvBGDIRxML+x uDO6J9I9Jjoq76egckBqpQ2IARCXU9iX0I8ZCeKRcSLvaDI7NQ3xpGQ7Wig4JF2OK/ LOaGZ6iglbkNGkhQhfB0I3FQcOTYDVP0b8gEHPL8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guillaume Nault , David Ahern , Hangbin Liu , "David S. Miller" Subject: [PATCH 4.19 100/114] net/dst: add new function skb_dst_update_pmtu_no_confirm Date: Thu, 2 Jan 2020 23:07:52 +0100 Message-Id: <20200102220039.284323737@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102220029.183913184@linuxfoundation.org> References: <20200102220029.183913184@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Hangbin Liu [ Upstream commit 07dc35c6e3cc3c001915d05f5bf21f80a39a0970 ] Add a new function skb_dst_update_pmtu_no_confirm() for callers who need update pmtu but should not do neighbor confirm. v5: No change. v4: No change. v3: Do not remove dst_confirm_neigh, but add a new bool parameter in dst_ops.update_pmtu to control whether we should do neighbor confirm. Also split the big patch to small ones for each area. v2: Remove dst_confirm_neigh in __ip6_rt_update_pmtu. Reviewed-by: Guillaume Nault Acked-by: David Ahern Signed-off-by: Hangbin Liu Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- include/net/dst.h | 9 +++++++++ 1 file changed, 9 insertions(+) --- a/include/net/dst.h +++ b/include/net/dst.h @@ -530,6 +530,15 @@ static inline void skb_dst_update_pmtu(s dst->ops->update_pmtu(dst, NULL, skb, mtu, true); } +/* update dst pmtu but not do neighbor confirm */ +static inline void skb_dst_update_pmtu_no_confirm(struct sk_buff *skb, u32 mtu) +{ + struct dst_entry *dst = skb_dst(skb); + + if (dst && dst->ops->update_pmtu) + dst->ops->update_pmtu(dst, NULL, skb, mtu, false); +} + static inline void skb_tunnel_check_pmtu(struct sk_buff *skb, struct dst_entry *encap_dst, int headroom)