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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,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 12AFAC43381 for ; Mon, 1 Feb 2021 12:14:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BD47B64EA0 for ; Mon, 1 Feb 2021 12:14:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229554AbhBAMOY (ORCPT ); Mon, 1 Feb 2021 07:14:24 -0500 Received: from foss.arm.com ([217.140.110.172]:58288 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229524AbhBAMOW (ORCPT ); Mon, 1 Feb 2021 07:14:22 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D5B0213D5; Mon, 1 Feb 2021 04:13:35 -0800 (PST) Received: from [192.168.1.179] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C3A813F718; Mon, 1 Feb 2021 04:13:34 -0800 (PST) Subject: Re: [PATCH 2/3] drm/panfrost: Don't try to map pages that are already mapped To: Boris Brezillon , Rob Herring , Tomeu Vizoso , Alyssa Rosenzweig , Robin Murphy Cc: dri-devel@lists.freedesktop.org, stable@vger.kernel.org References: <20210201082116.267208-1-boris.brezillon@collabora.com> <20210201082116.267208-3-boris.brezillon@collabora.com> From: Steven Price Message-ID: Date: Mon, 1 Feb 2021 12:13:42 +0000 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: <20210201082116.267208-3-boris.brezillon@collabora.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On 01/02/2021 08:21, Boris Brezillon wrote: > We allocate 2MB chunks at a time, so it might appear that a page fault > has already been handled by a previous page fault when we reach > panfrost_mmu_map_fault_addr(). Bail out in that case to avoid mapping the > same area twice. > > Cc: > Fixes: 187d2929206e ("drm/panfrost: Add support for GPU heap allocations") > Signed-off-by: Boris Brezillon Reviewed-by: Steven Price > --- > drivers/gpu/drm/panfrost/panfrost_mmu.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c > index 904d63450862..21e552d1ac71 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c > +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c > @@ -488,8 +488,14 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as, > } > bo->base.pages = pages; > bo->base.pages_use_count = 1; > - } else > + } else { > pages = bo->base.pages; > + if (pages[page_offset]) { > + /* Pages are already mapped, bail out. */ > + mutex_unlock(&bo->base.pages_lock); > + goto out; > + } > + } > > mapping = bo->base.base.filp->f_mapping; > mapping_set_unevictable(mapping); > @@ -522,6 +528,7 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as, > > dev_dbg(pfdev->dev, "mapped page fault @ AS%d %llx", as, addr); > > +out: > panfrost_gem_mapping_put(bomapping); > > return 0; > 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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,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 899F0C433DB for ; Mon, 1 Feb 2021 12:13:38 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1341264E9C for ; Mon, 1 Feb 2021 12:13:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1341264E9C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4E5856E560; Mon, 1 Feb 2021 12:13:37 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by gabe.freedesktop.org (Postfix) with ESMTP id 34E8C6E563 for ; Mon, 1 Feb 2021 12:13:36 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D5B0213D5; Mon, 1 Feb 2021 04:13:35 -0800 (PST) Received: from [192.168.1.179] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C3A813F718; Mon, 1 Feb 2021 04:13:34 -0800 (PST) Subject: Re: [PATCH 2/3] drm/panfrost: Don't try to map pages that are already mapped To: Boris Brezillon , Rob Herring , Tomeu Vizoso , Alyssa Rosenzweig , Robin Murphy References: <20210201082116.267208-1-boris.brezillon@collabora.com> <20210201082116.267208-3-boris.brezillon@collabora.com> From: Steven Price Message-ID: Date: Mon, 1 Feb 2021 12:13:42 +0000 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: <20210201082116.267208-3-boris.brezillon@collabora.com> Content-Language: en-GB X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stable@vger.kernel.org, dri-devel@lists.freedesktop.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 01/02/2021 08:21, Boris Brezillon wrote: > We allocate 2MB chunks at a time, so it might appear that a page fault > has already been handled by a previous page fault when we reach > panfrost_mmu_map_fault_addr(). Bail out in that case to avoid mapping the > same area twice. > > Cc: > Fixes: 187d2929206e ("drm/panfrost: Add support for GPU heap allocations") > Signed-off-by: Boris Brezillon Reviewed-by: Steven Price > --- > drivers/gpu/drm/panfrost/panfrost_mmu.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c > index 904d63450862..21e552d1ac71 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c > +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c > @@ -488,8 +488,14 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as, > } > bo->base.pages = pages; > bo->base.pages_use_count = 1; > - } else > + } else { > pages = bo->base.pages; > + if (pages[page_offset]) { > + /* Pages are already mapped, bail out. */ > + mutex_unlock(&bo->base.pages_lock); > + goto out; > + } > + } > > mapping = bo->base.base.filp->f_mapping; > mapping_set_unevictable(mapping); > @@ -522,6 +528,7 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as, > > dev_dbg(pfdev->dev, "mapped page fault @ AS%d %llx", as, addr); > > +out: > panfrost_gem_mapping_put(bomapping); > > return 0; > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel