| Message ID | 20240724212940.2819-1-pavan.kumar.linga@intel.com |
|---|---|
| State | Accepted |
| Delegated to: | Anthony Nguyen |
| Headers | show |
| Series | [iwl-net] idpf: remove redundant 'req_vec_chunks' NULL check | expand |
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of > Pavan Kumar Linga > Sent: Wednesday, July 24, 2024 2:30 PM > To: intel-wired-lan@lists.osuosl.org > Cc: Linga, Pavan Kumar <pavan.kumar.linga@intel.com>; Dan Carpenter > <dan.carpenter@linaro.org> > Subject: [Intel-wired-lan] [PATCH iwl-net] idpf: remove redundant > 'req_vec_chunks' NULL check > > 'req_vec_chunks' is used to store the vector info received > from the device control plane. The memory for it is allocated > in idpf_send_alloc_vectors_msg and returns an error if the memory > allocation fails. > > 'req_vec_chunks' cannot be NULL in the later code flow. So remove > the conditional check to extract the vector ids received from > the device control plane. > > Smatch static checker warning: > > drivers/net/ethernet/intel/idpf/idpf_lib.c:417 idpf_intr_req() > error: we previously assumed 'adapter->req_vec_chunks' > could be null (see line 360) > > Fixes: 4930fbf419a7 ("idpf: add core init and interrupt request") > Reported-by: Dan Carpenter <dan.carpenter@linaro.org> > Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org> > Signed-off-by: Pavan Kumar Linga <pavan.kumar.linga@intel.com> > --- > drivers/net/ethernet/intel/idpf/idpf_lib.c | 23 +++++----------------- > 1 file changed, 5 insertions(+), 18 deletions(-) > > diff --git a/drivers/net/ethernet/intel/idpf/idpf_lib.c > b/drivers/net/ethernet/intel/idpf/idpf_lib.c > index 5dbf2b4ba1b0..a56ea36fa8d5 100644 > --- a/drivers/net/ethernet/intel/idpf/idpf_lib.c > +++ b/drivers/net/ethernet/intel/idpf/idpf_lib.c Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
diff --git a/drivers/net/ethernet/intel/idpf/idpf_lib.c b/drivers/net/ethernet/intel/idpf/idpf_lib.c index 5dbf2b4ba1b0..a56ea36fa8d5 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_lib.c +++ b/drivers/net/ethernet/intel/idpf/idpf_lib.c @@ -357,24 +357,11 @@ int idpf_intr_req(struct idpf_adapter *adapter) goto free_msix; } - if (adapter->req_vec_chunks) { - struct virtchnl2_vector_chunks *vchunks; - struct virtchnl2_alloc_vectors *ac; - - ac = adapter->req_vec_chunks; - vchunks = &ac->vchunks; - - num_vec_ids = idpf_get_vec_ids(adapter, vecids, total_vecs, - vchunks); - if (num_vec_ids < v_actual) { - err = -EINVAL; - goto free_vecids; - } - } else { - int i; - - for (i = 0; i < v_actual; i++) - vecids[i] = i; + num_vec_ids = idpf_get_vec_ids(adapter, vecids, total_vecs, + &adapter->req_vec_chunks->vchunks); + if (num_vec_ids < v_actual) { + err = -EINVAL; + goto free_vecids; } for (vector = 0; vector < v_actual; vector++) {
'req_vec_chunks' is used to store the vector info received from the device control plane. The memory for it is allocated in idpf_send_alloc_vectors_msg and returns an error if the memory allocation fails. 'req_vec_chunks' cannot be NULL in the later code flow. So remove the conditional check to extract the vector ids received from the device control plane. Smatch static checker warning: drivers/net/ethernet/intel/idpf/idpf_lib.c:417 idpf_intr_req() error: we previously assumed 'adapter->req_vec_chunks' could be null (see line 360) Fixes: 4930fbf419a7 ("idpf: add core init and interrupt request") Reported-by: Dan Carpenter <dan.carpenter@linaro.org> Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org> Signed-off-by: Pavan Kumar Linga <pavan.kumar.linga@intel.com> --- drivers/net/ethernet/intel/idpf/idpf_lib.c | 23 +++++----------------- 1 file changed, 5 insertions(+), 18 deletions(-)