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 40EFBC43381 for ; Fri, 22 Mar 2019 15:56:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 04CF221900 for ; Fri, 22 Mar 2019 15:56:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="AX0r5+a8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727766AbfCVP4t (ORCPT ); Fri, 22 Mar 2019 11:56:49 -0400 Received: from mail-qt1-f202.google.com ([209.85.160.202]:56243 "EHLO mail-qt1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727169AbfCVP4s (ORCPT ); Fri, 22 Mar 2019 11:56:48 -0400 Received: by mail-qt1-f202.google.com with SMTP id h51so2664699qte.22 for ; Fri, 22 Mar 2019 08:56:48 -0700 (PDT) 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=aW1S8RqOUgHyvh2ByKVHD00Y2Vc4PQc3arK8qbp3Chc=; b=AX0r5+a8Fg18vbaov+42/rfXUzo55qcZP7X8wThj1z9ki8d4ml3Q0NjFrTCZl/xzsv mCYmNlcJDuH8U5qF5br95jzawRWSRRZ8vMrMIw/od4xsMs6Dr2BQIm/wCFCvrnNRQUpT TIiR0mjY46kknZpluGg+0WKg8ajm7TuHA6kGcgG3buhe9nYRGhEpiHtkxBdqUDSRrdZo psIDUZvW5MinJg3jS7F2eb4i4xOWALgjyQLxhWQOWeSCQiQ+Ih6rv0Fvg2fbg4IxzC96 TJUIYA8+jfUnq0hOEW9iWU51k7Z2vS3rvIN0UGHnMLTHZgkMbaBrG7sPyt30bQeO/gzh BJUQ== 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=aW1S8RqOUgHyvh2ByKVHD00Y2Vc4PQc3arK8qbp3Chc=; b=KXd15hcW9Qzr7GmEv3c/a4YmKSIqNtc4tAwSbtKxZCq0n/8nEpV/zjFsfkpXlk4qHG PE6KUvPJbOsJ0/quUphSL0gAWD6Da8xgm/5LBTZMuT/Hq8fE09Bwik3YN3iLk+jSzRxS tloD3m53D+heQLGdlpDhzBii0DYUmJNOPlnfXueGb2w/jR9NDS3HGpkMHsEMkIFiwBjE Ia0UG/EG70NIT8XgFmuThaHZqhtWEOcPkGQHOrE3A2JdponuwnYvwpBkU0cWBIOsBtwT ks8gcBDV2vgldWZoDN8/29Ea4ziMCHwwcAA8AFJZoAWL2mYowizTLirU0PVWGASkFa+c hxRw== X-Gm-Message-State: APjAAAUjRoPaFad1wC3PYSkzg3tcUr60IYJFs+5Z/0G5aik6jKRz9o7+ Pm/NVml0UBUnRh904Nyc8itrrhmR5VPQWQ== X-Google-Smtp-Source: APXvYqymE+zNYJRkD1KDAl0zo6XMbX9qxU9XOpVV/mk+bZFBswgfW8jBEler/sTFenUc9mnN6QMTgyl9/sQXiw== X-Received: by 2002:ae9:e21a:: with SMTP id c26mr8445857qkc.293.1553270207902; Fri, 22 Mar 2019 08:56:47 -0700 (PDT) Date: Fri, 22 Mar 2019 08:56:38 -0700 In-Reply-To: <20190322155640.248144-1-edumazet@google.com> Message-Id: <20190322155640.248144-2-edumazet@google.com> Mime-Version: 1.0 References: <20190322155640.248144-1-edumazet@google.com> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog Subject: [PATCH v3 net-next 1/3] net: convert rps_needed and rfs_needed to new static branch api From: Eric Dumazet To: "David S . Miller" Cc: netdev , Eric Dumazet , Eric Dumazet , Soheil Hassas Yeganeh , Willem de Bruijn 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 Acked-by: Soheil Hassas Yeganeh Acked-by: Willem de Bruijn --- drivers/net/tun.c | 2 +- include/linux/netdevice.h | 4 ++-- include/net/sock.h | 2 +- net/core/dev.c | 10 +++++----- net/core/net-sysfs.c | 4 ++-- net/core/sysctl_net_core.c | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 27798aacb671e3e8d754ea60dac528e8efdb52da..24d0220b9ba00724ebad94fbc58858a4abffb207 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1042,7 +1042,7 @@ static int tun_net_close(struct net_device *dev) static void tun_automq_xmit(struct tun_struct *tun, struct sk_buff *skb) { #ifdef CONFIG_RPS - if (tun->numqueues == 1 && static_key_false(&rps_needed)) { + if (tun->numqueues == 1 && static_branch_unlikely(&rps_needed)) { /* Select queue was not called for the skbuff, so we extract the * RPS hash and save it into the flow_table here. */ diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 823762291ebf59d2a8a0502f71d6591b5cd7839f..166fdc0a78b49c9df984b767169c3babce24462e 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -194,8 +194,8 @@ struct net_device_stats { #ifdef CONFIG_RPS #include -extern struct static_key rps_needed; -extern struct static_key rfs_needed; +extern struct static_key_false rps_needed; +extern struct static_key_false rfs_needed; #endif struct neighbour; diff --git a/include/net/sock.h b/include/net/sock.h index 8de5ee258b93a50b2fdcde796bae3a5b53ce4d6a..fecdf639225c2d4995ee2e2cd9be57f3d4f22777 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -966,7 +966,7 @@ static inline void sock_rps_record_flow_hash(__u32 hash) static inline void sock_rps_record_flow(const struct sock *sk) { #ifdef CONFIG_RPS - if (static_key_false(&rfs_needed)) { + if (static_branch_unlikely(&rfs_needed)) { /* Reading sk->sk_rxhash might incur an expensive cache line * miss. * diff --git a/net/core/dev.c b/net/core/dev.c index 357111431ec9a6a5873830b89dd137d5eba6f2f0..c71b0998fa3ac8ae9d28aa1131852032a5cd0008 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3973,9 +3973,9 @@ EXPORT_SYMBOL(rps_sock_flow_table); u32 rps_cpu_mask __read_mostly; EXPORT_SYMBOL(rps_cpu_mask); -struct static_key rps_needed __read_mostly; +struct static_key_false rps_needed __read_mostly; EXPORT_SYMBOL(rps_needed); -struct static_key rfs_needed __read_mostly; +struct static_key_false rfs_needed __read_mostly; EXPORT_SYMBOL(rfs_needed); static struct rps_dev_flow * @@ -4501,7 +4501,7 @@ static int netif_rx_internal(struct sk_buff *skb) } #ifdef CONFIG_RPS - if (static_key_false(&rps_needed)) { + if (static_branch_unlikely(&rps_needed)) { struct rps_dev_flow voidflow, *rflow = &voidflow; int cpu; @@ -5170,7 +5170,7 @@ static int netif_receive_skb_internal(struct sk_buff *skb) rcu_read_lock(); #ifdef CONFIG_RPS - if (static_key_false(&rps_needed)) { + if (static_branch_unlikely(&rps_needed)) { struct rps_dev_flow voidflow, *rflow = &voidflow; int cpu = get_rps_cpu(skb->dev, skb, &rflow); @@ -5218,7 +5218,7 @@ static void netif_receive_skb_list_internal(struct list_head *head) rcu_read_lock(); #ifdef CONFIG_RPS - if (static_key_false(&rps_needed)) { + if (static_branch_unlikely(&rps_needed)) { list_for_each_entry_safe(skb, next, head, list) { struct rps_dev_flow voidflow, *rflow = &voidflow; int cpu = get_rps_cpu(skb->dev, skb, &rflow); diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 4ff661f6f989ae10ca49a1e81c825be56683d026..851cabb90bce66f30a5868d6b7499f240202d1eb 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -754,9 +754,9 @@ static ssize_t store_rps_map(struct netdev_rx_queue *queue, rcu_assign_pointer(queue->rps_map, map); if (map) - static_key_slow_inc(&rps_needed); + static_branch_inc(&rps_needed); if (old_map) - static_key_slow_dec(&rps_needed); + static_branch_dec(&rps_needed); mutex_unlock(&rps_map_mutex); diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c index 84bf2861f45f76f162d661298991f13ac0e8b592..1a2685694abd537d7ae304754b84b237928fd298 100644 --- a/net/core/sysctl_net_core.c +++ b/net/core/sysctl_net_core.c @@ -95,12 +95,12 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write, if (sock_table != orig_sock_table) { rcu_assign_pointer(rps_sock_flow_table, sock_table); if (sock_table) { - static_key_slow_inc(&rps_needed); - static_key_slow_inc(&rfs_needed); + static_branch_inc(&rps_needed); + static_branch_inc(&rfs_needed); } if (orig_sock_table) { - static_key_slow_dec(&rps_needed); - static_key_slow_dec(&rfs_needed); + static_branch_dec(&rps_needed); + static_branch_dec(&rfs_needed); synchronize_rcu(); vfree(orig_sock_table); } -- 2.21.0.392.gf8f6787159e-goog