[PATCH v2] ARM: DMA: Fix kzalloc flags in __dma_alloc

Path	csiph.com!goblin3!goblin2!goblin.stu.neva.ru!gothmog.csi.it!bofh.it!news.nic.it!robomod
From	Alexandre Courbot <acourbot@nvidia.com>
Newsgroups	linux.kernel
Subject	[PATCH v2] ARM: DMA: Fix kzalloc flags in __dma_alloc
Date	Fri, 18 Mar 2016 10:30:01 +0100
Message-ID	<rdYTf-3Ff-9@gated-at.bofh.it> (permalink)
X-PGP-Universal	processed; by hqnvupgp07.nvidia.com on Fri, 18 Mar 2016 02:27:28 -0700
X-Mailer	git-send-email 2.7.3
X-Nvconfidentiality	public
MIME-Version	1.0
Content-Type	text/plain
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	38
Organization	linux.* mail to news gateway
X-Original-Cc	linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, gnurou@gmail.com, Alexandre Courbot <acourbot@nvidia.com>
X-Original-Date	Fri, 18 Mar 2016 18:28:49 +0900
X-Original-Message-ID	<1458293329-5519-1-git-send-email-acourbot@nvidia.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1360460

Show key headers only | View raw

Commit 19e6e5e5392b ("ARM: 8547/1: dma-mapping: store buffer
information") allocates a structure meant for internal buffer management
with the GFP flags of the buffer itself. This can trigger the following
safeguard in the slab/slub allocator:

	if (unlikely(flags & GFP_SLAB_BUG_MASK)) {
		pr_emerg("gfp: %u\n", flags & GFP_SLAB_BUG_MASK);
		BUG();
	}

Fix this by filtering the flags that make the slab allocator unhappy.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Cc: Rabin Vincent <rabin@rab.in>
---
Changes since v1:
- Filter flags that may cause problem instead of forcing GFP_KERNEL
  (and risk sleeping in atomic context), as suggested by Rabin.

 arch/arm/mm/dma-mapping.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index deac58d5f1f7..c941e93048ad 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -762,7 +762,8 @@ static void *__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
 	if (!mask)
 		return NULL;
 
-	buf = kzalloc(sizeof(*buf), gfp);
+	buf = kzalloc(sizeof(*buf),
+		      gfp & ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM));
 	if (!buf)
 		return NULL;
 
-- 
2.7.3

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2] ARM: DMA: Fix kzalloc flags in __dma_alloc Alexandre Courbot <acourbot@nvidia.com> - 2016-03-18 10:30 +0100
  Re: [PATCH v2] ARM: DMA: Fix kzalloc flags in __dma_alloc Rabin Vincent <rabin@rab.in> - 2016-03-18 11:40 +0100
  Re: [PATCH v2] ARM: DMA: Fix kzalloc flags in __dma_alloc Russell King - ARM Linux <linux@arm.linux.org.uk> - 2016-03-18 12:00 +0100
    Re: [PATCH v2] ARM: DMA: Fix kzalloc flags in __dma_alloc Alexandre Courbot <gnurou@gmail.com> - 2016-03-20 07:50 +0100

csiph-web