From patchwork Fri Jun 16 17:47:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Wang X-Patchwork-Id: 776901 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wq7Br1XRpz9s8N for ; Sat, 17 Jun 2017 03:48:20 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="U1ZT9yWt"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752198AbdFPRsS (ORCPT ); Fri, 16 Jun 2017 13:48:18 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:34419 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750947AbdFPRsR (ORCPT ); Fri, 16 Jun 2017 13:48:17 -0400 Received: by mail-pf0-f195.google.com with SMTP id d5so7559209pfe.1 for ; Fri, 16 Jun 2017 10:48:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iN4tvyn3S1UJPVb7DrgTR/avsx8J1b0q+Wwi2ASdfvU=; b=U1ZT9yWth8IUeyM4Ct9FicWEEIPK2Gdw6B6BOwoN3sGMIOX7DvVCobtz6Qdp6dIjtM P2DNjkwgYjv+FsT4uMW0paGp1sy0cLBU4d2COyNGswKQaluNS9zjg0F1ZI8EqwTwFtyB r8HD+9SwGGxZ85bCLaNTa1WwsA9mUv1HxmDyBbnBbm7GQ3oFph2NN1sgZI5X8alxyM4v ZpMisEHEgRonmV96t9LCpNknKRMDqIvaVcGlbQCY9a0rULmUsj+FhQH0Jc7drOuyPmpi p7q1D2WkrdcfBiMW6hA9zr6rbRTUrhcwOeSTTCVTW24hSmJyniPmtvl7ybrVjYI3kM+X 9q+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iN4tvyn3S1UJPVb7DrgTR/avsx8J1b0q+Wwi2ASdfvU=; b=qw4PhqJDmlFtJoojYpO4SYEHEDKsXx3186xum9h53B1ybTB6qbFZzw9zG/ljeD0f8n AtbblCWObffdBK4YLkiJLkou1LPh+O0ts1kZCPbJoU/HbJG+d6GU64qkzgMn17VwohJw pzKe4tuM4H3+NcKnskDVC254XYb8gcdMXLHc/p/WhHQe5mPdQG5TnOFcf1Lrh6BGgxr5 NAvJJShekf0jYNdCy9VksLaNiFqTPrnO/nrahg9CCcSvwxOiXWjxBnCNB256sg8DFNnz BVJdLZQwx4uVvsHuaP0+QVQBxmYfkorbD8KQzNygBOM6OISYrT+GSHN3i5wtA2jhgUJk Z9lw== X-Gm-Message-State: AKS2vOyhXkBWP9LjFaY484Z9IrjBR+T2cOrsdxZ64bLQouMzinMeTF1C vlfzsFl0AQbWBA== X-Received: by 10.84.143.100 with SMTP id 91mr14382405ply.186.1497635296846; Fri, 16 Jun 2017 10:48:16 -0700 (PDT) Received: from weiwan0.mtv.corp.google.com ([100.123.230.66]) by smtp.gmail.com with ESMTPSA id v62sm5292290pfb.124.2017.06.16.10.48.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Jun 2017 10:48:16 -0700 (PDT) From: Wei Wang To: David Miller , netdev@vger.kernel.org Cc: Eric Dumazet , Martin KaFai Lau , Wei Wang Subject: [PATCH net-next 01/21] ipv6: remove unnecessary dst_hold() in ip6_fragment() Date: Fri, 16 Jun 2017 10:47:24 -0700 Message-Id: <20170616174744.139688-2-tracywwnj@gmail.com> X-Mailer: git-send-email 2.13.1.518.g3df882009-goog In-Reply-To: <20170616174744.139688-1-tracywwnj@gmail.com> References: <20170616174744.139688-1-tracywwnj@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wei Wang In ipv6 tx path, rcu_read_lock() is taken so that dst won't get freed during the execution of ip6_fragment(). Hence, no need to hold dst in it. Signed-off-by: Wei Wang Acked-by: Martin KaFai Lau --- net/ipv6/ip6_output.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 8b8efb0e55bf..5baa6fab4b97 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -698,8 +698,6 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, ipv6_hdr(skb)->payload_len = htons(first_len - sizeof(struct ipv6hdr)); - dst_hold(&rt->dst); - for (;;) { /* Prepare header of the next frame, * before previous one went down. */ @@ -742,7 +740,6 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, if (err == 0) { IP6_INC_STATS(net, ip6_dst_idev(&rt->dst), IPSTATS_MIB_FRAGOKS); - ip6_rt_put(rt); return 0; } @@ -750,7 +747,6 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, IP6_INC_STATS(net, ip6_dst_idev(&rt->dst), IPSTATS_MIB_FRAGFAILS); - ip6_rt_put(rt); return err; slow_path_clean: