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=-7.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=ham 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 EB1EBC54E8D for ; Mon, 11 May 2020 18:52:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CEBDE20720 for ; Mon, 11 May 2020 18:52:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="d2g/X9yv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731240AbgEKSwj (ORCPT ); Mon, 11 May 2020 14:52:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1731234AbgEKSwj (ORCPT ); Mon, 11 May 2020 14:52:39 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 934BBC05BD0E for ; Mon, 11 May 2020 11:52:37 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id s8so12303728wrt.9 for ; Mon, 11 May 2020 11:52:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2ojEd/q/k+ui/tdlTtnZjdQdevINffYnK0fnxcI6+4Y=; b=d2g/X9yvb3uYH8vthU94GD76YkA9Y8adNPjh1+vkkGoC8mh6S2pDUgwnUnA4tFvqTw UY2yB8jQFS4wqhOOoBGD/WrwoflNslZnrpGTG2a5SOiXALgJYDI3ADfwUJtXJ76b3CAj PcpGdlzfeTNHMYaczBzVbworPahN01JbMHnOo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2ojEd/q/k+ui/tdlTtnZjdQdevINffYnK0fnxcI6+4Y=; b=m4FL2JDPWJXczkW18ycf4fRXGYWtImgMl7QB65RyQ9hWCSb7WM7zkVeQL9fjnzhES9 tXzFliS8We/hBs2RbtEwSjv75yv83AHd6lhoPDKSHVDYt3WNBBaqe4N/4uN5DocFimRt 3VeHIU602YiE6COsoj8/SN9XQ5ankr7zz8gyU51xLy92RpWu11RNciqlTQoZbrteuqBg Jy1uokp9USVOKZ3Y+ODRdpN3wrZRYDNQHT0Tv6AB9s6djAn8Z3YJ2tGweIvmqPn7uCb0 c4yQ3Tzq/z4mrGe473SW08lmjaYeSmLmg24EJ87KKjmobTZmnJ9lZtumpl1PMaZxY43A 4p6A== X-Gm-Message-State: AGi0PuaOuC5anBzSvcB2/uQqYUq8LfpPx36LIgRMxBm6smNggFSJ3t4D 1q8m8yQO7dbZ2aCKb8/2UUZMSA== X-Google-Smtp-Source: APiQypJguhmqZWm6uwGU1Lvf+X7YeVMHhDzstvAlIJDTuvKaDfsIYwLPROaPVYOBgfXEfPfzTpb4FQ== X-Received: by 2002:adf:ab09:: with SMTP id q9mr19761725wrc.240.1589223156180; Mon, 11 May 2020 11:52:36 -0700 (PDT) Received: from cloudflare.com ([2a02:a310:c262:aa00:b35e:8938:2c2a:ba8b]) by smtp.gmail.com with ESMTPSA id n7sm9896610wro.94.2020.05.11.11.52.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2020 11:52:35 -0700 (PDT) From: Jakub Sitnicki To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: dccp@vger.kernel.org, kernel-team@cloudflare.com, Alexei Starovoitov , Daniel Borkmann , "David S. Miller" , Eric Dumazet , Gerrit Renker , Jakub Kicinski , Andrii Nakryiko , Martin KaFai Lau , Marek Majkowski , Lorenz Bauer Subject: [PATCH bpf-next v2 10/17] udp: Run SK_LOOKUP BPF program on socket lookup Date: Mon, 11 May 2020 20:52:11 +0200 Message-Id: <20200511185218.1422406-11-jakub@cloudflare.com> X-Mailer: git-send-email 2.25.3 In-Reply-To: <20200511185218.1422406-1-jakub@cloudflare.com> References: <20200511185218.1422406-1-jakub@cloudflare.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Following INET/TCP socket lookup changes, modify UDP socket lookup to let BPF program select a receiving socket before searching for a socket by destination address and port as usual. Lookup of connected sockets that match packet 4-tuple is unaffected by this change. BPF program runs, and potentially overrides the lookup result, only if a 4-tuple match was not found. Suggested-by: Marek Majkowski Reviewed-by: Lorenz Bauer Signed-off-by: Jakub Sitnicki --- net/ipv4/udp.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index d4842f29294a..18d8432f6551 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -460,7 +460,7 @@ struct sock *__udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport, __be32 daddr, __be16 dport, int dif, int sdif, struct udp_table *udptable, struct sk_buff *skb) { - struct sock *result; + struct sock *result, *sk, *reuse_sk; unsigned short hnum = ntohs(dport); unsigned int hash2, slot2; struct udp_hslot *hslot2; @@ -469,18 +469,38 @@ struct sock *__udp4_lib_lookup(struct net *net, __be32 saddr, slot2 = hash2 & udptable->mask; hslot2 = &udptable->hash2[slot2]; + /* Lookup connected or non-wildcard socket */ result = udp4_lib_lookup2(net, saddr, sport, daddr, hnum, dif, sdif, hslot2, skb); - if (!result) { - hash2 = ipv4_portaddr_hash(net, htonl(INADDR_ANY), hnum); - slot2 = hash2 & udptable->mask; - hslot2 = &udptable->hash2[slot2]; + if (!IS_ERR_OR_NULL(result) && result->sk_state == TCP_ESTABLISHED) + goto done; - result = udp4_lib_lookup2(net, saddr, sport, - htonl(INADDR_ANY), hnum, dif, sdif, - hslot2, skb); + /* Lookup redirect from BPF */ + sk = inet_lookup_run_bpf(net, udptable->protocol, + saddr, sport, daddr, hnum); + if (IS_ERR(sk)) + return NULL; + if (sk) { + reuse_sk = lookup_reuseport(net, sk, skb, + saddr, sport, daddr, hnum); + result = reuse_sk ? : sk; + goto done; } + + /* Got non-wildcard socket or error on first lookup */ + if (result) + goto done; + + /* Lookup wildcard sockets */ + hash2 = ipv4_portaddr_hash(net, htonl(INADDR_ANY), hnum); + slot2 = hash2 & udptable->mask; + hslot2 = &udptable->hash2[slot2]; + + result = udp4_lib_lookup2(net, saddr, sport, + htonl(INADDR_ANY), hnum, dif, sdif, + hslot2, skb); +done: if (IS_ERR(result)) return NULL; return result; -- 2.25.3