From patchwork Thu Nov 15 15:45:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souptick Joarder X-Patchwork-Id: 10684645 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AA6A314DB for ; Thu, 15 Nov 2018 15:42:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A1B82CA31 for ; Thu, 15 Nov 2018 15:42:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 97CFA2CB52; Thu, 15 Nov 2018 15:42:03 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 179122CA31 for ; Thu, 15 Nov 2018 15:42:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388519AbeKPBuQ (ORCPT ); Thu, 15 Nov 2018 20:50:16 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:33515 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726432AbeKPBuP (ORCPT ); Thu, 15 Nov 2018 20:50:15 -0500 Received: by mail-pf1-f195.google.com with SMTP id v68-v6so9888785pfk.0; Thu, 15 Nov 2018 07:41:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=Cg6brz7mYbLRhNFEJEtQAETpRuMNOqibtuUBxg6orP4=; b=Eh6N6bxmBaJCmbCwKW3nWNFuf4BU086XyvkfRs4vTvK36lWMY6cUN0FJX1PSYvywPA imnNfFW8NM5MhtB/HlVZZcHG+VZLG6fwdGA8wfvH3nTVvJ65/UEg8XF5sPJgwcMQ+Hcp 24J7dBDK4YuAeDF1ME0tMs/isqPAtODXkGF+EuEklxGHrwSqW6x5O9XLDxpRfHpmSSvk Sm1Rl+EzeIHqJmV2GbHPGqlz3EsJ6NJzstXHM7D/kaiWLp1iZCgeJ7SAzbxnhLcdmVAD NANa4oTHJ5p9uJkn4VOq7tq40IfMMMlfkFxDrYrG6YazkS00ehOYAi289jFYFozTT7r6 m7Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=Cg6brz7mYbLRhNFEJEtQAETpRuMNOqibtuUBxg6orP4=; b=Fa567TI+O1CpU8eoLgDaskr3u+zB+OUMne2Lg1+kX5O33Cti5+e7j0dyPOap/J3frr F1XoC3J2cmi+yz8WbITbSYl3d4V5VJ0fCucPWLb15AuxMSkTb/2KyUDV5K5CbQOH+2FN S6cJ0zjBJAFw+kCg71knVgH3izY2cRQ10o5Xuv0S/plchx7v2WtCp6nyLUX4RyRQ8m/Z Ww1J2ZtUhVMZOIC3iKD5bpMRLNjO3+j5oONL6bSolTU2B2It0haRCm+W26esOOTSRbMl PmGZJV39eCPdXF63Y35aovG7dBaLPuFnErbyF3VwBrzkTiDa5xsYJt/A8UASMdLhKaXa YdOA== X-Gm-Message-State: AGRZ1gIGczk05TotICf1j32ASmp2qFlAF8EOIWFGlwBjDOM+p0fwEH2c YVadhRST5mf9/HkbOjgYriLTcKYSPKs= X-Google-Smtp-Source: AJdET5c/4IUsmJbAFLjrppekHCGzB7YBq4feZP6VdbGvFFyn78AfrEs+pTt1JsSRVIRjujxms+LN6A== X-Received: by 2002:a63:5153:: with SMTP id r19mr6195032pgl.281.1542296514745; Thu, 15 Nov 2018 07:41:54 -0800 (PST) Received: from jordon-HP-15-Notebook-PC ([103.227.97.233]) by smtp.gmail.com with ESMTPSA id u127-v6sm28519773pfb.47.2018.11.15.07.41.52 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Nov 2018 07:41:53 -0800 (PST) Date: Thu, 15 Nov 2018 21:15:30 +0530 From: Souptick Joarder To: akpm@linux-foundation.org, willy@infradead.org, mhocko@suse.com, kirill.shutemov@linux.intel.com, vbabka@suse.cz, riel@surriel.com, sfr@canb.auug.org.au, rppt@linux.vnet.ibm.com, peterz@infradead.org, linux@armlinux.org.uk, robin.murphy@arm.com, iamjoonsoo.kim@lge.com, treding@nvidia.com, keescook@chromium.org, m.szyprowski@samsung.com, stefanr@s5r6.in-berlin.de, hjc@rock-chips.com, heiko@sntech.de, airlied@linux.ie, oleksandr_andrushchenko@epam.com, joro@8bytes.org, pawel@osciak.com, kyungmin.park@samsung.com, mchehab@kernel.org, boris.ostrovsky@oracle.com, jgross@suse.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux1394-devel@lists.sourceforge.net, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, xen-devel@lists.xen.org, iommu@lists.linux-foundation.org, linux-media@vger.kernel.org Subject: [PATCH 1/9] mm: Introduce new vm_insert_range API Message-ID: <20181115154530.GA27872@jordon-HP-15-Notebook-PC> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Previouly drivers have their own way of mapping range of kernel pages/memory into user vma and this was done by invoking vm_insert_page() within a loop. As this pattern is common across different drivers, it can be generalized by creating a new function and use it across the drivers. vm_insert_range is the new API which will be used to map a range of kernel memory/pages to user vma. Signed-off-by: Souptick Joarder Reviewed-by: Matthew Wilcox Tested-by: Heiko Stuebner --- include/linux/mm_types.h | 3 +++ mm/memory.c | 28 ++++++++++++++++++++++++++++ mm/nommu.c | 7 +++++++ 3 files changed, 38 insertions(+) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 5ed8f62..15ae24f 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -523,6 +523,9 @@ extern void tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, extern void tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end); +int vm_insert_range(struct vm_area_struct *vma, unsigned long addr, + struct page **pages, unsigned long page_count); + static inline void init_tlb_flush_pending(struct mm_struct *mm) { atomic_set(&mm->tlb_flush_pending, 0); diff --git a/mm/memory.c b/mm/memory.c index 15c417e..da904ed 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1478,6 +1478,34 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr, } /** + * vm_insert_range - insert range of kernel pages into user vma + * @vma: user vma to map to + * @addr: target user address of this page + * @pages: pointer to array of source kernel pages + * @page_count: no. of pages need to insert into user vma + * + * This allows drivers to insert range of kernel pages they've allocated + * into a user vma. This is a generic function which drivers can use + * rather than using their own way of mapping range of kernel pages into + * user vma. + */ +int vm_insert_range(struct vm_area_struct *vma, unsigned long addr, + struct page **pages, unsigned long page_count) +{ + unsigned long uaddr = addr; + int ret = 0, i; + + for (i = 0; i < page_count; i++) { + ret = vm_insert_page(vma, uaddr, pages[i]); + if (ret < 0) + return ret; + uaddr += PAGE_SIZE; + } + + return ret; +} + +/** * vm_insert_page - insert single page into user vma * @vma: user vma to map to * @addr: target user address of this page diff --git a/mm/nommu.c b/mm/nommu.c index 749276b..d6ef5c7 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -473,6 +473,13 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr, } EXPORT_SYMBOL(vm_insert_page); +int vm_insert_range(struct vm_area_struct *vma, unsigned long addr, + struct page **pages, unsigned long page_count) +{ + return -EINVAL; +} +EXPORT_SYMBOL(vm_insert_range); + /* * sys_brk() for the most part doesn't need the global kernel * lock, except when an application is doing something nasty From patchwork Thu Nov 15 15:50:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souptick Joarder X-Patchwork-Id: 10684669 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D64F5109C for ; Thu, 15 Nov 2018 15:47:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C48A52C330 for ; Thu, 15 Nov 2018 15:47:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B71222C955; Thu, 15 Nov 2018 15:47:10 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6CE9C2C330 for ; Thu, 15 Nov 2018 15:47:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388622AbeKPBzZ (ORCPT ); Thu, 15 Nov 2018 20:55:25 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:36595 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388606AbeKPBzY (ORCPT ); Thu, 15 Nov 2018 20:55:24 -0500 Received: by mail-pg1-f195.google.com with SMTP id n2so2010108pgm.3; Thu, 15 Nov 2018 07:47:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=Y4j6wPLX63MzLmcWwklKXfRUptmuKvg6BDhxbcvJLX8=; b=EYIpEo6I3fyTu/nA00GV24mLYL1fuyuGTfdcuVne5cPVJTlBojkjhL2OR9kMr1l6cn Scq7Xxv5VO8kmlGpTZK8sToz3x2SA8R2VUHT14wnAGRw97Fvv5Vqye1EyoXfC4hFsSRv CJPVbdMq6d7Zcx34sbWJLXEiOab4y8TidiIMUeAwXtXDI+n1ulichB4QJqC/gUokWoln hH6K/9J9Doub4q0HmhCejsxJoGlHkavlcqgMGD6pG06VxU/WW/pYmLIt6ns2RxPRzngf WULQgfNQRcnx+Sazxjc7zDpqv+SjhYgzIv6Rw51NzfPr07yFExwKQWZCiZybCes1Rk/2 69GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=Y4j6wPLX63MzLmcWwklKXfRUptmuKvg6BDhxbcvJLX8=; b=dSOisbf5sbul4/vSEgdbhAw0SB6fOqVVMXQpXguhN0CwvoyB3y4v4TZAGwDYv2hHID 7OwJqy6Z16fRwaYx79aIwmY++mdmCWkqjd+P1uARmElG8WuCZzUHrbaot7vwN2ykONGd MvrMx/MvPFamhHCFPhwnvybdjljqkz7FqHMiixrquCNTq+TIzQfKGDEpA2q6mmT084Sy ucICl/78Xm/vqJBYelXCCk/cSjLELMq/nJve31vFrWmom6bxcs1cfroKCr4kGUwNFqVE YGtYJpLbtYrRvcJ3A/a37MITss1Ex5fHBUKsRoG01upN+Sz+S8KzaRCYH8DRz6Pbz1JF qEYA== X-Gm-Message-State: AGRZ1gKNu07eDQHcrePWILyNkq4i3tHSKBdv/Rl1DbibdcFwS3nKwS05 wy2CO7ahYTE5fRn6K8jef+Q= X-Google-Smtp-Source: AJdET5fKxAlomurtsT3Waf4QItnpyQmbkiTazNR0OLF+vbiHaETb9N5BF1yWp28J2QIaArlvH2Jy1Q== X-Received: by 2002:a63:fe0a:: with SMTP id p10mr6206480pgh.265.1542296822885; Thu, 15 Nov 2018 07:47:02 -0800 (PST) Received: from jordon-HP-15-Notebook-PC ([103.227.97.233]) by smtp.gmail.com with ESMTPSA id j187-v6sm31083356pfc.43.2018.11.15.07.47.01 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Nov 2018 07:47:01 -0800 (PST) Date: Thu, 15 Nov 2018 21:20:38 +0530 From: Souptick Joarder To: akpm@linux-foundation.org, willy@infradead.org, mhocko@suse.com, pawel@osciak.com, m.szyprowski@samsung.com, kyungmin.park@samsung.com, mchehab@kernel.org Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 7/9] videobuf2/videobuf2-dma-sg.c: Convert to use vm_insert_range Message-ID: <20181115155037.GA28004@jordon-HP-15-Notebook-PC> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Convert to use vm_insert_range to map range of kernel memory to user vma. Signed-off-by: Souptick Joarder Reviewed-by: Matthew Wilcox Acked-by: Marek Szyprowski --- drivers/media/common/videobuf2/videobuf2-dma-sg.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/drivers/media/common/videobuf2/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c index 015e737..898adef 100644 --- a/drivers/media/common/videobuf2/videobuf2-dma-sg.c +++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c @@ -328,28 +328,19 @@ static unsigned int vb2_dma_sg_num_users(void *buf_priv) static int vb2_dma_sg_mmap(void *buf_priv, struct vm_area_struct *vma) { struct vb2_dma_sg_buf *buf = buf_priv; - unsigned long uaddr = vma->vm_start; - unsigned long usize = vma->vm_end - vma->vm_start; - int i = 0; + unsigned long page_count = vma_pages(vma); + int err; if (!buf) { printk(KERN_ERR "No memory to map\n"); return -EINVAL; } - do { - int ret; - - ret = vm_insert_page(vma, uaddr, buf->pages[i++]); - if (ret) { - printk(KERN_ERR "Remapping memory, error: %d\n", ret); - return ret; - } - - uaddr += PAGE_SIZE; - usize -= PAGE_SIZE; - } while (usize > 0); - + err = vm_insert_range(vma, vma->vm_start, buf->pages, page_count); + if (err) { + printk(KERN_ERR "Remapping memory, error: %d\n", err); + return err; + } /* * Use common vm_area operations to track buffer refcount.