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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16E2FC433EF for ; Tue, 2 Nov 2021 19:47:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 98A0C60F36 for ; Tue, 2 Nov 2021 19:47:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 98A0C60F36 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 38D3D940008; Tue, 2 Nov 2021 15:47:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 33B4A940007; Tue, 2 Nov 2021 15:47:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1B4CF940008; Tue, 2 Nov 2021 15:47:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0021.hostedemail.com [216.40.44.21]) by kanga.kvack.org (Postfix) with ESMTP id 0A9C1940007 for ; Tue, 2 Nov 2021 15:47:47 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id C22B118481CA6 for ; Tue, 2 Nov 2021 19:47:46 +0000 (UTC) X-FDA: 78765025332.14.F41F475 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf09.hostedemail.com (Postfix) with ESMTP id EACBA300010B for ; Tue, 2 Nov 2021 19:47:45 +0000 (UTC) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1A2J4Og0010307; Tue, 2 Nov 2021 19:47:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : to : cc : references : from : message-id : date : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2021-07-09; bh=cy+j1Awpz7R8D8JxE0acR+cSLtU9H7CKQswvTHB4Ico=; b=ME5Za6LERCs1a4xgP907ugugTaCvhnX6D8c+SnZiDfz0m8O7mV2n9e5K2ibL4WKEFm8J Cfv+xefSt+oIiaiiq5cQT8X88hgo1iay1+hQ5pJ8kSrqwjqX6/8GY7OvTRLto30seW0v rRTuCrG8wvipyExIkRZ2IqPqHNW9i5tOcowdD0lpAdNG7TO/2cbJn1oDyi63R1a8+pcO l2pxzLyDFOU6U/eVd96PZmAE7LZm0MU+Q6YyBro/VGf0ap7Qtm/ERR6BElKq9NbCuuQT F8QHQYHvS5tKdlXOM8SN6wj1HYgUa54ZrXTmncVN+aqbqvUBaBqBi+8TFY3tmsyzCLpp JQ== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by mx0b-00069f02.pphosted.com with ESMTP id 3c278nhtam-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 02 Nov 2021 19:47:17 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1A2JUH64021577; Tue, 2 Nov 2021 19:46:58 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2046.outbound.protection.outlook.com [104.47.57.46]) by userp3020.oracle.com with ESMTP id 3c1khu4wgp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 02 Nov 2021 19:46:58 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K7ZLGZktOYhsGprIITltYiPMFLvLkxSOrIQfw4/CmLjWW8T+sX81XVQZBfFZ46Z2FRHxw1NSQp1QUmIQR2cNxpvktCTXueYjG7r/0OoCpr0iuDZSudQGx2G9zm5J6VVEKgxn7ifFfPlSoZ1dYpEld81rOPWVivem6v9cMag6ihx6SG8F/fys1De5GGfUK6HB4ZEfsB7JC4MRAe3xzEJ492IB8RAZ1fbbMArZMrsOPIw0p81dNJYujh+p+LXYrb02n7MWGvsDorrIEDNhNxgZHkfzNkdeAJDSWnHy8/zAb4GBHGd5vnq/zDF7pnoylYPIgwdO6hXZHP5q9v6Vu5m5PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cy+j1Awpz7R8D8JxE0acR+cSLtU9H7CKQswvTHB4Ico=; b=AS3vJexp+1b2akylJOOLENQDYr8bLYK17z5O2MRQe+etC2hnkIROM98qi3mk+73xa1JIFR73L1zJ3Yo1/+zVV4IK4ch85vG7t82lbwG2aBWeiAiraoAsCQr7N0Mj5JhQIgfpG0vx7czMxuma+ubw21n18Zl0qLGD3X9G9D4OQ41O64/VJ2Gp7tNCIB7AksRai9O8odx3N34XoDNaaVwaEZNOVTZfv5NgONp0AwgrYe7Hl+fcBy4XQnDo0M5tVzwa6j/HI7nvlFSQ9eZ6lMwBi9DIVgof/D93A3X3+uO6GqFQH+qWebJfTsm1kjhloC1U+yll7PFqZtRxrW2n+i1gtg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cy+j1Awpz7R8D8JxE0acR+cSLtU9H7CKQswvTHB4Ico=; b=ne06BUmsd5Se/W9Y7yroljr3TM2kD2XqzZJw1+8Yl002JfU8L0J85xc2FO/TLCrFz+ME/x6DbAVGAXVsVQeFUu1F/HK54g+jE7UON2tWUGYNjyspjALSXQ9xGnJX/7RoMosh4zqaLBrj8ZlBcCYgZy5CGzQs6ZTO4qN6nUuMpfI= Received: from BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) by BYAPR10MB3254.namprd10.prod.outlook.com (2603:10b6:a03:15d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.14; Tue, 2 Nov 2021 19:46:56 +0000 Received: from BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::bc59:71de:1590:cbf5]) by BY5PR10MB4196.namprd10.prod.outlook.com ([fe80::bc59:71de:1590:cbf5%8]) with mapi id 15.20.4608.026; Tue, 2 Nov 2021 19:46:56 +0000 Subject: Re: [PATCH v7] mm,hugetlb: remove mlock ulimit for SHM_HUGETLB To: zhangyiru Cc: akpm@linux-foundation.org, hughd@google.com, linux-mm@kvack.org, liusirui@huawei.com, liuzixian4@huawei.com, mhocko@suse.com, wuxu.wu@huawei.com References: <20211102154012.25403-1-zhangyiru3@huawei.com> From: Mike Kravetz Message-ID: <4d9194bf-e411-53d8-daa0-b12828d46ed6@oracle.com> Date: Tue, 2 Nov 2021 12:46:54 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 In-Reply-To: <20211102154012.25403-1-zhangyiru3@huawei.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-ClientProxiedBy: MWHPR14CA0046.namprd14.prod.outlook.com (2603:10b6:300:12b::32) To BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) MIME-Version: 1.0 Received: from [192.168.2.123] (50.38.35.18) by MWHPR14CA0046.namprd14.prod.outlook.com (2603:10b6:300:12b::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.15 via Frontend Transport; Tue, 2 Nov 2021 19:46:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e2306926-a22d-485c-8ba3-08d99e3986a5 X-MS-TrafficTypeDiagnostic: BYAPR10MB3254: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MC9Rc8e/9oMyCf6o95niOc/W0yjqn3hCau5CQIcYdim/BvJMLwrGdZUVfdyJaa8LK7GhhsIDVhpnVkoCww+p8i/0rGREEkHVsfMzMkhGc2QuDRO9/WFuSmtuyL2sFadLw5Mz/utDnzo2ArG2ZNWqfqv+BThZi/n9kyAKZU6DwXm3XVcmVUZpDH1bcavDr4jj7c9j9tH/tQ4z6+1cgRZMzaMvZVjefWGm3fVHlnI2Zg4Dy4n6IU8jVjg6ClTWRgSP87Nv/DVN6ZO1hnqLo2VL/nbhfWhX+vpnlCbDAD/NvIHyOkqppnbKyTszNg3qx1h+Joqys6V98pLIelHQbJEwTv66GgbzqjBbdKG+s3O3gJu36YaipYWTNWnLqn/mbeMusTXR9clFVu/nKoVZR9Kj4pkd9oogy4P9z8BQAAq8xdKpfAqPaNv5CHgppTkXaVkIs+8zs8ihJ+2iFYZuosGCSlECOV1P4vxigXK9jDcXGFqHqB5pjn2K5NQ9Kt/jWt/7HKfYSkr3UB+YDh7N1XLmgsFSDPEt0C6sdaghX3Af6ttvTOXtEpHdupLBhvjueu+OVFUpfXyIX3cw1kj17n0tFTaRm0TsTi8V/0p1Lsf189v+1J+Kz8lOOB4I4UZbbWKjcmFRXgDKG31YpuzLu+wMxCFIN7UgTrEXyy1790oCWM2+6h4tF5VRXFpDdPTK8Szud0YD7gtKrpqGGN08cWoK/zP4Ap1F760ymB/xurxPJM/jj6twy+hwoG83i/K2+pVAC/EEDs0K8Le8YAXCrz57Bg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4196.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(53546011)(186003)(52116002)(2906002)(6916009)(66556008)(66476007)(66946007)(26005)(36756003)(6486002)(38350700002)(16576012)(31686004)(38100700002)(8936002)(44832011)(5660300002)(316002)(83380400001)(8676002)(4326008)(956004)(2616005)(31696002)(86362001)(508600001)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QjU3NVZBT2FtcnBEVHExWWh6UHlub0R1R3lIVFZYWkF5aVNLMi9jQURuNVJO?= =?utf-8?B?Q2UwRXcwWnNwUlk2cmV1UTI5N2xpak9ZUHFndUR2WkI4QWhHNjF5OTI1cFgy?= =?utf-8?B?cFlBbEk3WkhIa3N3RXhxVitCZkp1MGRJaXdlTmhoZWJqSldId0pXQVJsOXIw?= =?utf-8?B?NGM5TXBiZTNiNDNReUxoREZMdDA0K05rSFJ5VmdtL1VQMi8rY3UwQTE2bmlw?= =?utf-8?B?Y1ZXL1BMRUNMUGZDYkt6UHlLb2FqYnUwODR5ZFYxSktpSlRTQmZNYzh5Wm1y?= =?utf-8?B?THl1amE5OVh4dkk2dkV0NkxlUFZkSzViaW1TcWtjd2dsT1ZQMEU3N3Q5NmY1?= =?utf-8?B?ZmpZTnREK0phQVNWYmdZVXFkaXk0eEdnM21BejdCdEFXaDl1YjdnSXE5L1BV?= =?utf-8?B?WXdRVVdHeE1vNUhvRHdKUVVWWW50MUdPTk5VOEhDMkxpbllRVG9XcHE1NW1h?= =?utf-8?B?cUtUNE9TenlHUzhJRkI2Z0Z4N3NQaVR6YVZxMzIzRk5RUmNSdEVKYkNDVC9k?= =?utf-8?B?NXdMUHQ1NGRvejlvNENMUEYwTmlVR3N1YUkzNDRFTmpPVitjYWpydVdRWXhF?= =?utf-8?B?V3ZKaE54NEEwODRjc0txVGJTaU1QTnQyd3ZCbzF3VEdjdFkrMUdzd1p5UlAy?= =?utf-8?B?WndFdW5vUFNHNUIraU5JeDNoTlE2OFNpc2IvbDVzOWJzbUUzYjhvbjVQeU02?= =?utf-8?B?eFhwYitpNFdYSXhBdTgxS1MxS0lFSXhtbUlTSU5xS2lid3JDVHRaK0R6ZUNX?= =?utf-8?B?TUtKbUZqUnV2N2w3TDZxb241R1ovYk8xYWdJbXpSeEptNUFuNUsxdEE0aEdk?= =?utf-8?B?NVNOR09iOWEwMkJwbXFwUHFrMndHTHRuWVczWmFDTTA1N1hUK0RsWHJGRC9Y?= =?utf-8?B?MmJBNnRlcTlCNUxpbG5zTGQ1ekI4QUlQQ2VSbWluekZyTEs4ejNXTG5hN3cz?= =?utf-8?B?Vnh5ZVpnVllESkVDM083QzJxanhJWTUrNE9kbDhiNGpPWm5CMVF5NHNXRUVx?= =?utf-8?B?blJnMnpQbVJnay8xYURjOTlwbEwrbVd2UWs0bVg1N1dQZ01GZ0pYNzJ4VWI0?= =?utf-8?B?VW9QbEwrOXIrbWpLWDFhRTU1MFNKNlU2OEkrN3FDWFRHZVg0S1RzQU1KZ0hT?= =?utf-8?B?cVcrOFZZTHJXRExWbjV2MzVCaFNoMFUxSHo1d0xvSzdOTmVrTmRYUEtldXk1?= =?utf-8?B?ZU1Zcmt5SXhGVDZwSERyeHhWZ1BIRm53dFQ1YlUrbTZraUJzZ0VXOUVGZThS?= =?utf-8?B?S0ZqYVNPT1JDRThBMUN1cUZnaGRrQnVGUHRqYkRRMjJld3hzOXlackk5ZkVI?= =?utf-8?B?OTVyRm1jUEhwNE01cTFIWXpranU3ZVdoTnpjN1hkNjQvQVlzVkxhYmU5SWtn?= =?utf-8?B?YkRFL0FWMWtEVGh2dHhQczZsNWNhc2Z0cmhMQW1IM0ExbnpFVjZKSlZLeFNz?= =?utf-8?B?OUU5cFIzZHFhYWEweHJqZDFub0tIKzBuV3ZyK0lNRHh6M0VKbG5UQ0NYWnJZ?= =?utf-8?B?TkkxUjYxSHV0MDNPcGF5QjhpQ056N1RSVlltYW9lSUQ0NlhJME5jcGdZM0hU?= =?utf-8?B?eUUyWHAvRTgwRmlqU2lIQ1FkZzdzNlRvUE0zWGhqdVZDR0hWUG5hb09iMEp5?= =?utf-8?B?dWkzZDNCSmZmSmJ4U3JtMEZIVFpaUEVsQlFzbWVmaitlNHhmNm1GWXBuVTFN?= =?utf-8?B?UTVxWmhwQlpybUtiMkZRU3RNU1ZZcXBTQnZYaExCMGZya2ErNWZLOG9XaWtn?= =?utf-8?B?bFdhMDNCUXBleXY1cUtzSk9NdXlxd1pzSHdRd0hBK3UyRkhrdnZyV2xOMXU5?= =?utf-8?B?MksweXk2MkxNNkozd0lWdkpxOHZ0NUI4TWRWem9KZ0twZjZ6RmRSZDVENENa?= =?utf-8?B?Qlg0bkZTK082aVUvSjFKbEpDU1BESnhYTSszSWpYQ1NZanVUVFVvQnMraWpX?= =?utf-8?B?REpDUzJJMFdJUHUxRlZrZnYwWnVqTFdJN2VQTnBLQnIrTzEySmd0MDhsNldW?= =?utf-8?B?Vm1LaXpXUjZHalFqek5odlppRUMwdFRDbzlxUDV1OGtLZGZjNGhjVng2anVC?= =?utf-8?B?b29rYnRyOGRkYVkvSWYxYXF1N08rT2t5V0poVm52a3JnR2ZNYUlpZDJBK3VH?= =?utf-8?B?V0dlK05meWpSaUYzckhOWUFqbjJKblFxVFVHTWpxN2dUMlVHRmRxUmxhblgv?= =?utf-8?Q?0aFzKFu3M92cGFik0lE3xI8=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e2306926-a22d-485c-8ba3-08d99e3986a5 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2021 19:46:56.2391 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NXbPd+1kxThTrp9aSSQMhFm9nnhUGeFTGvXmpIITgkBo9ExpEnOfypvPyOLZTYQpiHbtoI7QcSrGYUEX6GB+wQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3254 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10156 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111020104 X-Proofpoint-GUID: 2nEtPBxCC_pZPtVvSBsLYlroCK0WkQlQ X-Proofpoint-ORIG-GUID: 2nEtPBxCC_pZPtVvSBsLYlroCK0WkQlQ X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: EACBA300010B X-Stat-Signature: zfaj83mxd8dwusuf7ks5d58zi3iio898 Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=ME5Za6LE; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=ne06BUms; dmarc=pass (policy=none) header.from=oracle.com; spf=none (imf09.hostedemail.com: domain of mike.kravetz@oracle.com has no SPF policy when checking 205.220.165.32) smtp.mailfrom=mike.kravetz@oracle.com X-HE-Tag: 1635882465-494078 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/2/21 8:40 AM, zhangyiru wrote: > commit 21a3c273f88c9cbbaf7e ("mm, hugetlb: add thread name and pid to > SHM_HUGETLB mlock rlimit warning") marked this as deprecated in 2012, > but it is not deleted yet. > > Mike says he still see that message in log files on occasion, > so maybe we should preserve this warning. > > Also remove hugetlbfs related user_shm_unlock in ipc/shm.c and remove > the user_shm_unlock after out. > > Signed-off-by: zhangyiru > --- > Changelog: > v7: modify ucounts definition and remove the user_shm_unlock after out > v6: fix errors in v5 and remove hugetlbfs related user_shm_unlock in > ipc/shm.c > v5: delete ucounts variable, and function calls that use ucounts in > additon > v4: modify context information of obsolete > v3: modify warning message to obsolete > v2: preserve warning message > v1: remove mlock ulimit for SHM_HUGETLB > --- > fs/hugetlbfs/inode.c | 23 ++++++++--------------- > include/linux/hugetlb.h | 3 +-- > ipc/shm.c | 8 +------- > mm/memfd.c | 4 +--- > mm/mmap.c | 3 +-- > 5 files changed, 12 insertions(+), 29 deletions(-) Thanks for continuing to make updates. I think the use of user_shm_lock/unlock as done below to check for potential users of the obsolete feature is the simplest thing to do. If Hugh or someone else has another opinion, please speak up. > diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c > index cdfb1ae78a3f..49d2e686be74 100644 > --- a/fs/hugetlbfs/inode.c > +++ b/fs/hugetlbfs/inode.c > @@ -1446,8 +1446,8 @@ static int get_hstate_idx(int page_size_log) > * otherwise hugetlb_reserve_pages reserves one less hugepages than intended. > */ > struct file *hugetlb_file_setup(const char *name, size_t size, > - vm_flags_t acctflag, struct ucounts **ucounts, > - int creat_flags, int page_size_log) > + vm_flags_t acctflag, int creat_flags, > + int page_size_log) > { > struct inode *inode; > struct vfsmount *mnt; > @@ -1458,22 +1458,19 @@ struct file *hugetlb_file_setup(const char *name, size_t size, > if (hstate_idx < 0) > return ERR_PTR(-ENODEV); > > - *ucounts = NULL; > mnt = hugetlbfs_vfsmount[hstate_idx]; > if (!mnt) > return ERR_PTR(-ENOENT); > > if (creat_flags == HUGETLB_SHMFS_INODE && !can_do_hugetlb_shm()) { > - *ucounts = current_ucounts(); > - if (user_shm_lock(size, *ucounts)) { > - task_lock(current); > - pr_warn_once("%s (%d): Using mlock ulimits for SHM_HUGETLB is deprecated\n", > + struct ucounts *ucounts = current_ucounts(); > + > + if (user_shm_lock(size, ucounts)) { > + pr_warn_once("%s (%d): Using mlock ulimits for SHM_HUGETLB is obsolete\n", > current->comm, current->pid); > - task_unlock(current); > - } else { > - *ucounts = NULL; > - return ERR_PTR(-EPERM); > + user_shm_unlock(size, ucounts); > } > + return ERR_PTR(-EPERM); > } > > file = ERR_PTR(-ENOSPC); > @@ -1498,10 +1495,6 @@ struct file *hugetlb_file_setup(const char *name, size_t size, > > iput(inode); > out: > - if (*ucounts) { > - user_shm_unlock(size, *ucounts); > - *ucounts = NULL; > - } > return file; > } > > diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h > index f7ca1a3870ea..e8e033b74b7e 100644 > --- a/include/linux/hugetlb.h > +++ b/include/linux/hugetlb.h > @@ -468,8 +468,7 @@ static inline struct hugetlbfs_inode_info *HUGETLBFS_I(struct inode *inode) > extern const struct file_operations hugetlbfs_file_operations; > extern const struct vm_operations_struct hugetlb_vm_ops; > struct file *hugetlb_file_setup(const char *name, size_t size, vm_flags_t acct, > - struct ucounts **ucounts, int creat_flags, > - int page_size_log); > + int creat_flags, int page_size_log); > > static inline bool is_file_hugepages(struct file *file) > { You forgot to make the same change to the !CONFIG_HUGETLBFS version of hugetlb_file_setup() within include/linux/hugetlb.h. The rest of the changes look good to me. -- Mike Kravetz