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=-16.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,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 10891C433E6 for ; Tue, 9 Feb 2021 03:02:45 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8EBC664E9D for ; Tue, 9 Feb 2021 03:02:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8EBC664E9D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id DCA216B0071; Mon, 8 Feb 2021 22:02:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D58888D0003; Mon, 8 Feb 2021 22:02:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B0A718D0002; Mon, 8 Feb 2021 22:02:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0131.hostedemail.com [216.40.44.131]) by kanga.kvack.org (Postfix) with ESMTP id 9A4B96B0071 for ; Mon, 8 Feb 2021 22:02:43 -0500 (EST) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 5F7F018391D6B for ; Tue, 9 Feb 2021 03:02:43 +0000 (UTC) X-FDA: 77797231806.14.brake59_220df1827603 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin14.hostedemail.com (Postfix) with ESMTP id 2F15618150768 for ; Tue, 9 Feb 2021 03:02:43 +0000 (UTC) X-HE-Tag: brake59_220df1827603 X-Filterd-Recvd-Size: 7817 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by imf43.hostedemail.com (Postfix) with ESMTP for ; Tue, 9 Feb 2021 03:02:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612839761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=45ThGTqfFb6/yx2k3kPs+btJTG2mPFONj9RwvqJLKYY=; b=BfhE3PHxs8VNKvgC3LBTL5+4Ipev0Pts1mYK4BOIqMSjVzg2cHJvJsgoey5q+rNqloj5Ym I5GzDk6VHYp41LivEFtelF6h3iJz49fVxyB0OHWlAQ+rs2vGhOgYpntUYrZK9JzWY9T9qF OwLzFKBrl/q1T6B5Q5KSzxHZohUzf3M= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-60-gBmExIdwPEymLd-yifzjqw-1; Mon, 08 Feb 2021 22:02:40 -0500 X-MC-Unique: gBmExIdwPEymLd-yifzjqw-1 Received: by mail-qt1-f200.google.com with SMTP id h8so11221449qtj.1 for ; Mon, 08 Feb 2021 19:02:40 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=45ThGTqfFb6/yx2k3kPs+btJTG2mPFONj9RwvqJLKYY=; b=qEfIffTn+y8OX8Hk1RcL+iFJzCyGT8T3Bk3RBDJsR9mEVzdAHGFZcvsdz6CjAukGh+ +T/hMcZEuQ3V3fjUBQVg1VjoyHdipNbYAoG2wB0hIyyekEYGjcm4GEUKjW+r3IFHUt3R H44WJAvemDuwXiZ/oeYnJ90FrLeC+9x1EkkYRVQnZIxlVDyORB3wkRUXHlPaxtOFlwII KZmboXaG96XE8//ZUhyKZcHGMcZf4s5PEzK0cbs+PDlTpFRy09+7KX+IWV8vQHFPv308 W9001ejcKFGuDn9rzTQkSLleeuGHvSqMrfKLDNuOfSN/dwkasWpeB07UXcul76dUCYsn +nHw== X-Gm-Message-State: AOAM530P9Y+KZ29dXuztBGdogkXEc8R0fnR4X7KKFpd47XOrYwRGXdjQ sZOISB6kfS8HBBVml04OTeKRZ9ct1RFTIllkSkDpqT3uCaR+VUdzN3D3GjmaKMADBSDYLVduruv MgO1cnSAdpuGri3SGFInHclU4QhNvAcRp/aFHFr49AKruf0sLyiW9DaR8zP6/ X-Received: by 2002:ac8:1403:: with SMTP id k3mr18504429qtj.266.1612839760022; Mon, 08 Feb 2021 19:02:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJz2c1gqjFwl2EgCFV1jzhiFbIEsvjBLharoixnAKXp/pgq/v39CQuAjuR9IcJNqX5BFJAMTYA== X-Received: by 2002:ac8:1403:: with SMTP id k3mr18504382qtj.266.1612839759707; Mon, 08 Feb 2021 19:02:39 -0800 (PST) Received: from xz-x1.redhat.com (bras-vprn-toroon474qw-lp130-20-174-93-89-182.dsl.bell.ca. [174.93.89.182]) by smtp.gmail.com with ESMTPSA id z20sm17078830qki.93.2021.02.08.19.02.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 19:02:39 -0800 (PST) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Matthew Wilcox , Linus Torvalds , Kirill Tkhai , Mike Rapoport , David Gibson , Kirill Shutemov , Christoph Hellwig , Miaohe Lin , Gal Pressman , Jason Gunthorpe , Jann Horn , peterx@redhat.com, Jan Kara , Wei Zhang , Mike Kravetz , Andrea Arcangeli , Andrew Morton , VMware Graphics , Roland Scheidegger , David Airlie , Daniel Vetter , Alexey Dobriyan Subject: [PATCH v4 4/5] mm: Use is_cow_mapping() across tree where proper Date: Mon, 8 Feb 2021 22:02:28 -0500 Message-Id: <20210209030229.84991-5-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210209030229.84991-1-peterx@redhat.com> References: <20210209030229.84991-1-peterx@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=peterx@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="US-ASCII" 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: After is_cow_mapping() is exported in mm.h, replace some manual checks elsewhere throughout the tree but start to use the new helper. Cc: VMware Graphics Cc: Roland Scheidegger Cc: David Airlie Cc: Daniel Vetter Cc: Mike Kravetz Cc: Alexey Dobriyan Cc: Andrew Morton Signed-off-by: Peter Xu --- drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 4 +--- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 2 +- fs/proc/task_mmu.c | 2 -- mm/hugetlb.c | 4 +--- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c b/drivers/gpu/drm= /vmwgfx/vmwgfx_page_dirty.c index 0a900afc66ff..45c9c6a7f1d6 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c @@ -500,8 +500,6 @@ vm_fault_t vmw_bo_vm_huge_fault(struct vm_fault *vmf, vm_fault_t ret; pgoff_t fault_page_size; bool write =3D vmf->flags & FAULT_FLAG_WRITE; - bool is_cow_mapping =3D - (vma->vm_flags & (VM_SHARED | VM_MAYWRITE)) =3D=3D VM_MAYWRITE; =20 switch (pe_size) { case PE_SIZE_PMD: @@ -518,7 +516,7 @@ vm_fault_t vmw_bo_vm_huge_fault(struct vm_fault *vmf, } =20 /* Always do write dirty-tracking and COW on PTE level. */ - if (write && (READ_ONCE(vbo->dirty) || is_cow_mapping)) + if (write && (READ_ONCE(vbo->dirty) || is_cow_mapping(vma->vm_flags))) return VM_FAULT_FALLBACK; =20 ret =3D ttm_bo_vm_reserve(bo, vmf); diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c b/drivers/gpu/drm/v= mwgfx/vmwgfx_ttm_glue.c index 3c03b1746661..cb9975889e2f 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c @@ -49,7 +49,7 @@ int vmw_mmap(struct file *filp, struct vm_area_struct *= vma) vma->vm_ops =3D &vmw_vm_ops; =20 /* Use VM_PFNMAP rather than VM_MIXEDMAP if not a COW mapping */ - if ((vma->vm_flags & (VM_SHARED | VM_MAYWRITE)) !=3D VM_MAYWRITE) + if (!is_cow_mapping(vma->vm_flags)) vma->vm_flags =3D (vma->vm_flags & ~VM_MIXEDMAP) | VM_PFNMAP; =20 return 0; diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 602e3a52884d..96c1682025f9 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -1036,8 +1036,6 @@ struct clear_refs_private { =20 #ifdef CONFIG_MEM_SOFT_DIRTY =20 -#define is_cow_mapping(flags) (((flags) & (VM_SHARED | VM_MAYWRITE)) =3D= =3D VM_MAYWRITE) - static inline bool pte_is_pinned(struct vm_area_struct *vma, unsigned lo= ng addr, pte_t pte) { struct page *page; diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 71ccec5c3817..620700f05ff4 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3733,15 +3733,13 @@ int copy_hugetlb_page_range(struct mm_struct *dst= , struct mm_struct *src, pte_t *src_pte, *dst_pte, entry, dst_entry; struct page *ptepage; unsigned long addr; - int cow; + int cow =3D is_cow_mapping(vma->vm_flags); struct hstate *h =3D hstate_vma(vma); unsigned long sz =3D huge_page_size(h); struct address_space *mapping =3D vma->vm_file->f_mapping; struct mmu_notifier_range range; int ret =3D 0; =20 - cow =3D (vma->vm_flags & (VM_SHARED | VM_MAYWRITE)) =3D=3D VM_MAYWRITE; - if (cow) { mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma, src, vma->vm_start, --=20 2.26.2