From patchwork Mon Oct 24 09:28:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Sitnicki X-Patchwork-Id: 685746 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 3t2WGH0gxcz9t1Y for ; Mon, 24 Oct 2016 20:29:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938784AbcJXJ34 (ORCPT ); Mon, 24 Oct 2016 05:29:56 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:35747 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936395AbcJXJ3C (ORCPT ); Mon, 24 Oct 2016 05:29:02 -0400 Received: by mail-wm0-f47.google.com with SMTP id c78so93328583wme.0 for ; Mon, 24 Oct 2016 02:29:01 -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=S8qHvZTzbdAyrdOapmeCN1wiltKwrIePZp+EwFjlD6I=; b=K5BLxccbrKSTtD7ofLGiyA/kHexA6Xxg9qe4yIPnuMPrOTRIEad87PmZljUdivv+Og UcqDuDDC4sbzbTK5UkJ03YI+luU1SGReOU3wrZ5FcV9RCDCGPgKbjH8e+e6muWCXsaKF 5W5DNNmGZxyVuwmeWZzs5RoytAUxYBPfgn0zpZCYFEILjbvC6Z6wfyVBQsSFTLzCu+Pj WkkZakYB85zBnJ/gGfnrjpSjes0cl4SAUVG0w7OUiQG3/50F6DyNxqxt/5IEeLKP/WMV 7bNEBnuqaEtdttIanNJq7uK8N3PKUUbHXjnaQ075IdOqZVWAuV2lUS/YQnOxMg7azymA 64Dw== X-Gm-Message-State: AA6/9Rk1z8vR9ytbB/US3wqyxW8q7bSSybpwy9YWg3Jk5XRGLFa9ImFS7UJqbU9h/phshE87 X-Received: by 10.28.169.151 with SMTP id s145mr14957266wme.40.1477301340835; Mon, 24 Oct 2016 02:29:00 -0700 (PDT) Received: from redhat.com ([149.6.38.86]) by smtp.gmail.com with ESMTPSA id 1sm13705417wmk.22.2016.10.24.02.29.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Oct 2016 02:29:00 -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 , Eric Dumazet Subject: [PATCH net-next 4/5] ipv6: Compute multipath hash for sent ICMP errors from offending packet Date: Mon, 24 Oct 2016 11:28:51 +0200 Message-Id: <1477301332-23954-5-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 Improve debuggability with tools like traceroute and make PMTUD work in setups that make use of ECMP routing by sending ICMP errors down the same path as the offending packet would travel, if it was going in the opposite direction. There is a caveat, flows in both directions need use the same label. Otherwise packets from flow in the opposite direction and ICMP errors will not be routed over the same ECMP link. Export the function for calculating the multipath hash so that we can use it also on receive side, when forwarding ICMP errors. Signed-off-by: Jakub Sitnicki Acked-by: Hannes Frederic Sowa --- include/linux/icmpv6.h | 2 ++ net/ipv6/icmp.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h index 57086e9..6282e03 100644 --- a/include/linux/icmpv6.h +++ b/include/linux/icmpv6.h @@ -45,4 +45,6 @@ extern void icmpv6_flow_init(struct sock *sk, const struct in6_addr *saddr, const struct in6_addr *daddr, int oif); +struct ipv6hdr; +extern u32 icmpv6_multipath_hash(const struct ipv6hdr *iph); #endif diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index bd59c34..ab376b3d1 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -385,6 +385,26 @@ static struct dst_entry *icmpv6_route_lookup(struct net *net, return ERR_PTR(err); } +u32 icmpv6_multipath_hash(const struct ipv6hdr *iph) +{ + struct flowi6 fl6; + + /* Calculate the multipath hash from the offending IP datagram that + * triggered the ICMP error. The source and destination addresses are + * swapped as we do our best to route the ICMP message together with the + * flow it belongs to. However, flows in both directions have to have + * the same label (e.g. by using flow label reflection) for it to + * happen. + */ + memset(&fl6, 0, sizeof(fl6)); + fl6.daddr = iph->saddr; + fl6.saddr = iph->daddr; + fl6.flowlabel = ip6_flowinfo(iph); + fl6.flowi6_proto = iph->nexthdr; + + return get_hash_from_flowi6(&fl6); +} + /* * Send an ICMP message in response to a packet in error */ @@ -484,6 +504,7 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info, fl6.flowi6_oif = iif; fl6.fl6_icmp_type = type; fl6.fl6_icmp_code = code; + fl6.mp_hash = icmpv6_multipath_hash(hdr); security_skb_classify_flow(skb, flowi6_to_flowi(&fl6)); sk = icmpv6_xmit_lock(net);