From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
To: Mel Gorman <mgorman@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Linux-MM <linux-mm@kvack.org>,
Linux-Netdev <netdev@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
David Miller <davem@davemloft.net>, Neil Brown <neilb@suse.de>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Mike Christie <michaelc@cs.wisc.edu>,
Eric B Munson <emunson@mgebm.net>
Subject: Re: [PATCH 10/17] netvm: Allow skb allocation to use PFMEMALLOC reserves
Date: Thu, 21 Jun 2012 18:09:02 +0200 [thread overview]
Message-ID: <20120621160902.GA6045@breakpoint.cc> (raw)
In-Reply-To: <1340192652-31658-11-git-send-email-mgorman@suse.de>
On Wed, Jun 20, 2012 at 12:44:05PM +0100, Mel Gorman wrote:
> index b534a1b..61c951f 100644
> --- a/include/linux/skbuff.h
> +++ b/include/linux/skbuff.h
> @@ -505,6 +506,15 @@ struct sk_buff {
> #include <linux/slab.h>
>
>
> +#define SKB_ALLOC_FCLONE 0x01
> +#define SKB_ALLOC_RX 0x02
> +
> +/* Returns true if the skb was allocated from PFMEMALLOC reserves */
> +static inline bool skb_pfmemalloc(struct sk_buff *skb)
> +{
> + return unlikely(skb->pfmemalloc);
> +}
> +
> /*
> * skb might have a dst pointer attached, refcounted or not.
> * _skb_refdst low order bit is set if refcount was _not_ taken
> @@ -568,7 +578,7 @@ extern bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
> diff --git a/net/core/skbuff.c b/net/core/skbuff.c
> index 1d6ecc8..9a58dcc 100644
> --- a/net/core/skbuff.c
> +++ b/net/core/skbuff.c
> @@ -839,6 +900,13 @@ static void copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
> skb_shinfo(new)->gso_type = skb_shinfo(old)->gso_type;
> }
>
> +static inline int skb_alloc_rx_flag(const struct sk_buff *skb)
> +{
> + if (skb_pfmemalloc((struct sk_buff *)skb))
> + return SKB_ALLOC_RX;
> + return 0;
> +}
> +
> /**
> * skb_copy - create private copy of an sk_buff
> * @skb: buffer to copy
If merge this chunk
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 6510a5d..2acfec9 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -510,7 +510,7 @@ struct sk_buff {
#define SKB_ALLOC_RX 0x02
/* Returns true if the skb was allocated from PFMEMALLOC reserves */
-static inline bool skb_pfmemalloc(struct sk_buff *skb)
+static inline bool skb_pfmemalloc(const struct sk_buff *skb)
{
return unlikely(skb->pfmemalloc);
}
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index c44ab68..6ce94b5 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -852,7 +852,7 @@ static void copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
static inline int skb_alloc_rx_flag(const struct sk_buff *skb)
{
- if (skb_pfmemalloc((struct sk_buff *)skb))
+ if (skb_pfmemalloc(skb))
return SKB_ALLOC_RX;
return 0;
}
Then you should be able to drop the case in skb_alloc_rx_flag() without adding
a warning.
Sebastian
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2012-06-21 16:09 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-20 11:43 [PATCH 00/17] Swap-over-NBD without deadlocking V12 (resend) Mel Gorman
2012-06-20 11:43 ` [PATCH 01/17] mm: sl[au]b: Add knowledge of PFMEMALLOC reserve pages Mel Gorman
2012-06-21 21:30 ` Rik van Riel
2012-06-22 9:34 ` Mel Gorman
2012-06-20 11:43 ` [PATCH 02/17] mm: slub: Optimise the SLUB fast path to avoid pfmemalloc checks Mel Gorman
2012-06-20 11:43 ` [PATCH 03/17] mm: Introduce __GFP_MEMALLOC to allow access to emergency reserves Mel Gorman
2012-06-20 11:43 ` [PATCH 04/17] mm: allow PF_MEMALLOC from softirq context Mel Gorman
2012-06-20 11:44 ` [PATCH 05/17] mm: Only set page->pfmemalloc when ALLOC_NO_WATERMARKS was used Mel Gorman
2012-06-20 11:44 ` [PATCH 06/17] mm: Ignore mempolicies when using ALLOC_NO_WATERMARK Mel Gorman
2012-06-20 11:44 ` [PATCH 07/17] net: Introduce sk_gfp_atomic() to allow addition of GFP flags depending on the individual socket Mel Gorman
2012-06-20 12:06 ` Eric Dumazet
2012-06-20 14:20 ` Mel Gorman
2012-06-20 11:44 ` [PATCH 08/17] net: Do not coalesce skbs belonging to PFMEMALLOC sockets Mel Gorman
2012-06-20 12:04 ` Eric Dumazet
2012-06-20 13:36 ` Mel Gorman
2012-06-20 13:51 ` Eric Dumazet
2012-06-20 14:18 ` Mel Gorman
2012-06-20 11:44 ` [PATCH 09/17] netvm: Allow the use of __GFP_MEMALLOC by specific sockets Mel Gorman
2012-06-20 11:44 ` [PATCH 10/17] netvm: Allow skb allocation to use PFMEMALLOC reserves Mel Gorman
2012-06-21 16:09 ` Sebastian Andrzej Siewior [this message]
2012-06-22 10:00 ` Mel Gorman
2012-06-21 16:30 ` Sebastian Andrzej Siewior
2012-06-21 16:38 ` Eric Dumazet
2012-06-21 16:43 ` Sebastian Andrzej Siewior
2012-06-22 10:54 ` Mel Gorman
2012-06-22 11:27 ` Sebastian Andrzej Siewior
2012-06-20 11:44 ` [PATCH 11/17] netvm: Propagate page->pfmemalloc to skb Mel Gorman
2012-06-20 11:44 ` [PATCH 12/17] netvm: Propagate page->pfmemalloc from skb_alloc_page " Mel Gorman
2012-06-20 11:44 ` [PATCH 13/17] netvm: Set PF_MEMALLOC as appropriate during SKB processing Mel Gorman
2012-06-20 11:44 ` [PATCH 14/17] mm: Micro-optimise slab to avoid a function call Mel Gorman
2012-06-20 11:44 ` [PATCH 15/17] nbd: Set SOCK_MEMALLOC for access to PFMEMALLOC reserves Mel Gorman
2012-06-20 11:44 ` [PATCH 16/17] mm: Throttle direct reclaimers if PF_MEMALLOC reserves are low and swap is backed by network storage Mel Gorman
2012-06-20 11:44 ` [PATCH 17/17] mm: Account for the number of times direct reclaimers get throttled Mel Gorman
-- strict thread matches above, loose matches on Subject: below --
2012-05-17 14:50 [PATCH 00/17] Swap-over-NBD without deadlocking V11 Mel Gorman
2012-05-17 14:50 ` [PATCH 10/17] netvm: Allow skb allocation to use PFMEMALLOC reserves Mel Gorman
2012-05-17 20:12 ` David Miller
2012-05-10 13:44 [PATCH 00/17] Swap-over-NBD without deadlocking V10 Mel Gorman
2012-05-10 13:45 ` [PATCH 10/17] netvm: Allow skb allocation to use PFMEMALLOC reserves Mel Gorman
2012-05-11 4:57 ` David Miller
2012-05-11 14:32 ` Mel Gorman
2012-05-11 14:42 ` Peter Zijlstra
2012-05-11 15:07 ` Mel Gorman
2012-05-11 21:17 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120621160902.GA6045@breakpoint.cc \
--to=sebastian@breakpoint.cc \
--cc=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=emunson@mgebm.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@suse.de \
--cc=michaelc@cs.wisc.edu \
--cc=neilb@suse.de \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).