From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [PATCH v2 07/13] udmabuf: rework limits Date: Tue, 11 Sep 2018 15:42:10 +0200 Message-ID: <20180911134216.9760-8-kraxel@redhat.com> References: <20180911134216.9760-1-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by gabe.freedesktop.org (Postfix) with ESMTPS id F2B5F6E39D for ; Tue, 11 Sep 2018 13:42:20 +0000 (UTC) In-Reply-To: <20180911134216.9760-1-kraxel@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Gerd Hoffmann , open list , "moderated list:DMA BUFFER SHARING FRAMEWORK" , laurent.pinchart@ideasonboard.com, "open list:DMA BUFFER SHARING FRAMEWORK" List-Id: dri-devel@lists.freedesktop.org Q3JlYXRlIHZhcmlhYmxlIGZvciB0aGUgbGlzdCBsZW5ndGggbGltaXQuICBTZXJ2ZXMgYXMgZG9j dW1lbnRhdGlvbiwKYWxzbyBhbGxvd3MgdG8gbWFrZSBpdCBhIG1vZHVsZSBwYXJhbWV0ZXIgaWYg bmVlZGVkLgoKQWxzbyBhZGQgYSB0b3RhbCBzaXplIGxpbWl0LgoKU2lnbmVkLW9mZi1ieTogR2Vy ZCBIb2ZmbWFubiA8a3JheGVsQHJlZGhhdC5jb20+CkFja2VkLWJ5OiBEYW5pZWwgVmV0dGVyIDxk YW5pZWwudmV0dGVyQGZmd2xsLmNoPgotLS0KIGRyaXZlcnMvZG1hLWJ1Zi91ZG1hYnVmLmMgfCAx MCArKysrKysrKy0tCiAxIGZpbGUgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZG1hLWJ1Zi91ZG1hYnVmLmMgYi9kcml2ZXJzL2Rt YS1idWYvdWRtYWJ1Zi5jCmluZGV4IDQxNjdkYTgxNDEuLmEwMWZjZjZhNjYgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZG1hLWJ1Zi91ZG1hYnVmLmMKKysrIGIvZHJpdmVycy9kbWEtYnVmL3VkbWFidWYu YwpAQCAtMTIsNiArMTIsOSBAQAogI2luY2x1ZGUgPGxpbnV4L3NsYWIuaD4KICNpbmNsdWRlIDxs aW51eC91ZG1hYnVmLmg+CiAKK3N0YXRpYyBjb25zdCB1MzIgICAgbGlzdF9saW1pdCA9IDEwMjQ7 ICAvKiB1ZG1hYnVmX2NyZWF0ZV9saXN0LT5jb3VudCBsaW1pdCAqLworc3RhdGljIGNvbnN0IHNp emVfdCBzaXplX2xpbWl0X21iID0gNjQ7IC8qIHRvdGFsIGRtYWJ1ZiBzaXplLCBpbiBtZWdhYnl0 ZXMgICovCisKIHN0cnVjdCB1ZG1hYnVmIHsKIAlwZ29mZl90IHBhZ2Vjb3VudDsKIAlzdHJ1Y3Qg cGFnZSAqKnBhZ2VzOwpAQCAtMTIzLDcgKzEyNiw3IEBAIHN0YXRpYyBsb25nIHVkbWFidWZfY3Jl YXRlKGNvbnN0IHN0cnVjdCB1ZG1hYnVmX2NyZWF0ZV9saXN0ICpoZWFkLAogCXN0cnVjdCBmaWxl ICptZW1mZCA9IE5VTEw7CiAJc3RydWN0IHVkbWFidWYgKnVidWY7CiAJc3RydWN0IGRtYV9idWYg KmJ1ZjsKLQlwZ29mZl90IHBnb2ZmLCBwZ2NudCwgcGdpZHgsIHBnYnVmOworCXBnb2ZmX3QgcGdv ZmYsIHBnY250LCBwZ2lkeCwgcGdidWYsIHBnbGltaXQ7CiAJc3RydWN0IHBhZ2UgKnBhZ2U7CiAJ aW50IHNlYWxzLCByZXQgPSAtRUlOVkFMOwogCXUzMiBpLCBmbGFnczsKQEAgLTEzMiwxMiArMTM1 LDE1IEBAIHN0YXRpYyBsb25nIHVkbWFidWZfY3JlYXRlKGNvbnN0IHN0cnVjdCB1ZG1hYnVmX2Ny ZWF0ZV9saXN0ICpoZWFkLAogCWlmICghdWJ1ZikKIAkJcmV0dXJuIC1FTk9NRU07CiAKKwlwZ2xp bWl0ID0gKHNpemVfbGltaXRfbWIgKiAxMDI0ICogMTAyNCkgPj4gUEFHRV9TSElGVDsKIAlmb3Ig KGkgPSAwOyBpIDwgaGVhZC0+Y291bnQ7IGkrKykgewogCQlpZiAoIUlTX0FMSUdORUQobGlzdFtp XS5vZmZzZXQsIFBBR0VfU0laRSkpCiAJCQlnb3RvIGVycl9mcmVlX3VidWY7CiAJCWlmICghSVNf QUxJR05FRChsaXN0W2ldLnNpemUsIFBBR0VfU0laRSkpCiAJCQlnb3RvIGVycl9mcmVlX3VidWY7 CiAJCXVidWYtPnBhZ2Vjb3VudCArPSBsaXN0W2ldLnNpemUgPj4gUEFHRV9TSElGVDsKKwkJaWYg KHVidWYtPnBhZ2Vjb3VudCA+IHBnbGltaXQpCisJCQlnb3RvIGVycl9mcmVlX3VidWY7CiAJfQog CXVidWYtPnBhZ2VzID0ga21hbGxvY19hcnJheSh1YnVmLT5wYWdlY291bnQsIHNpemVvZihzdHJ1 Y3QgcGFnZSAqKSwKIAkJCQkgICAgR0ZQX0tFUk5FTCk7CkBAIC0yMjcsNyArMjMzLDcgQEAgc3Rh dGljIGxvbmcgdWRtYWJ1Zl9pb2N0bF9jcmVhdGVfbGlzdChzdHJ1Y3QgZmlsZSAqZmlscCwgdW5z aWduZWQgbG9uZyBhcmcpCiAKIAlpZiAoY29weV9mcm9tX3VzZXIoJmhlYWQsICh2b2lkIF9fdXNl ciAqKWFyZywgc2l6ZW9mKGhlYWQpKSkKIAkJcmV0dXJuIC1FRkFVTFQ7Ci0JaWYgKGhlYWQuY291 bnQgPiAxMDI0KQorCWlmIChoZWFkLmNvdW50ID4gbGlzdF9saW1pdCkKIAkJcmV0dXJuIC1FSU5W QUw7CiAJbHNpemUgPSBzaXplb2Yoc3RydWN0IHVkbWFidWZfY3JlYXRlX2l0ZW0pICogaGVhZC5j b3VudDsKIAlsaXN0ID0gbWVtZHVwX3VzZXIoKHZvaWQgX191c2VyICopKGFyZyArIHNpemVvZiho ZWFkKSksIGxzaXplKTsKLS0gCjIuOS4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx3-rdu2.redhat.com ([66.187.233.73]:57474 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727782AbeIKSln (ORCPT ); Tue, 11 Sep 2018 14:41:43 -0400 From: Gerd Hoffmann To: dri-devel@lists.freedesktop.org Cc: laurent.pinchart@ideasonboard.com, daniel@ffwll.ch, Gerd Hoffmann , Sumit Semwal , linux-media@vger.kernel.org (open list:DMA BUFFER SHARING FRAMEWORK), linaro-mm-sig@lists.linaro.org (moderated list:DMA BUFFER SHARING FRAMEWORK), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 07/13] udmabuf: rework limits Date: Tue, 11 Sep 2018 15:42:10 +0200 Message-Id: <20180911134216.9760-8-kraxel@redhat.com> In-Reply-To: <20180911134216.9760-1-kraxel@redhat.com> References: <20180911134216.9760-1-kraxel@redhat.com> Sender: linux-media-owner@vger.kernel.org List-ID: Create variable for the list length limit. Serves as documentation, also allows to make it a module parameter if needed. Also add a total size limit. Signed-off-by: Gerd Hoffmann Acked-by: Daniel Vetter --- drivers/dma-buf/udmabuf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index 4167da8141..a01fcf6a66 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -12,6 +12,9 @@ #include #include +static const u32 list_limit = 1024; /* udmabuf_create_list->count limit */ +static const size_t size_limit_mb = 64; /* total dmabuf size, in megabytes */ + struct udmabuf { pgoff_t pagecount; struct page **pages; @@ -123,7 +126,7 @@ static long udmabuf_create(const struct udmabuf_create_list *head, struct file *memfd = NULL; struct udmabuf *ubuf; struct dma_buf *buf; - pgoff_t pgoff, pgcnt, pgidx, pgbuf; + pgoff_t pgoff, pgcnt, pgidx, pgbuf, pglimit; struct page *page; int seals, ret = -EINVAL; u32 i, flags; @@ -132,12 +135,15 @@ static long udmabuf_create(const struct udmabuf_create_list *head, if (!ubuf) return -ENOMEM; + pglimit = (size_limit_mb * 1024 * 1024) >> PAGE_SHIFT; for (i = 0; i < head->count; i++) { if (!IS_ALIGNED(list[i].offset, PAGE_SIZE)) goto err_free_ubuf; if (!IS_ALIGNED(list[i].size, PAGE_SIZE)) goto err_free_ubuf; ubuf->pagecount += list[i].size >> PAGE_SHIFT; + if (ubuf->pagecount > pglimit) + goto err_free_ubuf; } ubuf->pages = kmalloc_array(ubuf->pagecount, sizeof(struct page *), GFP_KERNEL); @@ -227,7 +233,7 @@ static long udmabuf_ioctl_create_list(struct file *filp, unsigned long arg) if (copy_from_user(&head, (void __user *)arg, sizeof(head))) return -EFAULT; - if (head.count > 1024) + if (head.count > list_limit) return -EINVAL; lsize = sizeof(struct udmabuf_create_item) * head.count; list = memdup_user((void __user *)(arg + sizeof(head)), lsize); -- 2.9.3