From patchwork Mon Jul 13 17:46:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Sitnicki X-Patchwork-Id: 1328352 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=HQFFUQ/g; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B5B1K3p3Pz9sRN for ; Tue, 14 Jul 2020 03:47:17 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730498AbgGMRrQ (ORCPT ); Mon, 13 Jul 2020 13:47:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730423AbgGMRrO (ORCPT ); Mon, 13 Jul 2020 13:47:14 -0400 Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EFA3EC061755 for ; Mon, 13 Jul 2020 10:47:13 -0700 (PDT) Received: by mail-lj1-x241.google.com with SMTP id b25so18931599ljp.6 for ; Mon, 13 Jul 2020 10:47:13 -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=Htoi5B3nTzd0JCiGoeXt1gyzcrOgoKflVk9EqYXpwIA=; b=HQFFUQ/gwR7+Tm9gVtPMta13OFDeILtTCdYDunOYGsCbwIYv5mJ9ZWl9FW6kApiJpK wRoWTZ6pORqflBmUXe9/duod6Ebaacs0P6M5aeZWuJYSdD3P9ub8SZgeVE2y/KxTCqaT GOvo773DH1Cez5gXNYEIK2+oPF5IZpKdh5jEw= 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=Htoi5B3nTzd0JCiGoeXt1gyzcrOgoKflVk9EqYXpwIA=; b=RxrLmIBwCjAPcZjPZ1XbBUWf+S8TCGqi6nbv9yH63xF0NKmT5v/gcQa7mbDtphmkPt mAu+jHX4WBg2ZsSpkCLYGezJcE5xp185345fZ0ZIF/caMdx1WZEOXYAxgRQHrwDGB0yN QwZYCZokZmyo2NxFjVQskHNmXFSa2MXNvObqRWaBW4j7AS8NpE94Lq975IbBIccHC4eK QLai9IuCcNdSYzLb3OqaGgYrhSKzeCgQTtC8t4jOZFZmax9peu1vWvVbWPTs4OB7sFLW n9Q2xxxegXbtt17fD8vfuqcIdBaGCGrx9ywxB8cAPE10ZL2CkTLFZCAn5USymuqAN7qJ +Hqw== X-Gm-Message-State: AOAM531l4oEdt+MpeT/BM3++EQXUdk9wumRKV5vZQFqVpoMqu5Z1Sd+v JOS3W587zhR1K/lBFhaF83xkBSJ3uQhKFg== X-Google-Smtp-Source: ABdhPJzHDaCgFe74GEpCI8eS4qXtdM8DqQGYrEFuNA2bNi98V41lpwwgD/4Gyi5Dyifdd2IjU2jJFQ== X-Received: by 2002:a2e:99d0:: with SMTP id l16mr359282ljj.209.1594662432404; Mon, 13 Jul 2020 10:47:12 -0700 (PDT) Received: from cloudflare.com ([2a02:a310:c262:aa00:b35e:8938:2c2a:ba8b]) by smtp.gmail.com with ESMTPSA id g142sm4758350lfd.41.2020.07.13.10.47.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 10:47:11 -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 Subject: [PATCH bpf-next v4 09/16] udp6: Extract helper for selecting socket from reuseport group Date: Mon, 13 Jul 2020 19:46:47 +0200 Message-Id: <20200713174654.642628-10-jakub@cloudflare.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200713174654.642628-1-jakub@cloudflare.com> References: <20200713174654.642628-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 __udp6_lib_lookup as well. Signed-off-by: Jakub Sitnicki --- net/ipv6/udp.c | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 7d4151747340..65b843e7acde 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -141,6 +141,27 @@ static int compute_score(struct sock *sk, struct net *net, return score; } +static inline struct sock *lookup_reuseport(struct net *net, struct sock *sk, + struct sk_buff *skb, + const struct in6_addr *saddr, + __be16 sport, + const struct in6_addr *daddr, + unsigned int hnum) +{ + struct sock *reuse_sk = NULL; + u32 hash; + + if (sk->sk_reuseport && sk->sk_state != TCP_ESTABLISHED) { + hash = udp6_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 *udp6_lib_lookup2(struct net *net, const struct in6_addr *saddr, __be16 sport, @@ -150,7 +171,6 @@ static struct sock *udp6_lib_lookup2(struct net *net, { struct sock *sk, *result; int score, badness; - u32 hash = 0; result = NULL; badness = -1; @@ -158,16 +178,11 @@ static struct sock *udp6_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 = udp6_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; + result = sk; badness = score; }