2013-06-24 11:05:10 -07:00
|
|
|
|
/*
|
2014-01-14 14:35:48 -08:00
|
|
|
|
* Copyright (c) 2013, 2014 Nicira, Inc.
|
2013-06-24 11:05:10 -07:00
|
|
|
|
*
|
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
|
* You may obtain a copy of the License at:
|
|
|
|
|
*
|
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
*
|
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
|
* limitations under the License.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#include "ovs-thread.h"
|
|
|
|
|
#include <errno.h>
|
2013-06-19 13:07:35 -07:00
|
|
|
|
#include <poll.h>
|
2014-05-23 14:15:28 -07:00
|
|
|
|
#ifndef _WIN32
|
|
|
|
|
#include <signal.h>
|
|
|
|
|
#endif
|
2013-06-19 13:07:35 -07:00
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <unistd.h>
|
2013-06-24 11:05:10 -07:00
|
|
|
|
#include "compiler.h"
|
2013-12-23 14:04:13 -08:00
|
|
|
|
#include "hash.h"
|
netdev-dpdk: Fix race condition with DPDK mempools in non pmd threads
DPDK mempools rely on rte_lcore_id() to implement a thread-local cache.
Our non pmd threads had rte_lcore_id() == 0. This allowed concurrent access to
the "thread-local" cache, causing crashes.
This commit resolves the issue with the following changes:
- Every non pmd thread has the same lcore_id (0, for management reasons), which
is not shared with any pmd thread (lcore_id for pmd threads now start from 1)
- DPDK mbufs must be allocated/freed in pmd threads. When there is the need to
use mempools in non pmd threads, like in dpdk_do_tx_copy(), a mutex must be
held.
- The previous change does not allow us anymore to pass DPDK mbufs to handler
threads: therefore this commit partially revert 143859ec63d45e. Now packets
are copied for upcall processing. We can remove the extra memcpy by
processing upcalls in the pmd thread itself.
With the introduction of the extra locking, the packet throughput will be lower
in the following cases:
- When using internal (tap) devices with DPDK devices on the same datapath.
Anyway, to support internal devices efficiently, we needed DPDK KNI devices,
which will be proper pmd devices and will not need this locking.
- When packets are processed in the slow path by non pmd threads. This overhead
can be avoided by handling the upcalls directly in pmd threads (a change that
has already been proposed by Ryan Wilson)
Also, the following two fixes have been introduced:
- In dpdk_free_buf() use rte_pktmbuf_free_seg() instead of rte_mempool_put().
This allows OVS to run properly with CONFIG_RTE_LIBRTE_MBUF_DEBUG DPDK option
- Do not bulk free mbufs in a transmission queue. They may belong to different
mempools
Signed-off-by: Daniele Di Proietto <ddiproietto@vmware.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
2014-07-17 14:29:36 -07:00
|
|
|
|
#include "netdev-dpdk.h"
|
2014-03-18 16:34:28 -07:00
|
|
|
|
#include "ovs-rcu.h"
|
2013-06-19 13:07:35 -07:00
|
|
|
|
#include "poll-loop.h"
|
2014-05-29 15:37:37 -07:00
|
|
|
|
#include "seq.h"
|
2013-06-19 13:07:35 -07:00
|
|
|
|
#include "socket-util.h"
|
2013-06-24 11:05:10 -07:00
|
|
|
|
#include "util.h"
|
|
|
|
|
|
|
|
|
|
#ifdef __CHECKER__
|
|
|
|
|
/* Omit the definitions in this file because they are somewhat difficult to
|
|
|
|
|
* write without prompting "sparse" complaints, without ugliness or
|
|
|
|
|
* cut-and-paste. Since "sparse" is just a checker, not a compiler, it
|
|
|
|
|
* doesn't matter that we don't define them. */
|
|
|
|
|
#else
|
2013-06-19 13:07:35 -07:00
|
|
|
|
#include "vlog.h"
|
|
|
|
|
|
|
|
|
|
VLOG_DEFINE_THIS_MODULE(ovs_thread);
|
|
|
|
|
|
|
|
|
|
/* If there is a reason that we cannot fork anymore (unless the fork will be
|
|
|
|
|
* immediately followed by an exec), then this points to a string that
|
|
|
|
|
* explains why. */
|
|
|
|
|
static const char *must_not_fork;
|
|
|
|
|
|
|
|
|
|
/* True if we created any threads beyond the main initial thread. */
|
|
|
|
|
static bool multithreaded;
|
|
|
|
|
|
2013-07-30 15:31:48 -07:00
|
|
|
|
#define LOCK_FUNCTION(TYPE, FUN) \
|
|
|
|
|
void \
|
|
|
|
|
ovs_##TYPE##_##FUN##_at(const struct ovs_##TYPE *l_, \
|
|
|
|
|
const char *where) \
|
2013-08-21 11:24:49 -07:00
|
|
|
|
OVS_NO_THREAD_SAFETY_ANALYSIS \
|
2013-07-30 15:31:48 -07:00
|
|
|
|
{ \
|
|
|
|
|
struct ovs_##TYPE *l = CONST_CAST(struct ovs_##TYPE *, l_); \
|
2014-04-24 16:49:05 -07:00
|
|
|
|
int error; \
|
|
|
|
|
\
|
|
|
|
|
/* Verify that 'l' was initialized. */ \
|
2014-05-08 09:20:09 -07:00
|
|
|
|
if (OVS_UNLIKELY(!l->where)) { \
|
|
|
|
|
ovs_abort(0, "%s: %s() passed uninitialized ovs_"#TYPE, \
|
|
|
|
|
where, __func__); \
|
|
|
|
|
} \
|
2014-04-24 16:49:05 -07:00
|
|
|
|
\
|
|
|
|
|
error = pthread_##TYPE##_##FUN(&l->lock); \
|
2013-07-30 15:31:48 -07:00
|
|
|
|
if (OVS_UNLIKELY(error)) { \
|
2014-05-08 09:20:09 -07:00
|
|
|
|
ovs_abort(error, "%s: pthread_%s_%s failed", where, #TYPE, #FUN); \
|
2013-07-30 15:31:48 -07:00
|
|
|
|
} \
|
|
|
|
|
l->where = where; \
|
2014-04-24 16:49:05 -07:00
|
|
|
|
}
|
2013-07-30 15:31:48 -07:00
|
|
|
|
LOCK_FUNCTION(mutex, lock);
|
|
|
|
|
LOCK_FUNCTION(rwlock, rdlock);
|
|
|
|
|
LOCK_FUNCTION(rwlock, wrlock);
|
|
|
|
|
|
|
|
|
|
#define TRY_LOCK_FUNCTION(TYPE, FUN) \
|
|
|
|
|
int \
|
|
|
|
|
ovs_##TYPE##_##FUN##_at(const struct ovs_##TYPE *l_, \
|
|
|
|
|
const char *where) \
|
2013-08-21 11:24:49 -07:00
|
|
|
|
OVS_NO_THREAD_SAFETY_ANALYSIS \
|
2013-07-30 15:31:48 -07:00
|
|
|
|
{ \
|
|
|
|
|
struct ovs_##TYPE *l = CONST_CAST(struct ovs_##TYPE *, l_); \
|
2014-04-24 16:49:05 -07:00
|
|
|
|
int error; \
|
|
|
|
|
\
|
|
|
|
|
/* Verify that 'l' was initialized. */ \
|
2014-05-08 09:20:09 -07:00
|
|
|
|
if (OVS_UNLIKELY(!l->where)) { \
|
|
|
|
|
ovs_abort(0, "%s: %s() passed uninitialized ovs_"#TYPE, \
|
|
|
|
|
where, __func__); \
|
|
|
|
|
} \
|
2014-04-24 16:49:05 -07:00
|
|
|
|
\
|
|
|
|
|
error = pthread_##TYPE##_##FUN(&l->lock); \
|
2013-07-30 15:31:48 -07:00
|
|
|
|
if (OVS_UNLIKELY(error) && error != EBUSY) { \
|
2014-05-08 09:20:09 -07:00
|
|
|
|
ovs_abort(error, "%s: pthread_%s_%s failed", where, #TYPE, #FUN); \
|
2013-07-30 15:31:48 -07:00
|
|
|
|
} \
|
|
|
|
|
if (!error) { \
|
|
|
|
|
l->where = where; \
|
|
|
|
|
} \
|
|
|
|
|
return error; \
|
|
|
|
|
}
|
|
|
|
|
TRY_LOCK_FUNCTION(mutex, trylock);
|
|
|
|
|
TRY_LOCK_FUNCTION(rwlock, tryrdlock);
|
|
|
|
|
TRY_LOCK_FUNCTION(rwlock, trywrlock);
|
|
|
|
|
|
2014-04-24 16:49:05 -07:00
|
|
|
|
#define UNLOCK_FUNCTION(TYPE, FUN, WHERE) \
|
2013-07-30 15:31:48 -07:00
|
|
|
|
void \
|
|
|
|
|
ovs_##TYPE##_##FUN(const struct ovs_##TYPE *l_) \
|
2013-08-21 11:24:49 -07:00
|
|
|
|
OVS_NO_THREAD_SAFETY_ANALYSIS \
|
2013-07-30 15:31:48 -07:00
|
|
|
|
{ \
|
|
|
|
|
struct ovs_##TYPE *l = CONST_CAST(struct ovs_##TYPE *, l_); \
|
|
|
|
|
int error; \
|
2014-04-24 16:49:05 -07:00
|
|
|
|
\
|
|
|
|
|
/* Verify that 'l' was initialized. */ \
|
|
|
|
|
ovs_assert(l->where); \
|
|
|
|
|
\
|
|
|
|
|
l->where = WHERE; \
|
2013-07-30 15:31:48 -07:00
|
|
|
|
error = pthread_##TYPE##_##FUN(&l->lock); \
|
|
|
|
|
if (OVS_UNLIKELY(error)) { \
|
|
|
|
|
ovs_abort(error, "pthread_%s_%sfailed", #TYPE, #FUN); \
|
|
|
|
|
} \
|
|
|
|
|
}
|
2014-04-24 16:49:05 -07:00
|
|
|
|
UNLOCK_FUNCTION(mutex, unlock, "<unlocked>");
|
|
|
|
|
UNLOCK_FUNCTION(mutex, destroy, NULL);
|
|
|
|
|
UNLOCK_FUNCTION(rwlock, unlock, "<unlocked>");
|
|
|
|
|
UNLOCK_FUNCTION(rwlock, destroy, NULL);
|
2013-07-30 15:31:48 -07:00
|
|
|
|
|
2013-06-24 11:05:10 -07:00
|
|
|
|
#define XPTHREAD_FUNC1(FUNCTION, PARAM1) \
|
|
|
|
|
void \
|
|
|
|
|
x##FUNCTION(PARAM1 arg1) \
|
|
|
|
|
{ \
|
|
|
|
|
int error = FUNCTION(arg1); \
|
|
|
|
|
if (OVS_UNLIKELY(error)) { \
|
|
|
|
|
ovs_abort(error, "%s failed", #FUNCTION); \
|
|
|
|
|
} \
|
|
|
|
|
}
|
|
|
|
|
#define XPTHREAD_FUNC2(FUNCTION, PARAM1, PARAM2) \
|
|
|
|
|
void \
|
|
|
|
|
x##FUNCTION(PARAM1 arg1, PARAM2 arg2) \
|
|
|
|
|
{ \
|
|
|
|
|
int error = FUNCTION(arg1, arg2); \
|
|
|
|
|
if (OVS_UNLIKELY(error)) { \
|
|
|
|
|
ovs_abort(error, "%s failed", #FUNCTION); \
|
|
|
|
|
} \
|
|
|
|
|
}
|
2014-03-04 13:15:41 -08:00
|
|
|
|
#define XPTHREAD_FUNC3(FUNCTION, PARAM1, PARAM2, PARAM3)\
|
|
|
|
|
void \
|
|
|
|
|
x##FUNCTION(PARAM1 arg1, PARAM2 arg2, PARAM3 arg3) \
|
|
|
|
|
{ \
|
|
|
|
|
int error = FUNCTION(arg1, arg2, arg3); \
|
|
|
|
|
if (OVS_UNLIKELY(error)) { \
|
|
|
|
|
ovs_abort(error, "%s failed", #FUNCTION); \
|
|
|
|
|
} \
|
|
|
|
|
}
|
2013-06-24 11:05:10 -07:00
|
|
|
|
|
2013-07-31 16:09:11 -07:00
|
|
|
|
XPTHREAD_FUNC1(pthread_mutex_lock, pthread_mutex_t *);
|
|
|
|
|
XPTHREAD_FUNC1(pthread_mutex_unlock, pthread_mutex_t *);
|
2013-05-09 10:54:04 -07:00
|
|
|
|
XPTHREAD_FUNC1(pthread_mutexattr_init, pthread_mutexattr_t *);
|
|
|
|
|
XPTHREAD_FUNC1(pthread_mutexattr_destroy, pthread_mutexattr_t *);
|
|
|
|
|
XPTHREAD_FUNC2(pthread_mutexattr_settype, pthread_mutexattr_t *, int);
|
|
|
|
|
XPTHREAD_FUNC2(pthread_mutexattr_gettype, pthread_mutexattr_t *, int *);
|
|
|
|
|
|
2014-02-21 10:53:49 -08:00
|
|
|
|
XPTHREAD_FUNC1(pthread_rwlockattr_init, pthread_rwlockattr_t *);
|
|
|
|
|
XPTHREAD_FUNC1(pthread_rwlockattr_destroy, pthread_rwlockattr_t *);
|
|
|
|
|
#ifdef PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP
|
|
|
|
|
XPTHREAD_FUNC2(pthread_rwlockattr_setkind_np, pthread_rwlockattr_t *, int);
|
|
|
|
|
#endif
|
|
|
|
|
|
2013-06-24 11:05:10 -07:00
|
|
|
|
XPTHREAD_FUNC2(pthread_cond_init, pthread_cond_t *, pthread_condattr_t *);
|
2013-07-22 15:24:36 -07:00
|
|
|
|
XPTHREAD_FUNC1(pthread_cond_destroy, pthread_cond_t *);
|
2013-06-24 11:05:10 -07:00
|
|
|
|
XPTHREAD_FUNC1(pthread_cond_signal, pthread_cond_t *);
|
|
|
|
|
XPTHREAD_FUNC1(pthread_cond_broadcast, pthread_cond_t *);
|
|
|
|
|
|
2013-08-06 16:47:43 -07:00
|
|
|
|
XPTHREAD_FUNC2(pthread_join, pthread_t, void **);
|
|
|
|
|
|
2013-06-24 11:05:10 -07:00
|
|
|
|
typedef void destructor_func(void *);
|
|
|
|
|
XPTHREAD_FUNC2(pthread_key_create, pthread_key_t *, destructor_func *);
|
2014-01-14 14:35:48 -08:00
|
|
|
|
XPTHREAD_FUNC1(pthread_key_delete, pthread_key_t);
|
2013-08-06 14:30:01 -07:00
|
|
|
|
XPTHREAD_FUNC2(pthread_setspecific, pthread_key_t, const void *);
|
2013-06-24 11:05:10 -07:00
|
|
|
|
|
2014-05-23 14:15:28 -07:00
|
|
|
|
#ifndef _WIN32
|
|
|
|
|
XPTHREAD_FUNC3(pthread_sigmask, int, const sigset_t *, sigset_t *);
|
|
|
|
|
#endif
|
|
|
|
|
|
Use "error-checking" mutexes in place of other kinds wherever possible.
We've seen a number of deadlocks in the tree since thread safety was
introduced. So far, all of these are self-deadlocks, that is, a single
thread acquiring a lock and then attempting to re-acquire the same lock
recursively. When this has happened, the process simply hung, and it was
somewhat difficult to find the cause.
POSIX "error-checking" mutexes check for this specific problem (and
others). This commit switches from other types of mutexes to
error-checking mutexes everywhere that we can, that is, everywhere that
we're not using recursive mutexes. This ought to help find problems more
quickly in the future.
There might be performance advantages to other kinds of mutexes in some
cases. However, the existing mutex type choices were just guesses, so I'd
rather go for easy detection of errors until we know that other mutex
types actually perform better in specific cases. Also, I did a quick
microbenchmark of glibc mutex types on my host and found that the
error checking mutexes weren't any slower than the other types, at least
when the mutex is uncontended.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
2013-08-20 13:40:02 -07:00
|
|
|
|
static void
|
|
|
|
|
ovs_mutex_init__(const struct ovs_mutex *l_, int type)
|
2013-07-30 15:31:48 -07:00
|
|
|
|
{
|
|
|
|
|
struct ovs_mutex *l = CONST_CAST(struct ovs_mutex *, l_);
|
|
|
|
|
pthread_mutexattr_t attr;
|
|
|
|
|
int error;
|
|
|
|
|
|
2014-04-24 16:49:05 -07:00
|
|
|
|
l->where = "<unlocked>";
|
2013-07-30 15:31:48 -07:00
|
|
|
|
xpthread_mutexattr_init(&attr);
|
|
|
|
|
xpthread_mutexattr_settype(&attr, type);
|
|
|
|
|
error = pthread_mutex_init(&l->lock, &attr);
|
|
|
|
|
if (OVS_UNLIKELY(error)) {
|
|
|
|
|
ovs_abort(error, "pthread_mutex_init failed");
|
|
|
|
|
}
|
|
|
|
|
xpthread_mutexattr_destroy(&attr);
|
|
|
|
|
}
|
|
|
|
|
|
Use "error-checking" mutexes in place of other kinds wherever possible.
We've seen a number of deadlocks in the tree since thread safety was
introduced. So far, all of these are self-deadlocks, that is, a single
thread acquiring a lock and then attempting to re-acquire the same lock
recursively. When this has happened, the process simply hung, and it was
somewhat difficult to find the cause.
POSIX "error-checking" mutexes check for this specific problem (and
others). This commit switches from other types of mutexes to
error-checking mutexes everywhere that we can, that is, everywhere that
we're not using recursive mutexes. This ought to help find problems more
quickly in the future.
There might be performance advantages to other kinds of mutexes in some
cases. However, the existing mutex type choices were just guesses, so I'd
rather go for easy detection of errors until we know that other mutex
types actually perform better in specific cases. Also, I did a quick
microbenchmark of glibc mutex types on my host and found that the
error checking mutexes weren't any slower than the other types, at least
when the mutex is uncontended.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
2013-08-20 13:40:02 -07:00
|
|
|
|
/* Initializes 'mutex' as a normal (non-recursive) mutex. */
|
|
|
|
|
void
|
|
|
|
|
ovs_mutex_init(const struct ovs_mutex *mutex)
|
|
|
|
|
{
|
|
|
|
|
ovs_mutex_init__(mutex, PTHREAD_MUTEX_ERRORCHECK);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Initializes 'mutex' as a recursive mutex. */
|
|
|
|
|
void
|
|
|
|
|
ovs_mutex_init_recursive(const struct ovs_mutex *mutex)
|
|
|
|
|
{
|
|
|
|
|
ovs_mutex_init__(mutex, PTHREAD_MUTEX_RECURSIVE);
|
|
|
|
|
}
|
|
|
|
|
|
2014-02-04 15:47:39 -08:00
|
|
|
|
/* Initializes 'mutex' as a recursive mutex. */
|
|
|
|
|
void
|
|
|
|
|
ovs_mutex_init_adaptive(const struct ovs_mutex *mutex)
|
|
|
|
|
{
|
|
|
|
|
#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
|
|
|
|
|
ovs_mutex_init__(mutex, PTHREAD_MUTEX_ADAPTIVE_NP);
|
|
|
|
|
#else
|
|
|
|
|
ovs_mutex_init(mutex);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
2013-07-30 15:31:48 -07:00
|
|
|
|
void
|
|
|
|
|
ovs_rwlock_init(const struct ovs_rwlock *l_)
|
|
|
|
|
{
|
|
|
|
|
struct ovs_rwlock *l = CONST_CAST(struct ovs_rwlock *, l_);
|
2014-02-21 10:53:49 -08:00
|
|
|
|
pthread_rwlockattr_t attr;
|
2013-07-30 15:31:48 -07:00
|
|
|
|
int error;
|
|
|
|
|
|
2014-04-24 16:49:05 -07:00
|
|
|
|
l->where = "<unlocked>";
|
2014-02-21 10:53:49 -08:00
|
|
|
|
|
|
|
|
|
xpthread_rwlockattr_init(&attr);
|
|
|
|
|
#ifdef PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP
|
|
|
|
|
xpthread_rwlockattr_setkind_np(
|
|
|
|
|
&attr, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
|
|
|
|
|
#endif
|
2013-07-30 15:31:48 -07:00
|
|
|
|
error = pthread_rwlock_init(&l->lock, NULL);
|
|
|
|
|
if (OVS_UNLIKELY(error)) {
|
|
|
|
|
ovs_abort(error, "pthread_rwlock_init failed");
|
|
|
|
|
}
|
2014-02-21 10:53:49 -08:00
|
|
|
|
xpthread_rwlockattr_destroy(&attr);
|
2013-07-30 15:31:48 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
ovs_mutex_cond_wait(pthread_cond_t *cond, const struct ovs_mutex *mutex_)
|
|
|
|
|
{
|
|
|
|
|
struct ovs_mutex *mutex = CONST_CAST(struct ovs_mutex *, mutex_);
|
2014-03-18 16:34:28 -07:00
|
|
|
|
int error;
|
|
|
|
|
|
|
|
|
|
ovsrcu_quiesce_start();
|
|
|
|
|
error = pthread_cond_wait(cond, &mutex->lock);
|
|
|
|
|
ovsrcu_quiesce_end();
|
|
|
|
|
|
2013-07-30 15:31:48 -07:00
|
|
|
|
if (OVS_UNLIKELY(error)) {
|
|
|
|
|
ovs_abort(error, "pthread_cond_wait failed");
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-03-04 13:15:41 -08:00
|
|
|
|
|
2014-05-29 15:37:37 -07:00
|
|
|
|
/* Initializes the 'barrier'. 'size' is the number of threads
|
|
|
|
|
* expected to hit the barrier. */
|
|
|
|
|
void
|
|
|
|
|
ovs_barrier_init(struct ovs_barrier *barrier, uint32_t size)
|
2014-03-04 13:15:41 -08:00
|
|
|
|
{
|
2014-05-29 15:37:37 -07:00
|
|
|
|
barrier->size = size;
|
2014-08-29 16:15:44 -07:00
|
|
|
|
atomic_count_init(&barrier->count, 0);
|
2014-05-29 15:37:37 -07:00
|
|
|
|
barrier->seq = seq_create();
|
|
|
|
|
}
|
2014-03-04 13:15:41 -08:00
|
|
|
|
|
2014-05-29 15:37:37 -07:00
|
|
|
|
/* Destroys the 'barrier'. */
|
|
|
|
|
void
|
|
|
|
|
ovs_barrier_destroy(struct ovs_barrier *barrier)
|
|
|
|
|
{
|
|
|
|
|
seq_destroy(barrier->seq);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Makes the calling thread block on the 'barrier' until all
|
2014-08-29 16:15:44 -07:00
|
|
|
|
* 'barrier->size' threads hit the barrier.
|
|
|
|
|
* ovs_barrier provides the necessary acquire-release semantics to make
|
|
|
|
|
* the effects of prior memory accesses of all the participating threads
|
|
|
|
|
* visible on return and to prevent the following memory accesses to be
|
|
|
|
|
* reordered before the ovs_barrier_block(). */
|
2014-05-29 15:37:37 -07:00
|
|
|
|
void
|
|
|
|
|
ovs_barrier_block(struct ovs_barrier *barrier)
|
|
|
|
|
{
|
|
|
|
|
uint64_t seq = seq_read(barrier->seq);
|
|
|
|
|
uint32_t orig;
|
2014-04-25 13:50:48 -07:00
|
|
|
|
|
2014-08-29 16:15:44 -07:00
|
|
|
|
orig = atomic_count_inc(&barrier->count);
|
2014-05-29 15:37:37 -07:00
|
|
|
|
if (orig + 1 == barrier->size) {
|
2014-08-29 16:15:44 -07:00
|
|
|
|
atomic_count_set(&barrier->count, 0);
|
2014-08-29 16:15:44 -07:00
|
|
|
|
/* seq_change() serves as a release barrier against the other threads,
|
|
|
|
|
* so the zeroed count is visible to them as they continue. */
|
2014-05-29 15:37:37 -07:00
|
|
|
|
seq_change(barrier->seq);
|
2014-08-29 16:15:44 -07:00
|
|
|
|
} else {
|
|
|
|
|
/* To prevent thread from waking up by other event,
|
|
|
|
|
* keeps waiting for the change of 'barrier->seq'. */
|
|
|
|
|
while (seq == seq_read(barrier->seq)) {
|
|
|
|
|
seq_wait(barrier->seq, seq);
|
|
|
|
|
poll_block();
|
|
|
|
|
}
|
2014-05-29 15:37:37 -07:00
|
|
|
|
}
|
2014-03-04 13:15:41 -08:00
|
|
|
|
}
|
2013-08-06 14:57:19 -07:00
|
|
|
|
|
|
|
|
|
DEFINE_EXTERN_PER_THREAD_DATA(ovsthread_id, 0);
|
|
|
|
|
|
|
|
|
|
struct ovsthread_aux {
|
|
|
|
|
void *(*start)(void *);
|
|
|
|
|
void *arg;
|
ovs-thread: Make caller provide thread name when creating a thread.
Thread names are occasionally very useful for debugging, but from time to
time we've forgotten to set one. This commit adds the new thread's name
as a parameter to the function to start a thread, to make that mistake
impossible. This also simplifies code, since two function calls become
only one.
This makes a few other changes to the thread creation function:
* Since it is no longer a direct wrapper around a pthread function,
rename it to avoid giving that impression.
* Remove 'pthread_attr_t *' param that every caller supplied as NULL.
* Change 'pthread *' parameter into a return value, for convenience.
The system-stats code hadn't set a thread name, so this fixes that issue.
This patch is a prerequisite for making RCU report the name of a thread
that is blocking RCU synchronization, because the easiest way to do that is
for ovsrcu_quiesce_end() to record the current thread's name.
ovsrcu_quiesce_end() is called before the thread function is called, so it
won't get a name set within the thread function itself. Setting the thread
name earlier, as in this patch, avoids the problem.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
2014-04-25 17:46:21 -07:00
|
|
|
|
char name[16];
|
2013-08-06 14:57:19 -07:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void *
|
|
|
|
|
ovsthread_wrapper(void *aux_)
|
|
|
|
|
{
|
2014-08-29 16:15:44 -07:00
|
|
|
|
static atomic_count next_id = ATOMIC_COUNT_INIT(1);
|
2013-08-06 14:57:19 -07:00
|
|
|
|
|
|
|
|
|
struct ovsthread_aux *auxp = aux_;
|
|
|
|
|
struct ovsthread_aux aux;
|
|
|
|
|
unsigned int id;
|
|
|
|
|
|
2014-08-29 16:15:44 -07:00
|
|
|
|
id = atomic_count_inc(&next_id);
|
2013-08-06 14:57:19 -07:00
|
|
|
|
*ovsthread_id_get() = id;
|
|
|
|
|
|
|
|
|
|
aux = *auxp;
|
|
|
|
|
free(auxp);
|
|
|
|
|
|
2014-04-28 15:25:19 -07:00
|
|
|
|
/* The order of the following calls is important, because
|
|
|
|
|
* ovsrcu_quiesce_end() saves a copy of the thread name. */
|
ovs-thread: Make caller provide thread name when creating a thread.
Thread names are occasionally very useful for debugging, but from time to
time we've forgotten to set one. This commit adds the new thread's name
as a parameter to the function to start a thread, to make that mistake
impossible. This also simplifies code, since two function calls become
only one.
This makes a few other changes to the thread creation function:
* Since it is no longer a direct wrapper around a pthread function,
rename it to avoid giving that impression.
* Remove 'pthread_attr_t *' param that every caller supplied as NULL.
* Change 'pthread *' parameter into a return value, for convenience.
The system-stats code hadn't set a thread name, so this fixes that issue.
This patch is a prerequisite for making RCU report the name of a thread
that is blocking RCU synchronization, because the easiest way to do that is
for ovsrcu_quiesce_end() to record the current thread's name.
ovsrcu_quiesce_end() is called before the thread function is called, so it
won't get a name set within the thread function itself. Setting the thread
name earlier, as in this patch, avoids the problem.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
2014-04-25 17:46:21 -07:00
|
|
|
|
set_subprogram_name("%s%u", aux.name, id);
|
2014-03-18 16:34:28 -07:00
|
|
|
|
ovsrcu_quiesce_end();
|
2014-04-28 15:25:19 -07:00
|
|
|
|
|
netdev-dpdk: Fix race condition with DPDK mempools in non pmd threads
DPDK mempools rely on rte_lcore_id() to implement a thread-local cache.
Our non pmd threads had rte_lcore_id() == 0. This allowed concurrent access to
the "thread-local" cache, causing crashes.
This commit resolves the issue with the following changes:
- Every non pmd thread has the same lcore_id (0, for management reasons), which
is not shared with any pmd thread (lcore_id for pmd threads now start from 1)
- DPDK mbufs must be allocated/freed in pmd threads. When there is the need to
use mempools in non pmd threads, like in dpdk_do_tx_copy(), a mutex must be
held.
- The previous change does not allow us anymore to pass DPDK mbufs to handler
threads: therefore this commit partially revert 143859ec63d45e. Now packets
are copied for upcall processing. We can remove the extra memcpy by
processing upcalls in the pmd thread itself.
With the introduction of the extra locking, the packet throughput will be lower
in the following cases:
- When using internal (tap) devices with DPDK devices on the same datapath.
Anyway, to support internal devices efficiently, we needed DPDK KNI devices,
which will be proper pmd devices and will not need this locking.
- When packets are processed in the slow path by non pmd threads. This overhead
can be avoided by handling the upcalls directly in pmd threads (a change that
has already been proposed by Ryan Wilson)
Also, the following two fixes have been introduced:
- In dpdk_free_buf() use rte_pktmbuf_free_seg() instead of rte_mempool_put().
This allows OVS to run properly with CONFIG_RTE_LIBRTE_MBUF_DEBUG DPDK option
- Do not bulk free mbufs in a transmission queue. They may belong to different
mempools
Signed-off-by: Daniele Di Proietto <ddiproietto@vmware.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
2014-07-17 14:29:36 -07:00
|
|
|
|
thread_set_nonpmd();
|
|
|
|
|
|
2013-08-06 14:57:19 -07:00
|
|
|
|
return aux.start(aux.arg);
|
|
|
|
|
}
|
2013-07-30 15:31:48 -07:00
|
|
|
|
|
ovs-thread: Make caller provide thread name when creating a thread.
Thread names are occasionally very useful for debugging, but from time to
time we've forgotten to set one. This commit adds the new thread's name
as a parameter to the function to start a thread, to make that mistake
impossible. This also simplifies code, since two function calls become
only one.
This makes a few other changes to the thread creation function:
* Since it is no longer a direct wrapper around a pthread function,
rename it to avoid giving that impression.
* Remove 'pthread_attr_t *' param that every caller supplied as NULL.
* Change 'pthread *' parameter into a return value, for convenience.
The system-stats code hadn't set a thread name, so this fixes that issue.
This patch is a prerequisite for making RCU report the name of a thread
that is blocking RCU synchronization, because the easiest way to do that is
for ovsrcu_quiesce_end() to record the current thread's name.
ovsrcu_quiesce_end() is called before the thread function is called, so it
won't get a name set within the thread function itself. Setting the thread
name earlier, as in this patch, avoids the problem.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
2014-04-25 17:46:21 -07:00
|
|
|
|
/* Starts a thread that calls 'start(arg)'. Sets the thread's name to 'name'
|
|
|
|
|
* (suffixed by its ovsthread_id()). Returns the new thread's pthread_t. */
|
|
|
|
|
pthread_t
|
|
|
|
|
ovs_thread_create(const char *name, void *(*start)(void *), void *arg)
|
2013-06-24 11:05:10 -07:00
|
|
|
|
{
|
2013-08-06 14:57:19 -07:00
|
|
|
|
struct ovsthread_aux *aux;
|
2013-06-24 11:05:10 -07:00
|
|
|
|
pthread_t thread;
|
|
|
|
|
int error;
|
|
|
|
|
|
2013-06-19 13:07:35 -07:00
|
|
|
|
forbid_forking("multiple threads exist");
|
|
|
|
|
multithreaded = true;
|
2014-03-18 16:34:28 -07:00
|
|
|
|
ovsrcu_quiesce_end();
|
2013-06-19 13:07:35 -07:00
|
|
|
|
|
2013-08-06 14:57:19 -07:00
|
|
|
|
aux = xmalloc(sizeof *aux);
|
|
|
|
|
aux->start = start;
|
|
|
|
|
aux->arg = arg;
|
ovs-thread: Make caller provide thread name when creating a thread.
Thread names are occasionally very useful for debugging, but from time to
time we've forgotten to set one. This commit adds the new thread's name
as a parameter to the function to start a thread, to make that mistake
impossible. This also simplifies code, since two function calls become
only one.
This makes a few other changes to the thread creation function:
* Since it is no longer a direct wrapper around a pthread function,
rename it to avoid giving that impression.
* Remove 'pthread_attr_t *' param that every caller supplied as NULL.
* Change 'pthread *' parameter into a return value, for convenience.
The system-stats code hadn't set a thread name, so this fixes that issue.
This patch is a prerequisite for making RCU report the name of a thread
that is blocking RCU synchronization, because the easiest way to do that is
for ovsrcu_quiesce_end() to record the current thread's name.
ovsrcu_quiesce_end() is called before the thread function is called, so it
won't get a name set within the thread function itself. Setting the thread
name earlier, as in this patch, avoids the problem.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
2014-04-25 17:46:21 -07:00
|
|
|
|
ovs_strlcpy(aux->name, name, sizeof aux->name);
|
2013-08-06 14:57:19 -07:00
|
|
|
|
|
ovs-thread: Make caller provide thread name when creating a thread.
Thread names are occasionally very useful for debugging, but from time to
time we've forgotten to set one. This commit adds the new thread's name
as a parameter to the function to start a thread, to make that mistake
impossible. This also simplifies code, since two function calls become
only one.
This makes a few other changes to the thread creation function:
* Since it is no longer a direct wrapper around a pthread function,
rename it to avoid giving that impression.
* Remove 'pthread_attr_t *' param that every caller supplied as NULL.
* Change 'pthread *' parameter into a return value, for convenience.
The system-stats code hadn't set a thread name, so this fixes that issue.
This patch is a prerequisite for making RCU report the name of a thread
that is blocking RCU synchronization, because the easiest way to do that is
for ovsrcu_quiesce_end() to record the current thread's name.
ovsrcu_quiesce_end() is called before the thread function is called, so it
won't get a name set within the thread function itself. Setting the thread
name earlier, as in this patch, avoids the problem.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
2014-04-25 17:46:21 -07:00
|
|
|
|
error = pthread_create(&thread, NULL, ovsthread_wrapper, aux);
|
2013-06-24 11:05:10 -07:00
|
|
|
|
if (error) {
|
|
|
|
|
ovs_abort(error, "pthread_create failed");
|
|
|
|
|
}
|
ovs-thread: Make caller provide thread name when creating a thread.
Thread names are occasionally very useful for debugging, but from time to
time we've forgotten to set one. This commit adds the new thread's name
as a parameter to the function to start a thread, to make that mistake
impossible. This also simplifies code, since two function calls become
only one.
This makes a few other changes to the thread creation function:
* Since it is no longer a direct wrapper around a pthread function,
rename it to avoid giving that impression.
* Remove 'pthread_attr_t *' param that every caller supplied as NULL.
* Change 'pthread *' parameter into a return value, for convenience.
The system-stats code hadn't set a thread name, so this fixes that issue.
This patch is a prerequisite for making RCU report the name of a thread
that is blocking RCU synchronization, because the easiest way to do that is
for ovsrcu_quiesce_end() to record the current thread's name.
ovsrcu_quiesce_end() is called before the thread function is called, so it
won't get a name set within the thread function itself. Setting the thread
name earlier, as in this patch, avoids the problem.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
2014-04-25 17:46:21 -07:00
|
|
|
|
return thread;
|
2013-06-24 11:05:10 -07:00
|
|
|
|
}
|
2013-06-19 11:21:47 -07:00
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
ovsthread_once_start__(struct ovsthread_once *once)
|
|
|
|
|
{
|
2013-07-30 15:31:48 -07:00
|
|
|
|
ovs_mutex_lock(&once->mutex);
|
2014-08-29 16:15:44 -07:00
|
|
|
|
/* Mutex synchronizes memory, so we get the current value of 'done'. */
|
|
|
|
|
if (!once->done) {
|
|
|
|
|
return true;
|
2013-06-19 11:21:47 -07:00
|
|
|
|
}
|
2013-07-30 15:31:48 -07:00
|
|
|
|
ovs_mutex_unlock(&once->mutex);
|
2014-08-29 16:15:44 -07:00
|
|
|
|
return false;
|
2013-06-19 11:21:47 -07:00
|
|
|
|
}
|
|
|
|
|
|
2013-07-30 15:31:48 -07:00
|
|
|
|
void
|
2013-06-19 11:21:47 -07:00
|
|
|
|
ovsthread_once_done(struct ovsthread_once *once)
|
|
|
|
|
{
|
2014-08-29 16:15:44 -07:00
|
|
|
|
/* We need release semantics here, so that the following store may not
|
|
|
|
|
* be moved ahead of any of the preceding initialization operations.
|
|
|
|
|
* A release atomic_thread_fence provides that prior memory accesses
|
|
|
|
|
* will not be reordered to take place after the following store. */
|
|
|
|
|
atomic_thread_fence(memory_order_release);
|
|
|
|
|
once->done = true;
|
2013-07-30 15:31:48 -07:00
|
|
|
|
ovs_mutex_unlock(&once->mutex);
|
2013-06-19 11:21:47 -07:00
|
|
|
|
}
|
2013-06-19 13:07:35 -07:00
|
|
|
|
|
2014-03-18 16:34:28 -07:00
|
|
|
|
bool
|
|
|
|
|
single_threaded(void)
|
|
|
|
|
{
|
|
|
|
|
return !multithreaded;
|
|
|
|
|
}
|
|
|
|
|
|
2013-06-19 13:07:35 -07:00
|
|
|
|
/* Asserts that the process has not yet created any threads (beyond the initial
|
2013-07-29 15:24:45 -07:00
|
|
|
|
* thread).
|
|
|
|
|
*
|
|
|
|
|
* ('where' is used in logging. Commonly one would use
|
|
|
|
|
* assert_single_threaded() to automatically provide the caller's source file
|
|
|
|
|
* and line number for 'where'.) */
|
2013-06-19 13:07:35 -07:00
|
|
|
|
void
|
2013-07-29 15:24:45 -07:00
|
|
|
|
assert_single_threaded_at(const char *where)
|
2013-06-19 13:07:35 -07:00
|
|
|
|
{
|
|
|
|
|
if (multithreaded) {
|
|
|
|
|
VLOG_FATAL("%s: attempted operation not allowed when multithreaded",
|
|
|
|
|
where);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-12 10:32:59 -07:00
|
|
|
|
#ifndef _WIN32
|
2013-06-19 13:07:35 -07:00
|
|
|
|
/* Forks the current process (checking that this is allowed). Aborts with
|
|
|
|
|
* VLOG_FATAL if fork() returns an error, and otherwise returns the value
|
2013-07-29 15:24:45 -07:00
|
|
|
|
* returned by fork().
|
|
|
|
|
*
|
|
|
|
|
* ('where' is used in logging. Commonly one would use xfork() to
|
|
|
|
|
* automatically provide the caller's source file and line number for
|
|
|
|
|
* 'where'.) */
|
2013-06-19 13:07:35 -07:00
|
|
|
|
pid_t
|
2013-07-29 15:24:45 -07:00
|
|
|
|
xfork_at(const char *where)
|
2013-06-19 13:07:35 -07:00
|
|
|
|
{
|
|
|
|
|
pid_t pid;
|
|
|
|
|
|
|
|
|
|
if (must_not_fork) {
|
|
|
|
|
VLOG_FATAL("%s: attempted to fork but forking not allowed (%s)",
|
|
|
|
|
where, must_not_fork);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pid = fork();
|
|
|
|
|
if (pid < 0) {
|
2013-07-30 15:31:48 -07:00
|
|
|
|
VLOG_FATAL("%s: fork failed (%s)", where, ovs_strerror(errno));
|
2013-06-19 13:07:35 -07:00
|
|
|
|
}
|
|
|
|
|
return pid;
|
|
|
|
|
}
|
2014-03-12 10:32:59 -07:00
|
|
|
|
#endif
|
2013-06-19 13:07:35 -07:00
|
|
|
|
|
|
|
|
|
/* Notes that the process must not call fork() from now on, for the specified
|
|
|
|
|
* 'reason'. (The process may still fork() if it execs itself immediately
|
|
|
|
|
* afterward.) */
|
|
|
|
|
void
|
|
|
|
|
forbid_forking(const char *reason)
|
|
|
|
|
{
|
|
|
|
|
ovs_assert(reason != NULL);
|
|
|
|
|
must_not_fork = reason;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns true if the process is allowed to fork, false otherwise. */
|
|
|
|
|
bool
|
|
|
|
|
may_fork(void)
|
|
|
|
|
{
|
|
|
|
|
return !must_not_fork;
|
|
|
|
|
}
|
2013-12-06 07:42:20 +00:00
|
|
|
|
|
2014-03-19 07:47:12 -07:00
|
|
|
|
/* ovsthread_stats. */
|
2013-12-23 14:04:13 -08:00
|
|
|
|
|
2014-03-19 07:47:12 -07:00
|
|
|
|
void
|
|
|
|
|
ovsthread_stats_init(struct ovsthread_stats *stats)
|
2013-12-23 14:04:13 -08:00
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
2014-03-19 07:47:12 -07:00
|
|
|
|
ovs_mutex_init(&stats->mutex);
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(stats->buckets); i++) {
|
|
|
|
|
stats->buckets[i] = NULL;
|
2013-12-23 14:04:13 -08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2014-03-19 07:47:12 -07:00
|
|
|
|
ovsthread_stats_destroy(struct ovsthread_stats *stats)
|
2013-12-23 14:04:13 -08:00
|
|
|
|
{
|
2014-03-19 07:47:12 -07:00
|
|
|
|
ovs_mutex_destroy(&stats->mutex);
|
2013-12-23 14:04:13 -08:00
|
|
|
|
}
|
|
|
|
|
|
2014-03-19 07:47:12 -07:00
|
|
|
|
void *
|
|
|
|
|
ovsthread_stats_bucket_get(struct ovsthread_stats *stats,
|
|
|
|
|
void *(*new_bucket)(void))
|
2013-12-23 14:04:13 -08:00
|
|
|
|
{
|
2014-03-19 07:47:12 -07:00
|
|
|
|
unsigned int idx = ovsthread_id_self() & (ARRAY_SIZE(stats->buckets) - 1);
|
|
|
|
|
void *bucket = stats->buckets[idx];
|
|
|
|
|
if (!bucket) {
|
|
|
|
|
ovs_mutex_lock(&stats->mutex);
|
|
|
|
|
bucket = stats->buckets[idx];
|
|
|
|
|
if (!bucket) {
|
|
|
|
|
bucket = stats->buckets[idx] = new_bucket();
|
|
|
|
|
}
|
|
|
|
|
ovs_mutex_unlock(&stats->mutex);
|
|
|
|
|
}
|
|
|
|
|
return bucket;
|
2013-12-23 14:04:13 -08:00
|
|
|
|
}
|
|
|
|
|
|
2014-03-19 07:47:12 -07:00
|
|
|
|
size_t
|
|
|
|
|
ovs_thread_stats_next_bucket(const struct ovsthread_stats *stats, size_t i)
|
2013-12-23 14:04:13 -08:00
|
|
|
|
{
|
2014-03-19 07:47:12 -07:00
|
|
|
|
for (; i < ARRAY_SIZE(stats->buckets); i++) {
|
|
|
|
|
if (stats->buckets[i]) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
2013-12-23 14:04:13 -08:00
|
|
|
|
}
|
2014-03-19 07:47:12 -07:00
|
|
|
|
return i;
|
2013-12-23 14:04:13 -08:00
|
|
|
|
}
|
2014-03-19 07:47:12 -07:00
|
|
|
|
|
2013-12-23 14:04:13 -08:00
|
|
|
|
|
2013-12-06 07:42:21 +00:00
|
|
|
|
/* Parses /proc/cpuinfo for the total number of physical cores on this system
|
|
|
|
|
* across all CPU packages, not counting hyper-threads.
|
|
|
|
|
*
|
|
|
|
|
* Sets *n_cores to the total number of cores on this system, or 0 if the
|
|
|
|
|
* number cannot be determined. */
|
|
|
|
|
static void
|
|
|
|
|
parse_cpuinfo(long int *n_cores)
|
|
|
|
|
{
|
|
|
|
|
static const char file_name[] = "/proc/cpuinfo";
|
|
|
|
|
char line[128];
|
|
|
|
|
uint64_t cpu = 0; /* Support up to 64 CPU packages on a single system. */
|
|
|
|
|
long int cores = 0;
|
|
|
|
|
FILE *stream;
|
|
|
|
|
|
|
|
|
|
stream = fopen(file_name, "r");
|
|
|
|
|
if (!stream) {
|
2013-12-12 05:46:22 +00:00
|
|
|
|
VLOG_DBG("%s: open failed (%s)", file_name, ovs_strerror(errno));
|
2013-12-06 07:42:21 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
while (fgets(line, sizeof line, stream)) {
|
|
|
|
|
unsigned int id;
|
|
|
|
|
|
|
|
|
|
/* Find the next CPU package. */
|
|
|
|
|
if (ovs_scan(line, "physical id%*[^:]: %u", &id)) {
|
|
|
|
|
if (id > 63) {
|
|
|
|
|
VLOG_WARN("Counted over 64 CPU packages on this system. "
|
|
|
|
|
"Parsing %s for core count may be inaccurate.",
|
|
|
|
|
file_name);
|
|
|
|
|
cores = 0;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-29 12:21:49 +02:00
|
|
|
|
if (cpu & (1ULL << id)) {
|
2013-12-06 07:42:21 +00:00
|
|
|
|
/* We've already counted this package's cores. */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2014-08-29 12:21:49 +02:00
|
|
|
|
cpu |= 1ULL << id;
|
2013-12-06 07:42:21 +00:00
|
|
|
|
|
|
|
|
|
/* Find the number of cores for this package. */
|
|
|
|
|
while (fgets(line, sizeof line, stream)) {
|
|
|
|
|
int count;
|
|
|
|
|
|
|
|
|
|
if (ovs_scan(line, "cpu cores%*[^:]: %u", &count)) {
|
|
|
|
|
cores += count;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
fclose(stream);
|
|
|
|
|
|
|
|
|
|
*n_cores = cores;
|
|
|
|
|
}
|
|
|
|
|
|
2013-12-06 07:42:20 +00:00
|
|
|
|
/* Returns the total number of cores on this system, or 0 if the number cannot
|
2013-12-06 07:42:21 +00:00
|
|
|
|
* be determined.
|
|
|
|
|
*
|
|
|
|
|
* Tries not to count hyper-threads, but may be inaccurate - particularly on
|
|
|
|
|
* platforms that do not provide /proc/cpuinfo, but also if /proc/cpuinfo is
|
|
|
|
|
* formatted different to the layout that parse_cpuinfo() expects. */
|
2013-12-13 14:31:27 -08:00
|
|
|
|
int
|
2013-12-06 07:42:20 +00:00
|
|
|
|
count_cpu_cores(void)
|
|
|
|
|
{
|
2013-12-06 07:42:21 +00:00
|
|
|
|
static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER;
|
|
|
|
|
static long int n_cores;
|
|
|
|
|
|
|
|
|
|
if (ovsthread_once_start(&once)) {
|
2014-03-10 09:59:56 -07:00
|
|
|
|
#ifndef _WIN32
|
2013-12-06 07:42:21 +00:00
|
|
|
|
parse_cpuinfo(&n_cores);
|
|
|
|
|
if (!n_cores) {
|
|
|
|
|
n_cores = sysconf(_SC_NPROCESSORS_ONLN);
|
|
|
|
|
}
|
2014-03-10 09:59:56 -07:00
|
|
|
|
#else
|
|
|
|
|
SYSTEM_INFO sysinfo;
|
|
|
|
|
GetSystemInfo(&sysinfo);
|
|
|
|
|
n_cores = sysinfo.dwNumberOfProcessors;
|
|
|
|
|
#endif
|
2013-12-06 07:42:21 +00:00
|
|
|
|
ovsthread_once_done(&once);
|
|
|
|
|
}
|
2013-12-06 07:42:20 +00:00
|
|
|
|
|
|
|
|
|
return n_cores > 0 ? n_cores : 0;
|
|
|
|
|
}
|
2014-01-14 14:35:48 -08:00
|
|
|
|
|
|
|
|
|
/* ovsthread_key. */
|
|
|
|
|
|
|
|
|
|
#define L1_SIZE 1024
|
|
|
|
|
#define L2_SIZE 1024
|
|
|
|
|
#define MAX_KEYS (L1_SIZE * L2_SIZE)
|
|
|
|
|
|
|
|
|
|
/* A piece of thread-specific data. */
|
|
|
|
|
struct ovsthread_key {
|
|
|
|
|
struct list list_node; /* In 'inuse_keys' or 'free_keys'. */
|
|
|
|
|
void (*destructor)(void *); /* Called at thread exit. */
|
|
|
|
|
|
|
|
|
|
/* Indexes into the per-thread array in struct ovsthread_key_slots.
|
|
|
|
|
* This key's data is stored in p1[index / L2_SIZE][index % L2_SIZE]. */
|
|
|
|
|
unsigned int index;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Per-thread data structure. */
|
|
|
|
|
struct ovsthread_key_slots {
|
|
|
|
|
struct list list_node; /* In 'slots_list'. */
|
|
|
|
|
void **p1[L1_SIZE];
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Contains "struct ovsthread_key_slots *". */
|
|
|
|
|
static pthread_key_t tsd_key;
|
|
|
|
|
|
|
|
|
|
/* Guards data structures below. */
|
|
|
|
|
static struct ovs_mutex key_mutex = OVS_MUTEX_INITIALIZER;
|
|
|
|
|
|
|
|
|
|
/* 'inuse_keys' holds "struct ovsthread_key"s that have been created and not
|
|
|
|
|
* yet destroyed.
|
|
|
|
|
*
|
|
|
|
|
* 'free_keys' holds "struct ovsthread_key"s that have been deleted and are
|
|
|
|
|
* ready for reuse. (We keep them around only to be able to easily locate
|
|
|
|
|
* free indexes.)
|
|
|
|
|
*
|
|
|
|
|
* Together, 'inuse_keys' and 'free_keys' hold an ovsthread_key for every index
|
|
|
|
|
* from 0 to n_keys - 1, inclusive. */
|
|
|
|
|
static struct list inuse_keys OVS_GUARDED_BY(key_mutex)
|
|
|
|
|
= LIST_INITIALIZER(&inuse_keys);
|
|
|
|
|
static struct list free_keys OVS_GUARDED_BY(key_mutex)
|
|
|
|
|
= LIST_INITIALIZER(&free_keys);
|
|
|
|
|
static unsigned int n_keys OVS_GUARDED_BY(key_mutex);
|
|
|
|
|
|
|
|
|
|
/* All existing struct ovsthread_key_slots. */
|
|
|
|
|
static struct list slots_list OVS_GUARDED_BY(key_mutex)
|
|
|
|
|
= LIST_INITIALIZER(&slots_list);
|
|
|
|
|
|
|
|
|
|
static void *
|
|
|
|
|
clear_slot(struct ovsthread_key_slots *slots, unsigned int index)
|
|
|
|
|
{
|
|
|
|
|
void **p2 = slots->p1[index / L2_SIZE];
|
|
|
|
|
if (p2) {
|
|
|
|
|
void **valuep = &p2[index % L2_SIZE];
|
|
|
|
|
void *value = *valuep;
|
|
|
|
|
*valuep = NULL;
|
|
|
|
|
return value;
|
|
|
|
|
} else {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ovsthread_key_destruct__(void *slots_)
|
|
|
|
|
{
|
|
|
|
|
struct ovsthread_key_slots *slots = slots_;
|
|
|
|
|
struct ovsthread_key *key;
|
|
|
|
|
unsigned int n;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
ovs_mutex_lock(&key_mutex);
|
|
|
|
|
list_remove(&slots->list_node);
|
|
|
|
|
LIST_FOR_EACH (key, list_node, &inuse_keys) {
|
|
|
|
|
void *value = clear_slot(slots, key->index);
|
|
|
|
|
if (value && key->destructor) {
|
|
|
|
|
key->destructor(value);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
n = n_keys;
|
|
|
|
|
ovs_mutex_unlock(&key_mutex);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < n / L2_SIZE; i++) {
|
|
|
|
|
free(slots->p1[i]);
|
|
|
|
|
}
|
|
|
|
|
free(slots);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Initializes '*keyp' as a thread-specific data key. The data items are
|
|
|
|
|
* initially null in all threads.
|
|
|
|
|
*
|
|
|
|
|
* If a thread exits with non-null data, then 'destructor', if nonnull, will be
|
|
|
|
|
* called passing the final data value as its argument. 'destructor' must not
|
|
|
|
|
* call any thread-specific data functions in this API.
|
|
|
|
|
*
|
|
|
|
|
* This function is similar to xpthread_key_create(). */
|
|
|
|
|
void
|
|
|
|
|
ovsthread_key_create(ovsthread_key_t *keyp, void (*destructor)(void *))
|
|
|
|
|
{
|
|
|
|
|
static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER;
|
|
|
|
|
struct ovsthread_key *key;
|
|
|
|
|
|
|
|
|
|
if (ovsthread_once_start(&once)) {
|
|
|
|
|
xpthread_key_create(&tsd_key, ovsthread_key_destruct__);
|
|
|
|
|
ovsthread_once_done(&once);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ovs_mutex_lock(&key_mutex);
|
|
|
|
|
if (list_is_empty(&free_keys)) {
|
|
|
|
|
key = xmalloc(sizeof *key);
|
|
|
|
|
key->index = n_keys++;
|
|
|
|
|
if (key->index >= MAX_KEYS) {
|
|
|
|
|
abort();
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
key = CONTAINER_OF(list_pop_back(&free_keys),
|
|
|
|
|
struct ovsthread_key, list_node);
|
|
|
|
|
}
|
|
|
|
|
list_push_back(&inuse_keys, &key->list_node);
|
|
|
|
|
key->destructor = destructor;
|
|
|
|
|
ovs_mutex_unlock(&key_mutex);
|
|
|
|
|
|
|
|
|
|
*keyp = key;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Frees 'key'. The destructor supplied to ovsthread_key_create(), if any, is
|
|
|
|
|
* not called.
|
|
|
|
|
*
|
|
|
|
|
* This function is similar to xpthread_key_delete(). */
|
|
|
|
|
void
|
|
|
|
|
ovsthread_key_delete(ovsthread_key_t key)
|
|
|
|
|
{
|
|
|
|
|
struct ovsthread_key_slots *slots;
|
|
|
|
|
|
|
|
|
|
ovs_mutex_lock(&key_mutex);
|
|
|
|
|
|
|
|
|
|
/* Move 'key' from 'inuse_keys' to 'free_keys'. */
|
|
|
|
|
list_remove(&key->list_node);
|
|
|
|
|
list_push_back(&free_keys, &key->list_node);
|
|
|
|
|
|
|
|
|
|
/* Clear this slot in all threads. */
|
|
|
|
|
LIST_FOR_EACH (slots, list_node, &slots_list) {
|
|
|
|
|
clear_slot(slots, key->index);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ovs_mutex_unlock(&key_mutex);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void **
|
|
|
|
|
ovsthread_key_lookup__(const struct ovsthread_key *key)
|
|
|
|
|
{
|
|
|
|
|
struct ovsthread_key_slots *slots;
|
|
|
|
|
void **p2;
|
|
|
|
|
|
|
|
|
|
slots = pthread_getspecific(tsd_key);
|
|
|
|
|
if (!slots) {
|
|
|
|
|
slots = xzalloc(sizeof *slots);
|
|
|
|
|
|
|
|
|
|
ovs_mutex_lock(&key_mutex);
|
|
|
|
|
pthread_setspecific(tsd_key, slots);
|
|
|
|
|
list_push_back(&slots_list, &slots->list_node);
|
|
|
|
|
ovs_mutex_unlock(&key_mutex);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
p2 = slots->p1[key->index / L2_SIZE];
|
|
|
|
|
if (!p2) {
|
|
|
|
|
p2 = xzalloc(L2_SIZE * sizeof *p2);
|
|
|
|
|
slots->p1[key->index / L2_SIZE] = p2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return &p2[key->index % L2_SIZE];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Sets the value of thread-specific data item 'key', in the current thread, to
|
|
|
|
|
* 'value'.
|
|
|
|
|
*
|
|
|
|
|
* This function is similar to pthread_setspecific(). */
|
|
|
|
|
void
|
|
|
|
|
ovsthread_setspecific(ovsthread_key_t key, const void *value)
|
|
|
|
|
{
|
|
|
|
|
*ovsthread_key_lookup__(key) = CONST_CAST(void *, value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns the value of thread-specific data item 'key' in the current thread.
|
|
|
|
|
*
|
|
|
|
|
* This function is similar to pthread_getspecific(). */
|
|
|
|
|
void *
|
|
|
|
|
ovsthread_getspecific(ovsthread_key_t key)
|
|
|
|
|
{
|
|
|
|
|
return *ovsthread_key_lookup__(key);
|
|
|
|
|
}
|
2013-06-24 11:05:10 -07:00
|
|
|
|
#endif
|