Re: [PATCH Vx RESEND] mm,hugetlb: remove mlock ulimit for SHM_HUGETLB

[Mike Kravetz <mike.kravetz@oracle.com>]

On 9/4/21 12:54 AM, zhangyiru wrote:
> remove mlock ulimit for SHM_HUGETLB
> 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

A better commit to mention would be 2584e517320b ("mm: reintroduce and
deprecate rlimit based access for SHM_HUGETLB").  IIUC, 21a3c273f88c just
modified the log message.

There is nothing wrong with the code.  Adding Andrew and Michal on Cc:
as I have little or no experience with removing deprecated
features/code.  This certainly has been marked deprecated for a long
time (since 2.6.31).  However, I still see that message in log files on
occasion.

Andrew/Michal, comments?
-- 
Mike Kravetz

> 
> Signed-off-by: zhangyiru <zhangyiru3@huawei.com>
> ---
>  fs/hugetlbfs/inode.c | 14 ++------------
>  1 file changed, 2 insertions(+), 12 deletions(-)
> 
> diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
> index cdfb1ae78a3f..c092c4931c3e 100644
> --- a/fs/hugetlbfs/inode.c
> +++ b/fs/hugetlbfs/inode.c
> @@ -1463,18 +1463,8 @@ struct file *hugetlb_file_setup(const char *name, size_t size,
>  	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",
> -				current->comm, current->pid);
> -			task_unlock(current);
> -		} else {
> -			*ucounts = NULL;
> -			return ERR_PTR(-EPERM);
> -		}
> -	}
> +	if (creat_flags == HUGETLB_SHMFS_INODE && !can_do_hugetlb_shm())
> +		return ERR_PTR(-EPERM);
>  
>  	file = ERR_PTR(-ENOSPC);
>  	inode = hugetlbfs_get_inode(mnt->mnt_sb, NULL, S_IFREG | S_IRWXUGO, 0);
>