2018-10-23 14:42:56

by Ivan Vecera

Subject: [PATCH] Revert "be2net: remove desc field from be_eq_obj"

The mentioned commit needs to be reverted because we cannot pass
string allocated on stack to request_irq(). This function stores
uses this pointer for later use (e.g. /proc/interrupts) so we need
to keep this string persistently.

Fixes: d6d9704af8f4 ("be2net: remove desc field from be_eq_obj")

Signed-off-by: Ivan Vecera <[email protected]>
---
drivers/net/ethernet/emulex/benet/be.h | 1 +
drivers/net/ethernet/emulex/benet/be_main.c | 6 ++----
2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index 58bcee8f0a58..ce041c90adb0 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -185,6 +185,7 @@ static inline void queue_tail_inc(struct be_queue_info *q)

struct be_eq_obj {
struct be_queue_info q;
+ char desc[32];

struct be_adapter *adapter;
struct napi_struct napi;
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 534787291b44..bff74752cef1 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -3488,11 +3488,9 @@ static int be_msix_register(struct be_adapter *adapter)
int status, i, vec;

for_all_evt_queues(adapter, eqo, i) {
- char irq_name[IFNAMSIZ+4];
-
- snprintf(irq_name, sizeof(irq_name), "%s-q%d", netdev->name, i);
+ sprintf(eqo->desc, "%s-q%d", netdev->name, i);
vec = be_msix_vec_get(adapter, eqo);
- status = request_irq(vec, be_msix, 0, irq_name, eqo);
+ status = request_irq(vec, be_msix, 0, eqo->desc, eqo);
if (status)
goto err_msix;

--
2.18.1

2018-10-23 18:04:45

by David Miller

Subject: Re: [PATCH] Revert "be2net: remove desc field from be_eq_obj"

From: Ivan Vecera <[email protected]>
Date: Tue, 23 Oct 2018 16:40:26 +0200

> The mentioned commit needs to be reverted because we cannot pass
> string allocated on stack to request_irq(). This function stores
> uses this pointer for later use (e.g. /proc/interrupts) so we need
> to keep this string persistently.
>
> Fixes: d6d9704af8f4 ("be2net: remove desc field from be_eq_obj")
>
> Signed-off-by: Ivan Vecera <[email protected]>

Please do not put empty lines between Fixes and the other tags,
all tags should appear together as one contiguous group.

Fixed and applied and queued up for -stable.

2018-10-23 18:44:36

by Ivan Vecera

Subject: Re: [PATCH] Revert "be2net: remove desc field from be_eq_obj"

On 23.10.2018 20:03, David Miller wrote:
> From: Ivan Vecera <[email protected]>
> Date: Tue, 23 Oct 2018 16:40:26 +0200
>
>> The mentioned commit needs to be reverted because we cannot pass
>> string allocated on stack to request_irq(). This function stores
>> uses this pointer for later use (e.g. /proc/interrupts) so we need
>> to keep this string persistently.
>>
>> Fixes: d6d9704af8f4 ("be2net: remove desc field from be_eq_obj")
>>
>> Signed-off-by: Ivan Vecera <[email protected]>
>
> Please do not put empty lines between Fixes and the other tags,
> all tags should appear together as one contiguous group.
Sure Dave... sorry for that.

Ivan