|WARNING| pw112537 [PATCH] [v3] sched: enable CMAN at runtime

|WARNING| pw112537 [PATCH] [v3] sched: enable CMAN at runtime

[dpdklab]

[-- Attachment #1: Type: text/plain, Size: 3089 bytes --]

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

_apply patch failure_

Submitter: Marcin Danilewicz <marcinx.danilewicz@intel.com>
Date: Wednesday, June 08 2022 09:42:20 
Applied on: CommitID:b38db1bfb930fa27cfbc36db227b56c1c1613164
Apply patch set 112537 failed:

Checking patch config/rte_config.h...
Checking patch drivers/net/softnic/rte_eth_softnic_tm.c...
Checking patch examples/ip_pipeline/tmgr.c...
Checking patch examples/qos_sched/cfg_file.c...
Checking patch examples/qos_sched/cfg_file.h...
Checking patch examples/qos_sched/init.c...
Checking patch examples/qos_sched/main.h...
Checking patch examples/qos_sched/profile.cfg...
Checking patch examples/qos_sched/profile_pie.cfg...
Checking patch examples/qos_sched/profile_red.cfg...
Checking patch lib/sched/rte_sched.c...
Hunk #4 succeeded at 1080 (offset 3 lines).
error: while searching for:

	return -EINVAL;
}
#endif

int
rte_sched_subport_config(struct rte_sched_port *port,

error: patch failed: lib/sched/rte_sched.c:1163
error: while searching for:
		s->n_pipe_profiles = params->n_pipe_profiles;
		s->n_max_pipe_profiles = params->n_max_pipe_profiles;

#ifdef RTE_SCHED_CMAN
		if (params->cman_params != NULL) {
			s->cman_enabled = true;
			status = rte_sched_cman_config(port, s, params, n_subports);

error: patch failed: lib/sched/rte_sched.c:1254
Hunk #7 succeeded at 1292 (offset 33 lines).
Hunk #8 succeeded at 1817 (offset 33 lines).
Hunk #9 succeeded at 1843 (offset 33 lines).
Hunk #10 succeeded at 1898 (offset 33 lines).
Hunk #11 succeeded at 1921 (offset 33 lines).
Applied patch config/rte_config.h cleanly.
Applied patch drivers/net/softnic/rte_eth_softnic_tm.c cleanly.
Applied patch examples/ip_pipeline/tmgr.c cleanly.
Applied patch examples/qos_sched/cfg_file.c cleanly.
Applied patch examples/qos_sched/cfg_file.h cleanly.
Applied patch examples/qos_sched/init.c cleanly.
Applied patch examples/qos_sched/main.h cleanly.
Applied patch examples/qos_sched/profile.cfg cleanly.
Applied patch examples/qos_sched/profile_pie.cfg cleanly.
Applied patch examples/qos_sched/profile_red.cfg cleanly.
Applying patch lib/sched/rte_sched.c with 2 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Rejected hunk #5.
Rejected hunk #6.
Hunk #7 applied cleanly.
Hunk #8 applied cleanly.
Hunk #9 applied cleanly.
Hunk #10 applied cleanly.
Hunk #11 applied cleanly.
diff a/lib/sched/rte_sched.c b/lib/sched/rte_sched.c	(rejected hunks)
@@ -1163,7 +1158,6 @@ rte_sched_cman_config(struct rte_sched_port *port,
 
 	return -EINVAL;
 }
-#endif
 
 int
 rte_sched_subport_config(struct rte_sched_port *port,
@@ -1254,7 +1248,6 @@ rte_sched_subport_config(struct rte_sched_port *port,
 		s->n_pipe_profiles = params->n_pipe_profiles;
 		s->n_max_pipe_profiles = params->n_max_pipe_profiles;
 
-#ifdef RTE_SCHED_CMAN
 		if (params->cman_params != NULL) {
 			s->cman_enabled = true;
 			status = rte_sched_cman_config(port, s, params, n_subports);

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

UNH-IOL DPDK Community Lab