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.6 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,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 CA6C8C433E0 for ; Wed, 10 Jun 2020 20:39:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 84871206A4 for ; Wed, 10 Jun 2020 20:39:59 +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="QwUVdJWy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 84871206A4 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 1EE368D0035; Wed, 10 Jun 2020 16:39:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 178578D0033; Wed, 10 Jun 2020 16:39:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E96CC8D0035; Wed, 10 Jun 2020 16:39:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0052.hostedemail.com [216.40.44.52]) by kanga.kvack.org (Postfix) with ESMTP id C52FE8D0033 for ; Wed, 10 Jun 2020 16:39:36 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 6A04816926 for ; Wed, 10 Jun 2020 20:39:36 +0000 (UTC) X-FDA: 76914467952.21.lace05_0b04bd926dce Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id 36B5F18043C62 for ; Wed, 10 Jun 2020 20:39:36 +0000 (UTC) X-HE-Tag: lace05_0b04bd926dce X-Filterd-Recvd-Size: 5826 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf31.hostedemail.com (Postfix) with ESMTP for ; Wed, 10 Jun 2020 20:39:35 +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=hN/37aRhgzzO2Cu+X3jM7dH/y9JI16FETpuj+qe6qfM=; b=QwUVdJWyV9AHqtytLyaTzSg1RZ kKswsI3XPSy5+PmHAHPn+IveskrPZkD0lYCK/fdORj5YqbXlf8G6s9Dof2YbI9MRAN3tsIrsZ96hG E0lGakXh9umHZL1X9hL/6QIHgX7aSvFrNX1RHgeLvolIXInjJ6egbVKpwLEFNH63bsxx509TgCDSW ZaLRdHZgqSQWM9FR2vOjSaENRdjvsgKbDYKoBNjlrM+yEufRk1DOREwTa365Q4gtnmVDNgpltmZUz uxeHZCGRVQQrkch+HQL0YIX8PCkPYLG5c2mwiIqeed6eILT99YYWw96fyldiEh4vXfC/g956oIZkE Llbi9A2A==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jj76Z-0003Tn-J6; Wed, 10 Jun 2020 20:13:47 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 09/51] mm: Add thp_size Date: Wed, 10 Jun 2020 13:13:03 -0700 Message-Id: <20200610201345.13273-10-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200610201345.13273-1-willy@infradead.org> References: <20200610201345.13273-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 36B5F18043C62 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 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 function returns the number of bytes in a THP. It is like page_size(), but compiles to just PAGE_SIZE if CONFIG_TRANSPARENT_HUGEPAG= E is disabled. Signed-off-by: Matthew Wilcox (Oracle) --- drivers/nvdimm/btt.c | 4 +--- drivers/nvdimm/pmem.c | 6 ++---- include/linux/huge_mm.h | 11 +++++++++++ mm/internal.h | 2 +- mm/page_io.c | 2 +- mm/page_vma_mapped.c | 4 ++-- 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c index 90c0c4bbe77b..7255cfe6ebe2 100644 --- a/drivers/nvdimm/btt.c +++ b/drivers/nvdimm/btt.c @@ -1490,10 +1490,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 d1ecd6da11a2..d1999c266b20 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -238,11 +238,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 dd19720a8bc2..0ec3b5a73d38 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -469,4 +469,15 @@ static inline bool thp_migration_supported(void) } #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ =20 +/** + * thp_size - Size of a transparent huge page. + * @page: Head page of a transparent huge page. + * + * Return: Number of bytes in this page. + */ +static inline unsigned long thp_size(struct page *page) +{ + return PAGE_SIZE << thp_order(page); +} + #endif /* _LINUX_HUGE_MM_H */ diff --git a/mm/internal.h b/mm/internal.h index 9886db20d94f..de9f1d0ba5fc 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -395,7 +395,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 e8726f3e3820..888000d1a8cc 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -40,7 +40,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