Drivers: hv: vmbus: serialize Offer and Rescind offer processing
PATCH 1/1 Drivers: hv: vmbus: serialize Offer and Rescind offer processing
Commit 4b2f9abea52a ("staging: hv: convert channel_mgmt.c to not call osd_schedule_callback")' was written under an assumption that we never receive Rescind offer while we're still processing the initial Offer request. However, the issue we fixed in 04a258c162a8 could be caused by this assumption not always being true.
In particular, we need to protect against the following:
1) Receiving a Rescind offer after we do queue_work() for processing an Offer request and before we actually enter vmbus_process_offer(). work.func points to vmbus_process_offer() at this moment and in vmbus_onoffer_rescind() we do another queue_work() without a check so we'll enter vmbus_process_offer() twice.
2) Receiving a Rescind offer after we enter vmbus_process_offer() and especially after we set >state = CHANNEL_OPEN_STATE. Many things can go wrong in that case, e.g. we can call free_channel() while we're still using it.
Implement the required protection by changing work->func at the very end of vmbus_process_offer() and checking work->func in vmbus_onoffer_rescind(). pr_warn here serves only one purpose, it shows us the collision between Offer and Rescind offer actually happened. In case the assumption in 4b2f9abea52af3 was right and such collision is impossible this commit changes nothing.
I also fix one additional issue with this patch: vmbus_device_create() result is not being checked in vmbus_process_offer() and it can fail if kzalloc() fails.
--- drivers/hv/channel_mgmt.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-)
drivers/hv/channel_mgmt.c +23 -10
@@ -279,9 +279,6 @@ static void vmbus_process_offer(struct work_struct *work)int ret;unsigned long flags; -/* The next possible work is rescind handling */ -INIT_WORK (&newchannel->work, vmbus_process_rescind_offer); -/* Make sure this is a new offer */ spin_lock_irqsave (&vmbus_connection.channel_lock, flags);
@@ -340,12 +337,9 @@ static void vmbus_process_offer(struct work_struct *work) newchannel->state =CHANNEL_OPEN_STATE ;if (channel->sc_creation_callback !=NULL ) channel->sc_creation_callback (newchannel); - -return ; + goto out; } - -free_channel (newchannel); -return ; + goto error; }/*
@@ -365,6 +359,9 @@ static void vmbus_process_offer(struct work_struct *work) &newchannel->offermsg.offer.if_instance, newchannel); +if (!newchannel->device_obj) + goto error; +/* * Add the new device to the bus. This will kick off device-driver * binding which eventually invokes the device driver's AddDevice()
@@ -379,9 +376,16 @@ static void vmbus_process_offer(struct work_struct *work)list_del (&newchannel->listentry);spin_unlock_irqrestore (&vmbus_connection.channel_lock, flags);kfree (newchannel->device_obj); - -free_channel (newchannel); + goto error; } +out: +/* The next possible work is rescind handling */ +INIT_WORK (&newchannel->work, vmbus_process_rescind_offer); +return ; + +error: +free_channel (newchannel); +return ; }enum {
@@ -524,6 +528,15 @@ static void vmbus_onoffer_rescind(struct vmbus_channel_message_header *hdr)/* Just return here, no channel found */ return ; +if (channel->work.func != vmbus_process_rescind_offer) { +/* +* We're still processing offer request rescind offer can't be +* processed safely. This should not normally happen. +*/ +pr_warn ("Got Rescind offer during Offer processing!\n" ); +return ; + } + channel->rescind = true;/* work is initialized for vmbus_process_rescind_offer() from
Signature · 1 line
1.9.3
Quoted 33 lines
-----Original Message-----
From: Vitaly Kuznetsov [mailto:[email protected]]
Sent: Friday, January 16, 2015 5:46 AM
To: KY Srinivasan; [email protected]
Cc: Haiyang Zhang; [email protected]; Dexuan Cui; Jason Wang; Radim Krčmář
Subject: [PATCH] Drivers: hv: vmbus: serialize Offer and Rescind offer processingCommit
4b2f9abea52a("staging: hv: convertchannel_mgmt.cto not callosd_schedule_callback")' was written under an assumption that we never receive Rescind offer while we're still processing the initial Offer request. However, the issue we fixed in04a258c162a8could be caused by this assumption not always being true.In particular, we need to protect against the following:
1) Receiving a Rescind offer after we doqueue_work()for processing an Offer
request and before we actually entervmbus_process_offer(). work.func
points
tovmbus_process_offer()at this moment and invmbus_onoffer_rescind()
we do
anotherqueue_work()without a check so we'll entervmbus_process_offer()
twice.
2) Receiving a Rescind offer after we entervmbus_process_offer()and especially after we set >state =CHANNEL_OPEN_STATE. Many things can
go
wrong in that case, e.g. we can callfree_channel()while we're still using it.
Quoted 8 lines
Implement the required protection by changing
work->funcat the very end ofvmbus_process_offer()and checkingwork->funcinvmbus_onoffer_rescind().pr_warnhere serves only one purpose, it shows us the collision between Offer and Rescind offer actually happened. In case the assumption in4b2f9abea52af3was right and such collision is impossible this commit changes nothing.
It is clear that an offer that has not been made cannot be rescinded. So if a rescind were to come while we are in the process of handling the offer, we should deal with the rescind as well after the processing of the offer is done. Your patch does not do this; essentially we could miss handling a rescind message. We could tweak your patch to deal with this case. If a rescind message comes in while we are still processing the offer, we should process the rescind message in the same context. We can add this check at the end of the function that processes the offer. If the offer is processed fully when the rescind message comes in then we can process the rescind request in its own work context.
Quoted 3 lines
I also fix one additional issue with this patch:
vmbus_device_create()result is not being checked invmbus_process_offer()and it can fail ifkzalloc()fails.
Please have this fix in a separate patch.
Thanks,
K. Y ���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�