From patchwork Wed Nov 18 15:29:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Dangaard Brouer X-Patchwork-Id: 11915337 X-Patchwork-Delegate: bpf@iogearbox.net 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=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 7B74EC5519F for ; Wed, 18 Nov 2020 15:29:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1E39624757 for ; Wed, 18 Nov 2020 15:29:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="FcH2mQQ9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727318AbgKRP3t (ORCPT ); Wed, 18 Nov 2020 10:29:49 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44447 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726468AbgKRP3t (ORCPT ); Wed, 18 Nov 2020 10:29:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605713388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4jFpeGAhh6Fb5jG1FvpIjRZn9YY2hHww4xO7ltwcqts=; b=FcH2mQQ9NwO/qoQl9elXZfY4UmLiU7oISgmieAxgVrHXlOTTAz1Q9jZrbFHOgvC9nB4ds6 uWxAmOxd/UqlKPX523pREarvZwUMH7hq4oKb45VM5QFCimyxMUUMStiUXb9dwkalvn/QID tlejczSbxQaap6FqeT9CIrQarLXQXEI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-373-K1bTl2RQNyWCwRo6Oynxyg-1; Wed, 18 Nov 2020 10:29:44 -0500 X-MC-Unique: K1bTl2RQNyWCwRo6Oynxyg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E806410866A7; Wed, 18 Nov 2020 15:29:41 +0000 (UTC) Received: from firesoul.localdomain (unknown [10.40.208.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F5BD60C05; Wed, 18 Nov 2020 15:29:36 +0000 (UTC) Received: from [192.168.42.3] (localhost [IPv6:::1]) by firesoul.localdomain (Postfix) with ESMTP id 6A7FA32138456; Wed, 18 Nov 2020 16:29:35 +0100 (CET) Subject: [PATCH bpf-next V6 2/7] bpf: fix bpf_fib_lookup helper MTU check for SKB ctx From: Jesper Dangaard Brouer To: bpf@vger.kernel.org Cc: Jesper Dangaard Brouer , netdev@vger.kernel.org, Daniel Borkmann , Alexei Starovoitov , maze@google.com, lmb@cloudflare.com, shaun@tigera.io, Lorenzo Bianconi , marek@cloudflare.com, John Fastabend , Jakub Kicinski , eyal.birger@gmail.com, colrack@gmail.com Date: Wed, 18 Nov 2020 16:29:35 +0100 Message-ID: <160571337537.2801246.15228178384451037535.stgit@firesoul> In-Reply-To: <160571331409.2801246.11527010115263068327.stgit@firesoul> References: <160571331409.2801246.11527010115263068327.stgit@firesoul> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net BPF end-user on Cilium slack-channel (Carlo Carraro) wants to use bpf_fib_lookup for doing MTU-check, but *prior* to extending packet size, by adjusting fib_params 'tot_len' with the packet length plus the expected encap size. (Just like the bpf_check_mtu helper supports). He discovered that for SKB ctx the param->tot_len was not used, instead skb->len was used (via MTU check in is_skb_forwardable()). Fix this by using fib_params 'tot_len' for MTU check. If not provided (e.g. zero) then keep existing behaviour intact. Fixes: 4c79579b44b1 ("bpf: Change bpf_fib_lookup to return lookup status") Reported-by: Carlo Carraro Signed-off-by: Jesper Dangaard Brouer --- net/core/filter.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/net/core/filter.c b/net/core/filter.c index 1ee97fdeea64..ae1fe8e6069a 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -5567,10 +5567,20 @@ BPF_CALL_4(bpf_skb_fib_lookup, struct sk_buff *, skb, if (!rc) { struct net_device *dev; + u32 mtu; dev = dev_get_by_index_rcu(net, params->ifindex); - if (!is_skb_forwardable(dev, skb)) + mtu = dev->mtu; + + /* Using tot_len for L3 MTU check if provided by user. Notice at + * this TC cls_bpf level skb->len contains L2 size, but + * is_skb_forwardable takes that into account. + */ + if (params->tot_len > mtu) { rc = BPF_FIB_LKUP_RET_FRAG_NEEDED; + } else if (!is_skb_forwardable(dev, skb)) { + rc = BPF_FIB_LKUP_RET_FRAG_NEEDED; + } } return rc;