Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp5794407pxu; Thu, 22 Oct 2020 11:11:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUe7Yyur80gUQwTVrP8kqSZ5xiLJId9+ZZ3CWz5VpALg9bRwFzE1hwQgryHhgS/vQ57lNZ X-Received: by 2002:a50:f78b:: with SMTP id h11mr3322646edn.329.1603390261728; Thu, 22 Oct 2020 11:11:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603390261; cv=none; d=google.com; s=arc-20160816; b=G3uW4TTk9SeeqLczc1RAZCSLnnnQt9oFQkNoLa4N4rrh71S8plghDlEZFMVhZcNoFU yPdg2QU2dpk1bUjJaNlSC6DqidZ/v4emMT49PT3C0ywmKD12vemLVpvIJErPMMSrnHct jKRFQppgMy0JLVmoxw6dgq7fvAP5UzsTyqxfW7RaaPG+jN/Ijk4J5j80JOn3Pdgovun/ u8ki5n7qkNApGnJd9sliLoNSXBYBMHkrZd8JGPAilhFOhNNdPTaXGG+dAfYrk6/wKd+O DBE5BNLZskVbQQrsAaVxyCLzRTWmXFePPBbbvAgU2x2XiuYK2hoGWakmDe+h2HIn0cPq 7zmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:date:cc:to:from:subject:message-id; bh=1hwDuN1ojep5NuXLYQ2cWGbhNV4F+7aT9LHMKlctqVs=; b=FYqO4SzwruJKcJamI23ZUqflmQLyFp3IHwbutuIfOkta+SmaOGQGPPhKstF8+3qBmQ M1+BK/9A0bhuvm0ZVBGmN8YwVOzxbqiDdNSJd4E1ICqpMtArVt/x/q8DIcGgtRl6qT6p V7H6/9E6GH9OcBpXUX5tPnItaM7Gzfi/7z7iXKOH3rMXe9KiUVxfh1qUUE3mRqKQgGg8 v/AArBDepl0JLxff+tO37UJaqF7QTUiB3QVW+G7M7Cf5Z/LQJnlaVljEmcUDPMUWLbjQ T4DYAI0lFZwuuvG4BRtgPWXpHm3ANW+kimG1RKE5REn5eMAev+DXSj3hLyznfw87ZRUQ cMTg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a12si1481664ejv.55.2020.10.22.11.10.39; Thu, 22 Oct 2020 11:11:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2901928AbgJVQlA (ORCPT + 99 others); Thu, 22 Oct 2020 12:41:00 -0400 Received: from shelob.surriel.com ([96.67.55.147]:34856 "EHLO shelob.surriel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2897708AbgJVQk7 (ORCPT ); Thu, 22 Oct 2020 12:40:59 -0400 Received: from imladris.surriel.com ([96.67.55.152]) by shelob.surriel.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1kVde2-0001c1-45; Thu, 22 Oct 2020 12:40:54 -0400 Message-ID: <62fc8d07474acaccb65a9e20a4ebc0127e417f05.camel@surriel.com> Subject: Re: [PATCH] mm,thp,shmem: limit shmem THP alloc gfp_mask From: Rik van Riel To: Yu Xu , Hugh Dickins Cc: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@fb.com, Mel Gorman , Andrea Arcangeli , Matthew Wilcox Date: Thu, 22 Oct 2020 12:40:53 -0400 In-Reply-To: References: <20201021234846.5cc97e62@imladris.surriel.com> Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-292l4+Z5viPK7NhuvnQt" User-Agent: Evolution 3.34.4 (3.34.4-1.fc31) MIME-Version: 1.0 Sender: riel@shelob.surriel.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --=-292l4+Z5viPK7NhuvnQt Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, 2020-10-23 at 00:00 +0800, Yu Xu wrote: > On 10/22/20 11:48 AM, Rik van Riel wrote: > > The allocation flags of anonymous transparent huge pages can be > > controlled > > through the files in /sys/kernel/mm/transparent_hugepage/defrag, > > which can > > help the system from getting bogged down in the page reclaim and > > compaction > > code when many THPs are getting allocated simultaneously. > >=20 > > However, the gfp_mask for shmem THP allocations were not limited by > > those > > configuration settings, and some workloads ended up with all CPUs > > stuck > > on the LRU lock in the page reclaim code, trying to allocate dozens > > of > > THPs simultaneously. > >=20 > > This patch applies the same configurated limitation of THPs to > > shmem > > hugepage allocations, to prevent that from happening. > >=20 > > This way a THP defrag setting of "never" or "defer+madvise" will > > result > > in quick allocation failures without direct reclaim when no 2MB > > free > > pages are available. > >=20 > > Signed-off-by: Rik van Riel > > --- > >=20 > > diff --git a/include/linux/gfp.h b/include/linux/gfp.h > > index c603237e006c..0a5b164a26d9 100644 > > --- a/include/linux/gfp.h > > +++ b/include/linux/gfp.h > > @@ -614,6 +614,8 @@ bool gfp_pfmemalloc_allowed(gfp_t gfp_mask); > > extern void pm_restrict_gfp_mask(void); > > extern void pm_restore_gfp_mask(void); > > =20 > > +extern gfp_t alloc_hugepage_direct_gfpmask(struct vm_area_struct > > *vma); > > + > > #ifdef CONFIG_PM_SLEEP > > extern bool pm_suspended_storage(void); > > #else > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > > index 9474dbc150ed..9b08ce5cc387 100644 > > --- a/mm/huge_memory.c > > +++ b/mm/huge_memory.c > > @@ -649,7 +649,7 @@ static vm_fault_t > > __do_huge_pmd_anonymous_page(struct vm_fault *vmf, > > * available > > * never: never stall for any thp allocation > > */ > > -static inline gfp_t alloc_hugepage_direct_gfpmask(struct > > vm_area_struct *vma) > > +gfp_t alloc_hugepage_direct_gfpmask(struct vm_area_struct *vma) > > { > > const bool vma_madvised =3D !!(vma->vm_flags & VM_HUGEPAGE); > > =20 > > diff --git a/mm/shmem.c b/mm/shmem.c > > index 537c137698f8..d1290eb508e5 100644 > > --- a/mm/shmem.c > > +++ b/mm/shmem.c > > @@ -1545,8 +1545,11 @@ static struct page > > *shmem_alloc_hugepage(gfp_t gfp, > > return NULL; > > =20 > > shmem_pseudo_vma_init(&pvma, info, hindex); > > - page =3D alloc_pages_vma(gfp | __GFP_COMP | __GFP_NORETRY | > > __GFP_NOWARN, > > - HPAGE_PMD_ORDER, &pvma, 0, numa_node_id(), > > true); > > + /* Limit the gfp mask according to THP configuration. */ > > + gfp |=3D __GFP_COMP | __GFP_NORETRY | __GFP_NOWARN; > > + gfp &=3D alloc_hugepage_direct_gfpmask(&pvma); >=20 > It is fine to reuse `alloc_hugepage_direct_gfpmask`, but > `pvma.vm_flags & VM_HUGEPAGE` is always false here, thus, > `vma_madvised` in `alloc_hugepage_direct_gfpmask` will always > be false. >=20 > That is why I chose to do the gfp_mask fixup in `shmem_getpage_gfp`, > using `sgp_huge` to indicate `vma_madvised`, although with some silly > mistakes pointed out by you, in another mail thread. >=20 > It will be better if vma_madvised is well handled in your solution. OK, let me send a v2 that does that! By just passing a correct gfp_mask to shmem_alloc_and_acct_page we can also avoid the gfp gymnastics in shmem_alloc_hugepage that Michal rightfully objected to. --=20 All Rights Reversed. --=-292l4+Z5viPK7NhuvnQt Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEKR73pCCtJ5Xj3yADznnekoTE3oMFAl+RthUACgkQznnekoTE 3oNW0Af/ZErgA5cOrDiHMkRlcH76fPdw8whz+iN9/tqmguNEPBLntOEkULl+gH8n aHiI0F8OIt8oZTWoA4JowhOx1VCadr30XVaiNFym/3audu+Hsh9i8kf4FKGwxxb6 9khP8JubPidppIIBnt8q3TQvnFH/I5J6op2W2DKTs9lNFjxHkVzMpJDVyOm7i0Iq b+7yWS5RtJ2pszvI7T8BDT+UkWdB8Sl6mEC11SWaSGXm6X38viZVixG23PY/ZIl6 G9xoM2YYKcwqmb9aupwJuw2Xwei1q6aCnpTEEZ8eDdu8KLg5czCBjd9pyKZmqqSi gQs/ORiXvPLraSX2sZaLksh1PenTLw== =6hGB -----END PGP SIGNATURE----- --=-292l4+Z5viPK7NhuvnQt--