From patchwork Mon Apr 18 11:33:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konstantin Khlebnikov X-Patchwork-Id: 611701 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 3qpR8P28WHz9sXR for ; Mon, 18 Apr 2016 21:42:29 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=yandex-team.ru header.i=@yandex-team.ru header.b=E7Kz5mOQ; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753149AbcDRLl5 (ORCPT ); Mon, 18 Apr 2016 07:41:57 -0400 Received: from forward-corp1o.mail.yandex.net ([37.140.190.172]:48964 "EHLO forward-corp1o.mail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752994AbcDRLly (ORCPT ); Mon, 18 Apr 2016 07:41:54 -0400 Received: from smtpcorp1m.mail.yandex.net (smtpcorp1m.mail.yandex.net [77.88.61.150]) by forward-corp1o.mail.yandex.net (Yandex) with ESMTP id 837473920679; Mon, 18 Apr 2016 14:34:00 +0300 (MSK) Received: from smtpcorp1m.mail.yandex.net (localhost [127.0.0.1]) by smtpcorp1m.mail.yandex.net (Yandex) with ESMTP id 3BEAB2CA08C6; Mon, 18 Apr 2016 14:34:00 +0300 (MSK) Received: from unknown (unknown [2a02:6b8:0:408:eef4:bbff:fe5b:9a77]) by smtpcorp1m.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id q2GXSSzanf-Y0Wmvkef; Mon, 18 Apr 2016 14:34:00 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client certificate not present) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1460979240; bh=ih6vQc6NktEoBlNr25rDEkgTtn9dUsIGKT601MAOHTU=; h=Subject:From:To:Cc:Date:Message-ID:User-Agent:MIME-Version: Content-Type:Content-Transfer-Encoding; b=E7Kz5mOQuOSw2yUFUkeXA6O/pYjLIreBTbUqAyNSKz+ZfYdtireyJOey/wk8td40M KGEUMCVPLedfqnM2pJMbs0M/dtjtGO1P8/hiF2lha3wlfdc9UUOVFIUuc5rkdQj6I9 l9ZUogMkUBNfUJDf7eB0IbcWlzlM08FIaiJnA7mo= Authentication-Results: smtpcorp1m.mail.yandex.net; dkim=pass header.i=@yandex-team.ru Subject: [PATCH] net/mlx4_en: allocate non 0-order pages for RX ring with __GFP_NOMEMALLOC From: Konstantin Khlebnikov To: netdev@vger.kernel.org, Yishai Hadas , Eugenia Emantayev Cc: linux-kernel@vger.kernel.org Date: Mon, 18 Apr 2016 14:33:54 +0300 Message-ID: <146097923460.15114.8965134124148581055.stgit@buzz> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org High order pages are optional here since commit 51151a16a60f ("mlx4: allow order-0 memory allocations in RX path"), so here is no reason for depleting reserves. Generic __netdev_alloc_frag() implements the same logic. Signed-off-by: Konstantin Khlebnikov Acked-by: Eric Dumazet --- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c index 86bcfe510e4e..56d070d9cf01 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c @@ -61,7 +61,7 @@ static int mlx4_alloc_pages(struct mlx4_en_priv *priv, gfp_t gfp = _gfp; if (order) - gfp |= __GFP_COMP | __GFP_NOWARN; + gfp |= __GFP_COMP | __GFP_NOWARN | __GFP_NOMEMALLOC; page = alloc_pages(gfp, order); if (likely(page)) break;