aboutsummaryrefslogtreecommitdiffstats
path: root/src/vlib
diff options
context:
space:
mode:
Diffstat (limited to 'src/vlib')
-rw-r--r--src/vlib/CMakeLists.txt6
-rw-r--r--src/vlib/buffer.c46
-rw-r--r--src/vlib/buffer.h3
-rw-r--r--src/vlib/linux/pci.c15
-rw-r--r--src/vlib/pci/pci.c8
-rw-r--r--src/vlib/threads.c92
-rw-r--r--src/vlib/threads.h5
-rw-r--r--src/vlib/unix/main.c114
-rw-r--r--src/vlib/unix/plugin.c56
9 files changed, 235 insertions, 110 deletions
diff --git a/src/vlib/CMakeLists.txt b/src/vlib/CMakeLists.txt
index 7ec9b2050e9..3c354b764dd 100644
--- a/src/vlib/CMakeLists.txt
+++ b/src/vlib/CMakeLists.txt
@@ -55,6 +55,7 @@ install(
# vlib shared library
##############################################################################
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
set(PLATFORM_SOURCES
linux/pci.c
linux/vfio.c
@@ -64,6 +65,11 @@ set(PLATFORM_SOURCES
set(PLATFORM_HEADERS
linux/vfio.h
)
+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
+set(PLATFORM_SOURCES
+ freebsd/pci.c
+)
+endif()
add_vpp_library(vlib
SOURCES
diff --git a/src/vlib/buffer.c b/src/vlib/buffer.c
index 674f15d5dc6..5ba42270b1a 100644
--- a/src/vlib/buffer.c
+++ b/src/vlib/buffer.c
@@ -663,7 +663,7 @@ vlib_buffer_main_init_numa_alloc (struct vlib_main_t *vm, u32 numa_node,
u8 unpriv)
{
vlib_buffer_main_t *bm = vm->buffer_main;
- u32 buffers_per_numa = bm->buffers_per_numa;
+ u32 buffers_per_numa = bm->buffers_per_numa[numa_node];
clib_error_t *error;
u32 buffer_size;
uword n_pages, pagesize;
@@ -680,6 +680,9 @@ vlib_buffer_main_init_numa_alloc (struct vlib_main_t *vm, u32 numa_node,
"size (%llu)", buffer_size, pagesize);
if (buffers_per_numa == 0)
+ buffers_per_numa = bm->default_buffers_per_numa;
+
+ if (buffers_per_numa == 0)
buffers_per_numa = unpriv ? VLIB_BUFFER_DEFAULT_BUFFERS_PER_NUMA_UNPRIV :
VLIB_BUFFER_DEFAULT_BUFFERS_PER_NUMA;
@@ -906,18 +909,48 @@ done:
}
static clib_error_t *
+vlib_buffers_numa_configure (vlib_buffer_main_t *bm, u32 numa_node,
+ unformat_input_t *input)
+{
+ u32 buffers = 0;
+
+ if (numa_node >= VLIB_BUFFER_MAX_NUMA_NODES)
+ return clib_error_return (0, "invalid numa node");
+
+ if (!input)
+ return 0;
+
+ unformat_skip_white_space (input);
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "buffers %u", &buffers))
+ ;
+ else
+ return unformat_parse_error (input);
+ }
+
+ bm->buffers_per_numa[numa_node] = buffers;
+ return 0;
+}
+
+static clib_error_t *
vlib_buffers_configure (vlib_main_t * vm, unformat_input_t * input)
{
vlib_buffer_main_t *bm;
+ u32 numa_node;
+ unformat_input_t sub_input;
+ clib_error_t *error = 0;
vlib_buffer_main_alloc (vm);
bm = vm->buffer_main;
bm->log2_page_size = CLIB_MEM_PAGE_SZ_UNKNOWN;
+ memset (bm->buffers_per_numa, 0, sizeof (bm->buffers_per_numa));
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "buffers-per-numa %u", &bm->buffers_per_numa))
+ if (unformat (input, "buffers-per-numa %u",
+ &bm->default_buffers_per_numa))
;
else if (unformat (input, "page-size %U", unformat_log2_page_size,
&bm->log2_page_size))
@@ -925,6 +958,15 @@ vlib_buffers_configure (vlib_main_t * vm, unformat_input_t * input)
else if (unformat (input, "default data-size %u",
&bm->default_data_size))
;
+ else if (unformat (input, "numa %u %U", &numa_node,
+ unformat_vlib_cli_sub_input, &sub_input))
+ {
+ error = vlib_buffers_numa_configure (bm, numa_node, &sub_input);
+ unformat_free (&sub_input);
+
+ if (error)
+ return error;
+ }
else
return unformat_parse_error (input);
}
diff --git a/src/vlib/buffer.h b/src/vlib/buffer.h
index 7d45689ed19..aad9701080e 100644
--- a/src/vlib/buffer.h
+++ b/src/vlib/buffer.h
@@ -508,7 +508,8 @@ typedef struct
u8 default_buffer_pool_index_for_numa[VLIB_BUFFER_MAX_NUMA_NODES];
/* config */
- u32 buffers_per_numa;
+ u32 default_buffers_per_numa;
+ u32 buffers_per_numa[VLIB_BUFFER_MAX_NUMA_NODES];
u16 ext_hdr_size;
u32 default_data_size;
clib_mem_page_sz_t log2_page_size;
diff --git a/src/vlib/linux/pci.c b/src/vlib/linux/pci.c
index f7c63bc3607..29ca3d97523 100644
--- a/src/vlib/linux/pci.c
+++ b/src/vlib/linux/pci.c
@@ -1561,14 +1561,17 @@ linux_pci_init (vlib_main_t * vm)
ASSERT (sizeof (vlib_pci_addr_t) == sizeof (u32));
- addrs = vlib_pci_get_all_dev_addrs ();
- vec_foreach (addr, addrs)
+ if (pm->pci_device_registrations)
{
- vlib_pci_device_info_t *d;
- if ((d = vlib_pci_get_device_info (vm, addr, 0)))
+ addrs = vlib_pci_get_all_dev_addrs ();
+ vec_foreach (addr, addrs)
{
- init_device_from_registered (vm, d);
- vlib_pci_free_device_info (d);
+ vlib_pci_device_info_t *d;
+ if ((d = vlib_pci_get_device_info (vm, addr, 0)))
+ {
+ init_device_from_registered (vm, d);
+ vlib_pci_free_device_info (d);
+ }
}
}
diff --git a/src/vlib/pci/pci.c b/src/vlib/pci/pci.c
index 0bc90c5532d..7284e6675fd 100644
--- a/src/vlib/pci/pci.c
+++ b/src/vlib/pci/pci.c
@@ -119,7 +119,7 @@ vlib_pci_intr_enable (vlib_main_t *vm, vlib_pci_dev_handle_t h)
{
const vlib_pci_config_reg_command_t cmd = { .intx_disable = 1 };
clib_error_t *err;
- int already_set;
+ int already_set = 0;
err = _vlib_pci_config_set_control_bit (vm, h, cmd.as_u16, 0, &already_set);
log_debug (h, "interrupt%senabled", already_set ? " " : " already ");
@@ -131,7 +131,7 @@ vlib_pci_intr_disable (vlib_main_t *vm, vlib_pci_dev_handle_t h)
{
const vlib_pci_config_reg_command_t cmd = { .intx_disable = 1 };
clib_error_t *err;
- int already_set;
+ int already_set = 0;
err = _vlib_pci_config_set_control_bit (vm, h, cmd.as_u16, 1, &already_set);
log_debug (h, "interrupt%sdisabled", already_set ? " " : " already ");
@@ -143,7 +143,7 @@ vlib_pci_bus_master_enable (vlib_main_t *vm, vlib_pci_dev_handle_t h)
{
const vlib_pci_config_reg_command_t cmd = { .bus_master = 1 };
clib_error_t *err;
- int already_set;
+ int already_set = 0;
err = _vlib_pci_config_set_control_bit (vm, h, cmd.as_u16, 1, &already_set);
log_debug (h, "bus-master%senabled", already_set ? " " : " already ");
@@ -155,7 +155,7 @@ vlib_pci_bus_master_disable (vlib_main_t *vm, vlib_pci_dev_handle_t h)
{
const vlib_pci_config_reg_command_t cmd = { .bus_master = 1 };
clib_error_t *err;
- int already_set;
+ int already_set = 0;
err = _vlib_pci_config_set_control_bit (vm, h, cmd.as_u16, 0, &already_set);
log_debug (h, "bus-master%sdisabled", already_set ? " " : " already ");
diff --git a/src/vlib/threads.c b/src/vlib/threads.c
index bbcb4ec2979..ef2c5616f21 100644
--- a/src/vlib/threads.c
+++ b/src/vlib/threads.c
@@ -182,9 +182,7 @@ vlib_thread_init (vlib_main_t * vm)
u32 n_vlib_mains = 1;
u32 first_index = 1;
u32 i;
- pid_t pid;
- uword *avail_cpu, *affinity_cpu;
- uword n_cpus;
+ uword *avail_cpu;
u32 stats_num_worker_threads_dir_index;
stats_num_worker_threads_dir_index =
@@ -195,41 +193,22 @@ vlib_thread_init (vlib_main_t * vm)
tm->cpu_core_bitmap = os_get_online_cpu_core_bitmap ();
tm->cpu_socket_bitmap = os_get_online_cpu_node_bitmap ();
- /* get bitmap of active cpu cores vpp has affinity to */
- pid = getpid ();
- tm->cpu_affinity_bitmap = os_get_cpu_affinity_bitmap (pid);
-
- /* if fetching affinity fails, return online cpu core bmp */
- if (tm->cpu_affinity_bitmap == 0)
- tm->cpu_affinity_bitmap = os_get_online_cpu_core_bitmap ();
-
avail_cpu = clib_bitmap_dup (tm->cpu_core_bitmap);
- affinity_cpu = clib_bitmap_dup (tm->cpu_affinity_bitmap);
/* skip cores */
- n_cpus = clib_bitmap_count_set_bits (avail_cpu);
- if (tm->skip_cores >= n_cpus)
- return clib_error_return (0, "skip-core greater than available cpus");
- n_cpus = clib_bitmap_count_set_bits (affinity_cpu);
- if (tm->skip_cores >= n_cpus)
- return clib_error_return (0, "skip-core greater than affinity cpus");
-
for (i = 0; i < tm->skip_cores; i++)
{
- uword c;
- c = clib_bitmap_first_set (avail_cpu);
+ uword c = clib_bitmap_first_set (avail_cpu);
if (c == ~0)
return clib_error_return (0, "no available cpus to skip");
avail_cpu = clib_bitmap_set (avail_cpu, c, 0);
-
- c = clib_bitmap_first_set (affinity_cpu);
- if (c == ~0)
- return clib_error_return (0, "no available env cpus to skip");
-
- affinity_cpu = clib_bitmap_set (affinity_cpu, c, 0);
}
+ /* if main thread affinity is unspecified, set to current running cpu */
+ if (tm->main_lcore == ~0)
+ tm->main_lcore = sched_getcpu ();
+
/* grab cpu for main thread */
if (tm->main_lcore != ~0)
{
@@ -237,17 +216,6 @@ vlib_thread_init (vlib_main_t * vm)
return clib_error_return (0, "cpu %u is not available to be used"
" for the main thread", tm->main_lcore);
avail_cpu = clib_bitmap_set (avail_cpu, tm->main_lcore, 0);
- affinity_cpu = clib_bitmap_set (affinity_cpu, tm->main_lcore, 0);
- }
- /* if auto enabled, grab first cpu vpp has affinity to for main thread */
- else if (tm->use_main_core_auto)
- {
- uword c = clib_bitmap_first_set (affinity_cpu);
- if (c != ~0)
- tm->main_lcore = c;
-
- avail_cpu = clib_bitmap_set (avail_cpu, tm->main_lcore, 0);
- affinity_cpu = clib_bitmap_set (affinity_cpu, tm->main_lcore, 0);
}
/* assume that there is socket 0 only if there is no data from sysfs */
@@ -332,23 +300,13 @@ vlib_thread_init (vlib_main_t * vm)
}
else
{
- /* for automatic pinning, use cpu affinity list */
- uword n_env_cpu = 0;
- n_env_cpu = clib_bitmap_count_set_bits (affinity_cpu);
-
- if (n_env_cpu < tr->count)
- return clib_error_return (0,
- "no available cpus to be used for"
- " the '%s' thread #%u",
- tr->name, n_env_cpu);
-
for (j = 0; j < tr->count; j++)
{
/* Do not use CPU 0 by default - leave it to the host and IRQs */
- uword avail_c0 = clib_bitmap_get (affinity_cpu, 0);
- affinity_cpu = clib_bitmap_set (affinity_cpu, 0, 0);
+ uword avail_c0 = clib_bitmap_get (avail_cpu, 0);
+ avail_cpu = clib_bitmap_set (avail_cpu, 0, 0);
- uword c = clib_bitmap_first_set (affinity_cpu);
+ uword c = clib_bitmap_first_set (avail_cpu);
/* Use CPU 0 as a last resort */
if (c == ~0 && avail_c0)
{
@@ -362,15 +320,14 @@ vlib_thread_init (vlib_main_t * vm)
" the '%s' thread #%u",
tr->name, tr->count);
- affinity_cpu = clib_bitmap_set (affinity_cpu, 0, avail_c0);
- affinity_cpu = clib_bitmap_set (affinity_cpu, c, 0);
+ avail_cpu = clib_bitmap_set (avail_cpu, 0, avail_c0);
+ avail_cpu = clib_bitmap_set (avail_cpu, c, 0);
tr->coremask = clib_bitmap_set (tr->coremask, c, 1);
}
}
}
clib_bitmap_free (avail_cpu);
- clib_bitmap_free (affinity_cpu);
tm->n_vlib_mains = n_vlib_mains;
vlib_stats_set_gauge (stats_num_worker_threads_dir_index, n_vlib_mains - 1);
@@ -417,6 +374,8 @@ void
vlib_worker_thread_init (vlib_worker_thread_t * w)
{
vlib_thread_main_t *tm = vlib_get_thread_main ();
+ sigset_t signals;
+ int rv;
/*
* Note: disabling signals in worker threads as follows
@@ -426,7 +385,17 @@ vlib_worker_thread_init (vlib_worker_thread_t * w)
* sigfillset (&s);
* pthread_sigmask (SIG_SETMASK, &s, 0);
* }
+ * We can still disable signals for SIGINT,SIGHUP and SIGTERM as they don't
+ * trigger post-dump handlers anyway.
*/
+ sigemptyset (&signals);
+ sigaddset (&signals, SIGINT);
+ sigaddset (&signals, SIGHUP);
+ sigaddset (&signals, SIGTERM);
+ rv = pthread_sigmask (SIG_BLOCK, &signals, NULL);
+
+ if (rv)
+ clib_warning ("Failed to set the worker signal mask");
clib_mem_set_heap (w->thread_mheap);
@@ -1169,6 +1138,7 @@ cpu_config (vlib_main_t * vm, unformat_input_t * input)
u8 *name;
uword *bitmap;
u32 count;
+ int use_corelist = 0;
tm->thread_registrations_by_name = hash_create_string (0, sizeof (uword));
@@ -1176,7 +1146,6 @@ cpu_config (vlib_main_t * vm, unformat_input_t * input)
tm->sched_policy = ~0;
tm->sched_priority = ~0;
tm->main_lcore = ~0;
- tm->use_main_core_auto = 0;
tr = tm->next;
@@ -1192,8 +1161,6 @@ cpu_config (vlib_main_t * vm, unformat_input_t * input)
tm->use_pthreads = 1;
else if (unformat (input, "thread-prefix %v", &tm->thread_prefix))
;
- else if (unformat (input, "main-core auto"))
- tm->use_main_core_auto = 1;
else if (unformat (input, "main-core %u", &tm->main_lcore))
;
else if (unformat (input, "skip-cores %u", &tm->skip_cores))
@@ -1223,6 +1190,7 @@ cpu_config (vlib_main_t * vm, unformat_input_t * input)
tr->coremask = bitmap;
tr->count = clib_bitmap_count_set_bits (tr->coremask);
+ use_corelist = 1;
}
else
if (unformat
@@ -1252,13 +1220,9 @@ cpu_config (vlib_main_t * vm, unformat_input_t * input)
break;
}
- if (tm->main_lcore != ~0 && tm->use_main_core_auto)
- {
- return clib_error_return (
- 0, "cannot set both 'main-core %u' and 'main-core auto'",
- tm->main_lcore);
- }
-
+ if (use_corelist && tm->main_lcore == ~0)
+ return clib_error_return (0, "main-core must be specified when using "
+ "corelist-* or coremask-* attribute");
if (tm->sched_priority != ~0)
{
if (tm->sched_policy == SCHED_FIFO || tm->sched_policy == SCHED_RR)
diff --git a/src/vlib/threads.h b/src/vlib/threads.h
index 3072d0e67dd..ac0c1d5d266 100644
--- a/src/vlib/threads.h
+++ b/src/vlib/threads.h
@@ -255,8 +255,6 @@ typedef struct
int use_pthreads;
- int use_main_core_auto;
-
/* Number of vlib_main / vnet_main clones */
u32 n_vlib_mains;
@@ -284,9 +282,6 @@ typedef struct
/* Bitmap of available CPU sockets (NUMA nodes) */
uword *cpu_socket_bitmap;
- /* Bitmap of CPU affinity for VPP process */
- uword *cpu_affinity_bitmap;
-
/* Worker handoff queues */
vlib_frame_queue_main_t *frame_queue_mains;
diff --git a/src/vlib/unix/main.c b/src/vlib/unix/main.c
index ee28ca8f1aa..11d0cb1160c 100644
--- a/src/vlib/unix/main.c
+++ b/src/vlib/unix/main.c
@@ -40,6 +40,8 @@
#include <vlib/unix/unix.h>
#include <vlib/unix/plugin.h>
#include <vppinfra/unix.h>
+#include <vppinfra/stack.h>
+#include <vppinfra/format_ansi.h>
#include <limits.h>
#include <signal.h>
@@ -97,20 +99,42 @@ int vlib_last_signum = 0;
uword vlib_last_faulting_address = 0;
static void
+log_one_line ()
+{
+ vec_terminate_c_string (syslog_msg);
+ if (unix_main.flags & (UNIX_FLAG_INTERACTIVE | UNIX_FLAG_NOSYSLOG))
+ fprintf (stderr, "%s\n", syslog_msg);
+ else
+ syslog (LOG_ERR | LOG_DAEMON, "%s", syslog_msg);
+ vec_reset_length (syslog_msg);
+}
+
+static void
unix_signal_handler (int signum, siginfo_t * si, ucontext_t * uc)
{
uword fatal = 0;
+ int color =
+ (unix_main.flags & (UNIX_FLAG_INTERACTIVE | UNIX_FLAG_NOSYSLOG)) &&
+ (unix_main.flags & UNIX_FLAG_NOCOLOR) == 0;
/* These come in handy when looking at core files from optimized images */
vlib_last_signum = signum;
vlib_last_faulting_address = (uword) si->si_addr;
+ if (color)
+ syslog_msg = format (syslog_msg, ANSI_FG_BR_RED);
+
syslog_msg = format (syslog_msg, "received signal %U, PC %U",
format_signal, signum, format_ucontext_pc, uc);
- if (signum == SIGSEGV)
+ if (signum == SIGSEGV || signum == SIGBUS)
syslog_msg = format (syslog_msg, ", faulting address %p", si->si_addr);
+ if (color)
+ syslog_msg = format (syslog_msg, ANSI_FG_DEFAULT);
+
+ log_one_line ();
+
switch (signum)
{
/* these (caught) signals cause the application to exit */
@@ -120,11 +144,17 @@ unix_signal_handler (int signum, siginfo_t * si, ucontext_t * uc)
*/
if (unix_main.vlib_main && unix_main.vlib_main->main_loop_exit_set)
{
- syslog (LOG_ERR | LOG_DAEMON, "received SIGTERM, exiting...");
+ syslog_msg = format (
+ syslog_msg, "received SIGTERM from PID %d UID %d, exiting...",
+ si->si_pid, si->si_uid);
+ log_one_line ();
unix_main.vlib_main->main_loop_exit_now = 1;
}
else
- syslog (LOG_ERR | LOG_DAEMON, "IGNORE early SIGTERM...");
+ {
+ syslog_msg = format (syslog_msg, "IGNORE early SIGTERM...");
+ log_one_line ();
+ }
break;
/* fall through */
case SIGQUIT:
@@ -144,26 +174,75 @@ unix_signal_handler (int signum, siginfo_t * si, ucontext_t * uc)
break;
}
- /* Null terminate. */
- vec_add1 (syslog_msg, 0);
if (fatal)
{
- syslog (LOG_ERR | LOG_DAEMON, "%s", syslog_msg);
+ int skip = 1, index = 0;
- /* Address of callers: outer first, inner last. */
- uword callers[15];
- uword n_callers = clib_backtrace (callers, ARRAY_LEN (callers), 0);
- int i;
- for (i = 0; i < n_callers; i++)
+ foreach_clib_stack_frame (sf)
{
- vec_reset_length (syslog_msg);
+ if (sf->is_signal_frame)
+ {
+ int pipefd[2];
+ const int n_bytes = 20;
+ u8 *ip = (void *) sf->ip;
+
+ if (pipe (pipefd) == 0)
+ {
+ /* check PC points to valid memory */
+ if (write (pipefd[1], ip, n_bytes) == n_bytes)
+ {
+ syslog_msg = format (syslog_msg, "Code: ");
+ if (color)
+ syslog_msg = format (syslog_msg, ANSI_FG_CYAN);
+ for (int i = 0; i < n_bytes; i++)
+ syslog_msg = format (syslog_msg, " %02x", ip[i]);
+ if (color)
+ syslog_msg = format (syslog_msg, ANSI_FG_DEFAULT);
+ }
+ else
+ {
+ syslog_msg = format (
+ syslog_msg, "PC contains invalid memory address");
+ }
+ log_one_line ();
+ foreach_int (i, 0, 1)
+ close (pipefd[i]);
+ }
+ skip = 0;
+ }
+
+ if (skip)
+ continue;
+
+ syslog_msg = format (syslog_msg, "#%-2d ", index++);
+ if (color)
+ syslog_msg = format (syslog_msg, ANSI_FG_BLUE);
+ syslog_msg = format (syslog_msg, "0x%016lx", sf->ip);
+ if (color)
+ syslog_msg = format (syslog_msg, ANSI_FG_DEFAULT);
+
+ if (sf->name[0])
+ {
+ if (color)
+ syslog_msg = format (syslog_msg, ANSI_FG_YELLOW);
+ syslog_msg =
+ format (syslog_msg, " %s + 0x%x", sf->name, sf->offset);
+ if (color)
+ syslog_msg = format (syslog_msg, ANSI_FG_DEFAULT);
+ }
- syslog_msg =
- format (syslog_msg, "#%-2d 0x%016lx %U%c", i, callers[i],
- format_clib_elf_symbol_with_address, callers[i], 0);
+ log_one_line ();
- syslog (LOG_ERR | LOG_DAEMON, "%s", syslog_msg);
+ if (sf->file_name)
+ {
+ if (color)
+ syslog_msg = format (syslog_msg, ANSI_FG_GREEN);
+ syslog_msg = format (syslog_msg, " from %s", sf->file_name);
+ if (color)
+ syslog_msg = format (syslog_msg, ANSI_FG_DEFAULT);
+ log_one_line ();
+ }
}
/* have to remove SIGABRT to avoid recursive - os_exit calling abort() */
@@ -175,9 +254,6 @@ unix_signal_handler (int signum, siginfo_t * si, ucontext_t * uc)
else
os_exit (1);
}
- else
- clib_warning ("%s", syslog_msg);
-
}
static clib_error_t *
diff --git a/src/vlib/unix/plugin.c b/src/vlib/unix/plugin.c
index fd3a050b944..77e4633e14a 100644
--- a/src/vlib/unix/plugin.c
+++ b/src/vlib/unix/plugin.c
@@ -88,19 +88,14 @@ extract (u8 * sp, u8 * ep)
*/
static clib_error_t *
-r2_to_reg (elf_main_t * em, vlib_plugin_r2_t * r2,
- vlib_plugin_registration_t * reg)
+r2_to_reg (elf_main_t *em, vlib_plugin_r2_t *r2,
+ vlib_plugin_registration_t *reg, elf_section_t *data_section)
{
- clib_error_t *error;
- elf_section_t *section;
uword data_segment_offset;
u8 *data;
/* It turns out that the strings land in the ".data" section */
- error = elf_get_section_by_name (em, ".data", &section);
- if (error)
- return error;
- data = elf_get_section_contents (em, section->index, 1);
+ data = elf_get_section_contents (em, data_section->index, 1);
/*
* Offsets in the ".vlib_plugin_r2" section
@@ -177,13 +172,52 @@ load_one_plugin (plugin_main_t * pm, plugin_info_t * pi, int from_early_init)
error = elf_get_section_by_name (&em, ".vlib_plugin_r2", &section);
if (error == 0)
{
+ elf_section_t *data_section;
+ elf_relocation_table_t *rt;
+ elf_relocation_with_addend_t *r;
+ elf_symbol_table_t *st;
+ elf64_symbol_t *sym, *symok = 0;
+
data = elf_get_section_contents (&em, section->index, 1);
r2 = (vlib_plugin_r2_t *) data;
+
+ elf_get_section_by_name (&em, ".data", &data_section);
+
+ // Find first symbol in .vlib_plugin_r2 section.
+ vec_foreach (st, em.symbol_tables)
+ {
+ vec_foreach (sym, st->symbols)
+ {
+ if (sym->section_index == section->index)
+ {
+ symok = sym;
+ break;
+ }
+ }
+ }
+
+ // Relocate section data as per relocation tables.
+ if (symok != 0)
+ {
+ vec_foreach (rt, em.relocation_tables)
+ {
+ vec_foreach (r, rt->relocations)
+ {
+ if (r->address >= symok->value &&
+ r->address < symok->value + symok->size)
+ {
+ *(uword *) ((void *) data + r->address - symok->value) +=
+ r->addend - data_section->header.exec_address;
+ }
+ }
+ }
+ }
+
reg = clib_mem_alloc (sizeof (*reg));
memset (reg, 0, sizeof (*reg));
reg->default_disabled = r2->default_disabled != 0;
- error = r2_to_reg (&em, r2, reg);
+ error = r2_to_reg (&em, r2, reg, data_section);
if (error)
{
PLUGIN_LOG_ERR ("Bad r2 registration: %s\n", (char *) pi->name);
@@ -306,8 +340,12 @@ process_reg:
}
vec_free (version_required);
+#if defined(RTLD_DEEPBIND)
handle = dlopen ((char *) pi->filename,
RTLD_LAZY | (reg->deep_bind ? RTLD_DEEPBIND : 0));
+#else
+ handle = dlopen ((char *) pi->filename, RTLD_LAZY);
+#endif
if (handle == 0)
{