On Fri, 12 Jun 2015, Vlastimil Babka wrote:
> > diff --git a/net/core/skbuff.c b/net/core/skbuff.c
> > index 3cfff2a..41ec022 100644
> > --- a/net/core/skbuff.c
> > +++ b/net/core/skbuff.c
> > @@ -4398,7 +4398,7 @@ struct sk_buff *alloc_skb_with_frags(unsigned long
> > header_len,
> >
> > while (order) {
> > if (npages >= 1 << order) {
> > - page = alloc_pages(gfp_mask |
> > + page = alloc_pages((gfp_mask & ~__GFP_WAIT) |
> > __GFP_COMP |
> > __GFP_NOWARN |
> > __GFP_NORETRY,
>
> Note that __GFP_NORETRY is weaker than ~__GFP_WAIT and thus redundant. But it
> won't hurt anything leaving it there. And you might consider __GFP_NO_KSWAPD
> instead, as I said in the other thread.
>
Yeah, I agreed with __GFP_NO_KSWAPD to avoid utilizing memory reserves for
this.
> > diff --git a/net/core/sock.c b/net/core/sock.c
> > index 292f422..e9855a4 100644
> > --- a/net/core/sock.c
> > +++ b/net/core/sock.c
> > @@ -1883,7 +1883,7 @@ bool skb_page_frag_refill(unsigned int sz, struct
> > page_frag *pfrag, gfp_t gfp)
> >
> > pfrag->offset = 0;
> > if (SKB_FRAG_PAGE_ORDER) {
> > - pfrag->page = alloc_pages(gfp | __GFP_COMP |
> > + pfrag->page = alloc_pages((gfp & ~__GFP_WAIT) | __GFP_COMP |
> > __GFP_NOWARN | __GFP_NORETRY,
> > SKB_FRAG_PAGE_ORDER);
> > if (likely(pfrag->page)) {
> >
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>