From patchwork Fri Jul 19 07:58:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda Delgado X-Patchwork-Id: 2830340 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D4B879F4D4 for ; Fri, 19 Jul 2013 07:59:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C0C5720416 for ; Fri, 19 Jul 2013 07:59:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DACDB20414 for ; Fri, 19 Jul 2013 07:59:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965611Ab3GSH7z (ORCPT ); Fri, 19 Jul 2013 03:59:55 -0400 Received: from mail-lb0-f171.google.com ([209.85.217.171]:35471 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965599Ab3GSH7w (ORCPT ); Fri, 19 Jul 2013 03:59:52 -0400 Received: by mail-lb0-f171.google.com with SMTP id 13so3282861lba.30 for ; Fri, 19 Jul 2013 00:59:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=q/P8MKA/NZylnibSXK44lQH/a2irzQWNPIsMwdQ+azU=; b=SWr0zOqlj9sOZkl012uU4WSwJ1K/potMUvFBBEpa4EM421QpDH0h6HzWsIv+UvdnmD 9fo6KZ8Bv0ExtZ/0pFfjv4KAdZTMaS+3BcnD2UtDmkgJeIUfCrejNk7ruEZHzZ8kFAwt YbHZ1EopGvuwzUJt/Fb8/t6kmQMeSzORlOU2gYMNG9ImC0N99rTnu858ZVGZbRGH1Zgh 03b+TnQuJy3rbsTeW9hNlHyO8fHegsAsIYjvz/XAEA7kh43yzHnJ9VQGynvf1uSXh5TX Y4QDoVlhjaCLYv+7gQlW7BW3+hxYzj9/kwLS805B0CYCs24CCtfKOb6eZK74ei8B04c+ iVQQ== X-Received: by 10.112.150.231 with SMTP id ul7mr7019402lbb.92.1374220791007; Fri, 19 Jul 2013 00:59:51 -0700 (PDT) Received: from localhost (0x4dd4aed9.adsl.cybercity.dk. [77.212.174.217]) by mx.google.com with ESMTPSA id p10sm5422892lap.8.2013.07.19.00.59.49 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 19 Jul 2013 00:59:50 -0700 (PDT) From: Ricardo Ribalda Delgado To: Jonathan Corbet , =?UTF-8?q?=C2=A0Mauro=20Carvalho=20Chehab?= , Pawel Osciak , Marek Szyprowski , Kyungmin Park , =?UTF-8?q?=C2=A0Ismael=20Luceno?= , =?UTF-8?q?=C2=A0Greg=20Kroah-Hartman?= , linux-media@vger.kernel.org, devel@driverdev.osuosl.org Cc: Ricardo Ribalda Delgado Subject: [PATCH 1/4] videobuf2-dma-sg: Allocate pages as contiguous as possible Date: Fri, 19 Jul 2013 09:58:46 +0200 Message-Id: <1374220729-8304-2-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1374220729-8304-1-git-send-email-ricardo.ribalda@gmail.com> References: <1374220729-8304-1-git-send-email-ricardo.ribalda@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Most DMA engines have limitations regarding the number of DMA segments (sg-buffers) that they can handle. Videobuffers can easily spread through houndreds of pages. In the previous aproach, the pages were allocated individually, this could led to the creation houndreds of dma segments (sg-buffers) that could not be handled by some DMA engines. This patch tries to minimize the number of DMA segments by using alloc_pages. In the worst case it will behave as before, but most of the times it will reduce the number fo dma segments Signed-off-by: Ricardo Ribalda Delgado --- drivers/media/v4l2-core/videobuf2-dma-sg.c | 60 +++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 11 deletions(-) diff --git a/drivers/media/v4l2-core/videobuf2-dma-sg.c b/drivers/media/v4l2-core/videobuf2-dma-sg.c index 16ae3dc..9bf02c3 100644 --- a/drivers/media/v4l2-core/videobuf2-dma-sg.c +++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c @@ -42,10 +42,55 @@ struct vb2_dma_sg_buf { static void vb2_dma_sg_put(void *buf_priv); +static int vb2_dma_sg_alloc_compacted(struct vb2_dma_sg_buf *buf, + gfp_t gfp_flags) +{ + unsigned int last_page = 0; + int size = buf->sg_desc.size; + + while (size > 0) { + struct page *pages; + int order; + int i; + + order = get_order(size); + /* Dont over allocate*/ + if ((PAGE_SIZE << order) > size) + order--; + + pages = NULL; + while (!pages) { + pages = alloc_pages(GFP_KERNEL | __GFP_ZERO | + __GFP_NOWARN | gfp_flags, order); + if (pages) + break; + + if (order == 0) + while (--last_page >= 0) { + __free_page(buf->pages[last_page]); + return -ENOMEM; + } + order--; + } + + split_page(pages, order); + for (i = 0; i < (1<pages[last_page] = pages + i; + sg_set_page(&buf->sg_desc.sglist[last_page], + buf->pages[last_page], PAGE_SIZE, 0); + last_page++; + } + + size -= PAGE_SIZE << order; + } + + return 0; +} + static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_flags) { struct vb2_dma_sg_buf *buf; - int i; + int ret; buf = kzalloc(sizeof *buf, GFP_KERNEL); if (!buf) @@ -69,14 +114,9 @@ static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_fla if (!buf->pages) goto fail_pages_array_alloc; - for (i = 0; i < buf->sg_desc.num_pages; ++i) { - buf->pages[i] = alloc_page(GFP_KERNEL | __GFP_ZERO | - __GFP_NOWARN | gfp_flags); - if (NULL == buf->pages[i]) - goto fail_pages_alloc; - sg_set_page(&buf->sg_desc.sglist[i], - buf->pages[i], PAGE_SIZE, 0); - } + ret = vb2_dma_sg_alloc_compacted(buf, gfp_flags); + if (ret) + goto fail_pages_alloc; buf->handler.refcount = &buf->refcount; buf->handler.put = vb2_dma_sg_put; @@ -89,8 +129,6 @@ static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_fla return buf; fail_pages_alloc: - while (--i >= 0) - __free_page(buf->pages[i]); kfree(buf->pages); fail_pages_array_alloc: