Received-SPF: pass (google.com: domain of linux-kernel+bounces-150200-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Thu, 18 Apr 2024 09:48:31 -0400
From: Frank Li <Frank.li@nxp.com>
To: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Cc: Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= <kw@linux.com>,
	Kishon Vijay Abraham I <kishon@kernel.org>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Lorenzo Pieralisi <lpieralisi@kernel.org>,
	linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
	Niklas Cassel <cassel@kernel.org>,
	Dan Carpenter <dan.carpenter@linaro.org>
Subject: Re: [PATCH v2 1/2] PCI: endpoint: pci-epf-test: Make use of cached
 'epc_features' in pci_epf_test_core_init()
Message-ID: <ZiEkr3uTLK9B1jGx@lizhi-Precision-Tower-5810>
References: <20240418-pci-epf-test-fix-v2-0-eacd54831444@linaro.org>
 <20240418-pci-epf-test-fix-v2-1-eacd54831444@linaro.org>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240418-pci-epf-test-fix-v2-1-eacd54831444@linaro.org>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?8NPmmMmXgfuYyVwFh6N0/bnArTVUad+Y4FkQnPHNpoGi5Lg76tJULWi9KU/B?=
 =?us-ascii?Q?wKFsVLvJex+AJCpvZCFcc4Hl5ApHUmARH46GfBSUx4DCpYmdnuiQyYFE1260?=
 =?us-ascii?Q?w8eYdKrJALyS+TICLTkyHXJzAQgINYi3aTqRrdUXrNFnMxQRagIEzohslA2m?=
 =?us-ascii?Q?8olTKiv7SbxnTaVhdRWHVfFHM4nA5Hj8+YTCe0iGeEUUF3NiSUodyY7IQoLl?=
 =?us-ascii?Q?J0AJhRbcK6+lq8maP8iwBQBrATqN4n5TqnpB+LcLkwFSg2TUogEZKpVrLwiY?=
 =?us-ascii?Q?zP16jVw1qgGoRzqMrre5KLg1SekNt6o/yBP1+5zmh3TZ0AR2LZQxv6C5VkHY?=
 =?us-ascii?Q?WwYCedUMW1DGJdoqjWSruBvxOhPv+Yn70cbEW9tzkVXIlMqzGkfKh6GOKdzu?=
 =?us-ascii?Q?wC547BHKxPCjg8WLEmldQQeW2hRNJeLA2ZBnctnnyQ05BQ7Q+TfZZgX3FJwD?=
 =?us-ascii?Q?n9HZGUn06cF6zc6Hgt0NQwzJVolCUNY+5bmk4SbGjfAb4CP/ye/rLt8PJq+4?=
 =?us-ascii?Q?qfKk8a6qftzufaQH0dUiWCPc4uU7ncsjzvzhl91Lmcd5yJPJ3VMWAOYOy1FF?=
 =?us-ascii?Q?nNZHuaFVsH9D+NyOzuw3ZY3EZ7dnVGwMFyU9IboBbG7Ze0SOTIbkV4hc5/SD?=
 =?us-ascii?Q?X3l5Uoi2fNdT4VMAinx7BPZWQnqGnwX6VHDW+pCI3nObeNQSO8IXfD/TfLkW?=
 =?us-ascii?Q?xw36Gqg4IlEGvjuGVfaWzMcLm/65ifEHzTLFVNlzRahrhym7U1t7YVvSRlnS?=
 =?us-ascii?Q?3Ag3tRIYKdUgOsQ2kZGDQmIttVRXJ4CPN2/In+uvX9QWes35u/2TMIegkxqA?=
 =?us-ascii?Q?fhvJLYYxk8wjPAMzoVbgIn7NmEqCm5rhz1kdwntJKw2KC1FnT17ou8zl/yDe?=
 =?us-ascii?Q?0ALnWJpBgjFv3bPHk5qbnMk0MZmeA7gT8jvbhTimRp42Q1nHGPsGo1wK6lKQ?=
 =?us-ascii?Q?SZT0ArLbr8oSyD0xDm4OQWubYKhS3TSo55A25fDGCLjfm0a0rwVSIHbcxuLD?=
 =?us-ascii?Q?LmdaxhjcjJLRWnFdPDQgOI0dSod+Lj/3Zyqw613R3nOy6WTJhXmBkRzLjqpK?=
 =?us-ascii?Q?obOQOSDRiRZouYveoiIDS14wRUcAdWyhcCpP0zSosd4u0d3vqcSnhQYFYs5d?=
 =?us-ascii?Q?NUw7apJbRkkM417JLZCBBVoQfCuZdz4GzhaD23RKKIKfTas3iZtVtjXMV7YJ?=
 =?us-ascii?Q?GNM3hXlRtKPesau8DXr+L3ukv9s0rj0vGgRWD9aXHYki/kRtWp99FS2vHHVN?=
 =?us-ascii?Q?HGKKA/OJ7O34TNNrFDNSAnUCZaXbBPua1GHtUIC3cejfKgyvvio6Yh9AwpfK?=
 =?us-ascii?Q?+pjk4mZJtKymt4PeWErIkxtFkHi98HztJujMipsYn74zCkKJaJyqca78VdX4?=
 =?us-ascii?Q?BAXUqqVt6djnvzWwLmKof+Lfj2qYfaV+7j7oG+yuYe6Z7riy8PEa7fIFSVyW?=
 =?us-ascii?Q?FCa8D0CW8n34MlG1b1X6pUqgTS8Qxbm7ZuPFzXPrRQhxr2V8c1hsywvTzzlR?=
 =?us-ascii?Q?8kzkX5Qjg2hT4JeOpxGj+CC28O/lJ1YuovMgFSvptRJWXI7vFRhrk+/C6E02?=
 =?us-ascii?Q?HDhXLkN5Miv8+ecqUso=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 69b1edc4-8615-4627-3812-08dc5fae419e
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 13:48:41.2680
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: OLvO/7vxIh4K6BXuyC2BSI9nkdEC3vf/Y7xe8uBodiWgKSbsFJBQE7rj8XYf7NGN3QXwKQH1CMH6xsigYAfCcg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB9640

On Thu, Apr 18, 2024 at 01:29:58PM +0530, Manivannan Sadhasivam wrote:
> Instead of getting the epc_features from pci_epc_get_features() API, use
> the cached pci_epf_test::epc_features value to avoid the NULL check. Since
> the NULL check is already performed in pci_epf_test_bind(), having one more
> check in pci_epf_test_core_init() is redundant and it is not possible to
> hit the NULL pointer dereference.
> 
> Also with commit a01e7214bef9 ("PCI: endpoint: Remove "core_init_notifier"
> flag"), 'epc_features' got dereferenced without the NULL check, leading to
> the following false positive smatch warning:
> 
> drivers/pci/endpoint/functions/pci-epf-test.c:784 pci_epf_test_core_init()
> error: we previously assumed 'epc_features' could be null (see line 747)
> 
> So let's remove the redundant NULL check and also use the epc_features::
> {msix_capable/msi_capable} flags directly to avoid local variables.
> 
> Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
> Closes: https://lore.kernel.org/linux-pci/024b5826-7180-4076-ae08-57d2584cca3f@moroto.mountain/
> Fixes: 5e50ee27d4a5 ("PCI: pci-epf-test: Add support to defer core initialization")
> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

Reviewed-by: Frank Li <Frank.Li@nxp.com>

> ---
>  drivers/pci/endpoint/functions/pci-epf-test.c | 14 +++-----------
>  1 file changed, 3 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c
> index 977fb79c1567..546d2a27955c 100644
> --- a/drivers/pci/endpoint/functions/pci-epf-test.c
> +++ b/drivers/pci/endpoint/functions/pci-epf-test.c
> @@ -735,20 +735,12 @@ static int pci_epf_test_core_init(struct pci_epf *epf)
>  {
>  	struct pci_epf_test *epf_test = epf_get_drvdata(epf);
>  	struct pci_epf_header *header = epf->header;
> -	const struct pci_epc_features *epc_features;
> +	const struct pci_epc_features *epc_features = epf_test->epc_features;
>  	struct pci_epc *epc = epf->epc;
>  	struct device *dev = &epf->dev;
>  	bool linkup_notifier = false;
> -	bool msix_capable = false;
> -	bool msi_capable = true;
>  	int ret;
>  
> -	epc_features = pci_epc_get_features(epc, epf->func_no, epf->vfunc_no);
> -	if (epc_features) {
> -		msix_capable = epc_features->msix_capable;
> -		msi_capable = epc_features->msi_capable;
> -	}
> -
>  	if (epf->vfunc_no <= 1) {
>  		ret = pci_epc_write_header(epc, epf->func_no, epf->vfunc_no, header);
>  		if (ret) {
> @@ -761,7 +753,7 @@ static int pci_epf_test_core_init(struct pci_epf *epf)
>  	if (ret)
>  		return ret;
>  
> -	if (msi_capable) {
> +	if (epc_features->msi_capable) {
>  		ret = pci_epc_set_msi(epc, epf->func_no, epf->vfunc_no,
>  				      epf->msi_interrupts);
>  		if (ret) {
> @@ -770,7 +762,7 @@ static int pci_epf_test_core_init(struct pci_epf *epf)
>  		}
>  	}
>  
> -	if (msix_capable) {
> +	if (epc_features->msix_capable) {
>  		ret = pci_epc_set_msix(epc, epf->func_no, epf->vfunc_no,
>  				       epf->msix_interrupts,
>  				       epf_test->test_reg_bar,
> 
> -- 
> 2.25.1
>