{"id":788786,"url":"http://patchwork.ozlabs.org/api/1.2/patches/788786/?format=json","web_url":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170714131019.52530-4-alice.michael@intel.com/","project":{"id":46,"url":"http://patchwork.ozlabs.org/api/1.2/projects/46/?format=json","name":"Intel Wired Ethernet development","link_name":"intel-wired-lan","list_id":"intel-wired-lan.osuosl.org","list_email":"intel-wired-lan@osuosl.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170714131019.52530-4-alice.michael@intel.com>","list_archive_url":null,"date":"2017-07-14T13:10:10","name":"[next,S76-V2,04/13] i40e: initialize our affinity_mask based on cpu_possible_mask","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"9b6a6ac57ae0f6fb84251665aaf3907ab634d305","submitter":{"id":71123,"url":"http://patchwork.ozlabs.org/api/1.2/people/71123/?format=json","name":"Michael, Alice","email":"alice.michael@intel.com"},"delegate":{"id":68,"url":"http://patchwork.ozlabs.org/api/1.2/users/68/?format=json","username":"jtkirshe","first_name":"Jeff","last_name":"Kirsher","email":"jeffrey.t.kirsher@intel.com"},"mbox":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170714131019.52530-4-alice.michael@intel.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/788786/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/788786/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","intel-wired-lan@lists.osuosl.org"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","intel-wired-lan@lists.osuosl.org"],"Received":["from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3x8QRj2cVpz9s7F\n\tfor ;\n\tSat, 15 Jul 2017 07:14:25 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id EAEBD88423;\n\tFri, 14 Jul 2017 21:14:23 +0000 (UTC)","from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id L4nXxD6KaEPG; Fri, 14 Jul 2017 21:14:23 +0000 (UTC)","from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 1225688405;\n\tFri, 14 Jul 2017 21:14:23 +0000 (UTC)","from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 7FF521C0683\n\tfor ;\n\tFri, 14 Jul 2017 21:14:19 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 78DF48A42B\n\tfor ;\n\tFri, 14 Jul 2017 21:14:19 +0000 (UTC)","from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id VaSbyg-PC1jD for ;\n\tFri, 14 Jul 2017 21:14:18 +0000 (UTC)","from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 930DE8A423\n\tfor ;\n\tFri, 14 Jul 2017 21:14:18 +0000 (UTC)","from orsmga002.jf.intel.com ([10.7.209.21])\n\tby fmsmga105.fm.intel.com with ESMTP; 14 Jul 2017 14:14:18 -0700","from unknown (HELO localhost.jf.intel.com) ([10.166.16.121])\n\tby orsmga002.jf.intel.com with ESMTP; 14 Jul 2017 14:14:17 -0700"],"X-Virus-Scanned":["amavisd-new at osuosl.org","amavisd-new at osuosl.org"],"X-Greylist":"domain auto-whitelisted by SQLgrey-1.7.6","X-ExtLoop1":"1","X-IronPort-AV":"E=Sophos;i=\"5.40,360,1496127600\"; d=\"scan'208\";a=\"111486585\"","From":"Alice Michael ","To":"alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org","Date":"Fri, 14 Jul 2017 09:10:10 -0400","Message-Id":"<20170714131019.52530-4-alice.michael@intel.com>","X-Mailer":"git-send-email 2.9.3","In-Reply-To":"<20170714131019.52530-1-alice.michael@intel.com>","References":"<20170714131019.52530-1-alice.michael@intel.com>","Subject":"[Intel-wired-lan] [next PATCH S76-V2 04/13] i40e: initialize our\n\taffinity_mask based on cpu_possible_mask","X-BeenThere":"intel-wired-lan@osuosl.org","X-Mailman-Version":"2.1.18-1","Precedence":"list","List-Id":"Intel Wired Ethernet Linux Kernel Driver Development\n\t","List-Unsubscribe":", \n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":", \n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"intel-wired-lan-bounces@osuosl.org","Sender":"\"Intel-wired-lan\" "},"content":"From: Jacob Keller \n\nOn older kernels a call to irq_set_affinity_hint does not guarantee that\nthe IRQ affinity will be set. If nothing else on the system sets the IRQ\naffinity this can result in a bug in the i40e_napi_poll() routine where\nwe notice that our interrupt fired on the \"wrong\" CPU according to our\ninternal affinity_mask variable.\n\nThis results in a bug where we continuously tell napi to stop polling to\nmove the interrupt to a new CPU, but the CPU never changes because our\naffinity mask does not match the actual mask setup for the IRQ.\n\nThe root problem is a mismatched affinity mask value. So lets initialize\nthe value to cpu_possible_mask instead. This ensures that prior to the\nfirst time we get an irq affinity notification we'll have the mask set\nto include every possible CPU.\n\nWe use cpu_possible_mask instead of cpu_online_mask since the former is\nalmost certainly never going to change, while the later might change\nafter we've made a copy.\n\nSigned-off-by: Jacob Keller \n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 12 +++++++-----\n drivers/net/ethernet/intel/i40evf/i40evf_main.c | 7 +++++--\n 2 files changed, 12 insertions(+), 7 deletions(-)","diff":"diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 5004857..abf4025 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -2882,7 +2882,7 @@ static void i40e_config_xps_tx_ring(struct i40e_ring *ring)\n \tif ((vsi->tc_config.numtc <= 1) &&\n \t !test_and_set_bit(__I40E_TX_XPS_INIT_DONE, &ring->state)) {\n \t\tnetif_set_xps_queue(ring->netdev,\n-\t\t\t\t &ring->q_vector->affinity_mask,\n+\t\t\t\t get_cpu_mask(ring->q_vector->v_idx),\n \t\t\t\t ring->queue_index);\n \t}\n \n@@ -3507,8 +3507,10 @@ static int i40e_vsi_request_irq_msix(struct i40e_vsi *vsi, char *basename)\n \t\tq_vector->affinity_notify.notify = i40e_irq_affinity_notify;\n \t\tq_vector->affinity_notify.release = i40e_irq_affinity_release;\n \t\tirq_set_affinity_notifier(irq_num, &q_vector->affinity_notify);\n-\t\t/* assign the mask for this irq */\n-\t\tirq_set_affinity_hint(irq_num, &q_vector->affinity_mask);\n+\t\t/* get_cpu_mask returns a static constant mask with\n+\t\t * a permanent lifetime so it's ok to use here.\n+\t\t */\n+\t\tirq_set_affinity_hint(irq_num, get_cpu_mask(q_vector->v_idx));\n \t}\n \n \tvsi->irqs_ready = true;\n@@ -4290,7 +4292,7 @@ static void i40e_vsi_free_irq(struct i40e_vsi *vsi)\n \n \t\t\t/* clear the affinity notifier in the IRQ descriptor */\n \t\t\tirq_set_affinity_notifier(irq_num, NULL);\n-\t\t\t/* clear the affinity_mask in the IRQ descriptor */\n+\t\t\t/* remove our suggested affinity mask for this IRQ */\n \t\t\tirq_set_affinity_hint(irq_num, NULL);\n \t\t\tsynchronize_irq(irq_num);\n \t\t\tfree_irq(irq_num, vsi->q_vectors[i]);\n@@ -8221,7 +8223,7 @@ static int i40e_vsi_alloc_q_vector(struct i40e_vsi *vsi, int v_idx, int cpu)\n \n \tq_vector->vsi = vsi;\n \tq_vector->v_idx = v_idx;\n-\tcpumask_set_cpu(cpu, &q_vector->affinity_mask);\n+\tcpumask_copy(&q_vector->affinity_mask, cpu_possible_mask);\n \n \tif (vsi->netdev)\n \t\tnetif_napi_add(vsi->netdev, &q_vector->napi,\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\nindex 77d2835..7ffe30d 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n@@ -587,8 +587,10 @@ i40evf_request_traffic_irqs(struct i40evf_adapter *adapter, char *basename)\n \t\tq_vector->affinity_notify.release =\n \t\t\t\t\t\t i40evf_irq_affinity_release;\n \t\tirq_set_affinity_notifier(irq_num, &q_vector->affinity_notify);\n-\t\t/* assign the mask for this irq */\n-\t\tirq_set_affinity_hint(irq_num, &q_vector->affinity_mask);\n+\t\t/* get_cpu_mask returns a static constant mask with\n+\t\t * a permanent lifetime so it's ok to use here.\n+\t\t */\n+\t\tirq_set_affinity_hint(irq_num, get_cpu_mask(q_vector->v_idx));\n \t}\n \n \treturn 0;\n@@ -1459,6 +1461,7 @@ static int i40evf_alloc_q_vectors(struct i40evf_adapter *adapter)\n \t\tq_vector->adapter = adapter;\n \t\tq_vector->vsi = &adapter->vsi;\n \t\tq_vector->v_idx = q_idx;\n+\t\tcpumask_copy(&q_vector->affinity_mask, cpu_possible_mask);\n \t\tnetif_napi_add(adapter->netdev, &q_vector->napi,\n \t\t\t i40evf_napi_poll, NAPI_POLL_WEIGHT);\n \t}\n","prefixes":["next","S76-V2","04/13"]}