From patchwork Mon Oct 24 09:28:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Sitnicki X-Patchwork-Id: 685744 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 3t2WFd4qhDz9t2N for ; Mon, 24 Oct 2016 20:29:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938766AbcJXJ3O (ORCPT ); Mon, 24 Oct 2016 05:29:14 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:38349 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S938744AbcJXJ3K (ORCPT ); Mon, 24 Oct 2016 05:29:10 -0400 Received: by mail-wm0-f47.google.com with SMTP id c78so104311073wme.1 for ; Mon, 24 Oct 2016 02:29:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=s6Ytq103378/atN2TFmCGaW34rPlBvAGwZ3P+sA9IYk=; b=k45y22WXT05Ua2HwVgsAiy5BXciQFUkgB6+eBxhNoX/wTKYW3znSbgIP7vwqUIA7D8 yn7bburQC864ZxjK3kpkZco/6MpCTNwm30+jWZzth5uqeP+lPlrwzT6Zo1xD2xH/QABY ok3miTK4HylJhCT8vZpRC5xyrmMDAjFdXmIePFcT6NJ18oYazyPtOYm5JoNjuZGmVAff hTz6C1teUPyZxH0VmJQHxJ6Pr86BGMrqS+WnklI22otIy+yZ+5KjCTZhmTQ+CopThZP/ xQi2MF8rv/VFwBqeTHHkkpdyQUyQ82HQjRMPEZ9/DBEVG7W32gUwDVikh/mdpEL8SSem thZQ== X-Gm-Message-State: ABUngvc0JsxrRCeDoyWBHKWaB7wx8Z1P55dKUA6SBgIiwco98mQ4x57dMjhBxW0JmKEU7lxB X-Received: by 10.194.205.136 with SMTP id lg8mr10621046wjc.1.1477301342185; Mon, 24 Oct 2016 02:29:02 -0700 (PDT) Received: from redhat.com ([149.6.38.86]) by smtp.gmail.com with ESMTPSA id o1sm18311175wjh.9.2016.10.24.02.29.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Oct 2016 02:29:01 -0700 (PDT) From: Jakub Sitnicki To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, "David S. Miller" , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy Subject: [PATCH net-next 5/5] ipv6: Compute multipath hash for forwarded ICMP errors from offending packet Date: Mon, 24 Oct 2016 11:28:52 +0200 Message-Id: <1477301332-23954-6-git-send-email-jkbs@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477301332-23954-1-git-send-email-jkbs@redhat.com> References: <1477301332-23954-1-git-send-email-jkbs@redhat.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Same as for the transmit path, let's do our best to ensure that received ICMP errors that may be subject to forwarding will be routed the same path as flow that triggered the error, if it was going in the opposite direction. Signed-off-by: Jakub Sitnicki Acked-by: Hannes Frederic Sowa --- net/ipv6/route.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 1184c2b..c0f38ea 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1150,6 +1150,30 @@ struct dst_entry *ip6_route_input_lookup(struct net *net, } EXPORT_SYMBOL_GPL(ip6_route_input_lookup); +static u32 ip6_multipath_icmp_hash(const struct sk_buff *skb) +{ + const struct icmp6hdr *icmph = icmp6_hdr(skb); + const struct ipv6hdr *inner_iph; + struct ipv6hdr _inner_iph; + + if (icmph->icmp6_type != ICMPV6_DEST_UNREACH && + icmph->icmp6_type != ICMPV6_PKT_TOOBIG && + icmph->icmp6_type != ICMPV6_TIME_EXCEED && + icmph->icmp6_type != ICMPV6_PARAMPROB) + goto standard_hash; + + inner_iph = skb_header_pointer( + skb, skb_transport_offset(skb) + sizeof(*icmph), + sizeof(_inner_iph), &_inner_iph); + if (!inner_iph) + goto standard_hash; + + return icmpv6_multipath_hash(inner_iph); + +standard_hash: + return 0; /* compute it later, if needed */ +} + void ip6_route_input(struct sk_buff *skb) { const struct ipv6hdr *iph = ipv6_hdr(skb); @@ -1168,6 +1192,8 @@ void ip6_route_input(struct sk_buff *skb) tun_info = skb_tunnel_info(skb); if (tun_info && !(tun_info->mode & IP_TUNNEL_INFO_TX)) fl6.flowi6_tun_key.tun_id = tun_info->key.tun_id; + if (unlikely(fl6.flowi6_proto == IPPROTO_ICMPV6)) + fl6.mp_hash = ip6_multipath_icmp_hash(skb); skb_dst_drop(skb); skb_dst_set(skb, ip6_route_input_lookup(net, skb->dev, &fl6, flags)); }