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=-16.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 30BB3C43381 for ; Tue, 26 Feb 2019 17:49:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 02E3221850 for ; Tue, 26 Feb 2019 17:49:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="J/UP4nyH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728842AbfBZRta (ORCPT ); Tue, 26 Feb 2019 12:49:30 -0500 Received: from mail-it1-f201.google.com ([209.85.166.201]:44626 "EHLO mail-it1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727624AbfBZRt3 (ORCPT ); Tue, 26 Feb 2019 12:49:29 -0500 Received: by mail-it1-f201.google.com with SMTP id v12so2741380itv.9 for ; Tue, 26 Feb 2019 09:49:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=0cs3Uolhe+vksDAEo6jpZAJ0jIAq9mJNbij3am61uVE=; b=J/UP4nyHlkBFXiuHL7HGB0oQpQ+7V/dMZxVBikqZsCgyybIpdD32S6E+PGQpiNcbSC IQ45jQcxhaNmIAx2G2uascZExG57FTiU17ABpCXuUGFhgror74LztT7FnplCi3TKBiTQ HN6PEriX75cR82mgc1kfa03Gp2Euvb3nUCp5N+PIm6n3JGOMmodIgop1e+zX06mFrmkL MK0Gbs0ZUnV4gQP7Tib/YSzfyfDF/8M4ywUmCiS73OkemK/RRc1rPGFwK2CkomayNsnZ FZDH1VV55P74cA44M+tnzbqpWUObHM3XlcH8npo9U+s/26Uf3xVNZ/oUJn862mzhSpyE YmDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=0cs3Uolhe+vksDAEo6jpZAJ0jIAq9mJNbij3am61uVE=; b=bIlmMZAKLQ4cSiM0bYYPXyeb7E6mWnYa2O5LBpqb6uK6jgyr5vcCwdLbEcvwYmpJbS HZLRz6Nar4x1AZXr9vdnaxPs478hsx+GurAJF6bWF5iTKl6fLojV/f5ruelDxJDU7WFh W87P/zo93yLQ9j/tre9j0LKiG/uoDtWkABMi7DvL5te0ZLqnbF26yTHS9d/prI+otJmB 0hXOaPM+TQJKsI1cVT9zsF0dLqSl7t98EQ/4IHL6IBo+pdmY0ZuIOdugWJ8n6E0IDIkw v9K3PZz6Auvr+bMPfnf03TsAfC0hNsyERZOpmdImYIXaFf64x3h2BckUaub8Lsw/0TDN uFBw== X-Gm-Message-State: AHQUAuasUpHEhRdRkWWzBvBUqANtGV5R8ckQ6rV/0C9tLKn0zegcFvVK w2VuZAWkfPsG0Nxp79cdx7s/XCPcxB67EA== X-Google-Smtp-Source: APXvYqzT4WSJoNiRxqeci9gsx9ksDK6xxspvzG7NLDQBpGbxoWukVOoib1jLqS8Nm846qNdfUf+sWUG/Xujbzw== X-Received: by 2002:a24:108b:: with SMTP id 133mr3120549ity.29.1551203368275; Tue, 26 Feb 2019 09:49:28 -0800 (PST) Date: Tue, 26 Feb 2019 09:49:11 -0800 In-Reply-To: <20190226174913.18824-1-edumazet@google.com> Message-Id: <20190226174913.18824-4-edumazet@google.com> Mime-Version: 1.0 References: <20190226174913.18824-1-edumazet@google.com> X-Mailer: git-send-email 2.21.0.rc2.261.ga7da99ff1b-goog Subject: [PATCH net-next 3/5] tcp: convert tcp_md5_needed to static_branch API From: Eric Dumazet To: "David S . Miller" Cc: netdev , Eric Dumazet , Eric Dumazet Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We prefer static_branch_unlikely() over static_key_false() these days. Signed-off-by: Eric Dumazet --- include/net/tcp.h | 4 ++-- net/ipv4/tcp.c | 2 +- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/tcp_output.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index d66ac76a33d1298e48bb9dcef217beaedc8a7968..68ee02523b873db037aa9d6707edb14592e763fd 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1558,7 +1558,7 @@ struct tcp_md5sig_key *tcp_v4_md5_lookup(const struct sock *sk, #ifdef CONFIG_TCP_MD5SIG #include -extern struct static_key tcp_md5_needed; +extern struct static_key_false tcp_md5_needed; struct tcp_md5sig_key *__tcp_md5_do_lookup(const struct sock *sk, const union tcp_md5_addr *addr, int family); @@ -1567,7 +1567,7 @@ tcp_md5_do_lookup(const struct sock *sk, const union tcp_md5_addr *addr, int family) { - if (!static_key_false(&tcp_md5_needed)) + if (!static_branch_unlikely(&tcp_md5_needed)) return NULL; return __tcp_md5_do_lookup(sk, addr, family); } diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index e2fa6eb9f81aa0244ea05d99e2870a3d9294673b..ad07dd71063da09843ccfbd3e00d3f41567e1205 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3699,7 +3699,7 @@ bool tcp_alloc_md5sig_pool(void) if (!tcp_md5sig_pool_populated) { __tcp_alloc_md5sig_pool(); if (tcp_md5sig_pool_populated) - static_key_slow_inc(&tcp_md5_needed); + static_branch_inc(&tcp_md5_needed); } mutex_unlock(&tcp_md5sig_mutex); diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 4010ae3644f3101d01ee984c21256ca381588a3e..831d844a27ca20b52d590e17cb3eb2b2f8a697ce 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -973,7 +973,7 @@ static void tcp_v4_reqsk_destructor(struct request_sock *req) * We need to maintain these in the sk structure. */ -struct static_key tcp_md5_needed __read_mostly; +DEFINE_STATIC_KEY_FALSE(tcp_md5_needed); EXPORT_SYMBOL(tcp_md5_needed); /* Find the Key structure for an address. */ diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index e72aa0ff5785f177eb28ba8a3e4714997e58f35b..91f5cc5a3f88953da1043d051af9c5971c6006de 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -597,7 +597,7 @@ static unsigned int tcp_syn_options(struct sock *sk, struct sk_buff *skb, *md5 = NULL; #ifdef CONFIG_TCP_MD5SIG - if (static_key_false(&tcp_md5_needed) && + if (static_branch_unlikely(&tcp_md5_needed) && rcu_access_pointer(tp->md5sig_info)) { *md5 = tp->af_specific->md5_lookup(sk, sk); if (*md5) { @@ -734,7 +734,7 @@ static unsigned int tcp_established_options(struct sock *sk, struct sk_buff *skb *md5 = NULL; #ifdef CONFIG_TCP_MD5SIG - if (static_key_false(&tcp_md5_needed) && + if (static_branch_unlikely(&tcp_md5_needed) && rcu_access_pointer(tp->md5sig_info)) { *md5 = tp->af_specific->md5_lookup(sk, sk); if (*md5) { -- 2.21.0.rc2.261.ga7da99ff1b-goog