From patchwork Mon May 22 13:36:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Punit Agrawal X-Patchwork-Id: 9740365 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0530A6034C for ; Mon, 22 May 2017 13:42:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E6B4A28500 for ; Mon, 22 May 2017 13:42:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DB0DD28641; Mon, 22 May 2017 13:42:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 91F1828500 for ; Mon, 22 May 2017 13:42:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=W1tnUdhclHsFdJNxMag/GehJ8tpFDAlNTFvMrjYC/NY=; b=L85AJ9i83h2VLnYGHI0f/ODYWf 51ZxzZ7FERKRQYVw31e1h3kBOVyEaYGlcMjNrOKmrWXbBrtnZY34w65eqkWHdsVfK89ZfPL1NMcW8 6PLVPM0fsKmI/sKUClbensAj28FTKxJwf7of10TWq7eHwg7StWBbGHh8RBfOLR0obbPugZm04t/8/ iYhwZMqyuqio8uNr94SpuUR4c/0p0UcayHS1fItjwvLhTyqIaANqCyoNChsvM3m5KZx5r8b+85qB9 nVgfMwYwwN0ijnQ78O4/2XHFvb1FCpoV2WtB5zQmitjyC1P3kCfdcWpdBs11SO+OuvFAOk644ERcq gKVVqkqQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dCnbJ-0003Qg-5l; Mon, 22 May 2017 13:42:21 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dCnWe-0008IR-Gi for linux-arm-kernel@bombadil.infradead.org; Mon, 22 May 2017 13:37:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=/T5aoxN4CixsggaMcqA4bxOcrVf0yrge43ZV3GMRJis=; b=DT4lmrfkjDSFw7lMy2Hea5KJd 3zlC5bu7726DD66Usz3V/o0A9DjODEZW68PH8qIbjnO8S3R9cy3pjqY5sbEPJ2IKBNYQiRKZb1urv w/AJHQMlsr/XlkpDe6txhjXDCFkKZwt/7rFO+PsRKD5OPXAPrs48hRQ5ZT9WGTJjwT5P2oOsnwu4W 5mDoroItRnhODiAW3idxKHQHpHpyeQKansKpi6B6EMO3HiZYflSCOY5Y38IPQlTm6neK0wkcR7gOh 75C++pgGeIxoyF0tY5Mar/W5RVamacfmJXVMaudFQOUWFJwxw2Aa62J60pLpEahBg8K7JVa9OnTaq d+cLBeODw==; Received: from foss.arm.com ([217.140.101.70]) by merlin.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dCnWc-0006tN-GA for linux-arm-kernel@lists.infradead.org; Mon, 22 May 2017 13:37:31 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C09061682; Mon, 22 May 2017 06:37:13 -0700 (PDT) Received: from localhost (e105922-lin.cambridge.arm.com [10.1.207.56]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8ECFD3F53D; Mon, 22 May 2017 06:37:13 -0700 (PDT) From: Punit Agrawal To: akpm@linux-foundation.org Subject: [PATCH v3 5/6] mm/hugetlb: Introduce set_huge_swap_pte_at() helper Date: Mon, 22 May 2017 14:36:03 +0100 Message-Id: <20170522133604.11392-6-punit.agrawal@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170522133604.11392-1-punit.agrawal@arm.com> References: <20170522133604.11392-1-punit.agrawal@arm.com> X-ARM-No-Footer: FoSSMail X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170522_093730_704252_7ECB1A3D X-CRM114-Status: GOOD ( 11.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, linux-arch@vger.kernel.org, hillf.zj@alibaba-inc.com, steve.capper@arm.com, aneesh.kumar@linux.vnet.ibm.com, catalin.marinas@arm.com, Punit Agrawal , will.deacon@arm.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, kirill.shutemov@linux.intel.com, n-horiguchi@ah.jp.nec.com, linux-arm-kernel@lists.infradead.org, mike.kravetz@oracle.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP set_huge_pte_at(), an architecture callback to populate hugepage ptes, does not provide the range of virtual memory that is targeted. This leads to ambiguity when dealing with swap entries on architectures that support hugepages consisting of contiguous ptes. Fix the problem by introducing an overridable helper that is called when populating the page tables with swap entries. The size of the targeted region is provided to the helper to help determine the number of entries to be updated. Provide a default implementation that maintains the current behaviour. Signed-off-by: Punit Agrawal Acked-by: Steve Capper Cc: Mike Kravetz Cc: "Aneesh Kumar K.V" --- include/linux/hugetlb.h | 2 ++ mm/hugetlb.c | 14 +++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 23010a3b2047..fa65ad73a65f 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -127,6 +127,8 @@ int pud_huge(pud_t pud); unsigned long hugetlb_change_protection(struct vm_area_struct *vma, unsigned long address, unsigned long end, pgprot_t newprot); +void set_huge_swap_pte_at(struct mm_struct *mm, unsigned long addr, + pte_t *ptep, pte_t pte, unsigned long sz); #else /* !CONFIG_HUGETLB_PAGE */ static inline void reset_vma_resv_huge_pages(struct vm_area_struct *vma) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 2b0f6f96f2c1..a27e926913f4 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3211,6 +3211,12 @@ static int is_hugetlb_entry_hwpoisoned(pte_t pte) return 0; } +void __weak set_huge_swap_pte_at(struct mm_struct *mm, unsigned long addr, + pte_t *ptep, pte_t pte, unsigned long sz) +{ + set_huge_pte_at(mm, addr, ptep, pte); +} + int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, struct vm_area_struct *vma) { @@ -3263,9 +3269,10 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, */ make_migration_entry_read(&swp_entry); entry = swp_entry_to_pte(swp_entry); - set_huge_pte_at(src, addr, src_pte, entry); + set_huge_swap_pte_at(src, addr, src_pte, + entry, sz); } - set_huge_pte_at(dst, addr, dst_pte, entry); + set_huge_swap_pte_at(dst, addr, dst_pte, entry, sz); } else { if (cow) { huge_ptep_set_wrprotect(src, addr, src_pte); @@ -4283,7 +4290,8 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma, make_migration_entry_read(&entry); newpte = swp_entry_to_pte(entry); - set_huge_pte_at(mm, address, ptep, newpte); + set_huge_swap_pte_at(mm, address, ptep, + newpte, huge_page_size(h)); pages++; } spin_unlock(ptl);