Skip to contentSkip to conversation

FAILED: patch "[PATCH] Drivers: hv: vmbus: Fix the offer_in_progress in" failed to apply to 4.14-stable tree

PATCH [email protected] 2 participants 2 messages Sep 7, 2018 – Sep 8, 2018

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 50229128727f7e11840ca1b2b501f880818d56b6 Mon Sep 17 00:00:00 2001

From: Dexuan Cui <[email protected]>
Date: Tue, 5 Jun 2018 13:37:52 -0700
Subject: [PATCH] Drivers: hv: vmbus: Fix the offer_in_progress in
vmbus_process_offer()

I didn't really hit a real bug, but just happened to spot the bug:
we have decreased the counter at the beginning of vmbus_process_offer(), so we mustn't decrease it again.

Fixes 6f3d791f3006 ("Drivers: hv: vmbus: Fix rescind handling issues")
Cc Stephen Hemminger <[email protected]>
Cc K. Y. Srinivasan <[email protected]>
Cc Stable <[email protected]> # 4.14 and above
drivers/hv/channel_mgmt.c +1 -3
index ecc2bd275a73..f3b551a50653 100644
@@ -527,10 +527,8 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel)
 		struct hv_device *dev
 			= newchannel->primary_channel->device_obj;
 
-		if (vmbus_add_channel_kobj(dev, newchannel)) {
-			atomic_dec(&vmbus_connection.offer_in_progress);
+		if (vmbus_add_channel_kobj(dev, newchannel))
 			goto err_free_chan;
-		}
 
 		if (channel->sc_creation_callback != NULL)
 			channel->sc_creation_callback(newchannel);
maintainer
#1 lore raw

Hi Greg,
It turns out the patch is not needed for linux-4.14.y, because 4.14 doesn't have this commit:

c2e5df616e1a ("vmbus: add per-channel sysfs info"), which adds this chunk:

@@ -513,6 +513,14 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel)

        newchannel->state = CHANNEL_OPEN_STATE;

...
+ if (vmbus_add_channel_kobj(dev, newchannel)) {
+ atomic_dec(&vmbus_connection.offer_in_progress);
...

When c2e5df616e1a is not present, 6f3d791f3006 ("Drivers: hv: vmbus: Fix rescind handling issues") can not introduce the bug.

Thanks,
-- Dexuan

Quoted 59 lines

-----Original Message-----
From: [email protected] <[email protected]>
Sent: Friday, September 7, 2018 02:35
To: Dexuan Cui <[email protected]>; [email protected]; KY Srinivasan <[email protected]>; [email protected]; Stephen Hemminger <[email protected]>
Cc: [email protected]
Subject: FAILED: patch "[PATCH] Drivers: hv: vmbus: Fix the offer_in_progress in" failed to apply to 4.14-stable tree

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 50229128727f7e11840ca1b2b501f880818d56b6 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <[email protected]>
Date: Tue, 5 Jun 2018 13:37:52 -0700
Subject: [PATCH] Drivers: hv: vmbus: Fix the offer_in_progress in
vmbus_process_offer()

I didn't really hit a real bug, but just happened to spot the bug:
we have decreased the counter at the beginning of vmbus_process_offer(), so we mustn't decrease it again.

Fixes 6f3d791f3006 ("Drivers: hv: vmbus: Fix rescind handling issues")
Cc Stephen Hemminger <[email protected]>
Cc K. Y. Srinivasan <[email protected]>
Cc Stable <[email protected]> # 4.14 and above
drivers/hv/channel_mgmt.c +1 -3
index ecc2bd275a73..f3b551a50653 100644
@@ -527,10 +527,8 @@ static void vmbus_process_offer(struct
 vmbus_channel *newchannel)
 		struct hv_device *dev
 			= newchannel->primary_channel->device_obj;
 
-		if (vmbus_add_channel_kobj(dev, newchannel)) {
-			atomic_dec(&vmbus_connection.offer_in_progress);
+		if (vmbus_add_channel_kobj(dev, newchannel))
 			goto err_free_chan;
-		}
 
 		if (channel->sc_creation_callback != NULL)

channel->sc_creation_callback(newchannel);