Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Content-Type: text/plain;
        charset=utf-8
Mime-Version: 1.0 (Mac OS X Mail 13.0 \(3566.0.1\))
Subject: Re: [PATCH 2/3] sgi-gru: Remove CONFIG_HUGETLB_PAGE ifdef
From:   William Kucharski <william.kucharski@oracle.com>
In-Reply-To: <1563724685-6540-3-git-send-email-linux.bhar@gmail.com>
Date:   Sun, 21 Jul 2019 21:20:38 -0600
Cc:     arnd@arndb.de, sivanich@sgi.com, gregkh@linuxfoundation.org,
        ira.weiny@intel.com, jhubbard@nvidia.com, jglisse@redhat.com,
        linux-kernel@vger.kernel.org, linux-mm@kvack.org
Content-Transfer-Encoding: quoted-printable
Message-Id: <1BA84A99-4EB5-4520-BFBD-CD60D5B7AED9@oracle.com>
References: <1563724685-6540-1-git-send-email-linux.bhar@gmail.com>
 <1563724685-6540-3-git-send-email-linux.bhar@gmail.com>
To:     Bharath Vedartham <linux.bhar@gmail.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

I suspect I'm being massively pedantic here, but the comments for =
atomic_pte_lookup() note:

 * Only supports Intel large pages (2MB only) on x86_64.
 *	ZZZ - hugepage support is incomplete

That makes me wonder how many systems using this hardware are actually =
configured with CONFIG_HUGETLB_PAGE.

I ask as in the most common case, this is likely introducing a few extra =
instructions and possibly an additional branch to a routine that is =
called per-fault.

So the nit-picky questions are:

1) Does the code really need to be cleaned up in this way?

2) If it does, does it make more sense (given the way pmd_large() is =
handled now in atomic_pte_lookup()) for this to be coded as:

if (unlikely(is_vm_hugetlb_page(vma)))
	*pageshift =3D HPAGE_SHIFT;
else
	*pageshift =3D PAGE_SHIFT;

In all likelihood, these questions are no-ops, and the optimizer may =
even make my questions completely moot, but I thought I might as well =
ask anyway.


> On Jul 21, 2019, at 9:58 AM, Bharath Vedartham <linux.bhar@gmail.com> =
wrote:
>=20
> is_vm_hugetlb_page has checks for whether CONFIG_HUGETLB_PAGE is =
defined
> or not. If CONFIG_HUGETLB_PAGE is not defined is_vm_hugetlb_page will
> always return false. There is no need to have an uneccessary
> CONFIG_HUGETLB_PAGE check in the code.
>=20
> Cc: Ira Weiny <ira.weiny@intel.com>
> Cc: John Hubbard <jhubbard@nvidia.com>
> Cc: J=C3=A9r=C3=B4me Glisse <jglisse@redhat.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Dimitri Sivanich <sivanich@sgi.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: linux-kernel@vger.kernel.org
> Cc: linux-mm@kvack.org
> Signed-off-by: Bharath Vedartham <linux.bhar@gmail.com>
> ---
> drivers/misc/sgi-gru/grufault.c | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>=20
> diff --git a/drivers/misc/sgi-gru/grufault.c =
b/drivers/misc/sgi-gru/grufault.c
> index 61b3447..75108d2 100644
> --- a/drivers/misc/sgi-gru/grufault.c
> +++ b/drivers/misc/sgi-gru/grufault.c
> @@ -180,11 +180,8 @@ static int non_atomic_pte_lookup(struct =
vm_area_struct *vma,
> {
> 	struct page *page;
>=20
> -#ifdef CONFIG_HUGETLB_PAGE
> 	*pageshift =3D is_vm_hugetlb_page(vma) ? HPAGE_SHIFT : =
PAGE_SHIFT;
> -#else
> -	*pageshift =3D PAGE_SHIFT;
> -#endif
> +
> 	if (get_user_pages(vaddr, 1, write ? FOLL_WRITE : 0, &page, =
NULL) <=3D 0)
> 		return -EFAULT;
> 	*paddr =3D page_to_phys(page);
> @@ -238,11 +235,9 @@ static int atomic_pte_lookup(struct =
vm_area_struct *vma, unsigned long vaddr,
> 		return 1;
>=20
> 	*paddr =3D pte_pfn(pte) << PAGE_SHIFT;
> -#ifdef CONFIG_HUGETLB_PAGE
> +
> 	*pageshift =3D is_vm_hugetlb_page(vma) ? HPAGE_SHIFT : =
PAGE_SHIFT;
> -#else
> -	*pageshift =3D PAGE_SHIFT;
> -#endif
> +
> 	return 0;
>=20
> err:
> --=20
> 2.7.4
>=20