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;
From:   Song Liu <songliubraving@fb.com>
To:     Hugh Dickins <hughd@google.com>
CC:     Andrew Morton <akpm@linux-foundation.org>,
        "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linux-mm@kvack.org" <linux-mm@kvack.org>
Subject: Re: [PATCH] mm,thp: stop leaking unreleased file pages
Thread-Topic: [PATCH] mm,thp: stop leaking unreleased file pages
Thread-Index: AQHWMW24n9w2hRwgcEyvzNMwGpSUgKi37ZcA
Date:   Mon, 25 May 2020 00:05:40 +0000
Message-ID: <649C7E6B-BD4B-49F6-8CF2-E600AB4B94FF@fb.com>
References: <alpine.LSU.2.11.2005231837500.1766@eggly.anvils>
In-Reply-To: <alpine.LSU.2.11.2005231837500.1766@eggly.anvils>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-ID: <A172B347CA786544AEAD5E6CFC9BF487@namprd15.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 6d77327f-74eb-4b53-6cd7-08d8003f5c83
X-MS-Exchange-CrossTenant-originalarrivaltime: 25 May 2020 00:05:40.6362
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: cPQvskRN9X5vG7n6RdHM4Q6LWP1AOah9tcQ1AdDvcQ84K9hisOxnkzZ6QJcBW/pxqyMl9DQz3ai3uLbMVqu/Pg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR15MB2726
X-OriginatorOrg: fb.com
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216,18.0.676
 definitions=2020-05-24_07:2020-05-22,2020-05-24 signatures=0
X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 suspectscore=0
 spamscore=0 mlxscore=0 bulkscore=0 cotscore=-2147483648 mlxlogscore=905
 phishscore=0 adultscore=0 priorityscore=1501 clxscore=1011 impostorscore=0
 lowpriorityscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx
 scancount=1 engine=8.12.0-2004280000 definitions=main-2005240204
X-FB-Internal: deliver
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> On May 23, 2020, at 6:50 PM, Hugh Dickins <hughd@google.com> wrote:
>=20
> When collapse_file() calls try_to_release_page(), it has already
> isolated the page: so if releasing buffers happens to fail (as it
> sometimes does), remember to putback_lru_page(): otherwise that page is
> left unreclaimable and unfreeable, and the file extent uncollapsible.
>=20
> Signed-off-by: Hugh Dickins <hughd@google.com>
> Fixes: 99cb0dbd47a1 ("mm,thp: add read-only THP support for (non-shmem) F=
S")
> Cc: stable@vger.kernel.org # v5.4+

Acked-by: Song Liu <songliubraving@fb.com>

Thanks for the fix!

> ---
>=20
> mm/khugepaged.c |    1 +
> 1 file changed, 1 insertion(+)
>=20
> --- 5.7-rc6/mm/khugepaged.c	2020-04-12 16:24:37.710999073 -0700
> +++ linux/mm/khugepaged.c	2020-05-10 17:06:21.788398646 -0700
> @@ -1692,6 +1692,7 @@ static void collapse_file(struct mm_stru
> 		if (page_has_private(page) &&
> 		    !try_to_release_page(page, GFP_KERNEL)) {
> 			result =3D SCAN_PAGE_HAS_PRIVATE;
> +			putback_lru_page(page);
> 			goto out_unlock;
> 		}
>=20