From mboxrd@z Thu Jan 1 00:00:00 1970 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=-2.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=no 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 1A772C2BA83 for ; Thu, 13 Feb 2020 16:33:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AD34F217F4 for ; Thu, 13 Feb 2020 16:33:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=6wind.com header.i=@6wind.com header.b="VnuRT2MB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728087AbgBMQdF (ORCPT ); Thu, 13 Feb 2020 11:33:05 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:40953 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727828AbgBMQdF (ORCPT ); Thu, 13 Feb 2020 11:33:05 -0500 Received: by mail-wm1-f65.google.com with SMTP id t14so7469252wmi.5 for ; Thu, 13 Feb 2020 08:33:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google; h=reply-to:subject:to:references:from:organization:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=9tHgekIHlC5+cihMkWFyyekxwRBJeo3gDHbBhpXzdUI=; b=VnuRT2MBphLMUVUlAuVys1hgQ2ewyy9uvuwxTtjRkQyG+GjW1HoMnTI6N8EqpsPoOW mgvTIIpIB7wYOfbIz2i0bYDkOx/bjBvOX3dhm1vMdmgDWNWtYXDOrhgsOe98bvLVrckd 87klj417thhcm2uRrKFNUMICxW2tNSqeBMiSUncKrunIYFuuz0k/Q5mBozo39degIgka oCUe5Fjc1KmBOl59hWt8Y6QznFG0OTASV7I5+s3maMd+iBlucywMG6ME9nFEvJC6B1UI MUzw1CuAM43ILuItSquj/g485Art+vcINJTWSMNFy5Wwh3YZV5rNWcVHvXq3QiSnRSeM 8nHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:reply-to:subject:to:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=9tHgekIHlC5+cihMkWFyyekxwRBJeo3gDHbBhpXzdUI=; b=XuqyXhZ2wSXXqjxXx8wextXVg5Tp+JYRtN0lQQEuR4BRs9C5K5FnfnaCSj+ITVvOah XcqvvUJl0pJSo98zAexb/3QQsCzQrD7i9qKRdqSw1XFavt9ZqapWitxFob1myI4UFRxi sYRM9tjBp+MTFYAQO764JoX4o93YixS0rJdMquWs/rsVsJppA3rMKe2FesUsaiOWNQUe VJl5gcZlKybaa7W4GvYBAFtnR/1ey5a3LFWrYut8ENl9N2sYH/IFO6Ivxl0ng4YadpI8 HI5N26ny0IEIvwnCvpODc3DPYrcoXcZ+G7+PTGXSqZSW+9owoLEv3AGFC7F1/KZDqxRU kTDw== X-Gm-Message-State: APjAAAU3WFKNVlSs4vE/Ebwkcux5PR1kTohhL3Gs2mqP24jCF8ZGdVWS SqNSZYrk0o05+HW8WwmW5eEtgd8juYQ= X-Google-Smtp-Source: APXvYqzpjv55RQMLX6eNx3bSKVToLVRO8UwHbyj4PRBo9g0d6tLyCWYRuFYe9IXtcRagj7V0YU1VOg== X-Received: by 2002:a7b:cae9:: with SMTP id t9mr6570686wml.186.1581611583011; Thu, 13 Feb 2020 08:33:03 -0800 (PST) Received: from ?IPv6:2a01:e0a:410:bb00:7cb8:8eea:bf1c:ed6? ([2a01:e0a:410:bb00:7cb8:8eea:bf1c:ed6]) by smtp.gmail.com with ESMTPSA id x6sm3459098wmi.44.2020.02.13.08.33.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Feb 2020 08:33:02 -0800 (PST) Reply-To: nicolas.dichtel@6wind.com Subject: Re: [PATCH v4 net] net, ip6_tunnel: enhance tunnel locate with link check To: William Dauchy , netdev@vger.kernel.org References: <20200213153552.330380-1-w.dauchy@criteo.com> From: Nicolas Dichtel Organization: 6WIND Message-ID: Date: Thu, 13 Feb 2020 17:33:01 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <20200213153552.330380-1-w.dauchy@criteo.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Le 13/02/2020 à 16:35, William Dauchy a écrit : [snip] > @@ -1420,9 +1441,11 @@ ip6_tnl_start_xmit(struct sk_buff *skb, struct net_device *dev) > static void ip6_tnl_link_config(struct ip6_tnl *t) > { > struct net_device *dev = t->dev; > + struct net_device *tdev = NULL; > struct __ip6_tnl_parm *p = &t->parms; > struct flowi6 *fl6 = &t->fl.u.ip6; > int t_hlen; > + int mtu; > > memcpy(dev->dev_addr, &p->laddr, sizeof(struct in6_addr)); > memcpy(dev->broadcast, &p->raddr, sizeof(struct in6_addr)); > @@ -1457,22 +1480,24 @@ static void ip6_tnl_link_config(struct ip6_tnl *t) > struct rt6_info *rt = rt6_lookup(t->net, > &p->raddr, &p->laddr, > p->link, NULL, strict); > + if (!IS_ERR(rt)) { Why IS_ERR()? rt6_lookup() returns a valid pointer or NULL. > + tdev = rt->dst.dev; > + ip6_rt_put(rt); > + } else if (t->parms.link) { > + tdev = __dev_get_by_index(t->net, t->parms.link); p->link to be consistent with the rest of the function. > + } > > - if (!rt) > - return; > - > - if (rt->dst.dev) { But rt->dst.dev can be NULL. > - dev->hard_header_len = rt->dst.dev->hard_header_len + > - t_hlen; > + if (tdev) { > + dev->hard_header_len = tdev->hard_header_len + t_hlen; > + mtu = min(tdev->mtu, IP_MAX_MTU); IP6_MAX_MTU? > > - dev->mtu = rt->dst.dev->mtu - t_hlen; > + dev->mtu = mtu - t_hlen; > if (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT)) > dev->mtu -= 8; > > if (dev->mtu < IPV6_MIN_MTU) > dev->mtu = IPV6_MIN_MTU; > } > - ip6_rt_put(rt); > } > } > >