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.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 E79F6C4741F for ; Fri, 25 Sep 2020 22:26:05 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 80AA82087D for ; Fri, 25 Sep 2020 22:26:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZQKZN7ga" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 80AA82087D 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 50988900002; Fri, 25 Sep 2020 18:26:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4BE116B0068; Fri, 25 Sep 2020 18:26:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 338E36B006C; Fri, 25 Sep 2020 18:26:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0125.hostedemail.com [216.40.44.125]) by kanga.kvack.org (Postfix) with ESMTP id 05DDD6B0062 for ; Fri, 25 Sep 2020 18:26:04 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id A8FCD824999B for ; Fri, 25 Sep 2020 22:26:03 +0000 (UTC) X-FDA: 77303017806.12.pet77_48172662716b Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin12.hostedemail.com (Postfix) with ESMTP id 87F8518008C86 for ; Fri, 25 Sep 2020 22:26:03 +0000 (UTC) X-HE-Tag: pet77_48172662716b X-Filterd-Recvd-Size: 8712 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Fri, 25 Sep 2020 22:26:02 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601072762; 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=Z9s+mr3bMsoB4MuUwSCXxdu8k0Nki9gAjB7hXXinthg=; b=ZQKZN7gaiyXcIFv0UKW8p5dyVr3D/+6qCCzjbfLTflqiZWCmDEsIUqPZb3M4RdWnVo3qBI LIbUCzxcSaHgeoHr8rAijjyNHnv30flgMcPl33cEeDzeV8VYcye6bHVjxSHs4FGq3jOZhr lVsa5gcl7iErDqSHCho6lFSVSSTWErE= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-470-xb1RfZKCMI-Cbi2csSXXMw-1; Fri, 25 Sep 2020 18:26:01 -0400 X-MC-Unique: xb1RfZKCMI-Cbi2csSXXMw-1 Received: by mail-qv1-f70.google.com with SMTP id k14so2722888qvw.20 for ; Fri, 25 Sep 2020 15:26:01 -0700 (PDT) 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=Z9s+mr3bMsoB4MuUwSCXxdu8k0Nki9gAjB7hXXinthg=; b=GchaZXbE/TZWFRgjqE3T7P30jQ1/QxWrQulIuBZvzTZaOJx3u6R8ol0/TQQ3spCfEs nPUkiz3XpPioKzDKTmyZ+X6XbWFy3ubOqY4Wi2tUlrV+vBqF46xRAKVgmUlF/fpbMcq7 E4HZhGcztTEe5XQ6WKXzhNHh9+l9BZyge+5dQ4PKlGVY7VXResFpW6wLjxLySz6Msgwm a/Oc4VN5gKTD+41BFfpK5reKxpMc0S3SpWyk9NxKHSjemBFt7rlv7gHiogSf/pw2Ag/u MNYSc8Em9KrLxcXC1UmHbEVpAd86tfbQxrY9xtyxdzd33NvzqBBn43nvcisj7zvd4BBg OBeA== X-Gm-Message-State: AOAM533NhUX6qQubLsVsEiOM2VYTNVgEiJTQtAq81fYahSUAPg1K5uAy YldncPsCKp+WioXHNQUKwI/Ba1rd2kyQWMmJtie6tdXuFKXfkpapLMIvgW+ptHvOA8/2O0MUV6b FJzkvHNwHIBE= X-Received: by 2002:a37:9d88:: with SMTP id g130mr2293144qke.185.1601072760337; Fri, 25 Sep 2020 15:26:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkCQ0KWaGvyn4yX3yI4tLqcIVC13jgzjD2MfwexLOz4ZJw8pv6FU85VPx13F++9UIdIvBX7Q== X-Received: by 2002:a37:9d88:: with SMTP id g130mr2293120qke.185.1601072760046; Fri, 25 Sep 2020 15:26:00 -0700 (PDT) Received: from localhost.localdomain (bras-vprn-toroon474qw-lp130-11-70-53-122-15.dsl.bell.ca. [70.53.122.15]) by smtp.gmail.com with ESMTPSA id w44sm3051471qth.9.2020.09.25.15.25.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 15:25:59 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: peterx@redhat.com, Jason Gunthorpe , John Hubbard , Andrew Morton , Christoph Hellwig , Yang Shi , Oleg Nesterov , Kirill Tkhai , Kirill Shutemov , Hugh Dickins , Jann Horn , Linus Torvalds , Michal Hocko , Jan Kara , Andrea Arcangeli , Leon Romanovsky Subject: [PATCH v2 2/4] mm/fork: Pass new vma pointer into copy_page_range() Date: Fri, 25 Sep 2020 18:25:58 -0400 Message-Id: <20200925222600.6832-3-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200925222600.6832-1-peterx@redhat.com> References: <20200925222600.6832-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: This prepares for the future work to trigger early cow on pinned pages du= ring fork(). No functional change intended. Signed-off-by: Peter Xu --- include/linux/mm.h | 2 +- kernel/fork.c | 2 +- mm/memory.c | 14 +++++++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index b2f370f0b420..ae914be004b3 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1646,7 +1646,7 @@ struct mmu_notifier_range; void free_pgd_range(struct mmu_gather *tlb, unsigned long addr, unsigned long end, unsigned long floor, unsigned long ceiling); int copy_page_range(struct mm_struct *dst, struct mm_struct *src, - struct vm_area_struct *vma); + struct vm_area_struct *vma, struct vm_area_struct *new); int follow_pte_pmd(struct mm_struct *mm, unsigned long address, struct mmu_notifier_range *range, pte_t **ptepp, pmd_t **pmdpp, spinlock_t **ptlp); diff --git a/kernel/fork.c b/kernel/fork.c index e65d8192d080..da8d360fb032 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -589,7 +589,7 @@ static __latent_entropy int dup_mmap(struct mm_struct= *mm, =20 mm->map_count++; if (!(tmp->vm_flags & VM_WIPEONFORK)) - retval =3D copy_page_range(mm, oldmm, mpnt); + retval =3D copy_page_range(mm, oldmm, mpnt, tmp); =20 if (tmp->vm_ops && tmp->vm_ops->open) tmp->vm_ops->open(tmp); diff --git a/mm/memory.c b/mm/memory.c index e315b1f1ef08..4c56d7b92b0e 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -819,6 +819,7 @@ copy_present_pte(struct mm_struct *dst_mm, struct mm_= struct *src_mm, =20 static int copy_pte_range(struct mm_struct *dst_mm, struct mm_struct *sr= c_mm, pmd_t *dst_pmd, pmd_t *src_pmd, struct vm_area_struct *vma, + struct vm_area_struct *new, unsigned long addr, unsigned long end) { pte_t *orig_src_pte, *orig_dst_pte; @@ -889,6 +890,7 @@ static int copy_pte_range(struct mm_struct *dst_mm, s= truct mm_struct *src_mm, =20 static inline int copy_pmd_range(struct mm_struct *dst_mm, struct mm_str= uct *src_mm, pud_t *dst_pud, pud_t *src_pud, struct vm_area_struct *vma, + struct vm_area_struct *new, unsigned long addr, unsigned long end) { pmd_t *src_pmd, *dst_pmd; @@ -915,7 +917,7 @@ static inline int copy_pmd_range(struct mm_struct *ds= t_mm, struct mm_struct *src if (pmd_none_or_clear_bad(src_pmd)) continue; if (copy_pte_range(dst_mm, src_mm, dst_pmd, src_pmd, - vma, addr, next)) + vma, new, addr, next)) return -ENOMEM; } while (dst_pmd++, src_pmd++, addr =3D next, addr !=3D end); return 0; @@ -923,6 +925,7 @@ static inline int copy_pmd_range(struct mm_struct *ds= t_mm, struct mm_struct *src =20 static inline int copy_pud_range(struct mm_struct *dst_mm, struct mm_str= uct *src_mm, p4d_t *dst_p4d, p4d_t *src_p4d, struct vm_area_struct *vma, + struct vm_area_struct *new, unsigned long addr, unsigned long end) { pud_t *src_pud, *dst_pud; @@ -949,7 +952,7 @@ static inline int copy_pud_range(struct mm_struct *ds= t_mm, struct mm_struct *src if (pud_none_or_clear_bad(src_pud)) continue; if (copy_pmd_range(dst_mm, src_mm, dst_pud, src_pud, - vma, addr, next)) + vma, new, addr, next)) return -ENOMEM; } while (dst_pud++, src_pud++, addr =3D next, addr !=3D end); return 0; @@ -957,6 +960,7 @@ static inline int copy_pud_range(struct mm_struct *ds= t_mm, struct mm_struct *src =20 static inline int copy_p4d_range(struct mm_struct *dst_mm, struct mm_str= uct *src_mm, pgd_t *dst_pgd, pgd_t *src_pgd, struct vm_area_struct *vma, + struct vm_area_struct *new, unsigned long addr, unsigned long end) { p4d_t *src_p4d, *dst_p4d; @@ -971,14 +975,14 @@ static inline int copy_p4d_range(struct mm_struct *= dst_mm, struct mm_struct *src if (p4d_none_or_clear_bad(src_p4d)) continue; if (copy_pud_range(dst_mm, src_mm, dst_p4d, src_p4d, - vma, addr, next)) + vma, new, addr, next)) return -ENOMEM; } while (dst_p4d++, src_p4d++, addr =3D next, addr !=3D end); return 0; } =20 int copy_page_range(struct mm_struct *dst_mm, struct mm_struct *src_mm, - struct vm_area_struct *vma) + struct vm_area_struct *vma, struct vm_area_struct *new) { pgd_t *src_pgd, *dst_pgd; unsigned long next; @@ -1033,7 +1037,7 @@ int copy_page_range(struct mm_struct *dst_mm, struc= t mm_struct *src_mm, if (pgd_none_or_clear_bad(src_pgd)) continue; if (unlikely(copy_p4d_range(dst_mm, src_mm, dst_pgd, src_pgd, - vma, addr, next))) { + vma, new, addr, next))) { ret =3D -ENOMEM; break; } --=20 2.26.2