From patchwork Mon Feb 27 21:50:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Stoakes X-Patchwork-Id: 9594501 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 BF5DA604B9 for ; Tue, 28 Feb 2017 00:39:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0B9C2811C for ; Tue, 28 Feb 2017 00:39:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A5540284BA; Tue, 28 Feb 2017 00:39:20 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6A50F2811C for ; Tue, 28 Feb 2017 00:39:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B357B6E5BB; Tue, 28 Feb 2017 00:39:15 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 285416E5A3 for ; Mon, 27 Feb 2017 21:50:19 +0000 (UTC) Received: by mail-wr0-x243.google.com with SMTP id g10so11681147wrg.0 for ; Mon, 27 Feb 2017 13:50:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=2ZpIrrFUdigsDfpSlUBxFt+QIypYx6NGXfUPMNvr+CA=; b=hOsBP1tZGQTVCGVCrCm11/sFQ/OKTw8FeFPRRIHXTaBA78dnKo5Eo2rak9haF6Ti8e LWbCiQk1zu84yOzcfH/Sd6P3WL3hFXaPmVan4n/pJOcRPEpy0prW9uL1vjR1xi3+n0Ch XP5zQHnS2dWj/MtHV4mUjLYhMbWpL3WOANizxxEDSKt38GgPmn7u6BXP+hd+50ng0q9M Acfw44MvEZCROY62n8CGOI+0uTVLivLC4X7uYJdKcuCQdIxlriT+dnl4fPuK3CTKnwLW 7UwuPFfBeemfTvP5vUgirQtadBGfh0R83R5+oblcurr8YQSeYU3Jh0Q9ghoanZre7BVF q0Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=2ZpIrrFUdigsDfpSlUBxFt+QIypYx6NGXfUPMNvr+CA=; b=SOJ8rT44G9coPKRDUyiWHrOgZbD1S6bUPJ75d05cajcRuHJwaIztsGqY+HRWAvdX9W JvWm7g4g2aQeDc768WP5rmkOMHDBXKXTI0M3D0rra7kQmhu3OIk5fP0kMwQRoFtOo5M7 dCVwDJyz/fGZ9TvaK4jJWrP2BV+ACPUn2bL0apBa0nbQdgD4acAsiZRALhL7CJPebLoa /KGjSDYOXdVze1pq074z+HD6HtH97J+tJR8SlmS/BF6Vst5L6/w1DrpHt5374QSGVqzR 62gY/Oh4XZ5GLtxsyur7dwv0aZ7KTrdq92VXVjAh/PH3nz6osxxM8wOh+FuMrEGMV/xE 4YBg== X-Gm-Message-State: AMke39nTlqtDCmKqSi3F58kP2dvOYf5EATNqBWSGAtJiwvwNpdTL4aCFZ+FqQIjbab1Lrw== X-Received: by 10.223.176.87 with SMTP id g23mr13243277wra.12.1488232217711; Mon, 27 Feb 2017 13:50:17 -0800 (PST) Received: from localhost ([88.97.28.139]) by smtp.gmail.com with ESMTPSA id 191sm15897612wmo.21.2017.02.27.13.50.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Feb 2017 13:50:14 -0800 (PST) From: Lorenzo Stoakes To: Daniel Vetter Subject: [PATCH RESEND] drm/via: use get_user_pages_unlocked() Date: Mon, 27 Feb 2017 21:50:08 +0000 Message-Id: <20170227215008.21457-1-lstoakes@gmail.com> X-Mailer: git-send-email 2.11.1 X-Mailman-Approved-At: Tue, 28 Feb 2017 00:39:15 +0000 Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Lorenzo Stoakes X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Moving from get_user_pages() to get_user_pages_unlocked() simplifies the code and takes advantage of VM_FAULT_RETRY functionality when faulting in pages. Signed-off-by: Lorenzo Stoakes --- drivers/gpu/drm/via/via_dmablit.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c index 1a3ad769f8c8..98aae9809249 100644 --- a/drivers/gpu/drm/via/via_dmablit.c +++ b/drivers/gpu/drm/via/via_dmablit.c @@ -238,13 +238,9 @@ via_lock_all_dma_pages(drm_via_sg_info_t *vsg, drm_via_dmablit_t *xfer) vsg->pages = vzalloc(sizeof(struct page *) * vsg->num_pages); if (NULL == vsg->pages) return -ENOMEM; - down_read(¤t->mm->mmap_sem); - ret = get_user_pages((unsigned long)xfer->mem_addr, - vsg->num_pages, - (vsg->direction == DMA_FROM_DEVICE) ? FOLL_WRITE : 0, - vsg->pages, NULL); - - up_read(¤t->mm->mmap_sem); + ret = get_user_pages_unlocked((unsigned long)xfer->mem_addr, + vsg->num_pages, vsg->pages, + (vsg->direction == DMA_FROM_DEVICE) ? FOLL_WRITE : 0); if (ret != vsg->num_pages) { if (ret < 0) return ret;