| Message ID | 20190329220840.51187-7-alice.michael@intel.com |
|---|---|
| State | Accepted |
| Delegated to: | Jeff Kirsher |
| Headers | show |
| Series | [next,S4,01/11] i40e: VF's promiscuous attribute is not kept | expand |
> -----Original Message----- > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On > Behalf Of Alice Michael > Sent: Friday, March 29, 2019 3:09 PM > To: Michael, Alice <alice.michael@intel.com>; intel-wired- > lan@lists.osuosl.org > Subject: [Intel-wired-lan] [next PATCH S4 07/11] i40e: add num_vectors > checker in iwarp handler > > From: Sergey Nemov <sergey.nemov@intel.com> > > Field num_vectors from struct virtchnl_iwarp_qvlist_info should not be > larger than num_msix_vectors_vf in the hw struct. The iwarp uses the same > set of vectors as the LAN VF driver. > > Signed-off-by: Sergey Nemov <sergey.nemov@intel.com> > --- > drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c index 00345bbf68ec..25490cfb06fc 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c @@ -442,6 +442,16 @@ static int i40e_config_iwarp_qvlist(struct i40e_vf *vf, u32 next_q_idx, next_q_type; u32 msix_vf, size; + msix_vf = pf->hw.func_caps.num_msix_vectors_vf; + + if (qvlist_info->num_vectors > msix_vf) { + dev_warn(&pf->pdev->dev, + "Incorrect number of iwarp vectors %u. Maximum %u allowed.\n", + qvlist_info->num_vectors, + msix_vf); + goto err; + } + size = sizeof(struct virtchnl_iwarp_qvlist_info) + (sizeof(struct virtchnl_iwarp_qv_info) * (qvlist_info->num_vectors - 1));