Skip to contentSkip to conversation

net/ice: fix VLAN mode parser

PATCH Applied Qiming Yang 2 participants 2 messages Jun 25, 2023 – Jun 28, 2023 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/ice: fix VLAN mode parser

Parser will not be ctreated if raw packet filter is not support. This patch add NULL pointer check for parser structure when VLAN mode configure.

Fixes 6e753d777ffc ("net/ice: initialize parser for double VLAN")
---
 drivers/net/ice/ice_generic_flow.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/ice/ice_generic_flow.c +6 -4
index ed3075d555..91bf1d6fcb 100644
@@ -1836,10 +1836,12 @@ ice_flow_init(struct ice_adapter *ad)
 	if (ice_parser_create(&ad->hw, &ad->psr) != ICE_SUCCESS)
 		PMD_INIT_LOG(WARNING, "Failed to initialize DDP parser, raw packet filter will not be supported");
 
-	if (ice_is_dvm_ena(&ad->hw))
-		ice_parser_dvm_set(ad->psr, true);
-	else
-		ice_parser_dvm_set(ad->psr, false);
+	if (ad->psr) {
+		if (ice_is_dvm_ena(&ad->hw))
+			ice_parser_dvm_set(ad->psr, true);
+		else
+			ice_parser_dvm_set(ad->psr, false);
+	}
 
 	RTE_TAILQ_FOREACH_SAFE(engine, &engine_list, node, temp) {
 		if (engine->init == NULL) {
Signature · 1 line
2.25.1
Acked-by on v1 1/1 Applied
#1 lore raw
Quoted 9 lines

-----Original Message-----
From: Yang, Qiming <[email protected]>
Sent: Sunday, June 25, 2023 4:23 PM
To: Zhang, Qi Z <[email protected]>; [email protected]
Cc: Yang, Qiming <[email protected]>; [email protected]
Subject: [PATCH] net/ice: fix VLAN mode parser

Quoted 8 lines

Parser will not be ctreated if raw packet filter is not support. This patch add NULL pointer check for parser structure when VLAN mode configure.

Fixes 6e753d777ffc ("net/ice: initialize parser for double VLAN")

Applied to dpdk-next-net-intel.

Thanks
Qi

Quoted 29 lines
---
 drivers/net/ice/ice_generic_flow.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/ice/ice_generic_flow.c +6 -4
index ed3075d555..91bf1d6fcb 100644
@@ -1836,10 +1836,12 @@ ice_flow_init(struct ice_adapter *ad)
 	if (ice_parser_create(&ad->hw, &ad->psr) != ICE_SUCCESS)
 		PMD_INIT_LOG(WARNING, "Failed to initialize DDP parser, raw
 packet filter will not be supported");
 
-	if (ice_is_dvm_ena(&ad->hw))
-		ice_parser_dvm_set(ad->psr, true);
-	else
-		ice_parser_dvm_set(ad->psr, false);
+	if (ad->psr) {
+		if (ice_is_dvm_ena(&ad->hw))
+			ice_parser_dvm_set(ad->psr, true);
+		else
+			ice_parser_dvm_set(ad->psr, false);
+	}
 
 	RTE_TAILQ_FOREACH_SAFE(engine, &engine_list, node, temp) {

if (engine->init == NULL) {
--
2.25.1