From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 885FCC4363D for ; Fri, 25 Sep 2020 13:05:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 22688206BE for ; Fri, 25 Sep 2020 13:05:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 22688206BE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 65F696B009E; Fri, 25 Sep 2020 09:05:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 637C66B009F; Fri, 25 Sep 2020 09:05:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 54C366B00A0; Fri, 25 Sep 2020 09:05:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0104.hostedemail.com [216.40.44.104]) by kanga.kvack.org (Postfix) with ESMTP id 3D8656B009E for ; Fri, 25 Sep 2020 09:05:45 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id E957D2DFD for ; Fri, 25 Sep 2020 13:05:44 +0000 (UTC) X-FDA: 77301605808.12.tank73_100324d27167 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin12.hostedemail.com (Postfix) with ESMTP id A7247180154B6 for ; Fri, 25 Sep 2020 13:05:44 +0000 (UTC) X-HE-Tag: tank73_100324d27167 X-Filterd-Recvd-Size: 5956 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Fri, 25 Sep 2020 13:05:43 +0000 (UTC) IronPort-SDR: YFjMrnqsGx1bpLARDxZf6VK8N8QtXtClBsu0+YAyyDYSwwZ/J2GB0y9F3tzb4kM9hxHR1WBCmZ j6im1gZEBCgw== X-IronPort-AV: E=McAfee;i="6000,8403,9754"; a="141540604" X-IronPort-AV: E=Sophos;i="5.77,302,1596524400"; d="scan'208";a="141540604" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2020 06:05:41 -0700 IronPort-SDR: 5Dwboiqhy5yHPzqfhh5/S6fzq83iIqIUdZO8emD2bnlcA/WE0SaYoeYBpYxDMx5CtVPALBxtts ZUeFrbRupJww== X-IronPort-AV: E=Sophos;i="5.77,302,1596524400"; d="scan'208";a="455824158" Received: from mlevy2-mobl.ger.corp.intel.com (HELO [10.251.176.131]) ([10.251.176.131]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2020 06:05:34 -0700 Subject: Re: [PATCH 06/11] drm/i915: use vmap in shmem_pin_map To: Christoph Hellwig , Andrew Morton Cc: Peter Zijlstra , Boris Ostrovsky , Juergen Gross , Stefano Stabellini , Jani Nikula , Joonas Lahtinen , Chris Wilson , Matthew Auld , Rodrigo Vivi , Minchan Kim , Matthew Wilcox , Nitin Gupta , x86@kernel.org, xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org References: <20200924135853.875294-1-hch@lst.de> <20200924135853.875294-7-hch@lst.de> From: Tvrtko Ursulin Organization: Intel Corporation UK Plc Message-ID: <9459e195-a412-3357-c53d-4349e600896d@linux.intel.com> Date: Fri, 25 Sep 2020 14:05:32 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200924135853.875294-7-hch@lst.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 24/09/2020 14:58, Christoph Hellwig wrote: > shmem_pin_map somewhat awkwardly reimplements vmap using > alloc_vm_area and manual pte setup. The only practical difference > is that alloc_vm_area prefeaults the vmalloc area PTEs, which doesn't > seem to be required here (and could be added to vmap using a flag if > actually required). Switch to use vmap, and use vfree to free both the > vmalloc mapping and the page array, as well as dropping the references > to each page. > > Signed-off-by: Christoph Hellwig > --- > drivers/gpu/drm/i915/gt/shmem_utils.c | 76 +++++++-------------------- > 1 file changed, 18 insertions(+), 58 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/shmem_utils.c b/drivers/gpu/drm/i915/gt/shmem_utils.c > index 43c7acbdc79dea..f011ea42487e11 100644 > --- a/drivers/gpu/drm/i915/gt/shmem_utils.c > +++ b/drivers/gpu/drm/i915/gt/shmem_utils.c > @@ -49,80 +49,40 @@ struct file *shmem_create_from_object(struct drm_i915_gem_object *obj) > return file; > } > > -static size_t shmem_npte(struct file *file) > -{ > - return file->f_mapping->host->i_size >> PAGE_SHIFT; > -} > - > -static void __shmem_unpin_map(struct file *file, void *ptr, size_t n_pte) > -{ > - unsigned long pfn; > - > - vunmap(ptr); > - > - for (pfn = 0; pfn < n_pte; pfn++) { > - struct page *page; > - > - page = shmem_read_mapping_page_gfp(file->f_mapping, pfn, > - GFP_KERNEL); > - if (!WARN_ON(IS_ERR(page))) { > - put_page(page); > - put_page(page); > - } > - } > -} > - > void *shmem_pin_map(struct file *file) > { > - const size_t n_pte = shmem_npte(file); > - pte_t *stack[32], **ptes, **mem; > - struct vm_struct *area; > - unsigned long pfn; > - > - mem = stack; > - if (n_pte > ARRAY_SIZE(stack)) { > - mem = kvmalloc_array(n_pte, sizeof(*mem), GFP_KERNEL); > - if (!mem) > - return NULL; > - } > + struct page **pages; > + size_t n_pages, i; > + void *vaddr; > > - area = alloc_vm_area(n_pte << PAGE_SHIFT, mem); > - if (!area) { > - if (mem != stack) > - kvfree(mem); > + n_pages = file->f_mapping->host->i_size >> PAGE_SHIFT; > + pages = kvmalloc_array(n_pages, sizeof(*pages), GFP_KERNEL); > + if (!pages) > return NULL; > - } > > - ptes = mem; > - for (pfn = 0; pfn < n_pte; pfn++) { > - struct page *page; > - > - page = shmem_read_mapping_page_gfp(file->f_mapping, pfn, > - GFP_KERNEL); > - if (IS_ERR(page)) > + for (i = 0; i < n_pages; i++) { > + pages[i] = shmem_read_mapping_page_gfp(file->f_mapping, i, > + GFP_KERNEL); > + if (IS_ERR(pages[i])) > goto err_page; > - > - **ptes++ = mk_pte(page, PAGE_KERNEL); > } > > - if (mem != stack) > - kvfree(mem); > - > + vaddr = vmap(pages, n_pages, VM_MAP_PUT_PAGES, PAGE_KERNEL); > + if (!vaddr) > + goto err_page; > mapping_set_unevictable(file->f_mapping); > - return area->addr; > - > + return vaddr; > err_page: > - if (mem != stack) > - kvfree(mem); > - > - __shmem_unpin_map(file, area->addr, pfn); > + while (--i >= 0) > + put_page(pages[i]); > + kvfree(pages); > return NULL; > } > > void shmem_unpin_map(struct file *file, void *ptr) > { > mapping_clear_unevictable(file->f_mapping); > - __shmem_unpin_map(file, ptr, shmem_npte(file)); > + vfree(ptr); > } > > static int __shmem_rw(struct file *file, loff_t off, > Reviewed-by: Tvrtko Ursulin Regards, Tvrtko