Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2948838imu; Thu, 29 Nov 2018 12:54:05 -0800 (PST) X-Google-Smtp-Source: AFSGD/UHOdBia65Iob5CDa98oI/K+rbFNE+t/iUaIUNp96EUzDjIAljPNbCAsYzUL3X95HMJeRrZ X-Received: by 2002:a62:62c5:: with SMTP id w188mr2920477pfb.160.1543524845185; Thu, 29 Nov 2018 12:54:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543524845; cv=none; d=google.com; s=arc-20160816; b=cfgn1a5bhM+t6CR7nrZhrUQ34cZlqZVY0HokyK0miEyMHmQwA9kzhQ5NlS0GYKsySC TZpzD66gDdX1Uo+0EZaX2bYSZ8i3I0ZXR1PGq8qEEhCUbycHT07FA8mqMKjBqaQZuzpP 5lKej590bcmwjeq8sv+NNWvQ4i7SmgQGSbrYY1Fn0gj4ZQd8c3xr3P+wU6HuhWUoKwCx EsxhO2vvynmWr+MoHO3/x4PLO9ggjoTxXj4D0E4NvbagaV5+gm3VOwN2Y6R+xDjySJnV ig/AJItnItlj3ExojuimA5Q63vR53rhfYSBA/u2DuUGtwlwWnm6h5tw20BoQajQQCiXn JjBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature; bh=grgPLULET8+uSvpuhndEgkZYH2nwxusd0Dk7CvvRPH0=; b=lIuQ72oykLifl8eJ8v7EOr2rUIvCjWw/z2MHmgwNFRNhnwF7oIp6vtS++8DYIdV021 4qV6myAsfgouBwdnuHJmmQN8C/w0mzW1VIX/5uvntuj7yTDM6vYdm8dU/9PDh8+OM14V qu1F+srNVoyo9J+1GGJpX3kuRZxDaNZTSpyBVCKIZBKcOi17wpKHVvWBUTjrW019/oOj pYxrRjV3geEKWv2XFbKBERPkf+U/e/h291jfypu6I4X5Y4V87/ZFW99BTHrRuT19CJiW ast/EIo+Qw4K1zOkfUx3bC3Gr+MkL6GzU9FKbfPB0X2K8KTLd6HHERvtRryawKzSCgIA JfRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=Y5KS5BvV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f16si2542884pgg.173.2018.11.29.12.53.50; Thu, 29 Nov 2018 12:54:05 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=Y5KS5BvV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726870AbeK3H7r (ORCPT + 99 others); Fri, 30 Nov 2018 02:59:47 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:56472 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726178AbeK3H7r (ORCPT ); Fri, 30 Nov 2018 02:59:47 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id wATKhqTZ162622; Thu, 29 Nov 2018 20:52:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=grgPLULET8+uSvpuhndEgkZYH2nwxusd0Dk7CvvRPH0=; b=Y5KS5BvV6CtOpR46zY0HFs0fTpF4khwgCndzZidfk6kcHOaox5tajBmRe7xE/boevSIO BYcEW+Yhu08cpg4DutbJltngbX9/1EZIpULvXWUKMhrCAaRnzyhUzyz05TcrqgOwCeRq NK94/89BPrSmaO1takj0CyJ+NYXSg+qq+VhYHql3uLw+BXLPGi4LbELgiBOTrmG/kGIX IEW1TLpDKj/6XZKMWIXnCakoeaorD1raqp2+ZRfYMHa4iaSW9XzvxWYlmz8MwEo6u38u 2z4IqEiaV05B9EQimYbDh3+/zCo45lHnM4PWnZ1ijQBqKrL3lq9O9n15EI1enBeuAJ9c XA== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp2120.oracle.com with ESMTP id 2nxy9rjjyf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 29 Nov 2018 20:52:57 +0000 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id wATKquKN023427 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 29 Nov 2018 20:52:57 GMT Received: from abhmp0014.oracle.com (abhmp0014.oracle.com [141.146.116.20]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id wATKquhU012122; Thu, 29 Nov 2018 20:52:56 GMT Received: from [172.29.11.27] (/170.173.8.12) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 29 Nov 2018 12:52:55 -0800 Subject: Re: [PATCH] hugetlbfs: Call VM_BUG_ON_PAGE earlier in free_huge_page To: William Kucharski , Yongkai Wu , Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, nic_w@163.com, Michal Hocko References: <1543491843-23438-1-git-send-email-nic_w@163.com> <0B408D50-D101-4457-B779-5951DEE0435A@oracle.com> From: Mike Kravetz Message-ID: <211f80a2-9347-129c-0001-5f4abfd0b7dc@oracle.com> Date: Thu, 29 Nov 2018 12:52:54 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.3.0 MIME-Version: 1.0 In-Reply-To: <0B408D50-D101-4457-B779-5951DEE0435A@oracle.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9092 signatures=668686 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1811290173 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/29/18 5:51 AM, William Kucharski wrote: > Reviewed-by: William Kucharski > >> On Nov 29, 2018, at 4:44 AM, Yongkai Wu wrote: >> >> A stack trace was triggered by VM_BUG_ON_PAGE(page_mapcount(page), >> page) in free_huge_page(). Unfortunately, the page->mapping field >> was set to NULL before this test. This made it more difficult to >> determine the root cause of the problem. >> >> Move the VM_BUG_ON_PAGE tests earlier in the function so that if >> they do trigger more information is present in the page struct. >> >> Signed-off-by: Yongkai Wu >> Acked-by: Michal Hocko >> Acked-by: Mike Kravetz Thank you for fixing the formatting and commit message. Adding Andrew on so he can add to his tree as appropriatre. Also Cc'ing Michal. >> --- >> mm/hugetlb.c | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/mm/hugetlb.c b/mm/hugetlb.c >> index 7f2a28a..14ef274 100644 >> --- a/mm/hugetlb.c >> +++ b/mm/hugetlb.c >> @@ -1248,10 +1248,11 @@ void free_huge_page(struct page *page) >> (struct hugepage_subpool *)page_private(page); >> bool restore_reserve; >> >> - set_page_private(page, 0); >> - page->mapping = NULL; >> VM_BUG_ON_PAGE(page_count(page), page); >> VM_BUG_ON_PAGE(page_mapcount(page), page); >> + >> + set_page_private(page, 0); >> + page->mapping = NULL; >> restore_reserve = PagePrivate(page); >> ClearPagePrivate(page); >> >> -- >> 1.8.3.1 >> > -- Mike Kravetz