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=-9.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 00CA3C433E1 for ; Fri, 29 May 2020 03:00:37 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B8E6520814 for ; Fri, 29 May 2020 03:00:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="aEfaBOfM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B8E6520814 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 15216800D4; Thu, 28 May 2020 22:58:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0DE31800D3; Thu, 28 May 2020 22:58:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F0D43800D4; Thu, 28 May 2020 22:58:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0138.hostedemail.com [216.40.44.138]) by kanga.kvack.org (Postfix) with ESMTP id CFC08800D3 for ; Thu, 28 May 2020 22:58:34 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 9B11C181AEF0B for ; Fri, 29 May 2020 02:58:34 +0000 (UTC) X-FDA: 76868248548.13.rice72_10a190cf18700 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin13.hostedemail.com (Postfix) with ESMTP id 8028F18140B67 for ; Fri, 29 May 2020 02:58:34 +0000 (UTC) X-HE-Tag: rice72_10a190cf18700 X-Filterd-Recvd-Size: 6150 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf08.hostedemail.com (Postfix) with ESMTP for ; Fri, 29 May 2020 02:58:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=YpNOcOmQ2EiLs3AdppJEAuW3m0dTwOL20RLpwBVbMOo=; b=aEfaBOfM4JhC4kP3HQDlPVA0L7 7Yffsjt3lSI6NNyGjLyJkcUOJwJxg5sQ4tvNfWOjxIv7UJ2Td923Pdy+30Xh2/0a46AjpiXqaEWTH k3VjvlRpRsBNmnpdAxbY2235m94Hh/Ha/zpXecose30QfmvmlD7WLnQN5+XP9EqjIevmC3hHuGBUT SXB2qd+kHNX7yYu63WFbULj9bzPWq+ufkTtJW0W2Fsj1OlN6sR8BIYuByCt4AUat4SsH4e+nblg7C xVQyUOmlIvYUxWv1rsr3Mfg+gkkUn6CGh7xTP6NQ7I0gC5gWzbD/0sV0HJkJxM5w3X6k805uzE7YP FFoRGQ0Q==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jeVE2-0008Pu-Nv; Fri, 29 May 2020 02:58:26 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, David Hildenbrand Subject: [PATCH v5 04/39] mm: Introduce thp_size Date: Thu, 28 May 2020 19:57:49 -0700 Message-Id: <20200529025824.32296-5-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200529025824.32296-1-willy@infradead.org> References: <20200529025824.32296-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 8028F18140B67 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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: From: "Matthew Wilcox (Oracle)" This is like page_size(), but compiles down to just PAGE_SIZE if THP are disabled. Convert the users of hpage_nr_pages() which would prefer this interface. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: David Hildenbrand --- drivers/nvdimm/btt.c | 4 +--- drivers/nvdimm/pmem.c | 6 ++---- include/linux/huge_mm.h | 7 +++++++ mm/internal.h | 2 +- mm/page_io.c | 2 +- mm/page_vma_mapped.c | 4 ++-- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c index 3b09419218d6..78e8d972d45a 100644 --- a/drivers/nvdimm/btt.c +++ b/drivers/nvdimm/btt.c @@ -1488,10 +1488,8 @@ static int btt_rw_page(struct block_device *bdev, = sector_t sector, { struct btt *btt =3D bdev->bd_disk->private_data; int rc; - unsigned int len; =20 - len =3D hpage_nr_pages(page) * PAGE_SIZE; - rc =3D btt_do_bvec(btt, NULL, page, len, 0, op, sector); + rc =3D btt_do_bvec(btt, NULL, page, thp_size(page), 0, op, sector); if (rc =3D=3D 0) page_endio(page, op_is_write(op), 0); =20 diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 2df6994acf83..d511504d07af 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -235,11 +235,9 @@ static int pmem_rw_page(struct block_device *bdev, s= ector_t sector, blk_status_t rc; =20 if (op_is_write(op)) - rc =3D pmem_do_write(pmem, page, 0, sector, - hpage_nr_pages(page) * PAGE_SIZE); + rc =3D pmem_do_write(pmem, page, 0, sector, thp_size(page)); else - rc =3D pmem_do_read(pmem, page, 0, sector, - hpage_nr_pages(page) * PAGE_SIZE); + rc =3D pmem_do_read(pmem, page, 0, sector, thp_size(page)); /* * The ->rw_page interface is subtle and tricky. The core * retries on any error, so we can only invoke page_endio() in diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 6bec4b5b61e1..e944f9757349 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -271,6 +271,11 @@ static inline int hpage_nr_pages(struct page *page) return compound_nr(page); } =20 +static inline unsigned long thp_size(struct page *page) +{ + return page_size(page); +} + struct page *follow_devmap_pmd(struct vm_area_struct *vma, unsigned long= addr, pmd_t *pmd, int flags, struct dev_pagemap **pgmap); struct page *follow_devmap_pud(struct vm_area_struct *vma, unsigned long= addr, @@ -329,6 +334,8 @@ static inline int hpage_nr_pages(struct page *page) return 1; } =20 +#define thp_size(x) PAGE_SIZE + static inline bool __transparent_hugepage_enabled(struct vm_area_struct = *vma) { return false; diff --git a/mm/internal.h b/mm/internal.h index f762a34b0c57..5efb13d5c226 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -386,7 +386,7 @@ vma_address(struct page *page, struct vm_area_struct = *vma) unsigned long start, end; =20 start =3D __vma_address(page, vma); - end =3D start + PAGE_SIZE * (hpage_nr_pages(page) - 1); + end =3D start + thp_size(page) - PAGE_SIZE; =20 /* page should be within @vma mapping range */ VM_BUG_ON_VMA(end < vma->vm_start || start >=3D vma->vm_end, vma); diff --git a/mm/page_io.c b/mm/page_io.c index 76965be1d40e..dd935129e3cb 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -41,7 +41,7 @@ static struct bio *get_swap_bio(gfp_t gfp_flags, bio->bi_iter.bi_sector <<=3D PAGE_SHIFT - 9; bio->bi_end_io =3D end_io; =20 - bio_add_page(bio, page, PAGE_SIZE * hpage_nr_pages(page), 0); + bio_add_page(bio, page, thp_size(page), 0); } return bio; } diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c index 719c35246cfa..e65629c056e8 100644 --- a/mm/page_vma_mapped.c +++ b/mm/page_vma_mapped.c @@ -227,7 +227,7 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk= *pvmw) if (pvmw->address >=3D pvmw->vma->vm_end || pvmw->address >=3D __vma_address(pvmw->page, pvmw->vma) + - hpage_nr_pages(pvmw->page) * PAGE_SIZE) + thp_size(pvmw->page)) return not_found(pvmw); /* Did we cross page table boundary? */ if (pvmw->address % PMD_SIZE =3D=3D 0) { @@ -268,7 +268,7 @@ int page_mapped_in_vma(struct page *page, struct vm_a= rea_struct *vma) unsigned long start, end; =20 start =3D __vma_address(page, vma); - end =3D start + PAGE_SIZE * (hpage_nr_pages(page) - 1); + end =3D start + thp_size(page) - PAGE_SIZE; =20 if (unlikely(end < vma->vm_start || start >=3D vma->vm_end)) return 0; --=20 2.26.2