d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eal: bring forward init of interrupt handling

Browse Source 
Next commit will make asynchronous IPC requests rely on alarm API,
which in turn relies on interrupts to work. Therefore, move the EAL
interrupt initialization before IPC initialization to avoid breaking
IPC in the next commit.

Signed-off-by: Jianfeng Tan <jianfeng.tan@intel.com>
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
This commit is contained in:
Jianfeng Tan 2018-06-26 11:53:16 +01:00 committed by Thomas Monjalon
parent 26021a7150
commit d74b7748d6
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/librte_eal/bsdapp/eal/eal.c
View File

@ -625,6 +625,11 @@ rte_eal_init(int argc, char **argv)
rte_config_init(); rte_config_init();
if (rte_eal_intr_init() < 0) {
rte_eal_init_alert("Cannot init interrupt-handling thread\n");
return -1;
}
/* Put mp channel init before bus scan so that we can init the vdev /* Put mp channel init before bus scan so that we can init the vdev
* bus through mp channel in the secondary process before the bus scan. * bus through mp channel in the secondary process before the bus scan.
*/ */
@ -713,11 +718,6 @@ rte_eal_init(int argc, char **argv)
return -1; return -1;
} }
if (rte_eal_intr_init() < 0) {
rte_eal_init_alert("Cannot init interrupt-handling thread\n");
return -1;
}
if (rte_eal_timer_init() < 0) { if (rte_eal_timer_init() < 0) {
rte_eal_init_alert("Cannot init HPET or TSC timers\n"); rte_eal_init_alert("Cannot init HPET or TSC timers\n");
rte_errno = ENOTSUP; rte_errno = ENOTSUP;

10
lib/librte_eal/linuxapp/eal/eal.c
View File

@ -853,6 +853,11 @@ rte_eal_init(int argc, char **argv)
rte_config_init(); rte_config_init();
if (rte_eal_intr_init() < 0) {
rte_eal_init_alert("Cannot init interrupt-handling thread\n");
return -1;
}
/* Put mp channel init before bus scan so that we can init the vdev /* Put mp channel init before bus scan so that we can init the vdev
* bus through mp channel in the secondary process before the bus scan. * bus through mp channel in the secondary process before the bus scan.
*/ */
@ -982,11 +987,6 @@ rte_eal_init(int argc, char **argv)
rte_config.master_lcore, (int)thread_id, cpuset, rte_config.master_lcore, (int)thread_id, cpuset,
ret == 0 ? "" : "..."); ret == 0 ? "" : "...");
if (rte_eal_intr_init() < 0) {
rte_eal_init_alert("Cannot init interrupt-handling thread\n");
return -1;
}
RTE_LCORE_FOREACH_SLAVE(i) { RTE_LCORE_FOREACH_SLAVE(i) {
/* /*