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=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 A330FC46466 for ; Thu, 8 Oct 2020 11:23:49 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id F2E0621D41 for ; Thu, 8 Oct 2020 11:23:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RRd5pSd2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F2E0621D41 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id C23CA6B0062; Thu, 8 Oct 2020 07:23:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BD40A6B0068; Thu, 8 Oct 2020 07:23:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A9D4B6B006C; Thu, 8 Oct 2020 07:23:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0075.hostedemail.com [216.40.44.75]) by kanga.kvack.org (Postfix) with ESMTP id 7C9886B0062 for ; Thu, 8 Oct 2020 07:23:47 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id F22A11EE6 for ; Thu, 8 Oct 2020 11:23:46 +0000 (UTC) X-FDA: 77348523252.02.seat45_0918288271d7 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin02.hostedemail.com (Postfix) with ESMTP id CFAED1018ADDC for ; Thu, 8 Oct 2020 11:23:46 +0000 (UTC) X-HE-Tag: seat45_0918288271d7 X-Filterd-Recvd-Size: 9750 Received: from mail-ej1-f65.google.com (mail-ej1-f65.google.com [209.85.218.65]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Thu, 8 Oct 2020 11:23:46 +0000 (UTC) Received: by mail-ej1-f65.google.com with SMTP id u21so7580851eja.2 for ; Thu, 08 Oct 2020 04:23:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=g5slpzPB5zKh1WzF1mxgqBWxGWWJNpTg+Z0FPcFsWtg=; b=RRd5pSd2IwREt4izuuLm8dVSSb/OhWaKv4Raq6h8J84S8I+NOIk/xh7iDBib7SdVO1 2ueWE41eulixX+/eFqp9ZdPonlVOYP7vpnvg802TdM2IYrhe3+2KBB4nbruPLk0Xxtms AF183RMBIsiZWFiVzRtlol7CmehCFswX4QkfHebY6Q3g0rlF+KK9zWW9TErlt+9CMsQv EC5RBtQRAWZ8p+3RYRrOitr6nk8N3Nellvqnel9wyIFDKmQrTAebnwpD8611fPlcjMcp TqtvVtAolzV5vWZG41B13APAK1geRMi1CW/ESBxBymQ8ltP/zBX0D1F1HOmMGWORjPqV rATg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=g5slpzPB5zKh1WzF1mxgqBWxGWWJNpTg+Z0FPcFsWtg=; b=igcGXzbHwkPE+WpdoQWbpDX6F7pyRbqgIQYGtVaF3tkFcLEmlYK5NGGko71/VMaEbP BybP96SaBs/OEC3eyiAGRMD8KBjq0wBZyzAwR5EVQGpBUMWJwBF7fkCVQ4JtQNETGkd5 1yC5aFeUkZtPDg36cch5wCcTG78oablnuaAj3kuHa+Sjoktfm2hqXdZOV7+G567xgcEr S4KkBiTyrvxPni2H0DlBF+kzT7TYPA3Ej+u9sntDQS3U5IR7mGh+Cz3xW20UcW6HDQ+C ijBmHEnB3MPq8xfgqUVSU8DrhRX1+9cmbmnNBmA1MxODl5hxVa+Usama0sYUcimK1mJ5 b+Cw== X-Gm-Message-State: AOAM530uaUXLu6SaWGW/bwSfah/bXTtqSmgLvGKrK+job07vgjlSfczH pzf8v9mOOp/RmwsvDc/IYcVS/KJWeqY= X-Google-Smtp-Source: ABdhPJxL+c3qJ91ehT1z0omwcR8U0j/1R6BZHCRub4+KUwONUqk/Q7OikaBhK2zqj3mk6LY7IhEcXA== X-Received: by 2002:a17:906:2b85:: with SMTP id m5mr8624058ejg.143.1602156224656; Thu, 08 Oct 2020 04:23:44 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:4c64:a9a0:5e0:905a]) by smtp.gmail.com with ESMTPSA id i20sm3529030edv.96.2020.10.08.04.23.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2020 04:23:44 -0700 (PDT) From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" X-Google-Original-From: =?UTF-8?q?Christian=20K=C3=B6nig?= To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, chris@chris-wilson.co.uk, airlied@redhat.com, akpm@linux-foundation.org, daniel@ffwll.ch, sumit.semwal@linaro.org Subject: [PATCH 1/4] mm: introduce vma_set_file function v2 Date: Thu, 8 Oct 2020 13:23:39 +0200 Message-Id: <20201008112342.9394-1-christian.koenig@amd.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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: Add the new vma_set_file() function to allow changing vma->vm_file with the necessary refcount dance. v2: add more users of this. Signed-off-by: Christian K=C3=B6nig --- drivers/dma-buf/dma-buf.c | 16 +++++----------- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 4 +--- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 4 ++-- drivers/gpu/drm/msm/msm_gem.c | 4 +--- drivers/gpu/drm/omapdrm/omap_gem.c | 3 +-- drivers/gpu/drm/vgem/vgem_drv.c | 3 +-- drivers/staging/android/ashmem.c | 5 ++--- include/linux/mm.h | 2 ++ mm/mmap.c | 16 ++++++++++++++++ 10 files changed, 32 insertions(+), 28 deletions(-) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index a6ba4d598f0e..e4316aa7e0f4 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -1163,20 +1163,14 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct v= m_area_struct *vma, return -EINVAL; =20 /* readjust the vma */ - get_file(dmabuf->file); - oldfile =3D vma->vm_file; - vma->vm_file =3D dmabuf->file; + oldfile =3D vma_set_file(vma, dmabuf->file); vma->vm_pgoff =3D pgoff; =20 ret =3D dmabuf->ops->mmap(dmabuf, vma); - if (ret) { - /* restore old parameters on failure */ - vma->vm_file =3D oldfile; - fput(dmabuf->file); - } else { - if (oldfile) - fput(oldfile); - } + /* restore old parameters on failure */ + if (ret) + vma_set_file(vma, oldfile); + return ret; =20 } diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etna= viv/etnaviv_gem.c index 312e9d58d5a7..10ce267c0947 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c @@ -145,10 +145,8 @@ static int etnaviv_gem_mmap_obj(struct etnaviv_gem_o= bject *etnaviv_obj, * address_space (so unmap_mapping_range does what we want, * in particular in the case of mmap'd dmabufs) */ - fput(vma->vm_file); - get_file(etnaviv_obj->base.filp); vma->vm_pgoff =3D 0; - vma->vm_file =3D etnaviv_obj->base.filp; + vma_set_file(vma, etnaviv_obj->base.filp); =20 vma->vm_page_prot =3D vm_page_prot; } diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm= /i915/gem/i915_gem_dmabuf.c index fec0e1e3dc3e..8ce4c9e28b87 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c @@ -119,8 +119,7 @@ static int i915_gem_dmabuf_mmap(struct dma_buf *dma_b= uf, struct vm_area_struct * if (ret) return ret; =20 - fput(vma->vm_file); - vma->vm_file =3D get_file(obj->base.filp); + vma_set_file(vma, obj->base.filp); =20 return 0; } diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c b/drivers/gpu/drm/i= 915/gem/i915_gem_mman.c index 3d69e51f3e4d..c9d5f1a38af3 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c @@ -893,8 +893,8 @@ int i915_gem_mmap(struct file *filp, struct vm_area_s= truct *vma) * requires avoiding extraneous references to their filp, hence why * we prefer to use an anonymous file for their mmaps. */ - fput(vma->vm_file); - vma->vm_file =3D anon; + vma_set_file(vma, anon); + fput(anon); =20 switch (mmo->mmap_type) { case I915_MMAP_TYPE_WC: diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.= c index de915ff6f4b4..a71f42870d5e 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -223,10 +223,8 @@ int msm_gem_mmap_obj(struct drm_gem_object *obj, * address_space (so unmap_mapping_range does what we want, * in particular in the case of mmap'd dmabufs) */ - fput(vma->vm_file); - get_file(obj->filp); vma->vm_pgoff =3D 0; - vma->vm_file =3D obj->filp; + vma_set_file(vma, obj->filp); =20 vma->vm_page_prot =3D vm_get_page_prot(vma->vm_flags); } diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm= /omap_gem.c index 979d53a93c2b..0d4542ff1d7d 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -564,9 +564,8 @@ int omap_gem_mmap_obj(struct drm_gem_object *obj, * address_space (so unmap_mapping_range does what we want, * in particular in the case of mmap'd dmabufs) */ - fput(vma->vm_file); vma->vm_pgoff =3D 0; - vma->vm_file =3D get_file(obj->filp); + vma_set_file(vma, obj->filp); =20 vma->vm_page_prot =3D vm_get_page_prot(vma->vm_flags); } diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_= drv.c index fa54a6d1403d..ea0eecae5153 100644 --- a/drivers/gpu/drm/vgem/vgem_drv.c +++ b/drivers/gpu/drm/vgem/vgem_drv.c @@ -397,8 +397,7 @@ static int vgem_prime_mmap(struct drm_gem_object *obj= , if (ret) return ret; =20 - fput(vma->vm_file); - vma->vm_file =3D get_file(obj->filp); + vma_set_file(vma, obj->filp); vma->vm_flags |=3D VM_DONTEXPAND | VM_DONTDUMP; vma->vm_page_prot =3D pgprot_writecombine(vm_get_page_prot(vma->vm_flag= s)); =20 diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/a= shmem.c index 10b4be1f3e78..a51dc089896e 100644 --- a/drivers/staging/android/ashmem.c +++ b/drivers/staging/android/ashmem.c @@ -450,9 +450,8 @@ static int ashmem_mmap(struct file *file, struct vm_a= rea_struct *vma) vma_set_anonymous(vma); } =20 - if (vma->vm_file) - fput(vma->vm_file); - vma->vm_file =3D asma->file; + vma_set_file(vma, asma->file); + fput(asma->file); =20 out: mutex_unlock(&ashmem_mutex); diff --git a/include/linux/mm.h b/include/linux/mm.h index ca6e6a81576b..a558602afe1b 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2693,6 +2693,8 @@ static inline void vma_set_page_prot(struct vm_area= _struct *vma) } #endif =20 +struct file *vma_set_file(struct vm_area_struct *vma, struct file *file)= ; + #ifdef CONFIG_NUMA_BALANCING unsigned long change_prot_numa(struct vm_area_struct *vma, unsigned long start, unsigned long end); diff --git a/mm/mmap.c b/mm/mmap.c index 40248d84ad5f..d3c3c510f643 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -136,6 +136,22 @@ void vma_set_page_prot(struct vm_area_struct *vma) WRITE_ONCE(vma->vm_page_prot, vm_page_prot); } =20 +/* + * Change backing file, only valid to use during initial VMA setup. + */ +struct file *vma_set_file(struct vm_area_struct *vma, struct file *file) +{ + if (file) + get_file(file); + + swap(vma->vm_file, file); + + if (file) + fput(file); + + return file; +} + /* * Requires inode->i_mapping->i_mmap_rwsem */ --=20 2.17.1