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=-7.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 A2E53C433E5 for ; Thu, 16 Jul 2020 06:38:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5DA19206F5 for ; Thu, 16 Jul 2020 06:38:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="A3RvqCgs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5DA19206F5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B984A6B0007; Thu, 16 Jul 2020 02:38:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B22A96B0008; Thu, 16 Jul 2020 02:38:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9E9956B000C; Thu, 16 Jul 2020 02:38:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0080.hostedemail.com [216.40.44.80]) by kanga.kvack.org (Postfix) with ESMTP id 853376B0007 for ; Thu, 16 Jul 2020 02:38:06 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 1BB392DFA for ; Thu, 16 Jul 2020 06:38:06 +0000 (UTC) X-FDA: 77042984172.15.face18_520c89926f00 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id E2FD41814B0C1 for ; Thu, 16 Jul 2020 06:38:05 +0000 (UTC) X-HE-Tag: face18_520c89926f00 X-Filterd-Recvd-Size: 7025 Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) by imf27.hostedemail.com (Postfix) with ESMTP for ; Thu, 16 Jul 2020 06:38:05 +0000 (UTC) Received: by mail-lj1-f195.google.com with SMTP id h22so5836631lji.9 for ; Wed, 15 Jul 2020 23:38:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=YaSPUbyvBCVCojGQeoPnqHkyJKZ1ja3Lr18Jje7cOqY=; b=A3RvqCgsImn89jAmBAQl0jPkTGXm/qIASiHFdjKuJcvSnzMb7UwKbZPXvRK8ksXBe6 AHM3R3SiVqGkpawVE4KKXz+kX/RL1W75jq5DZGoysquqtbt3bsvgKrY54HJvqviQXjV5 95JOjbz1I3BJyEoOE6XyT+UNMnAc2JGrLyIas6TJSznkXgEKBN627ynk8DSDD9SyT5M+ Awoz1UQbqFptDo7wkZLfH75lSZ/79SNBBDb7ypq/refpjHrGwRZPtIoykmUtTKCDtL8C jEG7Lxu8jjhTeoquReZoxynfD7eOy0CkSmENMNHGZFx2/K+VEI/UecbAMaxbzifkYBzm i7Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=YaSPUbyvBCVCojGQeoPnqHkyJKZ1ja3Lr18Jje7cOqY=; b=le4okectXP89jhNtTnpLxH86lZJCiM6X8+PskNiwudCI0JBRQoh5thIzSEwW87s5Qe L+c1QGUIz67iYP+pn7kaavqJr4TTXjSYC1UixYIKVebtfGWmrf6OAFnxwH/4YIyPbIuj HCpuihcF4855r4W9MKEJfPG0wc+64QGzuR9f4qM46Lmk/4dJSHYf2zu2ldhT8hkt3TNa g+JnRtCvObCeUFRMF1SWxZA4J9Fm26ZYKTNoclFUw4bsPUYKHP+cSTvxRTPtBxwgJwfs io6cxLn3sZFGR3BUc+6KsnLOXGuunTF5iUonV6TmNsVFJnEwO7dcj0MRQHrcTIOIyoZ9 Ka7w== X-Gm-Message-State: AOAM533WGjwW87RJwEMdlmqbAgzYNzwEWgTVmm94l5jIu/CsOXdP7g37 Yz6QAc8Ubh0aUlon7vksw8qg/gzgaAZBExcuZtmuNw== X-Google-Smtp-Source: ABdhPJzl7MxZcRPZMcYe7FvBIvod+nuK2T3TXFDebC9bRcZP9xfmG1URn2nQMXs8vQhd38i87QcLVdvPUM+if6b5lzw= X-Received: by 2002:a2e:9857:: with SMTP id e23mr1322227ljj.411.1594881483731; Wed, 15 Jul 2020 23:38:03 -0700 (PDT) MIME-Version: 1.0 References: <20200715135011.42743-1-kirill.shutemov@linux.intel.com> <20200715205428.GA201569@google.com> <20200715222228.jf2pv5u2wyhtc5o5@box> In-Reply-To: From: Naresh Kamboju Date: Thu, 16 Jul 2020 12:07:52 +0530 Message-ID: Subject: Re: [PATCHv2] mm: Fix warning in move_normal_pmd() To: Linus Torvalds Cc: "Kirill A. Shutemov" , Joel Fernandes , "Kirill A. Shutemov" , Andrew Morton , Linux-MM , Linux Kernel Mailing List , William Kucharski Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: E2FD41814B0C1 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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: On Thu, 16 Jul 2020 at 04:49, Linus Torvalds wrote: > > On Wed, Jul 15, 2020 at 4:04 PM Linus Torvalds > wrote: > > > > It *might* be as simple as this incremental thing on top > > No, it needs to be > > + if (*old_addr + *len < old->vm_end) > + return; > > in try_to_align_end(), of course. > > Now I'm going for a lie-down, because this cross-eyed thing isn't working. Just want to double check. Here is the diff after those two patches applied. Please correct me if it is wrong. This patch applied on top of Linus mainline master branch. I am starting my test cycles. --- mm/mremap.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/mm/mremap.c b/mm/mremap.c index 6b153dc05fe4..4961c18d2008 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -254,6 +254,77 @@ static bool move_normal_pmd(struct vm_area_struct *vma, unsigned long old_addr, return true; } + +#define ADDR_BEFORE_PREV(addr, vma) \ + ((vma)->vm_prev && (addr) < (vma)->vm_prev->vm_end) + +static inline void try_to_align_start(unsigned long *len, + struct vm_area_struct *old, unsigned long *old_addr, + struct vm_area_struct *new, unsigned long *new_addr) +{ + if (*old_addr > old->vm_start) + return; + + if (ADDR_BEFORE_PREV(*old_addr & PMD_MASK, old)) + return; + + if (ADDR_BEFORE_PREV(*new_addr & PMD_MASK, new)) + return; + + /* Bingo! */ + *len += *new_addr & ~PMD_MASK; + *old_addr &= PMD_MASK; + *new_addr &= PMD_MASK; +} + +/* + * When aligning the end, avoid ALIGN() (which can overflow + * if the user space is the full address space, and overshoot + * the vm_start of the next vma). + * + * Align the upper limit down instead, and check that it's not + * in the same PMD as the end. + */ +#define ADDR_AFTER_NEXT(addr, vma) \ + ((vma)->vm_next && (addr) > (PMD_MASK & (vma)->vm_next->vm_start)) + +static inline void try_to_align_end(unsigned long *len, + struct vm_area_struct *old, unsigned long *old_addr, + struct vm_area_struct *new, unsigned long *new_addr) +{ + if (*old_addr < old->vm_end) + return; + + if (ADDR_AFTER_NEXT(*old_addr + *len, old)) + return; + + if (ADDR_AFTER_NEXT(*new_addr + *len, new)) + return; + + /* Mutual alignment means this is same for new/old addr */ + *len = ALIGN(*new_addr + *len, PMD_SIZE) - *new_addr; +} + +/* + * The PMD move case is much more efficient, so if we have the + * mutually aligned case, try to see if we can extend the + * beginning and end to be aligned too. + * + * The pointer dereferences look bad, but with inlining, the + * compiler will sort it out. + */ +static inline void try_to_align_range(unsigned long *len, + struct vm_area_struct *old, unsigned long *old_addr, + struct vm_area_struct *new, unsigned long *new_addr) +{ + if ((*old_addr ^ *new_addr) & ~PMD_MASK) + return; + + try_to_align_start(len, old, old_addr, new, new_addr); + try_to_align_end(len, old, old_addr, new, new_addr); +} +#else +#define try_to_align_range(len,old,olda,new,newa) do { } while(0); #endif unsigned long move_page_tables(struct vm_area_struct *vma, @@ -272,6 +343,8 @@ unsigned long move_page_tables(struct vm_area_struct *vma, old_addr, old_end); mmu_notifier_invalidate_range_start(&range); + try_to_align_range(&len, vma, &old_addr, new_vma, &new_addr); + for (; old_addr < old_end; old_addr += extent, new_addr += extent) { cond_resched(); next = (old_addr + PMD_SIZE) & PMD_MASK; -- 2.27.0 > > Linus - Naresh