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 BAFF8C433F5 for ; Mon, 1 Nov 2021 23:05:18 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 369ED603E5 for ; Mon, 1 Nov 2021 23:05:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 369ED603E5 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 78712940030; Mon, 1 Nov 2021 19:05:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 70F1894002B; Mon, 1 Nov 2021 19:05:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 58977940030; Mon, 1 Nov 2021 19:05:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0225.hostedemail.com [216.40.44.225]) by kanga.kvack.org (Postfix) with ESMTP id 481D194002B for ; Mon, 1 Nov 2021 19:05:17 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 00A5F56482 for ; Mon, 1 Nov 2021 23:05:16 +0000 (UTC) X-FDA: 78761894274.13.415E2B5 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf22.hostedemail.com (Postfix) with ESMTP id 549521906 for ; Mon, 1 Nov 2021 23:05:16 +0000 (UTC) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1A1Lwcbq022168; Mon, 1 Nov 2021 23:05:08 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=VjPEGkTLFRU/+R3rmAzy5yrFEgpgvPbegJXXD9xv39Y=; b=c8zYIOQRPrtijKDtWQOwB/GO4de+JmdZZUC8WLXGPRVTiy9/TI+f5ytY0pAbrwDMd4bk C+g3b5IQ50VlYZoRPB/APBBTCq09ap9Im5eCN8wPCrJrr+IJ+/AidG0ec9jZCjGCo9nN ZiviDkfK509FJPINSwRuBTh0dcxd2nILEBbeGyJ0RoMISnEn0hthEBi3bmJxoxrV3qz8 8LK8XN2lhbqhx/siVVA2AAdgaPeXo2dtnp4OpfNwUhE0y4qIsRcTxv98q43yWTeIus2h MGmiWE8MUtR4TV8ANvCx3mj6cCD0Qe47dguteU9Bt3JDrLzT+PkwWZXB/4fqTHemLug3 ww== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by mx0b-00069f02.pphosted.com with ESMTP id 3c26e8cw9d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 01 Nov 2021 23:05:07 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1A1N0ZY3089747; Mon, 1 Nov 2021 23:05:06 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2107.outbound.protection.outlook.com [104.47.55.107]) by userp3030.oracle.com with ESMTP id 3c27k45gpk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 01 Nov 2021 23:05:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dgvQpLBlqHuS8HIlL1eQ7N6JPiNhewY6Rekz1shjGrzow17MDyEF9MYHf/DY24jkGvK1WzW0tCntUERizqkU6PzFtxV8kWZMAjLxUY3scK2qd5T+QjpXvKGHxXg4P4wJ7KIb9/fPUOXHV26B6FwiKBJRVC67+ntLmRza6qJSb/8MM6sBjmD+sFOYIhJFA6k9gHP9P5u0/kjbH5mxJ4JKNlXr+NfxyKKk5RTUyVyt75vbktKsZtASKazBYlAW7paPyOyDc6g1ULXcITuSBYYu7HYdFeFZ19oM08vJqexveLdsA5oN6SqM+lBi9DiwU8YQd4wniNtJ6JEn33TiEakZag== 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=VjPEGkTLFRU/+R3rmAzy5yrFEgpgvPbegJXXD9xv39Y=; b=SW1sMRX13FSpGyHwzbaQGehGyM6oF6jnGb6fUSUowK/wq9t/V2N9UTnoiOgXinhy5/yQ3bR6uhZrxvifOvglC0JLFKH3R6eiRTQjN5UAFtw0kj3qAfz4egj5hdpi+C5/JViuOgDtuwQsJLLUU7AITbitIDb1PbpETJvGK5pvS3UnJARsCBleOXrvVFcOY3ZVJq45emvQJlWbHvjYqxvqYTuI0Qbwl17FneclO6dPRpAymXJwSwgPXbpJo6EEzgZFlno+DNPBSRwEtaEmpEd5SlasazP9vmpC7woSr1nNMDJULTQJqW73YH1Rq0xVW1KijbSaVp/XXfD4zstruO4s6w== 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=VjPEGkTLFRU/+R3rmAzy5yrFEgpgvPbegJXXD9xv39Y=; b=Q7G/0WJNNRZmis33LBW4lkMRhhI7ei6FJiWPlcRJn0r8gX20QKf1JdOhhFVscw+nlEdnWRPV+s4+g43QseRLFSb24hnAfN1xB0xljnkLsxNcLmoGXNDz12Bmk2s81cmMdIZdB0981hTlcruwyqja8uy2CATa6NamyFBm0akOCwA= Received: from BY5PR10MB4196.namprd10.prod.outlook.com (2603:10b6:a03:20d::23) by BYAPR10MB3157.namprd10.prod.outlook.com (2603:10b6:a03:14f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.17; Mon, 1 Nov 2021 23:05:04 +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; Mon, 1 Nov 2021 23:05:04 +0000 Subject: Re: [PATCH v6] 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: <20211101194408.112019-1-zhangyiru3@huawei.com> <20211101210910.92371-1-zhangyiru3@huawei.com> From: Mike Kravetz Message-ID: Date: Mon, 1 Nov 2021 16:05:02 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 In-Reply-To: <20211101210910.92371-1-zhangyiru3@huawei.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-ClientProxiedBy: MW4P222CA0022.NAMP222.PROD.OUTLOOK.COM (2603:10b6:303:114::27) 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 MW4P222CA0022.NAMP222.PROD.OUTLOOK.COM (2603:10b6:303:114::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.15 via Frontend Transport; Mon, 1 Nov 2021 23:05:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 02c93560-300b-45b8-3689-08d99d8c09e0 X-MS-TrafficTypeDiagnostic: BYAPR10MB3157: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:139; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Vr9/1zEugnEM3q3pq+rJK9EFnpR9KrTRLs1vEXQn8paMM4Nsf7GwR/nZE2AiW6TpVx4Ss5A9cDWD9CrBwBzZ++OmFDU0HE+xPgprOXhMaznOdQbwnPmTAz43JpoTKzcSVmtPlBQegqQlCkCGnYg7i7iOHxbjUjUpUhRq49mEcUoifSxKEbz1hIt5Qivpxt5dcI0bxaI5+vm7qg1HLjs33l9SuxkRs9R/fMEJ6WtG8sF9nbiIkcB9jXRJaLihlbMxi+Q0Be1cfHsFnRycYnyDL67M3Cjn6KiV0ZTQxPgaQmkLhI4bC+h12T0gf9v5Gf3sffQZyKGZWATDI8jFWrBVYGHUX7VxxddePkRwNTa3YJA0T+3X+0JWqC1ePGVY15fU2gGjtwEByW2z6NwHWhvXLexsgPUjk3LpjCUrJaH5qXUoF4ghHcslzrhB+PTMApdBkq8tYXAu9dYxnX2BfGVb6O1zg4LR87EEupZYgvgY5cRE/lj7K776RDg8LwH0aGVUzEu1WaRY82tAo4EDxNmLmXOz2kqD58o5Qzy+jFe1w0n2qqHp4v0etRFBApzj9/uqTentDnA6p2Q3ojDyJsga8XUb9Olx1ls/wks/jAyDiw5UGuUZg0QHjJVJpXF6jRlgP1SMbEMFCq812Dz+AVTBGLYn46xj7Nf7CfJUot5ZbLQbEJG7NFl4gLc3i2B9+c1LyxGGKQsUL+1Im2ptSx3J5x/vNXbN3LqcHxHfNRnnxZYpDmenPmqgr/OfwSXmT3oWewsQfffgargbK+y1R8i3xQ== 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)(316002)(66556008)(6916009)(31696002)(83380400001)(86362001)(508600001)(8676002)(16576012)(53546011)(2906002)(36756003)(26005)(31686004)(38350700002)(38100700002)(66476007)(2616005)(8936002)(956004)(6486002)(186003)(44832011)(52116002)(4326008)(5660300002)(66946007)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?d2xlcGo1ek9oRDJRYjduN29QL096NlhBSGdqSzF4SlgzSTNUOFZ2aFFyM2dF?= =?utf-8?B?RlBBcHMrQVpOK0ZQWk5zYmNsRWtsRjBnL3lMeHVUK1UrT28yYVArc1Z5aGor?= =?utf-8?B?SjJQTElNQTh2VnlQTTBPeWVzOGxydWlyVmtwZ2pOU0hXWC9XRFJ4MU1talNE?= =?utf-8?B?SFFDOGhILy9teVgxMkZKaTdBcHc1ODh4VkNSVUlNcXByQlIzanAvWVp1c1RQ?= =?utf-8?B?bDZlaDh1NzJ5SWoreGlleGhLdkNvKytYcmJPK3MyVE5KVGErbHNYRWd4KytJ?= =?utf-8?B?MTg4Rzd6VlhyMWFrNWIzRVN2U0F0UWxob1owYTV6K3M2ZUdQQUxEblVMVnQ5?= =?utf-8?B?RWdYbEpNS2E2WjlvbVlEN1RmUlhiaGpKeWxnamowNzRJWEZBS1lpZXV3ZGFq?= =?utf-8?B?eFBJL0J0L0htNnA5eWdOODBWSWFmSDNzMExiU1YvTEJyRXZsSTM5REZmTGVP?= =?utf-8?B?US9DUVRHTENoaDNQVW1NSzdpVTF0MEw4a0VuaDZ5ZHhzSmxyK2kveW1ITjha?= =?utf-8?B?UW5vT3hhWnB3NzJsaXErSDBJdG9pekJaWVpraGkvZllhZmRENTloY2lOUFBH?= =?utf-8?B?Nk1jTklwZFVZOTNDc2J3cDBjR0pWVVR0NXlOem1RSlliOHc2aTJTSXNrN0o3?= =?utf-8?B?bzJDWnZPMkdkQ040L2JDZWFQUkh1NmxkMkIvZkVVMlBjcEZxTDdmR2g4eWJV?= =?utf-8?B?MjJWSWVqMU9IVDJEZXQzU2dEN3RQWnROUG1EWWt4UXZjQW9wbk9JZ0dYdExR?= =?utf-8?B?MUVOdXNuSXNuTHk5eTdNWmREaUxUMzF2eFFGVVBPa2xuakttbVdXWDBGMVJM?= =?utf-8?B?NUE3dkcrOUJUS0grMkllWFgrNzlrcEc1TjIxL2xpeDV3eC91M3FhUkdrNXlo?= =?utf-8?B?bFJMZ3Q2UlU4Mlh0M0NHVVVYSm1DV2JCRDZLbFNqeGd3L1dhYitSSHVxd1Rq?= =?utf-8?B?T1lhZlUrOGJkdytDT3ptNE1obWxxdTU1SU9wTWUxZE9KdDQ5NGFtZHNuTTlV?= =?utf-8?B?RHdhM3JsZXpDWXBGaWJwdUxGK20xeStlUVVoRTgxK3F0bWRiNUQ0bXZFMm1E?= =?utf-8?B?aGpIZjJaR1ZlQUUvNmNrTjd2M2pjcllicy9qcjB4R2FLNTZtUU9QdXFkdFla?= =?utf-8?B?YVhTRFk3aTlyV0JTbTFueks3Zi9JS3FGOTNzTmx4TjlPV2poRUthb2c0Ulhq?= =?utf-8?B?UnJOV21HLzVmanhyL21ERUE4RzFmc1pydSsySm5oU2F4MEU0NnlRUTZmeDF1?= =?utf-8?B?dG5UUkJzOVpNa2hzOHFITytkMFhlVjNFeldTWGYrbkM4azF3eHpoNXBaSG9X?= =?utf-8?B?MXFNYlRLTVFnUWpha2U0RmxEN2F1WURYZVgwVmpNcmxzWDJmYUFqcWFFem84?= =?utf-8?B?VDVwUDk3QzgrcWJpRFJpSExyREpPNXQ4VTF4WUNUT0NDT202eE1KcmxieFZ0?= =?utf-8?B?SkcvdTFJS0RrdXI1azBGMGZTY0tLWWQxVXBDaTZSdlM4a291UzNDN1IvaEtk?= =?utf-8?B?MmQ5dTl5ZGE2M25mb2hUQzZ2MlNjNWRuemFxMmxVK2ZuNEp6ZkhYZnJONGVY?= =?utf-8?B?Y2lrd3g5NXQwVGtTaEZTWFFkRVpOZG4vTlVOREpPaU1ER0pqbGlHclJYeXRG?= =?utf-8?B?UWJKeDJjSzM0c2hRMnQ3d1Q5SyszbHNROGllWTN6MEFKZnl5OWlNaEY5YTlR?= =?utf-8?B?SzRlUWZnTmFnSUZJeStRMU5nVC9WU1JjczdCMTQ5L0V2NW9TREE2Zi9mVHQy?= =?utf-8?B?VU1Mb1hGemNJaWFrY1UwWWhKdGVhRWJjeGlmdmc5UkRzNlB5TWR4TTFnR2p6?= =?utf-8?B?RDJHQXZZckhXaDhDdEcxeE5hNFF2YUZQU1F3blh3d3BybStHZWxvUE5venJO?= =?utf-8?B?dFZERWs1bnVVT0MvcmFLMCtNZU5zNmIzN3lta1dnNXZ1SjFKejZOVVpWbm5W?= =?utf-8?B?THM5Wml0SkxHU1dpcWVYM3V5T3BGS1Y1MWR5ajdXZVJpY1V6N040bGRWdUpF?= =?utf-8?B?dWNMd2xWVDNhdXBRWlNDY2FaTTAydDN2SS9pTitSa1c2K3ZnUlI0cVlHR2xq?= =?utf-8?B?TlhQbXpNNlB3RE1zNUQ2RTM1VUpKd3l1Qy9XUThvMkUvNUdNbE8wYmkxcnhV?= =?utf-8?B?a2Z0WU00RlgvZTYxeGo0YWNrbHpCOVhTVDNFblpxK00xQXVTckxQQnRNa2E1?= =?utf-8?Q?14mSftMammRVh60jTbBWpGs=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02c93560-300b-45b8-3689-08d99d8c09e0 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Nov 2021 23:05:03.8816 (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: LNp6sC0aejxQUntQVN4TFh4rHY3ph6UQMAlV6a+PhC5gRme5ZRklJsIznPlBMpHLXJ3m3Ma9C7DOSTHKX/ocbw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3157 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10155 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxscore=0 spamscore=0 malwarescore=0 mlxlogscore=999 adultscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111010121 X-Proofpoint-GUID: mW78wPHQpOzyhUsO_39nyFFFyRb2XP5H X-Proofpoint-ORIG-GUID: mW78wPHQpOzyhUsO_39nyFFFyRb2XP5H X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 549521906 Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=c8zYIOQR; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b="Q7G/0WJN"; spf=none (imf22.hostedemail.com: domain of mike.kravetz@oracle.com has no SPF policy when checking 205.220.177.32) smtp.mailfrom=mike.kravetz@oracle.com; dmarc=pass (policy=none) header.from=oracle.com X-Stat-Signature: 6t5x3gzqg1xa8prom5higfd4o19af7hn X-HE-Tag: 1635807916-214888 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/1/21 2:09 PM, 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. > > Signed-off-by: zhangyiru > --- > Changelog: > 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 | 11 ++++------- > include/linux/hugetlb.h | 3 +-- > ipc/shm.c | 8 +------- > mm/memfd.c | 4 +--- > mm/mmap.c | 3 +-- > 5 files changed, 8 insertions(+), 21 deletions(-) > > diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c > index cdfb1ae78a3f..363eec008390 100644 > --- a/fs/hugetlbfs/inode.c > +++ b/fs/hugetlbfs/inode.c > @@ -1446,19 +1446,19 @@ 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; > int hstate_idx; > struct file *file; > + struct ucounts **ucounts; How about just moving this to the block where it is used? And no need for **ucounts, just struct *ucounts should do. > > hstate_idx = get_hstate_idx(page_size_log); > if (hstate_idx < 0) > return ERR_PTR(-ENODEV); > > - *ucounts = NULL; > mnt = hugetlbfs_vfsmount[hstate_idx]; > if (!mnt) > return ERR_PTR(-ENOENT); > @@ -1466,12 +1466,9 @@ struct file *hugetlb_file_setup(const char *name, size_t size, > 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", Please do change this to "... is obsolete\n". I am not sure why there was a v4 with the change back to deprecated? > current->comm, current->pid); > - task_unlock(current); > - } else { > - *ucounts = NULL; > + user_shm_unlock(size, *ucounts); > return ERR_PTR(-EPERM); I believe this error return should be outside this 'if user_shm_lock()' block. After the following '}'. > } Place return ERR_PTR(-EPERM); here. > } Also, need to remove the user_shm_unlock after out: in this function. -- Mike Kravetz