Drivers: hv: vmbus: Remove the channel from the channel list(s) on failure

Properly rollback state in vmbus_pocess_offer() in the failure paths.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index f8528e1e3a77b6cc0285543d4bffe4b549d19112..b1e5a5fdaf7f1b390f7975d47a41efc4b6e22c4f 100644 (file)
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -386,7 +386,7 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel)
                &newchannel->offermsg.offer.if_instance,
                newchannel);
        if (!newchannel->device_obj)
-               goto err_free_chan;
+               goto err_deq_chan;
 
        /*
         * Add the new device to the bus. This will kick off device-driver
@@ -398,15 +398,26 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel)
                pr_err("unable to add child device object (relid %d)\n",
                           newchannel->offermsg.child_relid);
 
-               spin_lock_irqsave(&vmbus_connection.channel_lock, flags);
-               list_del(&newchannel->listentry);
-               spin_unlock_irqrestore(&vmbus_connection.channel_lock, flags);
                kfree(newchannel->device_obj);
-               goto err_free_chan;
+               goto err_deq_chan;
        }
 
        return;
 
+err_deq_chan:
+       spin_lock_irqsave(&vmbus_connection.channel_lock, flags);
+       list_del(&newchannel->listentry);
+       spin_unlock_irqrestore(&vmbus_connection.channel_lock, flags);
+
+       if (newchannel->target_cpu != get_cpu()) {
+               put_cpu();
+               smp_call_function_single(newchannel->target_cpu,
+                                        percpu_channel_deq, newchannel, true);
+       } else {
+               percpu_channel_deq(newchannel);
+               put_cpu();
+       }
+
 err_free_chan:
        free_channel(newchannel);
 }