* [dpdk-dev] net/iavf: fix VF reset issue for hash
@ 2020-05-19 0:20 Jeff Guo
2020-05-18 13:14 ` He, Zhiwei
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Jeff Guo @ 2020-05-19 0:20 UTC (permalink / raw)
To: beilei.xing, xiaolong.ye, qi.z.zhang, jingjing.wu; +Cc: dev, jia.guo
Since there are some default rss configure in kernel PF/VF but not DPDK
IAVF, if these configurations be modified by VF and then VF reset, this
default rss configurations can not be reset to default by IAVF. So need
to add default rss set in IAVF hash initial process.
Signed-off-by: Jeff Guo <jia.guo@intel.com>
Fixes: 7be10c3004be ("net/iavf: add RSS configuration for VF")
---
drivers/net/iavf/iavf_hash.c | 51 +++++++++++++++++++++++++++++++++++-
1 file changed, 50 insertions(+), 1 deletion(-)
diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
index 975c84556..04b3492ce 100644
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -857,6 +857,17 @@ struct iavf_hash_match_type iavf_hash_type_list[] = {
&hdrs_hint_ipv6_sctp},
};
+struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
+ &hdrs_hint_ipv4,
+ &hdrs_hint_ipv4_udp,
+ &hdrs_hint_ipv4_tcp,
+ &hdrs_hint_ipv4_sctp,
+ &hdrs_hint_ipv6,
+ &hdrs_hint_ipv6_udp,
+ &hdrs_hint_ipv6_tcp,
+ &hdrs_hint_ipv6_sctp,
+};
+
static struct iavf_flow_engine iavf_hash_engine = {
.init = iavf_hash_init,
.create = iavf_hash_create,
@@ -875,6 +886,33 @@ static struct iavf_flow_parser iavf_hash_parser = {
.stage = IAVF_FLOW_STAGE_RSS,
};
+static int
+iavf_hash_default_set(struct iavf_adapter *ad)
+{
+ struct virtchnl_rss_cfg *rss_cfg;
+ uint16_t i;
+ int ret;
+
+ rss_cfg = rte_zmalloc("iavf rss rule",
+ sizeof(struct virtchnl_rss_cfg), 0);
+ if (!rss_cfg)
+ return -ENOMEM;
+
+ for (i = 0; i < RTE_DIM(iavf_hash_default_hdrs); i++) {
+ rss_cfg->proto_hdrs = *iavf_hash_default_hdrs[i];
+ rss_cfg->rss_algorithm = VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC;
+
+ ret = iavf_add_del_rss_cfg(ad, rss_cfg, true);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "fail to add RSS configure");
+ rte_free(rss_cfg);
+ return ret;
+ }
+ }
+
+ return ret;
+}
+
RTE_INIT(iavf_hash_engine_init)
{
struct iavf_flow_engine *engine = &iavf_hash_engine;
@@ -887,6 +925,7 @@ iavf_hash_init(struct iavf_adapter *ad)
{
struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad);
struct iavf_flow_parser *parser;
+ int ret;
if (!vf->vf_res)
return -EINVAL;
@@ -896,7 +935,17 @@ iavf_hash_init(struct iavf_adapter *ad)
parser = &iavf_hash_parser;
- return iavf_register_parser(parser, ad);
+ ret = iavf_register_parser(parser, ad);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "fail to register hash parser");
+ return ret;
+ }
+
+ ret = iavf_hash_default_set(ad);
+ if (ret)
+ PMD_DRV_LOG(ERR, "fail to set default RSS");
+
+ return ret;
}
static int
--
2.20.1
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [dpdk-dev] net/iavf: fix VF reset issue for hash
2020-05-19 0:20 [dpdk-dev] net/iavf: fix VF reset issue for hash Jeff Guo
@ 2020-05-18 13:14 ` He, Zhiwei
2020-05-18 13:36 ` Zhang, Qi Z
2020-05-18 23:54 ` Ye Xiaolong
2020-05-19 14:23 ` [dpdk-dev] [dpdk-dev v2] " Jeff Guo
2 siblings, 1 reply; 8+ messages in thread
From: He, Zhiwei @ 2020-05-18 13:14 UTC (permalink / raw)
To: Guo, Jia, Xing, Beilei, Ye, Xiaolong, Zhang, Qi Z, Wu, Jingjing
Cc: dev, Guo, Jia
Test-by Zhiwei.He <Zhiwei.he@intel.com>
-----Original Message-----
From: dev <dev-bounces@dpdk.org> On Behalf Of Jeff Guo
Sent: Tuesday, May 19, 2020 8:20 AM
To: Xing, Beilei <beilei.xing@intel.com>; Ye, Xiaolong <xiaolong.ye@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>
Cc: dev@dpdk.org; Guo, Jia <jia.guo@intel.com>
Subject: [dpdk-dev] net/iavf: fix VF reset issue for hash
Since there are some default rss configure in kernel PF/VF but not DPDK IAVF, if these configurations be modified by VF and then VF reset, this default rss configurations can not be reset to default by IAVF. So need to add default rss set in IAVF hash initial process.
Signed-off-by: Jeff Guo <jia.guo@intel.com>
Fixes: 7be10c3004be ("net/iavf: add RSS configuration for VF")
---
drivers/net/iavf/iavf_hash.c | 51 +++++++++++++++++++++++++++++++++++-
1 file changed, 50 insertions(+), 1 deletion(-)
diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c index 975c84556..04b3492ce 100644
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -857,6 +857,17 @@ struct iavf_hash_match_type iavf_hash_type_list[] = {
&hdrs_hint_ipv6_sctp},
};
+struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
+ &hdrs_hint_ipv4,
+ &hdrs_hint_ipv4_udp,
+ &hdrs_hint_ipv4_tcp,
+ &hdrs_hint_ipv4_sctp,
+ &hdrs_hint_ipv6,
+ &hdrs_hint_ipv6_udp,
+ &hdrs_hint_ipv6_tcp,
+ &hdrs_hint_ipv6_sctp,
+};
+
static struct iavf_flow_engine iavf_hash_engine = {
.init = iavf_hash_init,
.create = iavf_hash_create,
@@ -875,6 +886,33 @@ static struct iavf_flow_parser iavf_hash_parser = {
.stage = IAVF_FLOW_STAGE_RSS,
};
+static int
+iavf_hash_default_set(struct iavf_adapter *ad) {
+ struct virtchnl_rss_cfg *rss_cfg;
+ uint16_t i;
+ int ret;
+
+ rss_cfg = rte_zmalloc("iavf rss rule",
+ sizeof(struct virtchnl_rss_cfg), 0);
+ if (!rss_cfg)
+ return -ENOMEM;
+
+ for (i = 0; i < RTE_DIM(iavf_hash_default_hdrs); i++) {
+ rss_cfg->proto_hdrs = *iavf_hash_default_hdrs[i];
+ rss_cfg->rss_algorithm = VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC;
+
+ ret = iavf_add_del_rss_cfg(ad, rss_cfg, true);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "fail to add RSS configure");
+ rte_free(rss_cfg);
+ return ret;
+ }
+ }
+
+ return ret;
+}
+
RTE_INIT(iavf_hash_engine_init)
{
struct iavf_flow_engine *engine = &iavf_hash_engine; @@ -887,6 +925,7 @@ iavf_hash_init(struct iavf_adapter *ad) {
struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad);
struct iavf_flow_parser *parser;
+ int ret;
if (!vf->vf_res)
return -EINVAL;
@@ -896,7 +935,17 @@ iavf_hash_init(struct iavf_adapter *ad)
parser = &iavf_hash_parser;
- return iavf_register_parser(parser, ad);
+ ret = iavf_register_parser(parser, ad);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "fail to register hash parser");
+ return ret;
+ }
+
+ ret = iavf_hash_default_set(ad);
+ if (ret)
+ PMD_DRV_LOG(ERR, "fail to set default RSS");
+
+ return ret;
}
static int
--
2.20.1
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [dpdk-dev] net/iavf: fix VF reset issue for hash
2020-05-18 13:14 ` He, Zhiwei
@ 2020-05-18 13:36 ` Zhang, Qi Z
0 siblings, 0 replies; 8+ messages in thread
From: Zhang, Qi Z @ 2020-05-18 13:36 UTC (permalink / raw)
To: He, Zhiwei, Guo, Jia, Xing, Beilei, Ye, Xiaolong, Wu, Jingjing
Cc: dev, Guo, Jia
> -----Original Message-----
> From: He, Zhiwei <zhiwei.he@intel.com>
> Sent: Monday, May 18, 2020 9:15 PM
> To: Guo, Jia <jia.guo@intel.com>; Xing, Beilei <beilei.xing@intel.com>; Ye,
> Xiaolong <xiaolong.ye@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>; Wu,
> Jingjing <jingjing.wu@intel.com>
> Cc: dev@dpdk.org; Guo, Jia <jia.guo@intel.com>
> Subject: RE: [dpdk-dev] net/iavf: fix VF reset issue for hash
>
> Test-by Zhiwei.He <Zhiwei.he@intel.com>
>
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Jeff Guo
> Sent: Tuesday, May 19, 2020 8:20 AM
> To: Xing, Beilei <beilei.xing@intel.com>; Ye, Xiaolong
> <xiaolong.ye@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>; Wu, Jingjing
> <jingjing.wu@intel.com>
> Cc: dev@dpdk.org; Guo, Jia <jia.guo@intel.com>
> Subject: [dpdk-dev] net/iavf: fix VF reset issue for hash
>
> Since there are some default rss configure in kernel PF/VF but not DPDK IAVF,
> if these configurations be modified by VF and then VF reset, this default rss
> configurations can not be reset to default by IAVF. So need to add default rss
> set in IAVF hash initial process.
>
> Signed-off-by: Jeff Guo <jia.guo@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [dpdk-dev] net/iavf: fix VF reset issue for hash
2020-05-19 0:20 [dpdk-dev] net/iavf: fix VF reset issue for hash Jeff Guo
2020-05-18 13:14 ` He, Zhiwei
@ 2020-05-18 23:54 ` Ye Xiaolong
2020-05-19 2:03 ` Jeff Guo
2020-05-19 14:23 ` [dpdk-dev] [dpdk-dev v2] " Jeff Guo
2 siblings, 1 reply; 8+ messages in thread
From: Ye Xiaolong @ 2020-05-18 23:54 UTC (permalink / raw)
To: Jeff Guo; +Cc: beilei.xing, qi.z.zhang, jingjing.wu, dev
On 05/18, Jeff Guo wrote:
>Since there are some default rss configure in kernel PF/VF but not DPDK
>IAVF, if these configurations be modified by VF and then VF reset, this
>default rss configurations can not be reset to default by IAVF. So need
>to add default rss set in IAVF hash initial process.
>
>Signed-off-by: Jeff Guo <jia.guo@intel.com>
>Fixes: 7be10c3004be ("net/iavf: add RSS configuration for VF")
>---
> drivers/net/iavf/iavf_hash.c | 51 +++++++++++++++++++++++++++++++++++-
> 1 file changed, 50 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
>index 975c84556..04b3492ce 100644
>--- a/drivers/net/iavf/iavf_hash.c
>+++ b/drivers/net/iavf/iavf_hash.c
>@@ -857,6 +857,17 @@ struct iavf_hash_match_type iavf_hash_type_list[] = {
> &hdrs_hint_ipv6_sctp},
> };
>
>+struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
>+ &hdrs_hint_ipv4,
>+ &hdrs_hint_ipv4_udp,
>+ &hdrs_hint_ipv4_tcp,
>+ &hdrs_hint_ipv4_sctp,
>+ &hdrs_hint_ipv6,
>+ &hdrs_hint_ipv6_udp,
>+ &hdrs_hint_ipv6_tcp,
>+ &hdrs_hint_ipv6_sctp,
>+};
>+
> static struct iavf_flow_engine iavf_hash_engine = {
> .init = iavf_hash_init,
> .create = iavf_hash_create,
>@@ -875,6 +886,33 @@ static struct iavf_flow_parser iavf_hash_parser = {
> .stage = IAVF_FLOW_STAGE_RSS,
> };
>
>+static int
>+iavf_hash_default_set(struct iavf_adapter *ad)
>+{
>+ struct virtchnl_rss_cfg *rss_cfg;
>+ uint16_t i;
>+ int ret;
>+
>+ rss_cfg = rte_zmalloc("iavf rss rule",
>+ sizeof(struct virtchnl_rss_cfg), 0);
>+ if (!rss_cfg)
>+ return -ENOMEM;
>+
>+ for (i = 0; i < RTE_DIM(iavf_hash_default_hdrs); i++) {
>+ rss_cfg->proto_hdrs = *iavf_hash_default_hdrs[i];
>+ rss_cfg->rss_algorithm = VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC;
>+
>+ ret = iavf_add_del_rss_cfg(ad, rss_cfg, true);
>+ if (ret) {
>+ PMD_DRV_LOG(ERR, "fail to add RSS configure");
>+ rte_free(rss_cfg);
>+ return ret;
>+ }
>+ }
>+
>+ return ret;
>+}
>+
> RTE_INIT(iavf_hash_engine_init)
> {
> struct iavf_flow_engine *engine = &iavf_hash_engine;
>@@ -887,6 +925,7 @@ iavf_hash_init(struct iavf_adapter *ad)
> {
> struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad);
> struct iavf_flow_parser *parser;
>+ int ret;
>
> if (!vf->vf_res)
> return -EINVAL;
>@@ -896,7 +935,17 @@ iavf_hash_init(struct iavf_adapter *ad)
>
> parser = &iavf_hash_parser;
>
>- return iavf_register_parser(parser, ad);
>+ ret = iavf_register_parser(parser, ad);
>+ if (ret) {
>+ PMD_DRV_LOG(ERR, "fail to register hash parser");
>+ return ret;
>+ }
>+
>+ ret = iavf_hash_default_set(ad);
>+ if (ret)
>+ PMD_DRV_LOG(ERR, "fail to set default RSS");
Do we need to call iavf_unregister_parser in case of iavf_hash_default_set failure?
Thanks,
Xiaolong
>+
>+ return ret;
> }
>
> static int
>--
>2.20.1
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [dpdk-dev] net/iavf: fix VF reset issue for hash
2020-05-18 23:54 ` Ye Xiaolong
@ 2020-05-19 2:03 ` Jeff Guo
0 siblings, 0 replies; 8+ messages in thread
From: Jeff Guo @ 2020-05-19 2:03 UTC (permalink / raw)
To: Ye Xiaolong; +Cc: beilei.xing, qi.z.zhang, jingjing.wu, dev
hi, xiaolong
On 5/19/2020 7:54 AM, Ye Xiaolong wrote:
> On 05/18, Jeff Guo wrote:
>> Since there are some default rss configure in kernel PF/VF but not DPDK
>> IAVF, if these configurations be modified by VF and then VF reset, this
>> default rss configurations can not be reset to default by IAVF. So need
>> to add default rss set in IAVF hash initial process.
>>
>> Signed-off-by: Jeff Guo <jia.guo@intel.com>
>> Fixes: 7be10c3004be ("net/iavf: add RSS configuration for VF")
>> ---
>> drivers/net/iavf/iavf_hash.c | 51 +++++++++++++++++++++++++++++++++++-
>> 1 file changed, 50 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
>> index 975c84556..04b3492ce 100644
>> --- a/drivers/net/iavf/iavf_hash.c
>> +++ b/drivers/net/iavf/iavf_hash.c
>> @@ -857,6 +857,17 @@ struct iavf_hash_match_type iavf_hash_type_list[] = {
>> &hdrs_hint_ipv6_sctp},
>> };
>>
>> +struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
>> + &hdrs_hint_ipv4,
>> + &hdrs_hint_ipv4_udp,
>> + &hdrs_hint_ipv4_tcp,
>> + &hdrs_hint_ipv4_sctp,
>> + &hdrs_hint_ipv6,
>> + &hdrs_hint_ipv6_udp,
>> + &hdrs_hint_ipv6_tcp,
>> + &hdrs_hint_ipv6_sctp,
>> +};
>> +
>> static struct iavf_flow_engine iavf_hash_engine = {
>> .init = iavf_hash_init,
>> .create = iavf_hash_create,
>> @@ -875,6 +886,33 @@ static struct iavf_flow_parser iavf_hash_parser = {
>> .stage = IAVF_FLOW_STAGE_RSS,
>> };
>>
>> +static int
>> +iavf_hash_default_set(struct iavf_adapter *ad)
>> +{
>> + struct virtchnl_rss_cfg *rss_cfg;
>> + uint16_t i;
>> + int ret;
>> +
>> + rss_cfg = rte_zmalloc("iavf rss rule",
>> + sizeof(struct virtchnl_rss_cfg), 0);
>> + if (!rss_cfg)
>> + return -ENOMEM;
>> +
>> + for (i = 0; i < RTE_DIM(iavf_hash_default_hdrs); i++) {
>> + rss_cfg->proto_hdrs = *iavf_hash_default_hdrs[i];
>> + rss_cfg->rss_algorithm = VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC;
>> +
>> + ret = iavf_add_del_rss_cfg(ad, rss_cfg, true);
>> + if (ret) {
>> + PMD_DRV_LOG(ERR, "fail to add RSS configure");
>> + rte_free(rss_cfg);
>> + return ret;
>> + }
>> + }
>> +
>> + return ret;
>> +}
>> +
>> RTE_INIT(iavf_hash_engine_init)
>> {
>> struct iavf_flow_engine *engine = &iavf_hash_engine;
>> @@ -887,6 +925,7 @@ iavf_hash_init(struct iavf_adapter *ad)
>> {
>> struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad);
>> struct iavf_flow_parser *parser;
>> + int ret;
>>
>> if (!vf->vf_res)
>> return -EINVAL;
>> @@ -896,7 +935,17 @@ iavf_hash_init(struct iavf_adapter *ad)
>>
>> parser = &iavf_hash_parser;
>>
>> - return iavf_register_parser(parser, ad);
>> + ret = iavf_register_parser(parser, ad);
>> + if (ret) {
>> + PMD_DRV_LOG(ERR, "fail to register hash parser");
>> + return ret;
>> + }
>> +
>> + ret = iavf_hash_default_set(ad);
>> + if (ret)
>> + PMD_DRV_LOG(ERR, "fail to set default RSS");
> Do we need to call iavf_unregister_parser in case of iavf_hash_default_set failure?
>
> Thanks,
> Xiaolong
It should be and v2 will send. Thanks.
>> +
>> + return ret;
>> }
>>
>> static int
>> --
>> 2.20.1
>>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [dpdk-dev] [dpdk-dev v2] net/iavf: fix VF reset issue for hash
2020-05-19 0:20 [dpdk-dev] net/iavf: fix VF reset issue for hash Jeff Guo
2020-05-18 13:14 ` He, Zhiwei
2020-05-18 23:54 ` Ye Xiaolong
@ 2020-05-19 14:23 ` Jeff Guo
2020-05-19 3:08 ` Ye Xiaolong
2 siblings, 1 reply; 8+ messages in thread
From: Jeff Guo @ 2020-05-19 14:23 UTC (permalink / raw)
To: beilei.xing, xiaolong.ye, qi.z.zhang, jingjing.wu; +Cc: dev, jia.guo, Zhiwei He
Since there are some default rss configure in kernel PF/VF but not DPDK
IAVF, if these configurations be modified by VF and then VF reset, this
default rss configurations can not be reset to default by IAVF. So need
to add default rss set in IAVF hash initial process.
Signed-off-by: Jeff Guo <jia.guo@intel.com>
Fixes: 7be10c3004be ("net/iavf: add RSS configuration for VF")
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Tested-by: Zhiwei He <zhiwei.he@intel.com>
---
v2->v1:
add hash engine unregister process
---
drivers/net/iavf/iavf_hash.c | 53 +++++++++++++++++++++++++++++++++++-
1 file changed, 52 insertions(+), 1 deletion(-)
diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
index 975c84556..56ab170d8 100644
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -857,6 +857,17 @@ struct iavf_hash_match_type iavf_hash_type_list[] = {
&hdrs_hint_ipv6_sctp},
};
+struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
+ &hdrs_hint_ipv4,
+ &hdrs_hint_ipv4_udp,
+ &hdrs_hint_ipv4_tcp,
+ &hdrs_hint_ipv4_sctp,
+ &hdrs_hint_ipv6,
+ &hdrs_hint_ipv6_udp,
+ &hdrs_hint_ipv6_tcp,
+ &hdrs_hint_ipv6_sctp,
+};
+
static struct iavf_flow_engine iavf_hash_engine = {
.init = iavf_hash_init,
.create = iavf_hash_create,
@@ -875,6 +886,33 @@ static struct iavf_flow_parser iavf_hash_parser = {
.stage = IAVF_FLOW_STAGE_RSS,
};
+static int
+iavf_hash_default_set(struct iavf_adapter *ad)
+{
+ struct virtchnl_rss_cfg *rss_cfg;
+ uint16_t i;
+ int ret;
+
+ rss_cfg = rte_zmalloc("iavf rss rule",
+ sizeof(struct virtchnl_rss_cfg), 0);
+ if (!rss_cfg)
+ return -ENOMEM;
+
+ for (i = 0; i < RTE_DIM(iavf_hash_default_hdrs); i++) {
+ rss_cfg->proto_hdrs = *iavf_hash_default_hdrs[i];
+ rss_cfg->rss_algorithm = VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC;
+
+ ret = iavf_add_del_rss_cfg(ad, rss_cfg, true);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "fail to add RSS configure");
+ rte_free(rss_cfg);
+ return ret;
+ }
+ }
+
+ return ret;
+}
+
RTE_INIT(iavf_hash_engine_init)
{
struct iavf_flow_engine *engine = &iavf_hash_engine;
@@ -887,6 +925,7 @@ iavf_hash_init(struct iavf_adapter *ad)
{
struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad);
struct iavf_flow_parser *parser;
+ int ret;
if (!vf->vf_res)
return -EINVAL;
@@ -896,7 +935,19 @@ iavf_hash_init(struct iavf_adapter *ad)
parser = &iavf_hash_parser;
- return iavf_register_parser(parser, ad);
+ ret = iavf_register_parser(parser, ad);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "fail to register hash parser");
+ return ret;
+ }
+
+ ret = iavf_hash_default_set(ad);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "fail to set default RSS");
+ iavf_unregister_parser(parser, ad);
+ }
+
+ return ret;
}
static int
--
2.20.1
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [dpdk-dev] [dpdk-dev v2] net/iavf: fix VF reset issue for hash
2020-05-19 14:23 ` [dpdk-dev] [dpdk-dev v2] " Jeff Guo
@ 2020-05-19 3:08 ` Ye Xiaolong
0 siblings, 0 replies; 8+ messages in thread
From: Ye Xiaolong @ 2020-05-19 3:08 UTC (permalink / raw)
To: Jeff Guo; +Cc: beilei.xing, qi.z.zhang, jingjing.wu, dev, Zhiwei He
On 05/19, Jeff Guo wrote:
>Since there are some default rss configure in kernel PF/VF but not DPDK
>IAVF, if these configurations be modified by VF and then VF reset, this
>default rss configurations can not be reset to default by IAVF. So need
>to add default rss set in IAVF hash initial process.
>
>Signed-off-by: Jeff Guo <jia.guo@intel.com>
>Fixes: 7be10c3004be ("net/iavf: add RSS configuration for VF")
Fixes tag should be put before the SOB, fixed it while merging.
>Acked-by: Qi Zhang <qi.z.zhang@intel.com>
>Tested-by: Zhiwei He <zhiwei.he@intel.com>
>---
>v2->v1:
>add hash engine unregister process
>---
> drivers/net/iavf/iavf_hash.c | 53 +++++++++++++++++++++++++++++++++++-
> 1 file changed, 52 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
>index 975c84556..56ab170d8 100644
>--- a/drivers/net/iavf/iavf_hash.c
>+++ b/drivers/net/iavf/iavf_hash.c
>@@ -857,6 +857,17 @@ struct iavf_hash_match_type iavf_hash_type_list[] = {
> &hdrs_hint_ipv6_sctp},
> };
>
>+struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
>+ &hdrs_hint_ipv4,
>+ &hdrs_hint_ipv4_udp,
>+ &hdrs_hint_ipv4_tcp,
>+ &hdrs_hint_ipv4_sctp,
>+ &hdrs_hint_ipv6,
>+ &hdrs_hint_ipv6_udp,
>+ &hdrs_hint_ipv6_tcp,
>+ &hdrs_hint_ipv6_sctp,
>+};
>+
> static struct iavf_flow_engine iavf_hash_engine = {
> .init = iavf_hash_init,
> .create = iavf_hash_create,
>@@ -875,6 +886,33 @@ static struct iavf_flow_parser iavf_hash_parser = {
> .stage = IAVF_FLOW_STAGE_RSS,
> };
>
>+static int
>+iavf_hash_default_set(struct iavf_adapter *ad)
>+{
>+ struct virtchnl_rss_cfg *rss_cfg;
>+ uint16_t i;
>+ int ret;
>+
>+ rss_cfg = rte_zmalloc("iavf rss rule",
>+ sizeof(struct virtchnl_rss_cfg), 0);
>+ if (!rss_cfg)
>+ return -ENOMEM;
>+
>+ for (i = 0; i < RTE_DIM(iavf_hash_default_hdrs); i++) {
>+ rss_cfg->proto_hdrs = *iavf_hash_default_hdrs[i];
>+ rss_cfg->rss_algorithm = VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC;
>+
>+ ret = iavf_add_del_rss_cfg(ad, rss_cfg, true);
>+ if (ret) {
>+ PMD_DRV_LOG(ERR, "fail to add RSS configure");
>+ rte_free(rss_cfg);
>+ return ret;
>+ }
>+ }
>+
>+ return ret;
>+}
>+
> RTE_INIT(iavf_hash_engine_init)
> {
> struct iavf_flow_engine *engine = &iavf_hash_engine;
>@@ -887,6 +925,7 @@ iavf_hash_init(struct iavf_adapter *ad)
> {
> struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad);
> struct iavf_flow_parser *parser;
>+ int ret;
>
> if (!vf->vf_res)
> return -EINVAL;
>@@ -896,7 +935,19 @@ iavf_hash_init(struct iavf_adapter *ad)
>
> parser = &iavf_hash_parser;
>
>- return iavf_register_parser(parser, ad);
>+ ret = iavf_register_parser(parser, ad);
>+ if (ret) {
>+ PMD_DRV_LOG(ERR, "fail to register hash parser");
>+ return ret;
>+ }
>+
>+ ret = iavf_hash_default_set(ad);
>+ if (ret) {
>+ PMD_DRV_LOG(ERR, "fail to set default RSS");
>+ iavf_unregister_parser(parser, ad);
>+ }
>+
>+ return ret;
> }
>
> static int
>--
>2.20.1
>
Applied to dpdk-next-net-intel, Thanks.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [dpdk-dev] [dpdk-dev v2] net/iavf: fix VF reset issue for hash
@ 2020-05-19 14:17 Jeff Guo
0 siblings, 0 replies; 8+ messages in thread
From: Jeff Guo @ 2020-05-19 14:17 UTC (permalink / raw)
To: beilei.xing, xiaolong.ye, qi.z.zhang, jingjing.wu; +Cc: dev, jia.guo, Zhiwei He
Since there are some default rss configure in kernel PF/VF but not DPDK
IAVF, if these configurations be modified by VF and then VF reset, this
default rss configurations can not be reset to default by IAVF. So need
to add default rss set in IAVF hash initial process.
Signed-off-by: Jeff Guo <jia.guo@intel.com>
Fixes: 7be10c3004be ("net/iavf: add RSS configuration for VF")
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Tested-by: Zhiwei He <zhiwei.he@intel.com>
---
v2->v1:
add hash engine unregister process
---
drivers/net/iavf/iavf_hash.c | 53 +++++++++++++++++++++++++++++++++++-
1 file changed, 52 insertions(+), 1 deletion(-)
diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
index 975c84556..56ab170d8 100644
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -857,6 +857,17 @@ struct iavf_hash_match_type iavf_hash_type_list[] = {
&hdrs_hint_ipv6_sctp},
};
+struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
+ &hdrs_hint_ipv4,
+ &hdrs_hint_ipv4_udp,
+ &hdrs_hint_ipv4_tcp,
+ &hdrs_hint_ipv4_sctp,
+ &hdrs_hint_ipv6,
+ &hdrs_hint_ipv6_udp,
+ &hdrs_hint_ipv6_tcp,
+ &hdrs_hint_ipv6_sctp,
+};
+
static struct iavf_flow_engine iavf_hash_engine = {
.init = iavf_hash_init,
.create = iavf_hash_create,
@@ -875,6 +886,33 @@ static struct iavf_flow_parser iavf_hash_parser = {
.stage = IAVF_FLOW_STAGE_RSS,
};
+static int
+iavf_hash_default_set(struct iavf_adapter *ad)
+{
+ struct virtchnl_rss_cfg *rss_cfg;
+ uint16_t i;
+ int ret;
+
+ rss_cfg = rte_zmalloc("iavf rss rule",
+ sizeof(struct virtchnl_rss_cfg), 0);
+ if (!rss_cfg)
+ return -ENOMEM;
+
+ for (i = 0; i < RTE_DIM(iavf_hash_default_hdrs); i++) {
+ rss_cfg->proto_hdrs = *iavf_hash_default_hdrs[i];
+ rss_cfg->rss_algorithm = VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC;
+
+ ret = iavf_add_del_rss_cfg(ad, rss_cfg, true);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "fail to add RSS configure");
+ rte_free(rss_cfg);
+ return ret;
+ }
+ }
+
+ return ret;
+}
+
RTE_INIT(iavf_hash_engine_init)
{
struct iavf_flow_engine *engine = &iavf_hash_engine;
@@ -887,6 +925,7 @@ iavf_hash_init(struct iavf_adapter *ad)
{
struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad);
struct iavf_flow_parser *parser;
+ int ret;
if (!vf->vf_res)
return -EINVAL;
@@ -896,7 +935,19 @@ iavf_hash_init(struct iavf_adapter *ad)
parser = &iavf_hash_parser;
- return iavf_register_parser(parser, ad);
+ ret = iavf_register_parser(parser, ad);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "fail to register hash parser");
+ return ret;
+ }
+
+ ret = iavf_hash_default_set(ad);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "fail to set default RSS");
+ iavf_unregister_parser(parser, ad);
+ }
+
+ return ret;
}
static int
--
2.20.1
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-05-19 3:17 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-19 0:20 [dpdk-dev] net/iavf: fix VF reset issue for hash Jeff Guo
2020-05-18 13:14 ` He, Zhiwei
2020-05-18 13:36 ` Zhang, Qi Z
2020-05-18 23:54 ` Ye Xiaolong
2020-05-19 2:03 ` Jeff Guo
2020-05-19 14:23 ` [dpdk-dev] [dpdk-dev v2] " Jeff Guo
2020-05-19 3:08 ` Ye Xiaolong
2020-05-19 14:17 Jeff Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).