netdev - Re: [PATCH] net/ena: fix missing lock when update devlink params

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CE7F3E29-4D6B-4709-B991-0885C84F3020@amazon.com>
Date: Tue, 30 Dec 2025 12:33:15 +0000
From: "Arinzon, David" <darinzon@...zon.com>
To: Xiao Liang <xiliang@...hat.com>, "Allen, Neil" <shayagr@...zon.com>,
	"Kiyanovski, Arthur" <akiyano@...zon.com>, "Bshara, Saeed"
	<saeedb@...zon.com>, "netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: Re: [PATCH] net/ena: fix missing lock when update devlink params

> Fix assert lock warning while calling devl_param_driverinit_value_set()
> in ena.
> 
> 
> WARNING: net/devlink/core.c:261 at devl_assert_locked+0x62/0x90, CPU#0: kworker/0:0/9
> CPU: 0 UID: 0 PID: 9 Comm: kworker/0:0 Not tainted 6.19.0-rc2+ #1 PREEMPT(lazy)
> Hardware name: Amazon EC2 m8i-flex.4xlarge/, BIOS 1.0 10/16/2017
> Workqueue: events work_for_cpu_fn
> RIP: 0010:devl_assert_locked+0x62/0x90
> 
> 
> Call Trace:
> <TASK>
> devl_param_driverinit_value_set+0x15/0x1c0
> ena_devlink_alloc+0x18c/0x220 [ena]
> ? __pfx_ena_devlink_alloc+0x10/0x10 [ena]
> ? trace_hardirqs_on+0x18/0x140
> ? lockdep_hardirqs_on+0x8c/0x130
> ? __raw_spin_unlock_irqrestore+0x5d/0x80
> ? __raw_spin_unlock_irqrestore+0x46/0x80
> ? devm_ioremap_wc+0x9a/0xd0
> ena_probe+0x4d2/0x1b20 [ena]
> ? __lock_acquire+0x56a/0xbd0
> ? __pfx_ena_probe+0x10/0x10 [ena]
> ? local_clock+0x15/0x30
> ? __lock_release.isra.0+0x1c9/0x340
> ? mark_held_locks+0x40/0x70
> ? lockdep_hardirqs_on_prepare.part.0+0x92/0x170
> ? trace_hardirqs_on+0x18/0x140
> ? lockdep_hardirqs_on+0x8c/0x130
> ? __raw_spin_unlock_irqrestore+0x5d/0x80
> ? __raw_spin_unlock_irqrestore+0x46/0x80
> ? __pfx_ena_probe+0x10/0x10 [ena]
> ......
> </TASK>
> 
> 
> Signed-off-by: Frank Liang <xiliang@...hat.com <mailto:xiliang@...hat.com>>
> ---
> drivers/net/ethernet/amazon/ena/ena_devlink.c | 4 ++++
> 1 file changed, 4 insertions(+)
> 
> 
> diff --git a/drivers/net/ethernet/amazon/ena/ena_devlink.c b/drivers/net/ethernet/amazon/ena/ena_devlink.c
> index ac81c24016dd..b1eed4b3b39e 100644
> --- a/drivers/net/ethernet/amazon/ena/ena_devlink.c
> +++ b/drivers/net/ethernet/amazon/ena/ena_devlink.c
> @@ -53,10 +53,12 @@ void ena_devlink_disable_phc_param(struct devlink *devlink)
> {
> union devlink_param_value value;
> 
> 
> + devl_lock(devlink);
> value.vbool = false;
> devl_param_driverinit_value_set(devlink,
> DEVLINK_PARAM_GENERIC_ID_ENABLE_PHC,
> value);
> + devl_unlock(devlink);
> }
> 
> 
> static void ena_devlink_port_register(struct devlink *devlink)
> @@ -144,11 +146,13 @@ static int ena_devlink_configure_params(struct devlink *devlink)
> netdev_err(adapter->netdev, "Failed to register devlink params\n");
> return rc;
> }
> + devl_lock(devlink);

Can you please move the call to be above "value.vbool =" and maintain the newline after the "}"?

> 
> 
> value.vbool = ena_phc_is_enabled(adapter);
> devl_param_driverinit_value_set(devlink,
> DEVLINK_PARAM_GENERIC_ID_ENABLE_PHC,
> value);
> + devl_unlock(devlink);
> 
> 
> return 0;
> }

Thanks for identifying the issue and making the change.
Added a small nit.

Reviewed-by: David Arinzon <darinzon@...zon.com>