net/iavf: fix rte flow error log issue
Checks
Commit Message
When processing a rte flow, such as creating a parse engine, or
creating or destroying a rss rule, if they are failed, they all
need to construct the flow error structure before return the error
message back to app. If not so, it will cause app crash when
app printing the message out of a flow error.
Fixes: 7be10c3004be ("net/iavf: add RSS configuration for VF")
Fixes: ff2d0c345c3b ("net/iavf: support generic flow API")
Signed-off-by: Jeff Guo <jia.guo@intel.com>
---
drivers/net/iavf/iavf_generic_flow.c | 10 +++++++---
drivers/net/iavf/iavf_hash.c | 12 ++++++++++--
2 files changed, 17 insertions(+), 5 deletions(-)
Comments
> -----Original Message-----
> From: Guo, Jia <jia.guo@intel.com>
> Sent: Saturday, May 9, 2020 4:59 AM
> To: Xing, Beilei <beilei.xing@intel.com>; Ye, Xiaolong
> <xiaolong.ye@intel.com>; Yang, Qiming <qiming.yang@intel.com>; Wu,
> Jingjing <jingjing.wu@intel.com>
> Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; dev@dpdk.org; Lu, Wenzhuo
> <wenzhuo.lu@intel.com>; Guo, Jia <jia.guo@intel.com>
> Subject: [PATCH] net/iavf: fix rte flow error log issue
>
> When processing a rte flow, such as creating a parse engine, or creating or
> destroying a rss rule, if they are failed, they all need to construct the flow
> error structure before return the error message back to app. If not so, it will
> cause app crash when app printing the message out of a flow error.
>
> Fixes: 7be10c3004be ("net/iavf: add RSS configuration for VF")
> Fixes: ff2d0c345c3b ("net/iavf: support generic flow API")
> Signed-off-by: Jeff Guo <jia.guo@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
On 05/09, Zhang, Qi Z wrote:
>
>
>> -----Original Message-----
>> From: Guo, Jia <jia.guo@intel.com>
>> Sent: Saturday, May 9, 2020 4:59 AM
>> To: Xing, Beilei <beilei.xing@intel.com>; Ye, Xiaolong
>> <xiaolong.ye@intel.com>; Yang, Qiming <qiming.yang@intel.com>; Wu,
>> Jingjing <jingjing.wu@intel.com>
>> Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; dev@dpdk.org; Lu, Wenzhuo
>> <wenzhuo.lu@intel.com>; Guo, Jia <jia.guo@intel.com>
>> Subject: [PATCH] net/iavf: fix rte flow error log issue
>>
>> When processing a rte flow, such as creating a parse engine, or creating or
>> destroying a rss rule, if they are failed, they all need to construct the flow
>> error structure before return the error message back to app. If not so, it will
>> cause app crash when app printing the message out of a flow error.
>>
>> Fixes: 7be10c3004be ("net/iavf: add RSS configuration for VF")
>> Fixes: ff2d0c345c3b ("net/iavf: support generic flow API")
>> Signed-off-by: Jeff Guo <jia.guo@intel.com>
>
>Acked-by: Qi Zhang <qi.z.zhang@intel.com>
>
Applied to dpdk-next-net-intel, Thanks.
@@ -868,14 +868,18 @@ iavf_flow_process_filter(struct rte_eth_dev *dev,
*engine = iavf_parse_engine(ad, flow, &vf->rss_parser_list, pattern,
actions, error);
- if (*engine != NULL)
+ if (*engine)
return 0;
*engine = iavf_parse_engine(ad, flow, &vf->dist_parser_list, pattern,
actions, error);
- if (*engine == NULL)
- return -EINVAL;
+ if (!*engine) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
+ "Failed to create parser engine.");
+ return -rte_errno;
+ }
return 0;
}
@@ -1111,7 +1111,11 @@ iavf_hash_create(__rte_unused struct iavf_adapter *ad,
flow->rule = rss_cfg;
} else {
PMD_DRV_LOG(ERR, "fail to add RSS configure");
+ rte_flow_error_set(error, -ret,
+ RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
+ "Failed to add rss rule.");
rte_free(rss_cfg);
+ return -rte_errno;
}
rte_free(meta);
@@ -1130,9 +1134,13 @@ iavf_hash_destroy(__rte_unused struct iavf_adapter *ad,
rss_cfg = (struct virtchnl_rss_cfg *)flow->rule;
ret = iavf_add_del_rss_cfg(ad, rss_cfg, false);
- if (ret)
+ if (ret) {
PMD_DRV_LOG(ERR, "fail to del RSS configure");
-
+ rte_flow_error_set(error, -ret,
+ RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
+ "Failed to delete rss rule.");
+ return -rte_errno;
+ }
return ret;
}