Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shared core functionality for messages #149

Merged
merged 10 commits into from
Jul 27, 2019
Merged

Shared core functionality for messages #149

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
46bbc96
Merge pull request #134 from sdnfv/develop
koolzz Jun 4, 2019
ea0bf0c
Merge pull request #144 from sdnfv/develop
koolzz Jun 9, 2019
c12d26d
Merge pull request #146 from sdnfv/develop
koolzz Jun 12, 2019
ed5295b
Shared cores for messages
Jun 25, 2019
c00f6a2
Merge branch 'develop' of https://github.com/sdnfv/openNetVM into sha…
Jun 27, 2019
e700b57
Rm line
Jun 27, 2019
e34497a
nf context, not nf
Jun 27, 2019
be13c4a
Moved functionality to main thread
Jul 8, 2019
9d435db
Adding macro for msg threshold
Jul 19, 2019
cf8aa2a
Update NF_Dev.md
dennisafa Jul 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion onvm/onvm_nflib/onvm_common.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
#define ONVM_NF_ACTION_OUT 3 // send the packet out the NIC port set in the argument field

#define PKT_WAKEUP_THRESHOLD 1 // for shared core mode, how many packets are required to wake up the NF
#define MSG_WAKEUP_THRESHOLD 1 // for shared core mode, how many messages on an NF's ring are required to wake up the NF

/* Used in setting bit flags for core options */
#define MANUAL_CORE_ASSIGNMENT_BIT 0
Expand Down Expand Up @@ -469,7 +470,7 @@ get_sem_name(unsigned id) {

static inline int
whether_wakeup_client(struct onvm_nf *nf, struct nf_wakeup_info *nf_wakeup_info) {
if (rte_ring_count(nf->rx_q) < PKT_WAKEUP_THRESHOLD)
if (rte_ring_count(nf->rx_q) < PKT_WAKEUP_THRESHOLD && rte_ring_count(nf->msg_q) < MSG_WAKEUP_THRESHOLD)
return 0;

/* Check if its already woken up */
Expand Down
13 changes: 8 additions & 5 deletions onvm/onvm_nflib/onvm_nflib.c
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,14 @@ onvm_nflib_thread_main_loop(void *arg) {

start_time = rte_get_tsc_cycles();
for (;rte_atomic16_read(&nf_local_ctx->keep_running) && rte_atomic16_read(&main_nf_local_ctx->keep_running);) {
/* Possibly sleep if in shared core mode, otherwise continue */
if (ONVM_NF_SHARE_CORES) {
if (unlikely(rte_ring_count(nf->rx_q) == 0) && likely(rte_ring_count(nf->msg_q) == 0)) {
rte_atomic16_set(nf->shared_core.sleep_state, 1);
sem_wait(nf->shared_core.nf_mutex);
}
}

nb_pkts_added =
onvm_nflib_dequeue_packets((void **)pkts, nf_local_ctx, nf->function_table->pkt_handler);

Expand Down Expand Up @@ -908,12 +916,7 @@ onvm_nflib_dequeue_packets(void **pkts, struct onvm_nf_local_ctx *nf_local_ctx,
/* Dequeue all packets in ring up to max possible. */
nb_pkts = rte_ring_dequeue_burst(nf->rx_q, pkts, PACKET_READ_SIZE, NULL);

/* Possibly sleep if in shared core mode, otherwise return */
if (unlikely(nb_pkts == 0)) {
if (ONVM_NF_SHARE_CORES) {
rte_atomic16_set(nf->shared_core.sleep_state, 1);
sem_wait(nf->shared_core.nf_mutex);
}
return 0;
}

Expand Down