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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 86A6AC11F66 for ; Tue, 13 Jul 2021 13:44:15 +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 4FEAD60C40 for ; Tue, 13 Jul 2021 13:44:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4FEAD60C40 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F1A5889E26; Tue, 13 Jul 2021 13:44:14 +0000 (UTC) Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by gabe.freedesktop.org (Postfix) with ESMTPS id C5A3889E11 for ; Tue, 13 Jul 2021 13:44:13 +0000 (UTC) Received: by mail-wr1-x430.google.com with SMTP id p8so30536290wrr.1 for ; Tue, 13 Jul 2021 06:44:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=nyV98/xSrdlLqXzeigMDW23vrSitIA9rS+O8hNdz0DA=; b=PsrrhN0QJ1vxmFWGVDZByiF87Fq5rNPmKKosIPBcQRyN8D3D92B3QjJd6Csote7zgX 09VYhqZI+QYrMBfacueqbrcZ6aP5F/rNKDSK415NJqbfMGXk0gkYFj4o2K2bQcLrw/V2 m8jDdsZ+kcFKvp+/2kOA+r/5VDhj3CfWWeZ5U= 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:references :mime-version:content-disposition:in-reply-to; bh=nyV98/xSrdlLqXzeigMDW23vrSitIA9rS+O8hNdz0DA=; b=iQjZ6ED4QXkTDNnFAUGMxe8X9yma7Ee24ia4RNybQ1t3DhB1RM+wLOgsJBZEw1C/5r QjuxxmoSLVEFMHcsFZnGqDNHH6yA0hQ+IE8DcRY4c65sxzluhRGrAWe8A1XAG6mAno47 5/+PvboCjJCIUmsinov7VL8M2UHoLSnCaoNYgIxXHejOF2WKpWGTvEJoUk1eJVKE95Dc MAp16++6qvXLIzx7ssuzFsS/volpH3ZS2laDm6SoFTw0faMcKoz8y4RYITMPLlCXhozu S0Qpnff/2TPu8A/p/xj0kfrJFM6rOa6xRigmldL0gK8jAJGNo1C/fux0YWNQaQHrzr1g awGw== X-Gm-Message-State: AOAM533irEZZp2LZnDEMEKhBR/YCGuf3RaUUjzNHO8T8XvjgIOxD28A1 SqvBFjtXCkPdpv9bqhSVipM31Q== X-Google-Smtp-Source: ABdhPJxMVLc+AApJchKcylFycMbHPuEqfyY43Ai0sBS0de3tgUqRnau3oX5WgVUiBSGfBdqAyrJn/Q== X-Received: by 2002:a5d:4b44:: with SMTP id w4mr5585928wrs.275.1626183852448; Tue, 13 Jul 2021 06:44:12 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id f7sm10887865wru.11.2021.07.13.06.44.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jul 2021 06:44:10 -0700 (PDT) Date: Tue, 13 Jul 2021 15:44:08 +0200 From: Daniel Vetter To: DRI Development Message-ID: References: <20210603164113.1433476-3-daniel.vetter@ffwll.ch> <20210603210831.1492251-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210603210831.1492251-1-daniel.vetter@ffwll.ch> X-Operating-System: Linux phenom 5.10.0-7-amd64 Subject: Re: [Intel-gfx] [PATCH] drm/shmem-helper: Switch to vmf_insert_pfn X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Daniel Vetter , Intel Graphics Development , Maxime Ripard , Thomas Zimmermann , Daniel Vetter Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, Jun 03, 2021 at 11:08:31PM +0200, Daniel Vetter wrote: > We want to stop gup, which isn't the case if we use vmf_insert_page > and VM_MIXEDMAP, because that does not set pte_special. > > v2: With this shmem gem helpers now definitely need CONFIG_MMU (0day) > > v3: add more depends on MMU. For usb drivers this is a bit awkward, > but really it's correct: To be able to provide a contig mapping of > buffers to userspace on !MMU platforms we'd need to use the cma > helpers for these drivers on those platforms. As-is this wont work. > > Also not exactly sure why vm_insert_page doesn't go boom, because that > definitely wont fly in practice since the pages are non-contig to > begin with. > > Signed-off-by: Daniel Vetter > Cc: Maarten Lankhorst > Cc: Maxime Ripard > Cc: Thomas Zimmermann > Cc: David Airlie > Cc: Daniel Vetter Merged to drm-misc-next. Aside, anyone feel like a review on the previous patch? Still not ready to switch vgem over, but I think I've found the next bug that needs fixing in shmem helpers. -Daniel > --- > drivers/gpu/drm/Kconfig | 2 +- > drivers/gpu/drm/drm_gem_shmem_helper.c | 4 ++-- > drivers/gpu/drm/gud/Kconfig | 2 +- > drivers/gpu/drm/tiny/Kconfig | 4 ++-- > drivers/gpu/drm/udl/Kconfig | 1 + > 5 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > index 56a55a6e6239..9c21527b791f 100644 > --- a/drivers/gpu/drm/Kconfig > +++ b/drivers/gpu/drm/Kconfig > @@ -206,7 +206,7 @@ config DRM_KMS_CMA_HELPER > > config DRM_GEM_SHMEM_HELPER > bool > - depends on DRM > + depends on DRM && MMU > help > Choose this if you need the GEM shmem helper functions > > diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c > index 6d625cee7a6a..11edd54f0580 100644 > --- a/drivers/gpu/drm/drm_gem_shmem_helper.c > +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c > @@ -542,7 +542,7 @@ static vm_fault_t drm_gem_shmem_fault(struct vm_fault *vmf) > } else { > page = shmem->pages[page_offset]; > > - ret = vmf_insert_page(vma, vmf->address, page); > + ret = vmf_insert_pfn(vma, vmf->address, page_to_pfn(page)); > } > > mutex_unlock(&shmem->pages_lock); > @@ -612,7 +612,7 @@ int drm_gem_shmem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) > return ret; > } > > - vma->vm_flags |= VM_MIXEDMAP | VM_DONTEXPAND; > + vma->vm_flags |= VM_PFNMAP | VM_DONTEXPAND; > vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); > if (shmem->map_wc) > vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); > diff --git a/drivers/gpu/drm/gud/Kconfig b/drivers/gpu/drm/gud/Kconfig > index 1c8601bf4d91..9c1e61f9eec3 100644 > --- a/drivers/gpu/drm/gud/Kconfig > +++ b/drivers/gpu/drm/gud/Kconfig > @@ -2,7 +2,7 @@ > > config DRM_GUD > tristate "GUD USB Display" > - depends on DRM && USB > + depends on DRM && USB && MMU > select LZ4_COMPRESS > select DRM_KMS_HELPER > select DRM_GEM_SHMEM_HELPER > diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig > index d46f95d9196d..a15f57ace9e7 100644 > --- a/drivers/gpu/drm/tiny/Kconfig > +++ b/drivers/gpu/drm/tiny/Kconfig > @@ -31,7 +31,7 @@ config DRM_CIRRUS_QEMU > > config DRM_GM12U320 > tristate "GM12U320 driver for USB projectors" > - depends on DRM && USB > + depends on DRM && USB && MMU > select DRM_KMS_HELPER > select DRM_GEM_SHMEM_HELPER > help > @@ -40,7 +40,7 @@ config DRM_GM12U320 > > config DRM_SIMPLEDRM > tristate "Simple framebuffer driver" > - depends on DRM > + depends on DRM && MMU > select DRM_GEM_SHMEM_HELPER > select DRM_KMS_HELPER > help > diff --git a/drivers/gpu/drm/udl/Kconfig b/drivers/gpu/drm/udl/Kconfig > index 1f497d8f1ae5..c744175c6992 100644 > --- a/drivers/gpu/drm/udl/Kconfig > +++ b/drivers/gpu/drm/udl/Kconfig > @@ -4,6 +4,7 @@ config DRM_UDL > depends on DRM > depends on USB > depends on USB_ARCH_HAS_HCD > + depends on MMU > select DRM_GEM_SHMEM_HELPER > select DRM_KMS_HELPER > help > -- > 2.31.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx