From patchwork Fri Jul 17 10:35:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Sitnicki X-Patchwork-Id: 1331034 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=cloudflare.com header.i=@cloudflare.com header.a=rsa-sha256 header.s=google header.b=jld1eH43; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B7SFr2f5mz9sRN for ; Fri, 17 Jul 2020 20:36:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726742AbgGQKf7 (ORCPT ); Fri, 17 Jul 2020 06:35:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726465AbgGQKfv (ORCPT ); Fri, 17 Jul 2020 06:35:51 -0400 Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE0E8C08C5CE for ; Fri, 17 Jul 2020 03:35:50 -0700 (PDT) Received: by mail-lj1-x243.google.com with SMTP id q7so12081861ljm.1 for ; Fri, 17 Jul 2020 03:35:50 -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=CSImEKhTKz9014ktyOGoqavC0QLsyRB1xlDmWNPgHzk=; b=jld1eH43Rl3jAaZG9nfqDO/v6NmI7vDBccn7gbCD8iEN57dtEQGTFczd71GZZ68G62 aKg8NYJ8Vi8ilKuHWsrNO2kNC/pTCYkPBeMp0Lfus6etPmHIjhB4rUtjIHCt3iZCMx5E ojfnwO0ZXGEnPZQ3lEcmv6hc88JbdvHRU0QKc= 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=CSImEKhTKz9014ktyOGoqavC0QLsyRB1xlDmWNPgHzk=; b=GEhFdT6jy5EH3U/bNXHz7UyGB/too69LQ44DDm7FiQ7wZb5UIeAa3jdQzuJ9tqf1gP f2R2J/n7Jft3/EVpMxCw8O7DimVNKMXqiCjZx+DdulPJPkZMm3JdqVmZB5ADgAQdwlRk DMjTDLLOo7+6X/PB5IvZz45B0dHjvilfKZBOKQrYZgsaq8ekftv7aDOJ1PZRqCqxV8Rz 9HM0n58qWeKeX4EOzRB6blvwGCkxDgKi3aEzM8v55S5+KzsM3fdyyCL6m88qOhyn14IP EiZc9HH2s28c14AsCoBivxe1+qySNTXAsi9cLvh3A9sdjQjujhinriKgPO+sUuFrV9pi eW7g== X-Gm-Message-State: AOAM533arohyHQo/eXlHdhWEjblpCbfDRmdx5Rs4Ya32ZTC33wzbLEnh Tdirtuqzd2Aw0ax7LnQbDWL9CQ== X-Google-Smtp-Source: ABdhPJxxUChiTJ/6xSYiFLsHevu0HfKyACguUTGkSb4NUiU+no3MkKYf9/si0MS0PLS/THhZTg8vxg== X-Received: by 2002:a2e:9908:: with SMTP id v8mr4059749lji.186.1594982149229; Fri, 17 Jul 2020 03:35:49 -0700 (PDT) Received: from cloudflare.com ([2a02:a310:c262:aa00:b35e:8938:2c2a:ba8b]) by smtp.gmail.com with ESMTPSA id e24sm1723466ljg.18.2020.07.17.03.35.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 03:35:48 -0700 (PDT) From: Jakub Sitnicki To: bpf@vger.kernel.org Cc: netdev@vger.kernel.org, kernel-team@cloudflare.com, Alexei Starovoitov , Daniel Borkmann , "David S. Miller" , Jakub Kicinski , Andrii Nakryiko Subject: [PATCH bpf-next v5 07/15] udp: Extract helper for selecting socket from reuseport group Date: Fri, 17 Jul 2020 12:35:28 +0200 Message-Id: <20200717103536.397595-8-jakub@cloudflare.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200717103536.397595-1-jakub@cloudflare.com> References: <20200717103536.397595-1-jakub@cloudflare.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Prepare for calling into reuseport from __udp4_lib_lookup as well. Acked-by: Andrii Nakryiko Signed-off-by: Jakub Sitnicki --- net/ipv4/udp.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 073d346f515c..9296faea3acf 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -408,6 +408,25 @@ static u32 udp_ehashfn(const struct net *net, const __be32 laddr, udp_ehash_secret + net_hash_mix(net)); } +static inline struct sock *lookup_reuseport(struct net *net, struct sock *sk, + struct sk_buff *skb, + __be32 saddr, __be16 sport, + __be32 daddr, unsigned short hnum) +{ + struct sock *reuse_sk = NULL; + u32 hash; + + if (sk->sk_reuseport && sk->sk_state != TCP_ESTABLISHED) { + hash = udp_ehashfn(net, daddr, hnum, saddr, sport); + reuse_sk = reuseport_select_sock(sk, hash, skb, + sizeof(struct udphdr)); + /* Fall back to scoring if group has connections */ + if (reuseport_has_conns(sk, false)) + return NULL; + } + return reuse_sk; +} + /* called with rcu_read_lock() */ static struct sock *udp4_lib_lookup2(struct net *net, __be32 saddr, __be16 sport, @@ -418,7 +437,6 @@ static struct sock *udp4_lib_lookup2(struct net *net, { struct sock *sk, *result; int score, badness; - u32 hash = 0; result = NULL; badness = 0; @@ -426,15 +444,11 @@ static struct sock *udp4_lib_lookup2(struct net *net, score = compute_score(sk, net, saddr, sport, daddr, hnum, dif, sdif); if (score > badness) { - if (sk->sk_reuseport && - sk->sk_state != TCP_ESTABLISHED) { - hash = udp_ehashfn(net, daddr, hnum, - saddr, sport); - result = reuseport_select_sock(sk, hash, skb, - sizeof(struct udphdr)); - if (result && !reuseport_has_conns(sk, false)) - return result; - } + result = lookup_reuseport(net, sk, skb, + saddr, sport, daddr, hnum); + if (result) + return result; + badness = score; result = sk; }