fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-02 18:10:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: allow queuing SR-IOV operation from a callback

Browse source 
Keep priv->sriov.pending set during the callback set so that it
becomes possible to insert a new operation from the callback itself.

(cherry picked from commit 74ccda8a71)
This commit is contained in:
Beniamino Galvani 2020-04-01 15:18:10 +02:00
parent 01997b2550
commit b140adc40d
1 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/devices/nm-device.c
View file

@ -614,6 +614,7 @@ typedef struct _NMDevicePrivate {
SriovOp *pending; /* SR-IOV operation currently running */
SriovOp *next; /* next SR-IOV operation scheduled */
} sriov;
guint sriov_reset_pending;
struct {
guint timeout_id;
@ -4765,15 +4766,12 @@ sriov_op_cb (GError *error, gpointer user_data)
nm_assert (op == priv->sriov.pending);
priv->sriov.pending = NULL;
g_clear_object (&op->cancellable);
if (op->callback)
op->callback (error, op->callback_data);
nm_assert (!priv->sriov.pending);
priv->sriov.pending = NULL;
nm_g_slice_free (op);
if (priv->sriov.next) {
@ -4791,6 +4789,8 @@ sriov_op_queue_op (NMDevice *self,
if (priv->sriov.next) {
SriovOp *op_next = g_steal_pointer (&priv->sriov.next);
priv->sriov.next = op;
/* Cancel the next operation immediately */
if (op_next->callback) {
gs_free_error GError *error = NULL;
@ -4800,17 +4800,10 @@ sriov_op_queue_op (NMDevice *self,
}
nm_g_slice_free (op_next);
return;
}
if (!priv->sriov.pending) {
/* This (having "next" set but "pending" not) can only happen if we are
* called from inside the callback again.
*
* That means we append the new request as "next" and return. Once
* the callback returns, it will schedule the request. */
priv->sriov.next = op;
return;
}
} else if (priv->sriov.pending) {
if (priv->sriov.pending) {
priv->sriov.next = op;
g_cancellable_cancel (priv->sriov.pending->cancellable);
return;
@ -15927,23 +15920,28 @@ deactivate_ready (NMDevice *self, NMDeviceStateReason reason)
if (priv->dispatcher.call_id)
return;
if ( priv->sriov.pending
|| priv->sriov.next)
if (priv->sriov_reset_pending > 0)
return;
nm_device_queue_state (self, NM_DEVICE_STATE_DISCONNECTED, reason);
if (priv->state == NM_DEVICE_STATE_DEACTIVATING)
nm_device_queue_state (self, NM_DEVICE_STATE_DISCONNECTED, reason);
}
static void
sriov_deactivate_cb (GError *error, gpointer user_data)
{
NMDevice *self;
NMDevicePrivate *priv;
gpointer reason;
nm_utils_user_data_unpack (user_data, &self, &reason);
priv = NM_DEVICE_GET_PRIVATE (self);
nm_assert (priv->sriov_reset_pending > 0);
priv->sriov_reset_pending--;
if (nm_utils_error_is_cancelled_or_disposing (error))
return;
nm_utils_user_data_unpack (user_data, &self, &reason);
deactivate_ready (self, (NMDeviceStateReason) reason);
}
@ -16273,6 +16271,7 @@ _set_state_full (NMDevice *self,
if ( priv->ifindex > 0
&& (s_sriov = nm_device_get_applied_setting (self, NM_TYPE_SETTING_SRIOV))) {
priv->sriov_reset_pending++;
sriov_op_queue (self,
0,
NM_TERNARY_TRUE,