iavf: Replace one-element array in struct virtchnl_iwarp_qvlist_info and iavf_qvlist_info
Subsystems (3)
PATCH 1/1 iavf: Replace one-element array in struct virtchnl_iwarp_qvlist_info and iavf_qvlist_info
There is a regular need in the kernel to provide a way to declare having a dynamically sized set of trailing elements in a structure. Kernel code should always use “flexible array members”[1] for these cases. The older style of one-element or zero-length arrays should no longer be used[2].
Refactor the code according to the use of a flexible-array member in struct virtchnl_iwarp_qvlist_info and iavf_qvlist_info instead of one-element array, and use the flex_array_size() helper.
[1] https://en.wikipedia.org/wiki/Flexible_array_member
[2] https://www.kernel.org/doc/html/v5.10/process/deprecated.html#zero-length-and-one-element-arrays
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 +- drivers/net/ethernet/intel/iavf/iavf_client.c | 2 +- drivers/net/ethernet/intel/iavf/iavf_client.h | 2 +- include/linux/avf/virtchnl.h | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +1 -1
@@ -515,7 +515,7 @@ static int i40e_config_iwarp_qvlist(struct i40e_vf *vf,kfree (vf->qvlist_info); vf->qvlist_info =kzalloc (struct_size (vf->qvlist_info, qv_info, - qvlist_info->num_vectors -1 ), + qvlist_info->num_vectors),GFP_KERNEL );if (!vf->qvlist_info) { ret = -ENOMEM ;
drivers/net/ethernet/intel/iavf/iavf_client.c +1 -1
@@ -470,7 +470,7 @@ static int iavf_client_setup_qvlist(struct iavf_info *ldev, v_qvlist_info = (struct virtchnl_iwarp_qvlist_info *)qvlist_info; msg_size =struct_size (v_qvlist_info, qv_info, - v_qvlist_info->num_vectors -1 ); + v_qvlist_info->num_vectors); adapter->client_pending |=BIT (VIRTCHNL_OP_CONFIG_IWARP_IRQ_MAP ); err = iavf_aq_send_msg_to_pf(&adapter->hw,
drivers/net/ethernet/intel/iavf/iavf_client.h +1 -1
@@ -53,7 +53,7 @@ struct iavf_qv_info {struct iavf_qvlist_info {u32 num_vectors; -struct iavf_qv_info qv_info[1 ]; +struct iavf_qv_info qv_info[]; };#define IAVF_CLIENT_MSIX_ALL 0xFFFFFFFF
include/linux/avf/virtchnl.h +4 -4
@@ -658,10 +658,10 @@ VIRTCHNL_CHECK_STRUCT_LEN(12, virtchnl_iwarp_qv_info);struct virtchnl_iwarp_qvlist_info {u32 num_vectors; -struct virtchnl_iwarp_qv_info qv_info[1 ]; +struct virtchnl_iwarp_qv_info qv_info[]; }; -VIRTCHNL_CHECK_STRUCT_LEN (16 , virtchnl_iwarp_qvlist_info); +VIRTCHNL_CHECK_STRUCT_LEN (4 , virtchnl_iwarp_qvlist_info);/* VF reset states - these are written into the RSTAT register: * VFGEN_RSTAT on the VF
@@ -1069,8 +1069,8 @@ virtchnl_vc_validate_vf_msg(struct virtchnl_version_info *ver, u32 v_opcode, err_msg_format = true;break ; } - valid_len += ((qv->num_vectors -1 ) * -sizeof (struct virtchnl_iwarp_qv_info )); + valid_len +=flex_array_size (qv, qv_info, + qv->num_vectors); }break ;case VIRTCHNL_OP_CONFIG_RSS_KEY :
Signature · 1 line
2.27.0
Hi all,
Friendly ping (after more than a year after I sent this patch :O):
Who can review and/or take this patch, please?
Thanks
--
Gustavo
Quoted 88 lines · Gustavo A. R. Silva
There is a regular need in the kernel to provide a way to declare having a dynamically sized set of trailing elements in a structure. Kernel code should always use “flexible array members”[1] for these cases. The older style of one-element or zero-length arrays should no longer be used[2].
Refactor the code according to the use of a flexible-array member in struct
virtchnl_iwarp_qvlist_infoandiavf_qvlist_infoinstead of one-element array, and use theflex_array_size()helper.[1] https://en.wikipedia.org/wiki/Flexible_array_member
[2] https://www.kernel.org/doc/html/v5.10/process/deprecated.html#zero-length-and-one-element-arrays--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 +- drivers/net/ethernet/intel/iavf/iavf_client.c | 2 +- drivers/net/ethernet/intel/iavf/iavf_client.h | 2 +- include/linux/avf/virtchnl.h | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-)drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +1
-1@@ -515,7 +515,7 @@ static int i40e_config_iwarp_qvlist(struct i40e_vf *vf,kfree (vf->qvlist_info); vf->qvlist_info =kzalloc (struct_size (vf->qvlist_info, qv_info, - qvlist_info->num_vectors -1 ), + qvlist_info->num_vectors),GFP_KERNEL );if (!vf->qvlist_info) { ret = -ENOMEM ;drivers/net/ethernet/intel/iavf/iavf_client.c +1
-1@@ -470,7 +470,7 @@ static int iavf_client_setup_qvlist(struct iavf_info *ldev, v_qvlist_info = (struct virtchnl_iwarp_qvlist_info *)qvlist_info; msg_size =struct_size (v_qvlist_info, qv_info, - v_qvlist_info->num_vectors -1 ); + v_qvlist_info->num_vectors); adapter->client_pending |=BIT (VIRTCHNL_OP_CONFIG_IWARP_IRQ_MAP ); err = iavf_aq_send_msg_to_pf(&adapter->hw,drivers/net/ethernet/intel/iavf/iavf_client.h +1
-1@@ -53,7 +53,7 @@ struct iavf_qv_info {struct iavf_qvlist_info {u32 num_vectors; -struct iavf_qv_info qv_info[1 ]; +struct iavf_qv_info qv_info[]; };#define IAVF_CLIENT_MSIX_ALL 0xFFFFFFFFinclude/linux/avf/virtchnl.h +4
-4@@ -658,10 +658,10 @@ VIRTCHNL_CHECK_STRUCT_LEN(12, virtchnl_iwarp_qv_info);struct virtchnl_iwarp_qvlist_info {u32 num_vectors; -struct virtchnl_iwarp_qv_info qv_info[1 ]; +struct virtchnl_iwarp_qv_info qv_info[]; }; -VIRTCHNL_CHECK_STRUCT_LEN (16 , virtchnl_iwarp_qvlist_info); +VIRTCHNL_CHECK_STRUCT_LEN (4 , virtchnl_iwarp_qvlist_info);/* VF reset states - these are written into the RSTAT register: * VFGEN_RSTAT on the VF @@ -1069,8 +1069,8 @@ virtchnl_vc_validate_vf_msg(struct virtchnl_version_info *ver, u32 v_opcode, err_msg_format = true;break ; } - valid_len += ((qv->num_vectors -1 ) * -sizeof (struct virtchnl_iwarp_qv_info )); + valid_len +=flex_array_size (qv, qv_info, + qv->num_vectors); }break ;case VIRTCHNL_OP_CONFIG_RSS_KEY :
Tony Nguyen
maintainerQuoted 5 lines · Gustavo A. R. Silva
Hi all,
Friendly ping (after more than a year after I sent this patch :O):
Who can review and/or take this patch, please?
Hi Gustavo,
IIRC this could cause some issues with the expectations of the virtchnl structures [1] for compatibility. There was a direction that we were going to head to resolve this. Unfortunately, the person who, I believe, was going to make this change is out for a couple of weeks. I will ask around and see if I can get any updates on this work. Otherwise, I'll ask him when he returns.
Thanks,
Tony
[1] https://lore.kernel.org/intel-wired-lan/[email protected]/
Quoted 21 lines
Thanks
Signature · 1 line
GustavoQuoted 15 lines · Gustavo A. R. Silva
There is a regular need in the kernel to provide a way to declare having a dynamically sized set of trailing elements in a structure. Kernel code should always use “flexible array members”[1] for these cases. The older style of one-element or zero-length arrays should no longer be used[2].
Refactor the code according to the use of a flexible-array member in struct
virtchnl_iwarp_qvlist_infoandiavf_qvlist_infoinstead of one-element array, and use theflex_array_size()helper.[1] https://en.wikipedia.org/wiki/Flexible_array_member
[2] https://www.kernel.org/doc/html/v5.10/process/deprecated.html#zero-length-and-one-element-arrays