From: Vlastimil Babka <vbabka@suse.cz>
To: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
Andrea Arcangeli <aarcange@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/4] thp: reduce indentation level in change_huge_pmd()
Date: Wed, 12 Apr 2017 13:37:51 +0200 [thread overview]
Message-ID: <a33e10b7-9785-1c92-f12d-d56713835d10@suse.cz> (raw)
In-Reply-To: <20170302151034.27829-2-kirill.shutemov@linux.intel.com>
On 03/02/2017 04:10 PM, Kirill A. Shutemov wrote:
> Restructure code in preparation for a fix.
>
> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
> ---
> mm/huge_memory.c | 52 ++++++++++++++++++++++++++--------------------------
> 1 file changed, 26 insertions(+), 26 deletions(-)
>
> diff --git a/mm/huge_memory.c b/mm/huge_memory.c
> index 71e3dede95b4..e7ce73b2b208 100644
> --- a/mm/huge_memory.c
> +++ b/mm/huge_memory.c
> @@ -1722,37 +1722,37 @@ int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
> {
> struct mm_struct *mm = vma->vm_mm;
> spinlock_t *ptl;
> - int ret = 0;
> + pmd_t entry;
> + bool preserve_write;
> + int ret;
>
> ptl = __pmd_trans_huge_lock(pmd, vma);
> - if (ptl) {
> - pmd_t entry;
> - bool preserve_write = prot_numa && pmd_write(*pmd);
> - ret = 1;
> + if (!ptl)
> + return 0;
>
> - /*
> - * Avoid trapping faults against the zero page. The read-only
> - * data is likely to be read-cached on the local CPU and
> - * local/remote hits to the zero page are not interesting.
> - */
> - if (prot_numa && is_huge_zero_pmd(*pmd)) {
> - spin_unlock(ptl);
> - return ret;
> - }
> + preserve_write = prot_numa && pmd_write(*pmd);
> + ret = 1;
>
> - if (!prot_numa || !pmd_protnone(*pmd)) {
> - entry = pmdp_huge_get_and_clear_notify(mm, addr, pmd);
> - entry = pmd_modify(entry, newprot);
> - if (preserve_write)
> - entry = pmd_mk_savedwrite(entry);
> - ret = HPAGE_PMD_NR;
> - set_pmd_at(mm, addr, pmd, entry);
> - BUG_ON(vma_is_anonymous(vma) && !preserve_write &&
> - pmd_write(entry));
> - }
> - spin_unlock(ptl);
> - }
> + /*
> + * Avoid trapping faults against the zero page. The read-only
> + * data is likely to be read-cached on the local CPU and
> + * local/remote hits to the zero page are not interesting.
> + */
> + if (prot_numa && is_huge_zero_pmd(*pmd))
> + goto unlock;
>
> + if (prot_numa && pmd_protnone(*pmd))
> + goto unlock;
> +
> + entry = pmdp_huge_get_and_clear_notify(mm, addr, pmd);
> + entry = pmd_modify(entry, newprot);
> + if (preserve_write)
> + entry = pmd_mk_savedwrite(entry);
> + ret = HPAGE_PMD_NR;
> + set_pmd_at(mm, addr, pmd, entry);
> + BUG_ON(vma_is_anonymous(vma) && !preserve_write && pmd_write(entry));
> +unlock:
> + spin_unlock(ptl);
> return ret;
> }
>
>
next prev parent reply other threads:[~2017-04-12 11:37 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-02 15:10 [PATCH 0/4] thp: fix few MADV_DONTNEED races Kirill A. Shutemov
2017-03-02 15:10 ` [PATCH 1/4] thp: reduce indentation level in change_huge_pmd() Kirill A. Shutemov
2017-04-12 11:37 ` Vlastimil Babka [this message]
2017-03-02 15:10 ` [PATCH 2/4] thp: fix MADV_DONTNEED vs. numa balancing race Kirill A. Shutemov
2017-03-03 17:17 ` Dave Hansen
2017-04-12 13:33 ` Vlastimil Babka
2017-05-16 14:54 ` Vlastimil Babka
2017-05-16 20:29 ` Andrea Arcangeli
2017-05-23 12:42 ` Vlastimil Babka
2017-06-09 8:21 ` Vlastimil Babka
2017-03-02 15:10 ` [PATCH 3/4] thp: fix MADV_DONTNEED vs. MADV_FREE race Kirill A. Shutemov
2017-03-03 5:35 ` Hillf Danton
2017-03-03 10:26 ` Kirill A. Shutemov
2017-03-06 1:44 ` Minchan Kim
2017-03-07 14:04 ` Kirill A. Shutemov
2017-03-06 2:49 ` Aneesh Kumar K.V
2017-03-07 13:52 ` Kirill A. Shutemov
2017-03-02 15:10 ` [PATCH 4/4] thp: fix MADV_DONTNEED vs clear soft dirty race Kirill A. Shutemov
2017-03-03 22:29 ` Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a33e10b7-9785-1c92-f12d-d56713835d10@suse.cz \
--to=vbabka@suse.cz \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).