From patchwork Fri Apr 10 16:27:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Poirier X-Patchwork-Id: 460154 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7F3F61401AD for ; Sat, 11 Apr 2015 02:28:17 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=DiV5EH80; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754856AbbDJQ15 (ORCPT ); Fri, 10 Apr 2015 12:27:57 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:35288 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753864AbbDJQ1z (ORCPT ); Fri, 10 Apr 2015 12:27:55 -0400 Received: by pabtp1 with SMTP id tp1so26199263pab.2; Fri, 10 Apr 2015 09:27:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=BQ1VjMKOj6c7h9uHaApJEIw7RcXP+p3Oe4knV6ZzCGI=; b=DiV5EH80C7cwxhdVHJBRwuHd2Glr4Q7N6UpoQpiI+Na0Wt6vX/UeRNEl7GEzfZpVmc 4HUMCUqEPFiCVxnJsc1jgdIUR1v+v+ITyzKsCcQ2zodSJtN9NPxWka6UjEMp3oWHX3Pd BAMmM/nEpOFHDbX6GI9w+QW/7ESHy1R0FcTgQvrreNuf9wC3DmWRPZwUH6jMNTAnFkro +bDworDzDgjejke7WFAX8PasJEvRCbsxsxPV4gpwY5d+JIhc14LCy+Xu8BZfhBwIdh2A /n2ZF7CW4wEZUib/GCeiv7AtK/VGEckowyeuljwvMcfr7OrpY48P/AcF5RxYRGKkb6Yk cz9A== X-Received: by 10.66.62.137 with SMTP id y9mr4026120par.87.1428683275157; Fri, 10 Apr 2015 09:27:55 -0700 (PDT) Received: from f1.synalogic.ca (c-73-202-26-186.hsd1.ca.comcast.net. [73.202.26.186]) by mx.google.com with ESMTPSA id mq2sm2740172pbb.16.2015.04.10.09.27.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Apr 2015 09:27:54 -0700 (PDT) From: Benjamin Poirier To: Amir Vadai Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] mlx4: Fix tx ring affinity_mask creation Date: Fri, 10 Apr 2015 09:27:20 -0700 Message-Id: <1428683240-22879-1-git-send-email-bpoirier@suse.de> X-Mailer: git-send-email 2.3.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org By default, the number of tx queues is limited by the number of online cpus in mlx4_en_get_profile(). However, this limit no longer holds after the ethtool .set_channels method has been called. In that situation, the driver may access invalid bits of certain cpumask variables when queue_index > nr_cpu_ids. Signed-off-by: Benjamin Poirier Acked-by: Ido Shamay --- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c index 55f9f5c..8c234ec 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c @@ -143,8 +143,10 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv, ring->hwtstamp_tx_type = priv->hwtstamp_config.tx_type; ring->queue_index = queue_index; - if (queue_index < priv->num_tx_rings_p_up && cpu_online(queue_index)) - cpumask_set_cpu(queue_index, &ring->affinity_mask); + if (queue_index < priv->num_tx_rings_p_up) + cpumask_set_cpu_local_first(queue_index, + priv->mdev->dev->numa_node, + &ring->affinity_mask); *pring = ring; return 0; @@ -213,7 +215,7 @@ int mlx4_en_activate_tx_ring(struct mlx4_en_priv *priv, err = mlx4_qp_to_ready(mdev->dev, &ring->wqres.mtt, &ring->context, &ring->qp, &ring->qp_state); - if (!user_prio && cpu_online(ring->queue_index)) + if (!cpumask_empty(&ring->affinity_mask)) netif_set_xps_queue(priv->dev, &ring->affinity_mask, ring->queue_index);