From patchwork Tue Jun 26 15:27:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 167420 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 BA6471007D7 for ; Wed, 27 Jun 2012 01:28:26 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758541Ab2FZP2H (ORCPT ); Tue, 26 Jun 2012 11:28:07 -0400 Received: from Chamillionaire.breakpoint.cc ([80.244.247.6]:32947 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758517Ab2FZP2E (ORCPT ); Tue, 26 Jun 2012 11:28:04 -0400 Received: from bigeasy by Chamillionaire.breakpoint.cc with local (Exim 4.72) (envelope-from ) id 1SjXfz-0007Ge-N9; Tue, 26 Jun 2012 17:27:35 +0200 Date: Tue, 26 Jun 2012 17:27:34 +0200 From: Sebastian Andrzej Siewior To: Mel Gorman Cc: Andrew Morton , Linux-MM , Linux-Netdev , LKML , David Miller , Neil Brown , Peter Zijlstra , Mike Christie , Eric B Munson , Eric Dumazet Subject: Re: [PATCH 09/16] netvm: Allow skb allocation to use PFMEMALLOC reserves Message-ID: <20120626152734.GA6509@breakpoint.cc> References: <1340375443-22455-1-git-send-email-mgorman@suse.de> <1340375443-22455-10-git-send-email-mgorman@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1340375443-22455-10-git-send-email-mgorman@suse.de> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Fri, Jun 22, 2012 at 03:30:36PM +0100, Mel Gorman wrote: > diff --git a/net/core/sock.c b/net/core/sock.c > index 5c9ca2b..159dccc 100644 > --- a/net/core/sock.c > +++ b/net/core/sock.c > @@ -271,6 +271,9 @@ __u32 sysctl_rmem_default __read_mostly = SK_RMEM_MAX; > int sysctl_optmem_max __read_mostly = sizeof(unsigned long)*(2*UIO_MAXIOV+512); > EXPORT_SYMBOL(sysctl_optmem_max); > > +struct static_key memalloc_socks = STATIC_KEY_INIT_FALSE; > +EXPORT_SYMBOL_GPL(memalloc_socks); > + This is used via sk_memalloc_socks() by SLAB. From 3da9ab9972845974da114c5a6624335e6371b2d5 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Tue, 26 Jun 2012 17:18:20 +0200 Subject: [PATCH] export sk_memalloc_socks() only with CONFIG_NET |mm/built-in.o: In function `atomic_read': |include/asm/atomic.h:25: undefined reference to `memalloc_socks' |include/asm/atomic.h:25: undefined reference to `memalloc_socks' |include/asm/atomic.h:25: undefined reference to `memalloc_socks' |include/asm/atomic.h:25: undefined reference to `memalloc_socks' |include/asm/atomic.h:25: undefined reference to `memalloc_socks' |mm/built-in.o:include/asm/atomic.h:25: more undefined references to `memalloc_socks' follow Signed-off-by: Sebastian Andrzej Siewior --- include/net/sock.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/net/sock.h b/include/net/sock.h index db0c20c..767c443 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -659,11 +659,20 @@ static inline bool sock_flag(const struct sock *sk, enum sock_flags flag) return test_bit(flag, &sk->sk_flags); } +#ifdef CONFIG_NET extern struct static_key memalloc_socks; static inline int sk_memalloc_socks(void) { return static_key_false(&memalloc_socks); } +#else + +static inline int sk_memalloc_socks(void) +{ + return 0; +} + +#endif static inline gfp_t sk_gfp_atomic(struct sock *sk, gfp_t gfp_mask) {