From patchwork Wed Jun 8 13:13:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Sitnicki X-Patchwork-Id: 632238 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 3rPpmM4lt6z9t3Z for ; Wed, 8 Jun 2016 23:13:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756359AbcFHNNx (ORCPT ); Wed, 8 Jun 2016 09:13:53 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:37791 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751039AbcFHNNv (ORCPT ); Wed, 8 Jun 2016 09:13:51 -0400 Received: by mail-wm0-f46.google.com with SMTP id k204so16566372wmk.0 for ; Wed, 08 Jun 2016 06:13:50 -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; bh=CZV/tPCwrGLiikwNRtnM0tGIImUXXjDqzNRjCk4F3YY=; b=cjJC015kbNoSzmcXBZGlGSC91qjuPDImgtOR6doyg1S0H/JQJ6HsF+Wa+s5ezNf7dQ UjDCVTgtldaxVYNJ4SoicwYpqnmGbNpZgNyf+Av1S4Hx7ZIPEAJ9QTsrd0ue3+ZJyaa3 sbD7oG9NDH/lNXk1bnGVSfLQCsyn4HcM53wcog+ww8m/060qibHHoKQaSiinpW88F9Yq y8cSvclRWSt2UHKelovm8uGORbiGF1XIesX2Ti7dhEBOOn9+v9TTrv/ii9VWu/IMLrxo mtsHzuuKtYBaXTz2vIwJ3e3QqpYQcihiTGnw9lAX5p1Cy0wrYzvTbGNhCL9Ib1KPszDB 8dqQ== X-Gm-Message-State: ALyK8tKjQUKT+nyZIpTzYSQARaAiT3uIlDbvODCV/ZLw/e/Lh6KpvaGqspSap0qmY9rdiqwe X-Received: by 10.194.173.65 with SMTP id bi1mr2794302wjc.160.1465391629474; Wed, 08 Jun 2016 06:13:49 -0700 (PDT) Received: from redhat.com (89-75-188-86.dynamic.chello.pl. [89.75.188.86]) by smtp.gmail.com with ESMTPSA id q189sm2074616wmd.19.2016.06.08.06.13.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jun 2016 06:13:48 -0700 (PDT) From: Jakub Sitnicki To: netdev@vger.kernel.org Cc: Jan Tluka , Hannes Frederic Sowa , Jakub Sitnicki Subject: [PATCH net] ipv6: Skip XFRM lookup if dst_entry in socket cache is valid Date: Wed, 8 Jun 2016 15:13:34 +0200 Message-Id: <1465391614-8961-1-git-send-email-jkbs@redhat.com> X-Mailer: git-send-email 2.5.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org At present we perform an xfrm_lookup() for each UDPv6 message we send. The lookup involves querying the flow cache (flow_cache_lookup) and, in case of a cache miss, creating an XFRM bundle. If we miss the flow cache, we can end up creating a new bundle and deriving the path MTU (xfrm_init_pmtu) from on an already transformed dst_entry, which we pass from the socket cache (sk->sk_dst_cache) down to xfrm_lookup(). This can happen only if we're caching the dst_entry in the socket, that is when we're using a connected UDP socket. To put it another way, the path MTU shrinks each time we miss the flow cache, which later on leads to incorrectly fragmented payload. It can be observed with ESPv6 in transport mode: 1) Set up a transformation and lower the MTU to trigger fragmentation # ip xfrm policy add dir out src ::1 dst ::1 \ tmpl src ::1 dst ::1 proto esp spi 1 # ip xfrm state add src ::1 dst ::1 \ proto esp spi 1 enc 'aes' 0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b # ip link set dev lo mtu 1500 2) Monitor the packet flow and set up an UDP sink # tcpdump -ni lo -ttt & # socat udp6-listen:12345,fork /dev/null & 3) Send a datagram that needs fragmentation with a connected socket # perl -e 'print "@" x 1470 | socat - udp6:[::1]:12345 2016/06/07 18:52:52 socat[724] E read(3, 0x555bb3d5ba00, 8192): Protocol error 00:00:00.000000 IP6 ::1 > ::1: frag (0|1448) ESP(spi=0x00000001,seq=0x2), length 1448 00:00:00.000014 IP6 ::1 > ::1: frag (1448|32) 00:00:00.000050 IP6 ::1 > ::1: ESP(spi=0x00000001,seq=0x3), length 1272 (^ ICMPv6 Parameter Problem) 00:00:00.000022 IP6 ::1 > ::1: ESP(spi=0x00000001,seq=0x5), length 136 4) Compare it to a non-connected socket # perl -e 'print "@" x 1500' | socat - udp6-sendto:[::1]:12345 00:00:40.535488 IP6 ::1 > ::1: frag (0|1448) ESP(spi=0x00000001,seq=0x6), length 1448 00:00:00.000010 IP6 ::1 > ::1: frag (1448|64) What happens in step (3) is: 1) when connecting the socket in __ip6_datagram_connect(), we perform an XFRM lookup, miss the flow cache, create an XFRM bundle, and cache the destination, 2) afterwards, when sending the datagram, we perform an XFRM lookup, again, miss the flow cache (due to mismatch of flowi6_iif and flowi6_oif, which is an issue of its own), and recreate an XFRM bundle based on the cached (and already transformed) destination. To prevent the recreation of an XFRM bundle, avoid an XFRM lookup altogether whenever we already have a destination entry cached in the socket. This prevents the path MTU shrinkage and brings us on par with UDPv4. The fix also benefits connected PINGv6 sockets, another user of ip6_sk_dst_lookup_flow(), who also suffer messages being transformed twice. Joint work with Hannes Frederic Sowa. Reported-by: Jan Tluka Signed-off-by: Jakub Sitnicki Acked-by: Hannes Frederic Sowa --- net/ipv6/ip6_output.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 6b2f60a..fd32175 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1071,17 +1071,12 @@ struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6, const struct in6_addr *final_dst) { struct dst_entry *dst = sk_dst_check(sk, inet6_sk(sk)->dst_cookie); - int err; dst = ip6_sk_dst_check(sk, dst, fl6); + if (!dst) + dst = ip6_dst_lookup_flow(sk, fl6, final_dst); - err = ip6_dst_lookup_tail(sock_net(sk), sk, &dst, fl6); - if (err) - return ERR_PTR(err); - if (final_dst) - fl6->daddr = *final_dst; - - return xfrm_lookup_route(sock_net(sk), dst, flowi6_to_flowi(fl6), sk, 0); + return dst; } EXPORT_SYMBOL_GPL(ip6_sk_dst_lookup_flow);