From patchwork Fri Jan 17 15:18:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Christoph Lameter (Ampere)" X-Patchwork-Id: 312119 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4FBEF2C0091 for ; Sat, 18 Jan 2014 02:25:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753175AbaAQPYy (ORCPT ); Fri, 17 Jan 2014 10:24:54 -0500 Received: from qmta03.emeryville.ca.mail.comcast.net ([76.96.30.32]:44117 "EHLO qmta03.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752184AbaAQPYt (ORCPT ); Fri, 17 Jan 2014 10:24:49 -0500 X-Greylist: delayed 365 seconds by postgrey-1.27 at vger.kernel.org; Fri, 17 Jan 2014 10:24:49 EST Received: from omta21.emeryville.ca.mail.comcast.net ([76.96.30.88]) by qmta03.emeryville.ca.mail.comcast.net with comcast id F3FT1n0071u4NiLA33Jjpo; Fri, 17 Jan 2014 15:18:43 +0000 Received: from gentwo.org ([98.213.233.247]) by omta21.emeryville.ca.mail.comcast.net with comcast id F3Jh1n00f5Lw0ES8h3JijV; Fri, 17 Jan 2014 15:18:43 +0000 Received: by gentwo.org (Postfix, from userid 1001) id ED3152F299; Fri, 17 Jan 2014 09:18:36 -0600 (CST) Message-Id: <20140117151836.883704411@linux.com> Date: Fri, 17 Jan 2014 09:18:36 -0600 From: Christoph Lameter To: Tejun Heo Cc: akpm@linuxfoundation.org, rostedt@goodmis.org, linux-kernel@vger.kernel.org, Ingo Molnar , Peter Zijlstra , Thomas Gleixner , "David S. Miller" , netdev@vger.kernel.org, Eric Dumazet Subject: [PATCH 24/41] net: Replace get_cpu_var through this_cpu_ptr References: <20140117151812.770437629@linux.com> Content-Disposition: inline; filename=this_net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20121106; t=1389971923; bh=Vw0igTmCPoMn1zDzaCXKgpRcWG/hWSvTbgpaYxBKCy0=; h=Received:Received:Received:Message-Id:Date:From:To:Subject: Content-Type; b=EqKa8k8EkZ4hWXMEBfTAYtsJYN0sj6AF4Hs3F/Gym8pHlSlSzWaRvJ0pp6h4BJs1E 4EK7Ig6amQTvooPUmcAjPaYQ1yeRuIlUI92VZU/9Y+8lFLR1J8rNtpNT9CxZHmyb4w 2eHdV6N6FBwmJoO60Lg2FZ81ChRcvxCdf/SoDwH2e5A/jLyoRFcZgx69hzDzs+C+bj XEnJNYTlAc9hdsSkPsddrBMMZCT0heRiyTxYEIdBIEclDMUuFZ/VU/KPE9S1ee2MU7 yBLcsyNtZwKOlGIrz4Ky0hoVZZALtYRSjvZ3HW9mxe0/KouWonBe19P9pA3QPBT/R9 3vLpd6QnBEFxg== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org [Patch depends on another patch in this series that introduces raw_cpu_ops] Replace uses of get_cpu_var for address calculation through this_cpu_ptr. Cc: "David S. Miller" Cc: netdev@vger.kernel.org Cc: Eric Dumazet Signed-off-by: Christoph Lameter Acked-by: David S. Miller --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux/net/core/dev.c =================================================================== --- linux.orig/net/core/dev.c 2013-12-02 16:07:45.264759422 -0600 +++ linux/net/core/dev.c 2013-12-02 16:07:45.254759699 -0600 @@ -2130,7 +2130,7 @@ static inline void __netif_reschedule(st unsigned long flags; local_irq_save(flags); - sd = &__get_cpu_var(softnet_data); + sd = this_cpu_ptr(&softnet_data); q->next_sched = NULL; *sd->output_queue_tailp = q; sd->output_queue_tailp = &q->next_sched; @@ -2152,7 +2152,7 @@ void dev_kfree_skb_irq(struct sk_buff *s unsigned long flags; local_irq_save(flags); - sd = &__get_cpu_var(softnet_data); + sd = this_cpu_ptr(&softnet_data); skb->next = sd->completion_queue; sd->completion_queue = skb; raise_softirq_irqoff(NET_TX_SOFTIRQ); @@ -3122,7 +3122,7 @@ static void rps_trigger_softirq(void *da static int rps_ipi_queued(struct softnet_data *sd) { #ifdef CONFIG_RPS - struct softnet_data *mysd = &__get_cpu_var(softnet_data); + struct softnet_data *mysd = this_cpu_ptr(&softnet_data); if (sd != mysd) { sd->rps_ipi_next = mysd->rps_ipi_list; @@ -3149,7 +3149,7 @@ static bool skb_flow_limit(struct sk_buf if (qlen < (netdev_max_backlog >> 1)) return false; - sd = &__get_cpu_var(softnet_data); + sd = this_cpu_ptr(&softnet_data); rcu_read_lock(); fl = rcu_dereference(sd->flow_limit); @@ -3291,7 +3291,7 @@ EXPORT_SYMBOL(netif_rx_ni); static void net_tx_action(struct softirq_action *h) { - struct softnet_data *sd = &__get_cpu_var(softnet_data); + struct softnet_data *sd = this_cpu_ptr(&softnet_data); if (sd->completion_queue) { struct sk_buff *clist; @@ -3711,7 +3711,7 @@ EXPORT_SYMBOL(netif_receive_skb); static void flush_backlog(void *arg) { struct net_device *dev = arg; - struct softnet_data *sd = &__get_cpu_var(softnet_data); + struct softnet_data *sd = this_cpu_ptr(&softnet_data); struct sk_buff *skb, *tmp; rps_lock(sd); @@ -4157,7 +4157,7 @@ void __napi_schedule(struct napi_struct unsigned long flags; local_irq_save(flags); - ____napi_schedule(&__get_cpu_var(softnet_data), n); + ____napi_schedule(this_cpu_ptr(&softnet_data), n); local_irq_restore(flags); } EXPORT_SYMBOL(__napi_schedule); @@ -4285,7 +4285,7 @@ EXPORT_SYMBOL(netif_napi_del); static void net_rx_action(struct softirq_action *h) { - struct softnet_data *sd = &__get_cpu_var(softnet_data); + struct softnet_data *sd = this_cpu_ptr(&softnet_data); unsigned long time_limit = jiffies + 2; int budget = netdev_budget; void *have; Index: linux/net/core/drop_monitor.c =================================================================== --- linux.orig/net/core/drop_monitor.c 2013-12-02 16:07:45.264759422 -0600 +++ linux/net/core/drop_monitor.c 2013-12-02 16:07:45.254759699 -0600 @@ -147,7 +147,7 @@ static void trace_drop_common(struct sk_ unsigned long flags; local_irq_save(flags); - data = &__get_cpu_var(dm_cpu_data); + data = this_cpu_ptr(&dm_cpu_data); spin_lock(&data->lock); dskb = data->skb; Index: linux/net/core/skbuff.c =================================================================== --- linux.orig/net/core/skbuff.c 2013-12-02 16:07:45.264759422 -0600 +++ linux/net/core/skbuff.c 2013-12-02 16:07:45.254759699 -0600 @@ -371,7 +371,7 @@ static void *__netdev_alloc_frag(unsigne unsigned long flags; local_irq_save(flags); - nc = &__get_cpu_var(netdev_alloc_cache); + nc = this_cpu_ptr(&netdev_alloc_cache); if (unlikely(!nc->frag.page)) { refill: for (order = NETDEV_FRAG_PAGE_MAX_ORDER; ;) { Index: linux/net/ipv4/tcp_output.c =================================================================== --- linux.orig/net/ipv4/tcp_output.c 2013-12-02 16:07:45.264759422 -0600 +++ linux/net/ipv4/tcp_output.c 2013-12-02 16:07:45.254759699 -0600 @@ -815,7 +815,7 @@ void tcp_wfree(struct sk_buff *skb) /* queue this socket to tasklet queue */ local_irq_save(flags); - tsq = &__get_cpu_var(tsq_tasklet); + tsq = this_cpu_ptr(&tsq_tasklet); list_add(&tp->tsq_node, &tsq->head); tasklet_schedule(&tsq->tasklet); local_irq_restore(flags); Index: linux/net/ipv6/syncookies.c =================================================================== --- linux.orig/net/ipv6/syncookies.c 2013-12-02 16:07:45.264759422 -0600 +++ linux/net/ipv6/syncookies.c 2013-12-02 16:07:45.254759699 -0600 @@ -67,7 +67,7 @@ static u32 cookie_hash(const struct in6_ net_get_random_once(syncookie6_secret, sizeof(syncookie6_secret)); - tmp = __get_cpu_var(ipv6_cookie_scratch); + tmp = this_cpu_ptr(ipv6_cookie_scratch); /* * we have 320 bits of information to hash, copy in the remaining Index: linux/net/rds/ib_rdma.c =================================================================== --- linux.orig/net/rds/ib_rdma.c 2013-12-02 16:07:45.264759422 -0600 +++ linux/net/rds/ib_rdma.c 2013-12-02 16:07:45.254759699 -0600 @@ -267,7 +267,7 @@ static inline struct rds_ib_mr *rds_ib_r unsigned long *flag; preempt_disable(); - flag = &__get_cpu_var(clean_list_grace); + flag = this_cpu_ptr(&clean_list_grace); set_bit(CLEAN_LIST_BUSY_BIT, flag); ret = llist_del_first(&pool->clean_list); if (ret) Index: linux/include/net/netfilter/nf_conntrack.h =================================================================== --- linux.orig/include/net/netfilter/nf_conntrack.h 2013-12-02 16:07:45.264759422 -0600 +++ linux/include/net/netfilter/nf_conntrack.h 2013-12-02 16:07:45.254759699 -0600 @@ -235,7 +235,7 @@ extern s32 (*nf_ct_nat_offset)(const str DECLARE_PER_CPU(struct nf_conn, nf_conntrack_untracked); static inline struct nf_conn *nf_ct_untracked_get(void) { - return &__raw_get_cpu_var(nf_conntrack_untracked); + return raw_cpu_ptr(&nf_conntrack_untracked); } void nf_ct_untracked_status_or(unsigned long bits); Index: linux/include/net/snmp.h =================================================================== --- linux.orig/include/net/snmp.h 2013-12-02 16:07:45.264759422 -0600 +++ linux/include/net/snmp.h 2013-12-02 16:07:45.254759699 -0600 @@ -170,7 +170,7 @@ struct linux_xfrm_mib { #define SNMP_ADD_STATS64_BH(mib, field, addend) \ do { \ - __typeof__(*mib[0]) *ptr = __this_cpu_ptr((mib)[0]); \ + __typeof__(*mib[0]) *ptr = raw_cpu_ptr((mib)[0]); \ u64_stats_update_begin(&ptr->syncp); \ ptr->mibs[field] += addend; \ u64_stats_update_end(&ptr->syncp); \ @@ -192,7 +192,7 @@ struct linux_xfrm_mib { #define SNMP_UPD_PO_STATS64_BH(mib, basefield, addend) \ do { \ __typeof__(*mib[0]) *ptr; \ - ptr = __this_cpu_ptr((mib)[0]); \ + ptr = raw_cpu_ptr((mib)[0]); \ u64_stats_update_begin(&ptr->syncp); \ ptr->mibs[basefield##PKTS]++; \ ptr->mibs[basefield##OCTETS] += addend; \ Index: linux/net/ipv4/route.c =================================================================== --- linux.orig/net/ipv4/route.c 2013-12-02 16:07:45.264759422 -0600 +++ linux/net/ipv4/route.c 2013-12-02 16:09:22.000000000 -0600 @@ -1306,7 +1306,7 @@ static bool rt_cache_route(struct fib_nh if (rt_is_input_route(rt)) { p = (struct rtable **)&nh->nh_rth_input; } else { - p = (struct rtable **)__this_cpu_ptr(nh->nh_pcpu_rth_output); + p = (struct rtable **)raw_cpu_ptr(nh->nh_pcpu_rth_output); } orig = *p; @@ -1932,7 +1932,7 @@ static struct rtable *__mkroute_output(c do_cache = false; goto add; } - prth = __this_cpu_ptr(nh->nh_pcpu_rth_output); + prth = raw_cpu_ptr(nh->nh_pcpu_rth_output); } rth = rcu_dereference(*prth); if (rt_cache_valid(rth)) { Index: linux/net/ipv4/tcp.c =================================================================== --- linux.orig/net/ipv4/tcp.c 2013-12-02 16:07:45.264759422 -0600 +++ linux/net/ipv4/tcp.c 2013-12-02 16:07:45.254759699 -0600 @@ -2981,7 +2981,7 @@ struct tcp_md5sig_pool *tcp_get_md5sig_p local_bh_disable(); p = ACCESS_ONCE(tcp_md5sig_pool); if (p) - return __this_cpu_ptr(p); + return raw_cpu_ptr(p); local_bh_enable(); return NULL; Index: linux/net/ipv4/syncookies.c =================================================================== --- linux.orig/net/ipv4/syncookies.c 2013-12-02 16:07:45.264759422 -0600 +++ linux/net/ipv4/syncookies.c 2013-12-02 16:07:45.254759699 -0600 @@ -40,7 +40,7 @@ static u32 cookie_hash(__be32 saddr, __b net_get_random_once(syncookie_secret, sizeof(syncookie_secret)); - tmp = __get_cpu_var(ipv4_cookie_scratch); + tmp = this_cpu_ptr(ipv4_cookie_scratch); memcpy(tmp + 4, syncookie_secret[c], sizeof(syncookie_secret[c])); tmp[0] = (__force u32)saddr; tmp[1] = (__force u32)daddr;