diff mbox

[v2] i40e/i40evf: use cpumask_copy() for assigning cpumask

Message ID 20170816175257.9647-1-jgross@suse.com
State Awaiting Upstream, archived
Delegated to: David Miller
Headers show

Commit Message

Jürgen Groß Aug. 16, 2017, 5:52 p.m. UTC
Using direct assignment for a cpumask is wrong, cpumask_copy() should
be used instead.

Otherwise crashes like the following might happen:

[62792.326374] BUG: unable to handle kernel paging request at ffff8800049ff000
[62792.340118] IP: [<ffffffffa2043341>] i40e_irq_affinity_notify+0x11/0x20 [i40e]
...
[62792.810770] Call Trace:
[62792.815722]  [<ffffffff810d77a5>] irq_affinity_notify+0xb5/0xf0
[62792.827593]  [<ffffffff8109593e>] process_one_work+0x14e/0x410
[62792.839282]  [<ffffffff81096196>] worker_thread+0x116/0x490
[62792.850459]  [<ffffffff8109b667>] kthread+0xc7/0xe0
[62792.860255]  [<ffffffff816094bf>] ret_from_fork+0x3f/0x70
[62792.871996] DWARF2 unwinder stuck at ret_from_fork+0x3f/0x70

Fixes: 96db776a3682 ("i40e/i40evf: fix interrupt affinity bug")
Cc: <stable@vger.kernel.org> # 4.10+
Signed-off-by: Juergen Gross <jgross@suse.com>
---
V2: enhance commit message, merge patches
---
 drivers/net/ethernet/intel/i40e/i40e_main.c     | 2 +-
 drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Kirsher, Jeffrey T Aug. 17, 2017, 12:24 a.m. UTC | #1
On Wed, 2017-08-16 at 19:52 +0200, Juergen Gross wrote:
> Using direct assignment for a cpumask is wrong, cpumask_copy() should
> be used instead.
> 
> Otherwise crashes like the following might happen:
> 
> [62792.326374] BUG: unable to handle kernel paging request at
> ffff8800049ff000
> [62792.340118] IP: [<ffffffffa2043341>]
> i40e_irq_affinity_notify+0x11/0x20 [i40e]
> ...
> [62792.810770] Call Trace:
> [62792.815722]  [<ffffffff810d77a5>] irq_affinity_notify+0xb5/0xf0
> [62792.827593]  [<ffffffff8109593e>] process_one_work+0x14e/0x410
> [62792.839282]  [<ffffffff81096196>] worker_thread+0x116/0x490
> [62792.850459]  [<ffffffff8109b667>] kthread+0xc7/0xe0
> [62792.860255]  [<ffffffff816094bf>] ret_from_fork+0x3f/0x70
> [62792.871996] DWARF2 unwinder stuck at ret_from_fork+0x3f/0x70
> 
> Fixes: 96db776a3682 ("i40e/i40evf: fix interrupt affinity bug")
> Cc: <stable@vger.kernel.org> # 4.10+
> Signed-off-by: Juergen Gross <jgross@suse.com>
> ---
> V2: enhance commit message, merge patches
> ---
>  drivers/net/ethernet/intel/i40e/i40e_main.c     | 2 +-
>  drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

This is already resolved with a previous patch from Jacob Keller, see
the following commit in my tree:

commit f15ac286b0d111499e0fec4b50c8c870ad3b4573
Author: Jacob Keller <jacob.e.keller@intel.com>
Date:   Wed Aug 16 17:12:00 2017 -0700

    i40e: use cpumask_copy instead of direct assignment
    
    According to the header file cpumask.h, we shouldn't be directly
copying
    a cpumask_t, since its a bitmap and might not be copied correctly.
Lets
    use the provided cpumask_copy() function instead.
    
    Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
diff mbox

Patch

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 2db93d3f6d23..c0e42d162c7c 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -3495,7 +3495,7 @@  static void i40e_irq_affinity_notify(struct irq_affinity_notify *notify,
 	struct i40e_q_vector *q_vector =
 		container_of(notify, struct i40e_q_vector, affinity_notify);
 
-	q_vector->affinity_mask = *mask;
+	cpumask_copy(&q_vector->affinity_mask, mask);
 }
 
 /**
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 7c213a347909..a4b60367ecce 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -520,7 +520,7 @@  static void i40evf_irq_affinity_notify(struct irq_affinity_notify *notify,
 	struct i40e_q_vector *q_vector =
 		container_of(notify, struct i40e_q_vector, affinity_notify);
 
-	q_vector->affinity_mask = *mask;
+	cpumask_copy(&q_vector->affinity_mask, mask);
 }
 
 /**