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=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 0915AC56201 for ; Wed, 18 Nov 2020 18:44:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 498132225E for ; Wed, 18 Nov 2020 18:44:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="FE59WBZl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 498132225E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 4D39A6B0036; Wed, 18 Nov 2020 13:44:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 484426B006E; Wed, 18 Nov 2020 13:44:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3734E6B0072; Wed, 18 Nov 2020 13:44:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0175.hostedemail.com [216.40.44.175]) by kanga.kvack.org (Postfix) with ESMTP id 059C56B0036 for ; Wed, 18 Nov 2020 13:44:03 -0500 (EST) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 697B8181AEF1A for ; Wed, 18 Nov 2020 18:44:03 +0000 (UTC) X-FDA: 77498413566.27.loss14_1209a632733c Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin27.hostedemail.com (Postfix) with ESMTP id 49C5A3D663 for ; Wed, 18 Nov 2020 18:44:03 +0000 (UTC) X-HE-Tag: loss14_1209a632733c X-Filterd-Recvd-Size: 4876 Received: from userp2120.oracle.com (userp2120.oracle.com [156.151.31.85]) by imf35.hostedemail.com (Postfix) with ESMTP for ; Wed, 18 Nov 2020 18:44:02 +0000 (UTC) Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0AIIhfdQ061670; Wed, 18 Nov 2020 18:43: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-2020-01-29; bh=SL22lGGVpKno+/uHpGKGIJnK6X8Tldkc1ill4oT2NE8=; b=FE59WBZlOMjuY9q4kIArWoGE6DVKBOeqHXKmMPcQ90nx1PfsJYH3obIG9B3oMm8hhRSJ FYntKWygafq3M+OMiaP9SribXfIuvloRlIKOfipP9tNypA8BNekLWXEMUWlC4y8b2B92 eW1nTTwvsZ1WnpMyvktPhIffDrB17MxcjQzcHHTLp0seiQV4IqLlwiFgx3CDyWd0PH+h CFnwvd0JiboGRqU4I8XAonBL2IjISB8wmhCdXfRcC3Erv20hxII9lncLp9Htos/9hrL6 FsifPqNo8aIjyDmGqkrObVnSEmEUWz3/qq4NLRsSljd5DvNScxVuJKEwnri9mXOA3+vI Kg== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by userp2120.oracle.com with ESMTP id 34t7vn9jvg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 18 Nov 2020 18:43:57 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0AIIfNkC035313; Wed, 18 Nov 2020 18:41:56 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserp3020.oracle.com with ESMTP id 34umd0xcba-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Nov 2020 18:41:56 +0000 Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 0AIIfrs6020208; Wed, 18 Nov 2020 18:41:53 GMT Received: from [192.168.2.112] (/50.38.35.18) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 18 Nov 2020 10:41:52 -0800 Subject: Re: [PATCH] mm: hugetlb: fix type of delta parameter in gather_surplus_pages() To: Liu Xiang , linux-mm@kvack.org Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, liuxiang_1999@126.com, Pan Jiagen References: <1605705241-3561-1-git-send-email-liu.xiang@zlingsmart.com> From: Mike Kravetz Message-ID: <51fbc8e7-7e9d-4070-f8d5-83b33d2d4607@oracle.com> Date: Wed, 18 Nov 2020 10:41:51 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <1605705241-3561-1-git-send-email-liu.xiang@zlingsmart.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9809 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxscore=0 phishscore=0 spamscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011180130 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9809 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0 malwarescore=0 bulkscore=0 impostorscore=0 lowpriorityscore=0 spamscore=0 adultscore=0 mlxscore=0 priorityscore=1501 phishscore=0 clxscore=1011 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011180130 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: On 11/18/20 5:14 AM, Liu Xiang wrote: > On 64-bit machine, delta variable in hugetlb_acct_memory() may be larger > than 0xffffffff, but gather_surplus_pages() can only use the low 32-bit > value now. > > Reported-by: Ma Chenggong > Signed-off-by: Liu Xiang > Signed-off-by: Pan Jiagen > --- > mm/hugetlb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 37f15c3..293b36d 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -1943,7 +1943,7 @@ struct page *alloc_huge_page_vma(struct hstate *h, struct vm_area_struct *vma, > * Increase the hugetlb pool such that it can accommodate a reservation > * of size 'delta'. > */ > -static int gather_surplus_pages(struct hstate *h, int delta) > +static int gather_surplus_pages(struct hstate *h, long delta) > __must_hold(&hugetlb_lock) > { > struct list_head surplus_list; Thank you for noticing the type difference. However, if the parameter delta is changed to long then we should also change the local variables in gather_surplus_pages that are used with delta. Specifically, the local variables 'needed', 'allocated' and 'i' should also be of type long. -- Mike Kravetz