621b509048
Replace the existing ad-hoc configuration via various global variables with a small database of key-value pairs. The database supports heirarchical keys using a MIB-like syntax to name the path to a given key. Values are always stored as strings. The API used to manage configuation values does include wrappers to handling boolean values. Other values use non-string types require parsing by consumers. The configuration values are stored in a tree using nvlists. Leaf nodes hold string values. Configuration values are permitted to reference other configuration values using '%(name)'. This permits constructing template configurations. All existing command line arguments now set configuration values. For devices, the "-s" option parses its option argument to generate a list of key-value pairs for the given device. A new '-o' command line option permits setting an individual configuration variable. The key name is always given as a full path of dot-separated components. A new '-k' command line option parses a simple configuration file. This configuration file holds a flat list of 'key=value' lines where the 'key' is the full path of a configuration variable. Lines starting with a '#' are comments. In general, bhyve starts by parsing command line options in sequence and applying those settings to configuration values. Once this is complete, bhyve then begins initializing its state based on the configuration values. This means that subsequent configuration options or files may override or supplement previously given settings. A special 'config.dump' configuration value can be set to true to help debug configuration issues. When this value is set, bhyve will print out the configuration variables as a flat list of 'key=value' lines. Most command line argments map to a single configuration variable, e.g. '-w' sets the 'x86.strictmsr' value to false. A few command line arguments have less obvious effects: - Multiple '-p' options append their values (as a comma-seperated list) to "vcpu.N.cpuset" values (where N is a decimal vcpu number). - For '-s' options, a pci.<bus>.<slot>.<function> node is created. The first argument to '-s' (the device type) is used as the value of a "device" variable. Additional comma-separated arguments are then parsed into 'key=value' pairs and used to set additional variables under the device node. A PCI device emulation driver can provide its own hook to override the parsing of the additonal '-s' arguments after the device type. After the configuration phase as completed, the init_pci hook then walks the "pci.<bus>.<slot>.<func>" nodes. It uses the "device" value to find the device model to use. The device model's init routine is passed a reference to its nvlist node in the configuration tree which it can query for specific variables. The result is that a lot of the string parsing is removed from the device models and centralized. In addition, adding a new variable just requires teaching the model to look for the new variable. - For '-l' options, a similar model is used where the string is parsed into values that are later read during initialization. One key note here is that the serial ports use the commonly used lowercase names from existing documentation and examples (e.g. "lpc.com1") instead of the uppercase names previously used internally in bhyve. Reviewed by: grehan MFC after: 3 months Differential Revision: https://reviews.freebsd.org/D26035
257 lines
5.3 KiB
C
257 lines
5.3 KiB
C
/*-
|
|
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
|
|
*
|
|
* Copyright (c) 2011 NetApp, Inc.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY NETAPP, INC ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL NETAPP, INC OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
/*
|
|
* Test program for the micro event library. Set up a simple TCP echo
|
|
* service.
|
|
*
|
|
* cc mevent_test.c mevent.c -lpthread
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/stdint.h>
|
|
#include <sys/sysctl.h>
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
#include <machine/cpufunc.h>
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <pthread.h>
|
|
#include <unistd.h>
|
|
|
|
#include "mevent.h"
|
|
|
|
#define TEST_PORT 4321
|
|
|
|
static pthread_mutex_t accept_mutex = PTHREAD_MUTEX_INITIALIZER;
|
|
static pthread_cond_t accept_condvar = PTHREAD_COND_INITIALIZER;
|
|
|
|
static struct mevent *tevp;
|
|
|
|
|
|
#define MEVENT_ECHO
|
|
|
|
/* Number of timer events to capture */
|
|
#define TEVSZ 4096
|
|
uint64_t tevbuf[TEVSZ];
|
|
|
|
static void
|
|
timer_print(void)
|
|
{
|
|
uint64_t min, max, diff, sum, tsc_freq;
|
|
size_t len;
|
|
int j;
|
|
|
|
min = UINT64_MAX;
|
|
max = 0;
|
|
sum = 0;
|
|
|
|
len = sizeof(tsc_freq);
|
|
sysctlbyname("machdep.tsc_freq", &tsc_freq, &len, NULL, 0);
|
|
|
|
for (j = 1; j < TEVSZ; j++) {
|
|
/* Convert a tsc diff into microseconds */
|
|
diff = (tevbuf[j] - tevbuf[j-1]) * 1000000 / tsc_freq;
|
|
sum += diff;
|
|
if (min > diff)
|
|
min = diff;
|
|
if (max < diff)
|
|
max = diff;
|
|
}
|
|
|
|
printf("timers done: usecs, min %ld, max %ld, mean %ld\n", min, max,
|
|
sum/(TEVSZ - 1));
|
|
}
|
|
|
|
static void
|
|
timer_callback(int fd, enum ev_type type, void *param)
|
|
{
|
|
static int i;
|
|
|
|
if (i >= TEVSZ)
|
|
abort();
|
|
|
|
tevbuf[i++] = rdtsc();
|
|
|
|
if (i == TEVSZ) {
|
|
mevent_delete(tevp);
|
|
timer_print();
|
|
}
|
|
}
|
|
|
|
|
|
#ifdef MEVENT_ECHO
|
|
struct esync {
|
|
pthread_mutex_t e_mt;
|
|
pthread_cond_t e_cond;
|
|
};
|
|
|
|
static void
|
|
echoer_callback(int fd, enum ev_type type, void *param)
|
|
{
|
|
struct esync *sync = param;
|
|
|
|
pthread_mutex_lock(&sync->e_mt);
|
|
pthread_cond_signal(&sync->e_cond);
|
|
pthread_mutex_unlock(&sync->e_mt);
|
|
}
|
|
|
|
static void *
|
|
echoer(void *param)
|
|
{
|
|
struct esync sync;
|
|
struct mevent *mev;
|
|
char buf[128];
|
|
int fd = (int)(uintptr_t) param;
|
|
int len;
|
|
|
|
pthread_mutex_init(&sync.e_mt, NULL);
|
|
pthread_cond_init(&sync.e_cond, NULL);
|
|
|
|
pthread_mutex_lock(&sync.e_mt);
|
|
|
|
mev = mevent_add(fd, EVF_READ, echoer_callback, &sync);
|
|
if (mev == NULL) {
|
|
printf("Could not allocate echoer event\n");
|
|
exit(4);
|
|
}
|
|
|
|
while (!pthread_cond_wait(&sync.e_cond, &sync.e_mt)) {
|
|
len = read(fd, buf, sizeof(buf));
|
|
if (len > 0) {
|
|
write(fd, buf, len);
|
|
write(0, buf, len);
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
|
|
mevent_delete_close(mev);
|
|
|
|
pthread_mutex_unlock(&sync.e_mt);
|
|
pthread_mutex_destroy(&sync.e_mt);
|
|
pthread_cond_destroy(&sync.e_cond);
|
|
|
|
return (NULL);
|
|
}
|
|
|
|
#else
|
|
|
|
static void *
|
|
echoer(void *param)
|
|
{
|
|
char buf[128];
|
|
int fd = (int)(uintptr_t) param;
|
|
int len;
|
|
|
|
while ((len = read(fd, buf, sizeof(buf))) > 0) {
|
|
write(1, buf, len);
|
|
}
|
|
|
|
return (NULL);
|
|
}
|
|
#endif /* MEVENT_ECHO */
|
|
|
|
static void
|
|
acceptor_callback(int fd, enum ev_type type, void *param)
|
|
{
|
|
pthread_mutex_lock(&accept_mutex);
|
|
pthread_cond_signal(&accept_condvar);
|
|
pthread_mutex_unlock(&accept_mutex);
|
|
}
|
|
|
|
static void *
|
|
acceptor(void *param)
|
|
{
|
|
struct sockaddr_in sin;
|
|
pthread_t tid;
|
|
int news;
|
|
int s;
|
|
static int first;
|
|
|
|
if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
|
|
perror("cannot create socket");
|
|
exit(4);
|
|
}
|
|
|
|
sin.sin_len = sizeof(sin);
|
|
sin.sin_family = AF_INET;
|
|
sin.sin_addr.s_addr = htonl(INADDR_ANY);
|
|
sin.sin_port = htons(TEST_PORT);
|
|
|
|
if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
|
|
perror("cannot bind socket");
|
|
exit(4);
|
|
}
|
|
|
|
if (listen(s, 1) < 0) {
|
|
perror("cannot listen socket");
|
|
exit(4);
|
|
}
|
|
|
|
(void) mevent_add(s, EVF_READ, acceptor_callback, NULL);
|
|
|
|
pthread_mutex_lock(&accept_mutex);
|
|
|
|
while (!pthread_cond_wait(&accept_condvar, &accept_mutex)) {
|
|
news = accept(s, NULL, NULL);
|
|
if (news < 0) {
|
|
perror("accept error");
|
|
} else {
|
|
static int first = 1;
|
|
|
|
if (first) {
|
|
/*
|
|
* Start a timer
|
|
*/
|
|
first = 0;
|
|
tevp = mevent_add(1, EVF_TIMER, timer_callback,
|
|
NULL);
|
|
}
|
|
|
|
printf("incoming connection, spawning thread\n");
|
|
pthread_create(&tid, NULL, echoer,
|
|
(void *)(uintptr_t)news);
|
|
}
|
|
}
|
|
|
|
return (NULL);
|
|
}
|
|
|
|
main()
|
|
{
|
|
pthread_t tid;
|
|
|
|
pthread_create(&tid, NULL, acceptor, NULL);
|
|
|
|
mevent_dispatch();
|
|
}
|