Skip to contentSkip to conversation

vDPA/ifcvf: fix uninitialized config_vector warning

PATCH In review Zhu Lingshan 2 participants 2 messages Apr 24, 2022 – Apr 27, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vDPA/ifcvf: fix uninitialized config_vector warning

Static checkers are not informed that config_vector is controlled by vf->msix_vector_status, which can only be MSIX_VECTOR_SHARED_VQ_AND_CONFIG, MSIX_VECTOR_SHARED_VQ_AND_CONFIG and MSIX_VECTOR_DEV_SHARED.

This commit uses an "if...elseif...else" code block to tell the checkers that it is a complete set, and config_vector can be initialized anyway

---
 drivers/vdpa/ifcvf/ifcvf_main.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/vdpa/ifcvf/ifcvf_main.c +6 -6
index 4366320fb68d..9172905fc7ae 100644
@@ -290,16 +290,16 @@ static int ifcvf_request_config_irq(struct ifcvf_adapter *adapter)
 	struct ifcvf_hw *vf = &adapter->vf;
 	int config_vector, ret;
 
-	if (vf->msix_vector_status == MSIX_VECTOR_DEV_SHARED)
-		return 0;
-
 	if (vf->msix_vector_status == MSIX_VECTOR_PER_VQ_AND_CONFIG)
-		/* vector 0 ~ vf->nr_vring for vqs, num vf->nr_vring vector for config interrupt */
 		config_vector = vf->nr_vring;
-
-	if (vf->msix_vector_status ==  MSIX_VECTOR_SHARED_VQ_AND_CONFIG)
+	else if (vf->msix_vector_status ==  MSIX_VECTOR_SHARED_VQ_AND_CONFIG)
 		/* vector 0 for vqs and 1 for config interrupt */
 		config_vector = 1;
+	else if (vf->msix_vector_status == MSIX_VECTOR_DEV_SHARED)
+		/* re-use the vqs vector */
+		return 0;
+	else
+		return -EINVAL;
 
 	snprintf(vf->config_msix_name, 256, "ifcvf[%s]-config\n",
 		 pci_name(pdev));
Signature · 1 line
2.31.1
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Zhu Lingshan

Static checkers are not informed that config_vector is controlled by vf->msix_vector_status, which can only be MSIX_VECTOR_SHARED_VQ_AND_CONFIG, MSIX_VECTOR_SHARED_VQ_AND_CONFIG and MSIX_VECTOR_DEV_SHARED.

Quoted 6 lines

This commit uses an "if...elseif...else" code block to tell the checkers that it is a complete set, and config_vector can be initialized anyway

Quoted 34 lines
---
 drivers/vdpa/ifcvf/ifcvf_main.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/vdpa/ifcvf/ifcvf_main.c +6 -7
index 4366320fb68d..9172905fc7ae 100644
@@ -290,16 +290,16 @@ static int ifcvf_request_config_irq(struct ifcvf_adapter *adapter)
        struct ifcvf_hw *vf = &adapter->vf;
        int config_vector, ret;
 
-       if (vf->msix_vector_status == MSIX_VECTOR_DEV_SHARED)
-               return 0;
-
        if (vf->msix_vector_status == MSIX_VECTOR_PER_VQ_AND_CONFIG)
-               /* vector 0 ~ vf->nr_vring for vqs, num vf->nr_vring vector for config interrupt */
                config_vector = vf->nr_vring;
-
-       if (vf->msix_vector_status ==  MSIX_VECTOR_SHARED_VQ_AND_CONFIG)
+       else if (vf->msix_vector_status ==  MSIX_VECTOR_SHARED_VQ_AND_CONFIG)
                /* vector 0 for vqs and 1 for config interrupt */
                config_vector = 1;
+       else if (vf->msix_vector_status == MSIX_VECTOR_DEV_SHARED)
+               /* re-use the vqs vector */
+               return 0;
+       else
+               return -EINVAL;
 
        snprintf(vf->config_msix_name, 256, "ifcvf[%s]-config\n",
                 pci_name(pdev));
--

2.31.1