Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   ebiederm@xmission.com (Eric W. Biederman)
To:     Kaitao Cheng <pilgrimtao@gmail.com>
Cc:     adobriyan@gmail.com, christian@brauner.io,
        akpm@linux-foundation.org, gladkov.alexey@gmail.com, guro@fb.com,
        walken@google.com, avagin@gmail.com, khlebnikov@yandex-team.ru,
        linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
References: <20200527141155.47554-1-pilgrimtao@gmail.com>
Date:   Wed, 27 May 2020 09:41:53 -0500
In-Reply-To: <20200527141155.47554-1-pilgrimtao@gmail.com> (Kaitao Cheng's
        message of "Wed, 27 May 2020 22:11:55 +0800")
Message-ID: <87k10x5tji.fsf@x220.int.ebiederm.org>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
Subject: Re: [PATCH] proc/base: Skip assignment to len when there is no error on d_path in do_proc_readlink.
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Kaitao Cheng <pilgrimtao@gmail.com> writes:

> we don't need {len = PTR_ERR(pathname)} when IS_ERR(pathname) is false,
> it's better to move it into if(IS_ERR(pathname)){}.

Please look at the generated code.

I believe you will find that your change will generate worse assembly.

Eric


> Signed-off-by: Kaitao Cheng <pilgrimtao@gmail.com>
> ---
>  fs/proc/base.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/fs/proc/base.c b/fs/proc/base.c
> index d86c0afc8a85..9509e0d42610 100644
> --- a/fs/proc/base.c
> +++ b/fs/proc/base.c
> @@ -1753,9 +1753,10 @@ static int do_proc_readlink(struct path *path, char __user *buffer, int buflen)
>  		return -ENOMEM;
>  
>  	pathname = d_path(path, tmp, PAGE_SIZE);
> -	len = PTR_ERR(pathname);
> -	if (IS_ERR(pathname))
> +	if (IS_ERR(pathname)) {
> +		len = PTR_ERR(pathname);
>  		goto out;
> +	}
>  	len = tmp + PAGE_SIZE - 1 - pathname;
>  
>  	if (len > buflen)