[PATCH 0/4] um: Some minor driver fixes

[PATCH 0/4] um: Some minor driver fixes

[Tiwei Bie]

Tiwei Bie (4):
  um: ubd: Initialize ubd's disk pointer in ubd_add
  um: ubd: Do not use drvdata in release
  um: net: Do not use drvdata in release
  um: vector: Do not use drvdata in release

 arch/um/drivers/net_kern.c    | 2 +-
 arch/um/drivers/ubd_kern.c    | 4 +++-
 arch/um/drivers/vector_kern.c | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

-- 
2.34.1

[PATCH 1/4] um: ubd: Initialize ubd's disk pointer in ubd_add

[Tiwei Bie]

Currently, the initialization of the disk pointer in the ubd structure
is missing. It should be initialized with the allocated gendisk pointer
in ubd_add().

Fixes: 32621ad7a7ea ("ubd: remove the ubd_gendisk array")
Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com>
---
 arch/um/drivers/ubd_kern.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 2b8d04e67600..f19173da64d8 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -898,6 +898,8 @@ static int ubd_add(int n, char **error_out)
 	if (err)
 		goto out_cleanup_disk;
 
+	ubd_dev->disk = disk;
+
 	return 0;
 
 out_cleanup_disk:
-- 
2.34.1

[PATCH 2/4] um: ubd: Do not use drvdata in release

[Tiwei Bie]

The drvdata is not available in release. Let's just use container_of()
to get the ubd instance. Otherwise, removing a ubd device will result
in a crash:

RIP: 0033:blk_mq_free_tag_set+0x1f/0xba
RSP: 00000000e2083bf0  EFLAGS: 00010246
RAX: 000000006021463a RBX: 0000000000000348 RCX: 0000000062604d00
RDX: 0000000004208060 RSI: 00000000605241a0 RDI: 0000000000000348
RBP: 00000000e2083c10 R08: 0000000062414010 R09: 00000000601603f7
R10: 000000000000133a R11: 000000006038c4bd R12: 0000000000000000
R13: 0000000060213a5c R14: 0000000062405d20 R15: 00000000604f7aa0
Kernel panic - not syncing: Segfault with no mm
CPU: 0 PID: 17 Comm: kworker/0:1 Not tainted 6.8.0-rc3-00107-gba3f67c11638 #1
Workqueue: events mc_work_proc
Stack:
 00000000 604f7ef0 62c5d000 62405d20
 e2083c30 6002c776 6002c755 600e47ff
 e2083c60 6025ffe3 04208060 603d36e0
Call Trace:
 [<6002c776>] ubd_device_release+0x21/0x55
 [<6002c755>] ? ubd_device_release+0x0/0x55
 [<600e47ff>] ? kfree+0x0/0x100
 [<6025ffe3>] device_release+0x70/0xba
 [<60381d6a>] kobject_put+0xb5/0xe2
 [<6026027b>] put_device+0x19/0x1c
 [<6026a036>] platform_device_put+0x26/0x29
 [<6026ac5a>] platform_device_unregister+0x2c/0x2e
 [<6002c52e>] ubd_remove+0xb8/0xd6
 [<6002bb74>] ? mconsole_reply+0x0/0x50
 [<6002b926>] mconsole_remove+0x160/0x1cc
 [<6002bbbc>] ? mconsole_reply+0x48/0x50
 [<6003379c>] ? um_set_signals+0x3b/0x43
 [<60061c55>] ? update_min_vruntime+0x14/0x70
 [<6006251f>] ? dequeue_task_fair+0x164/0x235
 [<600620aa>] ? update_cfs_group+0x0/0x40
 [<603a0e77>] ? __schedule+0x0/0x3ed
 [<60033761>] ? um_set_signals+0x0/0x43
 [<6002af6a>] mc_work_proc+0x77/0x91
 [<600520b4>] process_scheduled_works+0x1af/0x2c3
 [<6004ede3>] ? assign_work+0x0/0x58
 [<600527a1>] worker_thread+0x2f7/0x37a
 [<6004ee3b>] ? set_pf_worker+0x0/0x64
 [<6005765d>] ? arch_local_irq_save+0x0/0x2d
 [<60058e07>] ? kthread_exit+0x0/0x3a
 [<600524aa>] ? worker_thread+0x0/0x37a
 [<60058f9f>] kthread+0x130/0x135
 [<6002068e>] new_thread_handler+0x85/0xb6

Cc: stable@vger.kernel.org
Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com>
---
 arch/um/drivers/ubd_kern.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index f19173da64d8..66c1a8835e36 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -779,7 +779,7 @@ static int ubd_open_dev(struct ubd *ubd_dev)
 
 static void ubd_device_release(struct device *dev)
 {
-	struct ubd *ubd_dev = dev_get_drvdata(dev);
+	struct ubd *ubd_dev = container_of(dev, struct ubd, pdev.dev);
 
 	blk_mq_free_tag_set(&ubd_dev->tag_set);
 	*ubd_dev = ((struct ubd) DEFAULT_UBD);
-- 
2.34.1

[PATCH 3/4] um: net: Do not use drvdata in release

[Tiwei Bie]

The drvdata is not available in release. Let's just use container_of()
to get the uml_net instance. Otherwise, removing a network device will
result in a crash:

RIP: 0033:net_device_release+0x10/0x6f
RSP: 00000000e20c7c40  EFLAGS: 00010206
RAX: 000000006002e4e7 RBX: 00000000600f1baf RCX: 00000000624074e0
RDX: 0000000062778000 RSI: 0000000060551c80 RDI: 00000000627af028
RBP: 00000000e20c7c50 R08: 00000000603ad594 R09: 00000000e20c7b70
R10: 000000000000135a R11: 00000000603ad422 R12: 0000000000000000
R13: 0000000062c7af00 R14: 0000000062406d60 R15: 00000000627700b6
Kernel panic - not syncing: Segfault with no mm
CPU: 0 UID: 0 PID: 29 Comm: kworker/0:2 Not tainted 6.12.0-rc6-g59b723cd2adb #1
Workqueue: events mc_work_proc
Stack:
 627af028 62c7af00 e20c7c80 60276fcd
 62778000 603f5820 627af028 00000000
 e20c7cb0 603a2bcd 627af000 62770010
Call Trace:
 [<60276fcd>] device_release+0x70/0xba
 [<603a2bcd>] kobject_put+0xba/0xe7
 [<60277265>] put_device+0x19/0x1c
 [<60281266>] platform_device_put+0x26/0x29
 [<60281e5f>] platform_device_unregister+0x2c/0x2e
 [<6002ec9c>] net_remove+0x63/0x69
 [<60031316>] ? mconsole_reply+0x0/0x50
 [<600310c8>] mconsole_remove+0x160/0x1cc
 [<60087d40>] ? __remove_hrtimer+0x38/0x74
 [<60087ff8>] ? hrtimer_try_to_cancel+0x8c/0x98
 [<6006b3cf>] ? dl_server_stop+0x3f/0x48
 [<6006b390>] ? dl_server_stop+0x0/0x48
 [<600672e8>] ? dequeue_entities+0x327/0x390
 [<60038fa6>] ? um_set_signals+0x0/0x43
 [<6003070c>] mc_work_proc+0x77/0x91
 [<60057664>] process_scheduled_works+0x1b3/0x2dd
 [<60055f32>] ? assign_work+0x0/0x58
 [<60057f0a>] worker_thread+0x1e9/0x293
 [<6005406f>] ? set_pf_worker+0x0/0x64
 [<6005d65d>] ? arch_local_irq_save+0x0/0x2d
 [<6005d748>] ? kthread_exit+0x0/0x3a
 [<60057d21>] ? worker_thread+0x0/0x293
 [<6005dbf1>] kthread+0x126/0x12b
 [<600219c5>] new_thread_handler+0x85/0xb6

Cc: stable@vger.kernel.org
Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com>
---
 arch/um/drivers/net_kern.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 77c4afb8ab90..75d04fb4994a 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -336,7 +336,7 @@ static struct platform_driver uml_net_driver = {
 
 static void net_device_release(struct device *dev)
 {
-	struct uml_net *device = dev_get_drvdata(dev);
+	struct uml_net *device = container_of(dev, struct uml_net, pdev.dev);
 	struct net_device *netdev = device->dev;
 	struct uml_net_private *lp = netdev_priv(netdev);
 
-- 
2.34.1

[PATCH 4/4] um: vector: Do not use drvdata in release

[Tiwei Bie]

The drvdata is not available in release. Let's just use container_of()
to get the vector_device instance. Otherwise, removing a vector device
will result in a crash:

RIP: 0033:vector_device_release+0xf/0x50
RSP: 00000000e187bc40  EFLAGS: 00010202
RAX: 0000000060028f61 RBX: 00000000600f1baf RCX: 00000000620074e0
RDX: 000000006220b9c0 RSI: 0000000060551c80 RDI: 0000000000000000
RBP: 00000000e187bc50 R08: 00000000603ad594 R09: 00000000e187bb70
R10: 000000000000135a R11: 00000000603ad422 R12: 00000000623ae028
R13: 000000006287a200 R14: 0000000062006d30 R15: 00000000623700b6
Kernel panic - not syncing: Segfault with no mm
CPU: 0 UID: 0 PID: 16 Comm: kworker/0:1 Not tainted 6.12.0-rc6-g59b723cd2adb #1
Workqueue: events mc_work_proc
Stack:
 60028f61 623ae028 e187bc80 60276fcd
 6220b9c0 603f5820 623ae028 00000000
 e187bcb0 603a2bcd 623ae000 62370010
Call Trace:
 [<60028f61>] ? vector_device_release+0x0/0x50
 [<60276fcd>] device_release+0x70/0xba
 [<603a2bcd>] kobject_put+0xba/0xe7
 [<60277265>] put_device+0x19/0x1c
 [<60281266>] platform_device_put+0x26/0x29
 [<60281e5f>] platform_device_unregister+0x2c/0x2e
 [<60029422>] vector_remove+0x52/0x58
 [<60031316>] ? mconsole_reply+0x0/0x50
 [<600310c8>] mconsole_remove+0x160/0x1cc
 [<603b19f4>] ? strlen+0x0/0x15
 [<60066611>] ? __dequeue_entity+0x1a9/0x206
 [<600666a7>] ? set_next_entity+0x39/0x63
 [<6006666e>] ? set_next_entity+0x0/0x63
 [<60038fa6>] ? um_set_signals+0x0/0x43
 [<6003070c>] mc_work_proc+0x77/0x91
 [<60057664>] process_scheduled_works+0x1b3/0x2dd
 [<60055f32>] ? assign_work+0x0/0x58
 [<60057f0a>] worker_thread+0x1e9/0x293
 [<6005406f>] ? set_pf_worker+0x0/0x64
 [<6005d65d>] ? arch_local_irq_save+0x0/0x2d
 [<6005d748>] ? kthread_exit+0x0/0x3a
 [<60057d21>] ? worker_thread+0x0/0x293
 [<6005dbf1>] kthread+0x126/0x12b
 [<600219c5>] new_thread_handler+0x85/0xb6

Cc: stable@vger.kernel.org
Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com>
---
 arch/um/drivers/vector_kern.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c
index c992da83268d..64c09db392c1 100644
--- a/arch/um/drivers/vector_kern.c
+++ b/arch/um/drivers/vector_kern.c
@@ -815,7 +815,8 @@ static struct platform_driver uml_net_driver = {
 
 static void vector_device_release(struct device *dev)
 {
-	struct vector_device *device = dev_get_drvdata(dev);
+	struct vector_device *device =
+		container_of(dev, struct vector_device, pdev.dev);
 	struct net_device *netdev = device->dev;
 
 	list_del(&device->list);
-- 
2.34.1

Re: [PATCH 4/4] um: vector: Do not use drvdata in release

[Anton Ivanov]

On 04/11/2024 16:32, Tiwei Bie wrote:
> The drvdata is not available in release. Let's just use container_of()
> to get the vector_device instance. Otherwise, removing a vector device
> will result in a crash:
> 
> RIP: 0033:vector_device_release+0xf/0x50
> RSP: 00000000e187bc40  EFLAGS: 00010202
> RAX: 0000000060028f61 RBX: 00000000600f1baf RCX: 00000000620074e0
> RDX: 000000006220b9c0 RSI: 0000000060551c80 RDI: 0000000000000000
> RBP: 00000000e187bc50 R08: 00000000603ad594 R09: 00000000e187bb70
> R10: 000000000000135a R11: 00000000603ad422 R12: 00000000623ae028
> R13: 000000006287a200 R14: 0000000062006d30 R15: 00000000623700b6
> Kernel panic - not syncing: Segfault with no mm
> CPU: 0 UID: 0 PID: 16 Comm: kworker/0:1 Not tainted 6.12.0-rc6-g59b723cd2adb #1
> Workqueue: events mc_work_proc
> Stack:
>   60028f61 623ae028 e187bc80 60276fcd
>   6220b9c0 603f5820 623ae028 00000000
>   e187bcb0 603a2bcd 623ae000 62370010
> Call Trace:
>   [<60028f61>] ? vector_device_release+0x0/0x50
>   [<60276fcd>] device_release+0x70/0xba
>   [<603a2bcd>] kobject_put+0xba/0xe7
>   [<60277265>] put_device+0x19/0x1c
>   [<60281266>] platform_device_put+0x26/0x29
>   [<60281e5f>] platform_device_unregister+0x2c/0x2e
>   [<60029422>] vector_remove+0x52/0x58
>   [<60031316>] ? mconsole_reply+0x0/0x50
>   [<600310c8>] mconsole_remove+0x160/0x1cc
>   [<603b19f4>] ? strlen+0x0/0x15
>   [<60066611>] ? __dequeue_entity+0x1a9/0x206
>   [<600666a7>] ? set_next_entity+0x39/0x63
>   [<6006666e>] ? set_next_entity+0x0/0x63
>   [<60038fa6>] ? um_set_signals+0x0/0x43
>   [<6003070c>] mc_work_proc+0x77/0x91
>   [<60057664>] process_scheduled_works+0x1b3/0x2dd
>   [<60055f32>] ? assign_work+0x0/0x58
>   [<60057f0a>] worker_thread+0x1e9/0x293
>   [<6005406f>] ? set_pf_worker+0x0/0x64
>   [<6005d65d>] ? arch_local_irq_save+0x0/0x2d
>   [<6005d748>] ? kthread_exit+0x0/0x3a
>   [<60057d21>] ? worker_thread+0x0/0x293
>   [<6005dbf1>] kthread+0x126/0x12b
>   [<600219c5>] new_thread_handler+0x85/0xb6
> 
> Cc: stable@vger.kernel.org
> Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com>
> ---
>   arch/um/drivers/vector_kern.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c
> index c992da83268d..64c09db392c1 100644
> --- a/arch/um/drivers/vector_kern.c
> +++ b/arch/um/drivers/vector_kern.c
> @@ -815,7 +815,8 @@ static struct platform_driver uml_net_driver = {
>   
>   static void vector_device_release(struct device *dev)
>   {
> -	struct vector_device *device = dev_get_drvdata(dev);
> +	struct vector_device *device =
> +		container_of(dev, struct vector_device, pdev.dev);
>   	struct net_device *netdev = device->dev;
>   
>   	list_del(&device->list);

Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com>

-- 
Anton R. Ivanov
Cambridgegreys Limited. Registered in England. Company Number 10273661
https://www.cambridgegreys.com/

Re: [PATCH 3/4] um: net: Do not use drvdata in release

[Anton Ivanov]

On 04/11/2024 16:32, Tiwei Bie wrote:
> The drvdata is not available in release. Let's just use container_of()
> to get the uml_net instance. Otherwise, removing a network device will
> result in a crash:
> 
> RIP: 0033:net_device_release+0x10/0x6f
> RSP: 00000000e20c7c40  EFLAGS: 00010206
> RAX: 000000006002e4e7 RBX: 00000000600f1baf RCX: 00000000624074e0
> RDX: 0000000062778000 RSI: 0000000060551c80 RDI: 00000000627af028
> RBP: 00000000e20c7c50 R08: 00000000603ad594 R09: 00000000e20c7b70
> R10: 000000000000135a R11: 00000000603ad422 R12: 0000000000000000
> R13: 0000000062c7af00 R14: 0000000062406d60 R15: 00000000627700b6
> Kernel panic - not syncing: Segfault with no mm
> CPU: 0 UID: 0 PID: 29 Comm: kworker/0:2 Not tainted 6.12.0-rc6-g59b723cd2adb #1
> Workqueue: events mc_work_proc
> Stack:
>   627af028 62c7af00 e20c7c80 60276fcd
>   62778000 603f5820 627af028 00000000
>   e20c7cb0 603a2bcd 627af000 62770010
> Call Trace:
>   [<60276fcd>] device_release+0x70/0xba
>   [<603a2bcd>] kobject_put+0xba/0xe7
>   [<60277265>] put_device+0x19/0x1c
>   [<60281266>] platform_device_put+0x26/0x29
>   [<60281e5f>] platform_device_unregister+0x2c/0x2e
>   [<6002ec9c>] net_remove+0x63/0x69
>   [<60031316>] ? mconsole_reply+0x0/0x50
>   [<600310c8>] mconsole_remove+0x160/0x1cc
>   [<60087d40>] ? __remove_hrtimer+0x38/0x74
>   [<60087ff8>] ? hrtimer_try_to_cancel+0x8c/0x98
>   [<6006b3cf>] ? dl_server_stop+0x3f/0x48
>   [<6006b390>] ? dl_server_stop+0x0/0x48
>   [<600672e8>] ? dequeue_entities+0x327/0x390
>   [<60038fa6>] ? um_set_signals+0x0/0x43
>   [<6003070c>] mc_work_proc+0x77/0x91
>   [<60057664>] process_scheduled_works+0x1b3/0x2dd
>   [<60055f32>] ? assign_work+0x0/0x58
>   [<60057f0a>] worker_thread+0x1e9/0x293
>   [<6005406f>] ? set_pf_worker+0x0/0x64
>   [<6005d65d>] ? arch_local_irq_save+0x0/0x2d
>   [<6005d748>] ? kthread_exit+0x0/0x3a
>   [<60057d21>] ? worker_thread+0x0/0x293
>   [<6005dbf1>] kthread+0x126/0x12b
>   [<600219c5>] new_thread_handler+0x85/0xb6
> 
> Cc: stable@vger.kernel.org
> Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com>
> ---
>   arch/um/drivers/net_kern.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
> index 77c4afb8ab90..75d04fb4994a 100644
> --- a/arch/um/drivers/net_kern.c
> +++ b/arch/um/drivers/net_kern.c
> @@ -336,7 +336,7 @@ static struct platform_driver uml_net_driver = {
>   
>   static void net_device_release(struct device *dev)
>   {
> -	struct uml_net *device = dev_get_drvdata(dev);
> +	struct uml_net *device = container_of(dev, struct uml_net, pdev.dev);
>   	struct net_device *netdev = device->dev;
>   	struct uml_net_private *lp = netdev_priv(netdev);
>   
Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com>
-- 
Anton R. Ivanov
Cambridgegreys Limited. Registered in England. Company Number 10273661
https://www.cambridgegreys.com/

Re: [PATCH 2/4] um: ubd: Do not use drvdata in release

[Anton Ivanov]

On 04/11/2024 16:32, Tiwei Bie wrote:
> The drvdata is not available in release. Let's just use container_of()
> to get the ubd instance. Otherwise, removing a ubd device will result
> in a crash:
> 
> RIP: 0033:blk_mq_free_tag_set+0x1f/0xba
> RSP: 00000000e2083bf0  EFLAGS: 00010246
> RAX: 000000006021463a RBX: 0000000000000348 RCX: 0000000062604d00
> RDX: 0000000004208060 RSI: 00000000605241a0 RDI: 0000000000000348
> RBP: 00000000e2083c10 R08: 0000000062414010 R09: 00000000601603f7
> R10: 000000000000133a R11: 000000006038c4bd R12: 0000000000000000
> R13: 0000000060213a5c R14: 0000000062405d20 R15: 00000000604f7aa0
> Kernel panic - not syncing: Segfault with no mm
> CPU: 0 PID: 17 Comm: kworker/0:1 Not tainted 6.8.0-rc3-00107-gba3f67c11638 #1
> Workqueue: events mc_work_proc
> Stack:
>   00000000 604f7ef0 62c5d000 62405d20
>   e2083c30 6002c776 6002c755 600e47ff
>   e2083c60 6025ffe3 04208060 603d36e0
> Call Trace:
>   [<6002c776>] ubd_device_release+0x21/0x55
>   [<6002c755>] ? ubd_device_release+0x0/0x55
>   [<600e47ff>] ? kfree+0x0/0x100
>   [<6025ffe3>] device_release+0x70/0xba
>   [<60381d6a>] kobject_put+0xb5/0xe2
>   [<6026027b>] put_device+0x19/0x1c
>   [<6026a036>] platform_device_put+0x26/0x29
>   [<6026ac5a>] platform_device_unregister+0x2c/0x2e
>   [<6002c52e>] ubd_remove+0xb8/0xd6
>   [<6002bb74>] ? mconsole_reply+0x0/0x50
>   [<6002b926>] mconsole_remove+0x160/0x1cc
>   [<6002bbbc>] ? mconsole_reply+0x48/0x50
>   [<6003379c>] ? um_set_signals+0x3b/0x43
>   [<60061c55>] ? update_min_vruntime+0x14/0x70
>   [<6006251f>] ? dequeue_task_fair+0x164/0x235
>   [<600620aa>] ? update_cfs_group+0x0/0x40
>   [<603a0e77>] ? __schedule+0x0/0x3ed
>   [<60033761>] ? um_set_signals+0x0/0x43
>   [<6002af6a>] mc_work_proc+0x77/0x91
>   [<600520b4>] process_scheduled_works+0x1af/0x2c3
>   [<6004ede3>] ? assign_work+0x0/0x58
>   [<600527a1>] worker_thread+0x2f7/0x37a
>   [<6004ee3b>] ? set_pf_worker+0x0/0x64
>   [<6005765d>] ? arch_local_irq_save+0x0/0x2d
>   [<60058e07>] ? kthread_exit+0x0/0x3a
>   [<600524aa>] ? worker_thread+0x0/0x37a
>   [<60058f9f>] kthread+0x130/0x135
>   [<6002068e>] new_thread_handler+0x85/0xb6
> 
> Cc: stable@vger.kernel.org
> Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com>
> ---
>   arch/um/drivers/ubd_kern.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
> index f19173da64d8..66c1a8835e36 100644
> --- a/arch/um/drivers/ubd_kern.c
> +++ b/arch/um/drivers/ubd_kern.c
> @@ -779,7 +779,7 @@ static int ubd_open_dev(struct ubd *ubd_dev)
>   
>   static void ubd_device_release(struct device *dev)
>   {
> -	struct ubd *ubd_dev = dev_get_drvdata(dev);
> +	struct ubd *ubd_dev = container_of(dev, struct ubd, pdev.dev);
>   
>   	blk_mq_free_tag_set(&ubd_dev->tag_set);
>   	*ubd_dev = ((struct ubd) DEFAULT_UBD);

Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com>

-- 
Anton R. Ivanov
Cambridgegreys Limited. Registered in England. Company Number 10273661
https://www.cambridgegreys.com/

Re: [PATCH 1/4] um: ubd: Initialize ubd's disk pointer in ubd_add

[Anton Ivanov]

On 04/11/2024 16:32, Tiwei Bie wrote:
> Currently, the initialization of the disk pointer in the ubd structure
> is missing. It should be initialized with the allocated gendisk pointer
> in ubd_add().
> 
> Fixes: 32621ad7a7ea ("ubd: remove the ubd_gendisk array")
> Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com>
> ---
>   arch/um/drivers/ubd_kern.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
> index 2b8d04e67600..f19173da64d8 100644
> --- a/arch/um/drivers/ubd_kern.c
> +++ b/arch/um/drivers/ubd_kern.c
> @@ -898,6 +898,8 @@ static int ubd_add(int n, char **error_out)
>   	if (err)
>   		goto out_cleanup_disk;
>   
> +	ubd_dev->disk = disk;
> +
>   	return 0;
>   
>   out_cleanup_disk:

Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com>

-- 
Anton R. Ivanov
Cambridgegreys Limited. Registered in England. Company Number 10273661
https://www.cambridgegreys.com/