Received-SPF: pass (google.com: domain of linux-kernel+bounces-104016-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Message-ID: <2f93789c-e931-452a-9b42-43c3254b626f@linux.alibaba.com>
Date: Fri, 15 Mar 2024 11:22:53 +0800
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] relay: avoid relay_open_buf inproperly fails in
 buffer-only mode
To: zhangzhengming <zhang.zhengming@h3c.com>
Cc: akpm@linux-foundation.org, alibuda@linux.alibaba.com,
 dust.li@linux.alibaba.com, gregkh@linuxfoundation.org,
 guwen@linux.alibaba.com, hengqi@linux.alibaba.com, kunyu@nfschina.com,
 linux-kernel@vger.kernel.org, nabijaczleweli@nabijaczleweli.xyz,
 xuanzhuo@linux.alibaba.com, zhao_lei1@hoperun.com, zhou.kete@h3c.com
References: <20240220105836.15815-1-lulie@linux.alibaba.com>
 <20240315023912.13390-1-zhang.zhengming@h3c.com>
From: Philo Lu <lulie@linux.alibaba.com>
In-Reply-To: <20240315023912.13390-1-zhang.zhengming@h3c.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit


On 2024/3/15 10:39, zhangzhengming wrote:
>> diff --git a/kernel/relay.c b/kernel/relay.c
>> index a8e90e98bf2c..0d8b8325530a 100644
>> --- a/kernel/relay.c
>> +++ b/kernel/relay.c
>> @@ -391,12 +391,13 @@ static struct rchan_buf *relay_open_buf(struct rchan *chan, unsigned int cpu)
>>   			goto free_buf;
>>   		relay_set_buf_dentry(buf, dentry);
>>   	} else {
>> -		/* Only retrieve global info, nothing more, nothing less */
>> +		/* In buffer-only mode, relay_open_buf is called with
>> +		 * filename=NULL, but create_buf_file is still needed to
>> +		 * retrieve is_global info. So dentry should be NULL here.
>> +		 */
>>   		dentry = chan->cb->create_buf_file(NULL, NULL,
>>   						   S_IRUSR, buf,
>>   						   &chan->is_global);
>> -		if (IS_ERR_OR_NULL(dentry))
>> -			goto free_buf;
>>   	}
>>   
>>    	buf->cpu = cpu;
> I suggest replacing IS_ERR_OR_NULL with IS_ERR instead of removing it due to the possibility of create_buf_file callback returning an error.
> 

This would be fine. AFAICT the return value here is un-important. So 
reverting to `WARN_ON(dentry)` maybe another choice.