Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/114791

_apply patch failure_

Submitter: Zeng, ZhichaoX <zhichaox.zeng@intel.com>
Date: Wednesday, August 10 2022 06:49:37 
Applied on: CommitID:72206323a5dd3182b13f61b25a64abdddfee595c
Apply patch set 114791 failed:

Checking patch doc/guides/nics/features/ice.ini...
error: while searching for:
passthru             = Y
queue                = Y
rss                  = Y
vf                   = Y
represented_port     = Y

error: patch failed: doc/guides/nics/features/ice.ini:81
Checking patch drivers/net/ice/ice_switch_filter.c...
error: while searching for:
			    struct ice_adv_rule_info *rule_info)
{
	const struct rte_flow_action_ethdev *act_ethdev;
	const struct rte_flow_action_vf *act_vf;
	const struct rte_flow_action *action;
	const struct rte_eth_dev *repr_dev;
	enum rte_flow_action_type action_type;

error: patch failed: drivers/net/ice/ice_switch_filter.c:1619
error: while searching for:
				RTE_FLOW_ACTION_TYPE_END; action++) {
		action_type = action->type;
		switch (action_type) {
		case RTE_FLOW_ACTION_TYPE_VF:
			rule_info->sw_act.fltr_act = ICE_FWD_TO_VSI;
			act_vf = action->conf;

			if (act_vf->id >= ad->real_hw.num_vfs &&
				!act_vf->original) {
				rte_flow_error_set(error,
					EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
					actions,
					"Invalid vf id");
				return -rte_errno;
			}

			if (act_vf->original)
				rule_info->sw_act.vsi_handle =
					ad->real_hw.avf.bus.func;
			else
				rule_info->sw_act.vsi_handle = act_vf->id;
			break;

		case RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT:
			rule_info->sw_act.fltr_act = ICE_FWD_TO_VSI;
			act_ethdev = action->conf;

error: patch failed: drivers/net/ice/ice_switch_filter.c:1629
Hunk #3 succeeded at 1785 (offset -6 lines).
Applying patch doc/guides/nics/features/ice.ini with 1 reject...
Rejected hunk #1.
Applying patch drivers/net/ice/ice_switch_filter.c with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
Hunk #3 applied cleanly.
diff a/doc/guides/nics/features/ice.ini b/doc/guides/nics/features/ice.ini	(rejected hunks)
@@ -81,5 +81,4 @@ mark                 = Y
 passthru             = Y
 queue                = Y
 rss                  = Y
-vf                   = Y
 represented_port     = Y
diff a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c	(rejected hunks)
@@ -1619,7 +1619,6 @@ ice_switch_parse_dcf_action(struct ice_dcf_adapter *ad,
 			    struct ice_adv_rule_info *rule_info)
 {
 	const struct rte_flow_action_ethdev *act_ethdev;
-	const struct rte_flow_action_vf *act_vf;
 	const struct rte_flow_action *action;
 	const struct rte_eth_dev *repr_dev;
 	enum rte_flow_action_type action_type;
@@ -1629,26 +1628,6 @@ ice_switch_parse_dcf_action(struct ice_dcf_adapter *ad,
 				RTE_FLOW_ACTION_TYPE_END; action++) {
 		action_type = action->type;
 		switch (action_type) {
-		case RTE_FLOW_ACTION_TYPE_VF:
-			rule_info->sw_act.fltr_act = ICE_FWD_TO_VSI;
-			act_vf = action->conf;
-
-			if (act_vf->id >= ad->real_hw.num_vfs &&
-				!act_vf->original) {
-				rte_flow_error_set(error,
-					EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
-					actions,
-					"Invalid vf id");
-				return -rte_errno;
-			}
-
-			if (act_vf->original)
-				rule_info->sw_act.vsi_handle =
-					ad->real_hw.avf.bus.func;
-			else
-				rule_info->sw_act.vsi_handle = act_vf->id;
-			break;
-
 		case RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT:
 			rule_info->sw_act.fltr_act = ICE_FWD_TO_VSI;
 			act_ethdev = action->conf;

https://lab.dpdk.org/results/dashboard/patchsets/23179/

UNH-IOL DPDK Community Lab