From patchwork Tue Feb 21 13:16:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 9584595 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B4AE0600CA for ; Tue, 21 Feb 2017 13:17:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88EF32855C for ; Tue, 21 Feb 2017 13:17:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C0D0285CA; Tue, 21 Feb 2017 13:17:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9333B2855C for ; Tue, 21 Feb 2017 13:17:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: Message-id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:List-Owner; bh=1SYIMgu4AmQP6T7C6qiqua8Kvizl2JFk+45MErytNNk=; b=JJ VCElrk+CrChIAXcrp2URqy/ohTOHVeMeUncHdfq5lHg8uJnEf5hrdh958g3XI70WHO1HTXoit7TGb Il09RyjzOOwJxbC8bw1TBkxTcVHwdK0VQtKfiiQQcy7Oc4ZOxNIzTfBCXjvWDxp0eZv7bcvy4XR+Y WPAe7IR79zFtvYF/8i4G5C4RLgiuelGySmQlMG6olo4R2oeZ+kpDDHjUCf9QR/e/L4ozoLgBprTiM MDIVjEuetdDzHx0AzusgGqRp8bbN/p1Xzu9b9aN6hEfyAI4Q17tH7bsdasSBxrZ+vJRVU9rTsmGVY L3um8E9sjL5V1PLpFLvQ3WyKHItjdVFw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cgAKD-00056S-RW; Tue, 21 Feb 2017 13:17:49 +0000 Received: from mailout2.w1.samsung.com ([210.118.77.12]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cgAJo-00054K-An for linux-arm-kernel@lists.infradead.org; Tue, 21 Feb 2017 13:17:26 +0000 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OLQ008A57K8E140@mailout2.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 21 Feb 2017 13:16:56 +0000 (GMT) Received: from eusmges4.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170221131656eucas1p264257f021fc48033c7dd75d2883af250~lT9IzO5pK1742817428eucas1p2Z; Tue, 21 Feb 2017 13:16:56 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges4.samsung.com (EUCPMTA) with SMTP id D3.02.28517.7CD3CA85; Tue, 21 Feb 2017 13:16:55 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170221131655eucas1p2f2ca6e3c819aeae227c5e5c5f2bc7d3f~lT9IEv2xI3011430114eucas1p2z; Tue, 21 Feb 2017 13:16:55 +0000 (GMT) X-AuditID: cbfec7f4-f79716d000006f65-5b-58ac3dc73d39 Received: from eusync3.samsung.com ( [203.254.199.213]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 02.4B.06687.C1E3CA85; Tue, 21 Feb 2017 13:18:20 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OLQ00F1J7K3DM70@eusync3.samsung.com>; Tue, 21 Feb 2017 13:16:55 +0000 (GMT) From: Marek Szyprowski To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: dma-mapping: Fix dma_get_sgtable() for regions without struct page Date: Tue, 21 Feb 2017 14:16:38 +0100 Message-id: <1487682998-2564-1-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrDIsWRmVeSWpSXmKPExsWy7djPc7rHbddEGLR9MLXYOGM9q8Wmx9dY LdYeuctusfnDSzaLBRsfMTqwerQ097B5bF5S79G3ZRWjx+dNcgEsUVw2Kak5mWWpRfp2CVwZ /6ZPZCx4w1Gx4OVupgbGzexdjJwcEgImEg/WdLBC2GISF+6tZ+ti5OIQEljKKLHn/l0WkISQ wGdGibtL3GAa7r1bxQJRtIxRovPMdVYIp4FJ4taWSWwgVWwChhJdb7vAbBEBDYkpXY/ZQYqY BdYySvxZeQ1srLBAlMSv5nVgNouAqkT7m3lgd/AKuEtMX3qFBWKdnMTJY5PBNkgIHGCTeLbg L2MXIweQIyux6QAzRI2LxItPj6FsYYlXx7dA/SYj0dlxkAnC7meUaGrVhrBnMEqce8sLYVtL HD5+EWwvswCfxKRt05khxvNKdLQJQZR4SNx/cQIaRI4Sja872SChEiuxZdFcxgmM0gsYGVYx iqSWFuempxab6BUn5haX5qXrJefnbmIExuHpf8e/7GBcfMzqEKMAB6MSD++OH6sihFgTy4or cw8xSnAwK4nwvjVaEyHEm5JYWZValB9fVJqTWnyIUZqDRUmcd8+CK+FCAumJJanZqakFqUUw WSYOTqkGxuVfN0noyWecnH+Ap3vfntOpzPk5KW2vuK/PD54V+fnkZNkLMyrnhWo/f7eRZ8K9 Ir2SRKnKixEWflXtLw1rDU9H8tipJpfZf9p5MT10cdO9lV6/09/G7i+KfGDqIaWnezRS5bFV jkm8E//BJ3ora7/Fz+ldFsu0gP/hLxbJqSdm7/ByPynLr8RSnJFoqMVcVJwIACO3KEe/AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrELMWRmVeSWpSXmKPExsVy+t/xq7oydmsiDK6uYrLYOGM9q8Wmx9dY LdYeuctusfnDSzaLBRsfMTqwerQ097B5bF5S79G3ZRWjx+dNcgEsUW42GamJKalFCql5yfkp mXnptkqhIW66FkoKeYm5qbZKEbq+IUFKCmWJOaVAnpEBGnBwDnAPVtK3S3DL+Dd9ImPBG46K BS93MzUwbmbvYuTkkBAwkbj3bhULhC0mceHeerYuRi4OIYEljBIfp59ggnCamCRu3J4DVsUm YCjR9baLDcQWEdCQmNL1mB2kiFlgLaNEy8PrzCAJYYEoiV/N68AaWARUJdrfzGMFsXkF3CWm L70CtU5O4uSxyawTGLkXMDKsYhRJLS3OTc8tNtQrTswtLs1L10vOz93ECAy/bcd+bt7BeGlj 8CFGAQ5GJR7eHT9WRQixJpYVV+YeYpTgYFYS4X1rtCZCiDclsbIqtSg/vqg0J7X4EKMp0PKJ zFKiyfnA2MgriTc0MTS3NDQytrAwNzJSEuct+XAlXEggPbEkNTs1tSC1CKaPiYNTqoEx+5jb QaPd+x63Hlh3Kv/LBFk9i51vPrKdylgaVrJa8YGe+Wk5aZk7h+TLVs0vLmZ+zZHS+/ZKb7JN gMCBbs/d3jMXLlfyqBRmOWGxM353VRLD6nqjiidPLT64/Fscoc8ok2I4V+FU986DTlsvft+0 wpB5olzkKq/Zx+yO+jYnGMge235x9XJ9JZbijERDLeai4kQA773OwlUCAAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170221131655eucas1p2f2ca6e3c819aeae227c5e5c5f2bc7d3f X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRs=?= =?UTF-8?B?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRtT?= =?UTF-8?B?YW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170221131655eucas1p2f2ca6e3c819aeae227c5e5c5f2bc7d3f X-RootMTR: 20170221131655eucas1p2f2ca6e3c819aeae227c5e5c5f2bc7d3f References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170221_051724_536411_509F449B X-CRM114-Status: GOOD ( 14.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Russell King , Bartlomiej Zolnierkiewicz , stable@vger.kernel.org, Marek Szyprowski MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Some DMA regions, for example those created by dma_declare_coherent_memory, might not be possible to be represented by struct page pointers. Getting scatterlist for the buffer allocated from such region is not possible. This patch adds a simple check in arm_dma_get_sgtable() function if the exported struct page pointer is valid. Fixes: dc2832e1e7db3 ("ARM: dma-mapping: add support for dma_get_sgtable()") Signed-off-by: Marek Szyprowski --- arch/arm/mm/dma-mapping.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index fc4a4eaa9934..4b2cf82fbca6 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -942,6 +942,10 @@ int arm_dma_get_sgtable(struct device *dev, struct sg_table *sgt, struct page *page = pfn_to_page(dma_to_pfn(dev, handle)); int ret; + /* Check if DMA handle has been properly translated to page. */ + if (pfn_to_dma(dev, page_to_pfn(page)) != handle) + return -ENXIO; + ret = sg_alloc_table(sgt, 1, GFP_KERNEL); if (unlikely(ret)) return ret;