Skip to contentSkip to conversation

net/ice: add error cases with a wrong package

PATCH Applied Simei Su 3 participants 3 messages Nov 7, 2019 – Nov 8, 2019 Network drivers

lore
Share & tools
lore

Simei Su

author
#0 lore raw

PATCH 1/1 net/ice: add error cases with a wrong package

If the switch/fdir/hash module can't resolve a correct parser, it should return error.

Fixes 47d460d63233 ("net/ice: rework switch filter")
Fixes efc16c621415 ("net/ice: support flow director GTPU tunnel")
Fixes 5ad3db8d4bdd ("net/ice: enable advanced RSS")
---
 drivers/net/ice/ice_fdir_filter.c   | 4 +++-
 drivers/net/ice/ice_hash.c          | 2 ++
 drivers/net/ice/ice_switch_filter.c | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)
drivers/net/ice/ice_fdir_filter.c +3 -1
index fbbc41f..baaa7fa 100644
@@ -863,8 +863,10 @@
 
 	if (ad->active_pkg_type == ICE_PKG_TYPE_COMMS)
 		parser = &ice_fdir_parser_comms;
-	else
+	else if (ad->active_pkg_type == ICE_PKG_TYPE_OS_DEFAULT)
 		parser = &ice_fdir_parser_os;
+	else
+		return -EINVAL;
 
 	return ice_register_parser(parser, ad);
 }
drivers/net/ice/ice_hash.c +2 -0
index 3381b45..8dc3146 100644
@@ -242,6 +242,8 @@ struct ice_hash_match_type ice_hash_type_list[] = {
 		parser = &ice_hash_parser_os;
 	else if (ad->active_pkg_type == ICE_PKG_TYPE_COMMS)
 		parser = &ice_hash_parser_comms;
+	else
+		return -EINVAL;
 
 	return ice_register_parser(parser, ad);
 }
drivers/net/ice/ice_switch_filter.c +3 -1
index 4be87c2..2406102 100644
@@ -1122,8 +1122,10 @@ struct sw_meta {
 
 	if (ad->active_pkg_type == ICE_PKG_TYPE_COMMS)
 		dist_parser = &ice_switch_dist_parser_comms;
-	else
+	else if (ad->active_pkg_type == ICE_PKG_TYPE_OS_DEFAULT)
 		dist_parser = &ice_switch_dist_parser_os;
+	else
+		return -EINVAL;
 
 	if (ad->devargs.pipe_mode_support)
 		ret = ice_register_parser(perm_parser, ad);
Signature · 1 line
1.8.3.1
Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines

-----Original Message-----
From: Su, Simei <[email protected]>
Sent: Thursday, November 7, 2019 3:35 PM
To: Zhang, Qi Z <[email protected]>; Ye, Xiaolong <[email protected]>; Yang, Qiming <[email protected]>
Cc: [email protected]; Su, Simei <[email protected]>
Subject: [PATCH] net/ice: add error cases with a wrong package

Quoted 8 lines

If the switch/fdir/hash module can't resolve a correct parser, it should return error.

Fixes 47d460d63233 ("net/ice: rework switch filter")
Fixes efc16c621415 ("net/ice: support flow director GTPU tunnel")
Fixes 5ad3db8d4bdd ("net/ice: enable advanced RSS")
Acked-by on v1 1/1 Applied
#2 lore raw
In reply to Simei Su
Quoted 62 lines · Simei Su

If the switch/fdir/hash module can't resolve a correct parser, it should return error.

Fixes 47d460d63233 ("net/ice: rework switch filter")
Fixes efc16c621415 ("net/ice: support flow director GTPU tunnel")
Fixes 5ad3db8d4bdd ("net/ice: enable advanced RSS")

---

drivers/net/ice/ice_fdir_filter.c   | 4 +++-
drivers/net/ice/ice_hash.c          | 2 ++
drivers/net/ice/ice_switch_filter.c | 4 +++-
3 files changed, 8 insertions(+), 2 deletions(-)
drivers/net/ice/ice_fdir_filter.c +3 -1
index fbbc41f..baaa7fa 100644
@@ -863,8 +863,10 @@
 
 	if (ad->active_pkg_type == ICE_PKG_TYPE_COMMS)
 		parser = &ice_fdir_parser_comms;
-	else
+	else if (ad->active_pkg_type == ICE_PKG_TYPE_OS_DEFAULT)
 		parser = &ice_fdir_parser_os;
+	else
+		return -EINVAL;
 
 	return ice_register_parser(parser, ad);
 }
drivers/net/ice/ice_hash.c +2 -0
index 3381b45..8dc3146 100644
@@ -242,6 +242,8 @@ struct ice_hash_match_type ice_hash_type_list[] = {
 		parser = &ice_hash_parser_os;
 	else if (ad->active_pkg_type == ICE_PKG_TYPE_COMMS)
 		parser = &ice_hash_parser_comms;
+	else
+		return -EINVAL;
 
 	return ice_register_parser(parser, ad);
 }
drivers/net/ice/ice_switch_filter.c +3 -1
index 4be87c2..2406102 100644
@@ -1122,8 +1122,10 @@ struct sw_meta {
 
 	if (ad->active_pkg_type == ICE_PKG_TYPE_COMMS)
 		dist_parser = &ice_switch_dist_parser_comms;
-	else
+	else if (ad->active_pkg_type == ICE_PKG_TYPE_OS_DEFAULT)
 		dist_parser = &ice_switch_dist_parser_os;
+	else
+		return -EINVAL;
 
 	if (ad->devargs.pipe_mode_support)
 		ret = ice_register_parser(perm_parser, ad);
Signature · 1 line
1.8.3.1

Applied to dpdk-next-net-intel. Thanks.