Skip to content

port: handle RTE_ETH_EVENT_INTR_RESET events #464

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

Merged
christophefontaine merged 1 commit into from
Dec 17, 2025
Merged

port: handle RTE_ETH_EVENT_INTR_RESET events #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions modules/infra/control/gr_port.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ GR_IFACE_INFO(GR_IFACE_TYPE_PORT, iface_info_port, {

uint16_t port_id;
bool started;
bool needs_reset;
struct rte_mempool *pool;
char *devargs;
uint32_t pool_size;
Expand Down
66 changes: 64 additions & 2 deletions modules/infra/control/port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <rte_malloc.h>

#include <arpa/inet.h>
#include <pthread.h>
#include <stdio.h>
#include <string.h>

Expand Down Expand Up @@ -281,11 +282,17 @@ static int iface_port_reconfig(
needs_configure = true;
}

if (p->started && needs_configure) {
if (p->started && (needs_configure || p->needs_reset)) {
p->started = false;
rte_rcu_qsbr_synchronize(gr_datapath_rcu(), RTE_QSBR_THRID_INVALID);
if ((ret = rte_eth_dev_stop(p->port_id)) < 0)
if (p->needs_reset) {
p->needs_reset = false;
needs_configure = true;
if ((ret = rte_eth_dev_reset(p->port_id)) < 0)
return errno_log(-ret, "rte_eth_dev_reset");
} else if ((ret = rte_eth_dev_stop(p->port_id)) < 0) {
return errno_log(-ret, "rte_eth_dev_stop");
}
}

if (needs_configure) {
Expand Down Expand Up @@ -668,6 +675,51 @@ static int lsc_port_cb(
return 0;
}

static struct event *reset_event;
static gr_vec uint16_t *reset_ports;
static pthread_mutex_t reset_ports_lock = PTHREAD_MUTEX_INITIALIZER;

static int intr_reset_cb(
uint16_t port_id,
enum rte_eth_event_type,
void * /*cb_arg*/,
void * /*ret_param*/
) {
// Multiple VFs may be reset before reset_event is fired in the main loop.
// Queue the port IDs in a vector protected by a mutex so that they are all
// processed in port_reset_cb().
pthread_mutex_lock(&reset_ports_lock);
gr_vec_add(reset_ports, port_id);
pthread_mutex_unlock(&reset_ports_lock);
// This callback may be executed from any dataplane or DPDK thread.
// In order to serialize the reset of the port, propagate the callback
// event to the event loop running in the main lcore.
event_active(reset_event, 0, 0);
return 0;
}

static void port_reset_cb(evutil_socket_t, short, void * /*priv*/) {
gr_vec uint16_t *port_ids;

// reset the port_id queue
pthread_mutex_lock(&reset_ports_lock);
port_ids = reset_ports;
reset_ports = NULL;
pthread_mutex_unlock(&reset_ports_lock);

gr_vec_foreach (uint16_t pid, port_ids) {
struct iface *iface = (struct iface *)port_get_iface(pid);
if (iface != NULL) {
struct iface_info_port *port = iface_info_port(iface);
struct gr_iface_info_port api = {.mac = {{0}}};
LOG(INFO, "%s: port %u reset", iface->name, pid);
port->needs_reset = true;
iface_port_reconfig(iface, GR_PORT_SET_MAC, NULL, &api);
Copy link
Collaborator

@christophefontaine christophefontaine Dec 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIUC, this will override any manually configured MAC on the port, won't it ?

On a side note, on a mac change event, do we trigger a gratuitous ARP and a NA message to tell all neighbors that the hardware address is modified ?

Copy link
Collaborator Author

@rjarry rjarry Dec 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIUC, this will override any manually configured MAC on the port, won't it ?

Yes indeed. Unfortunately, we don't have a way of knowing if the user had configured a specific mac address.

On a side note, on a mac change event, do we trigger a gratuitous ARP and a NA message to tell all neighbors that the hardware address is modified ?

We don't, but we should. Not only when there is a VF reset by the way. I can address this in a separate patch if that is OK.

}
}
gr_vec_free(port_ids);
}

static void port_init(struct event_base *base) {
link_event = event_new(base, -1, EV_PERSIST | EV_FINALIZE, link_event_cb, NULL);
if (link_event == NULL)
Expand All @@ -678,12 +730,22 @@ static void port_init(struct event_base *base) {
if (event_add(link_event, &tv) < 0)
ABORT("event_add() failed");
rte_eth_dev_callback_register(RTE_ETH_ALL, RTE_ETH_EVENT_INTR_LSC, lsc_port_cb, NULL);

// register an interrupt callback for port hardware reset events
reset_event = event_new(base, -1, EV_PERSIST | EV_FINALIZE, port_reset_cb, NULL);
if (reset_event == NULL)
ABORT("event_new() failed");
rte_eth_dev_callback_register(RTE_ETH_ALL, RTE_ETH_EVENT_INTR_RESET, intr_reset_cb, NULL);
}

static void port_fini(struct event_base *) {
rte_eth_dev_callback_unregister(RTE_ETH_ALL, RTE_ETH_EVENT_INTR_LSC, lsc_port_cb, NULL);
event_free(link_event);
link_event = NULL;
rte_eth_dev_callback_unregister(RTE_ETH_ALL, RTE_ETH_EVENT_INTR_RESET, intr_reset_cb, NULL);
event_free(reset_event);
reset_event = NULL;
gr_vec_free(reset_ports);
}

static struct iface_type iface_type_port = {
Expand Down