From patchwork Tue Nov 21 13:54:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souradeep Chakrabarti X-Patchwork-Id: 167771 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp634767vqb; Tue, 21 Nov 2023 05:54:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IEQTR/Zo12SZmwvDcpTfT8H3sVsviAhSrv4UWEhYRiwUd+W7j8C4XNbloKBiZrWe6AQsoZF X-Received: by 2002:a05:6808:1185:b0:3a7:6213:6897 with SMTP id j5-20020a056808118500b003a762136897mr10042616oil.11.1700574888678; Tue, 21 Nov 2023 05:54:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700574888; cv=none; d=google.com; s=arc-20160816; b=JICHUqwmGfmExRvpgy3jp3tBsHmdV0beinuazNUPkZuayehhPjb+7SK3t3ESgQu1wp ndrBl6yL82OcqnIYTQQoqJRdpF24Q4XAj9ZRkXzKLEaE/BojmnNdAmNAcWnsexbbWGeY BfPG8YQf+zNQr5iUZgrGfLy1M1eW/y4zFiMCM1m1xUPxd3jOvkoVlpL4ZxIuvF3d6rtS KRozF/DIVJmjOOrv3bVinXJ1HYEp87vEBzN4/7y0dXpC+IbBdp8R1uAPhiXcT9Hw9mDs WMH6/jHmRgiyj7eLeMa30YEz0pClCTOvxtQ4R9Syo2YaD0D5TFSdwjNgmYmfDAvl4HXb i0Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=4d/Tj40I/q17k+/4xRhGk5Qv/cyNpSEcakEe1Oqoli0=; fh=J7bYpgDbyFSJ1MNAZDVqZiqHDv9lQRrjhG0pAE8611I=; b=LCj/ZiKbCx0vyqe5lefCtk87lj4kPQJp/Vp6n2vaIfesTgkwi9yt39izVEYlwF2Qf+ F3hmDGizDZNNKKKpkEkVyzZ2IjFMfvqH0+m7F4r/ig7hZb+UcMochOomDMypaKhWOKKU EK6XNp23twg7xkoWu1c7q6NNF2nZZqt4GAKruLOX9ygYnYpM1QvLZq4YxZ7A9TGK0QvA lwa/BXKXafsT2bJIYv7LQPfZESy/rw/6virEFftrdsRdpBM/4aKaRM8ScXt3b96R+H1b C2q8Acxh5XQEfVJG93DiRzmUpvbONjuM19kvHQxx9yYmduotic009NmnHHRCGrkUYp6J xarA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=F4nAeQAd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id c26-20020a630d1a000000b005acb92781fbsi10485203pgl.415.2023.11.21.05.54.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 05:54:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=F4nAeQAd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id D0E328027B1E; Tue, 21 Nov 2023 05:54:42 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234303AbjKUNyo (ORCPT + 99 others); Tue, 21 Nov 2023 08:54:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229514AbjKUNym (ORCPT ); Tue, 21 Nov 2023 08:54:42 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1554CD6A; Tue, 21 Nov 2023 05:54:39 -0800 (PST) Received: by linux.microsoft.com (Postfix, from userid 1099) id 72E1520B74C0; Tue, 21 Nov 2023 05:54:38 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 72E1520B74C0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1700574878; bh=4d/Tj40I/q17k+/4xRhGk5Qv/cyNpSEcakEe1Oqoli0=; h=From:To:Cc:Subject:Date:From; b=F4nAeQAd5kyOcVSyw99btyLgSRxMu13uOqYGPWIWoERH9t4JBazZb6wjLfuc1OScB eRMnIe0A3w5npnpV3XgO2YfH+R++1Yyq8bQ7RJAz//olGn/UoXNdnhCeRSE4v6QM2R 5UxTz7+VHkfPQ3jesFSw1IKiQfkJfCUNzj+utm/Q= From: Souradeep Chakrabarti To: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, longli@microsoft.com, sharmaajay@microsoft.com, leon@kernel.org, cai.huoqing@linux.dev, ssengar@linux.microsoft.com, vkuznets@redhat.com, tglx@linutronix.de, linux-hyperv@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org Cc: schakrabarti@microsoft.com, paulros@microsoft.com, Souradeep Chakrabarti Subject: [PATCH V2 net-next] net: mana: Assigning IRQ affinity on HT cores Date: Tue, 21 Nov 2023 05:54:37 -0800 Message-Id: <1700574877-6037-1-git-send-email-schakrabarti@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 21 Nov 2023 05:54:42 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783182014334552078 X-GMAIL-MSGID: 1783182014334552078 Existing MANA design assigns IRQ to every CPUs, including sibling hyper-threads in a core. This causes multiple IRQs to work on same CPU and may reduce the network performance with RSS. Improve the performance by adhering the configuration for RSS, which assigns IRQ on HT cores. Signed-off-by: Souradeep Chakrabarti --- V1 -> V2: * Simplified the code by removing filter_mask_list and using avail_cpus. * Addressed infinite loop issue when there are numa nodes with no CPUs. * Addressed uses of local numa node instead of 0 to start. * Removed uses of BUG_ON. * Placed cpus_read_lock in parent function to avoid num_online_cpus to get changed before function finishes the affinity assignment. --- .../net/ethernet/microsoft/mana/gdma_main.c | 134 ++++++++++++++++-- 1 file changed, 123 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c b/drivers/net/ethernet/microsoft/mana/gdma_main.c index 6367de0c2c2e..8177502ffbd9 100644 --- a/drivers/net/ethernet/microsoft/mana/gdma_main.c +++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c @@ -1243,15 +1243,120 @@ void mana_gd_free_res_map(struct gdma_resource *r) r->size = 0; } +static int irq_setup(int *irqs, int nvec, int start_numa_node) +{ + unsigned int *core_id_list; + cpumask_var_t filter_mask, avail_cpus; + int i, core_count = 0, cpu_count = 0, err = 0, node_count = 0; + unsigned int cpu_first, cpu, irq_start, cores = 0, numa_node = start_numa_node; + + if(!alloc_cpumask_var(&filter_mask, GFP_KERNEL) + || !alloc_cpumask_var(&avail_cpus, GFP_KERNEL)) { + err = -ENOMEM; + goto free_irq; + } + cpumask_copy(filter_mask, cpu_online_mask); + cpumask_copy(avail_cpus, cpu_online_mask); + /* count the number of cores + */ + for_each_cpu(cpu, filter_mask) { + cpumask_andnot(filter_mask, filter_mask, topology_sibling_cpumask(cpu)); + cores++; + } + core_id_list = kcalloc(cores, sizeof(unsigned int), GFP_KERNEL); + cpumask_copy(filter_mask, cpu_online_mask); + /* initialize core_id_list array */ + for_each_cpu(cpu, filter_mask) { + core_id_list[core_count] = cpu; + cpumask_andnot(filter_mask, filter_mask, topology_sibling_cpumask(cpu)); + core_count++; + } + + /* if number of cpus are equal to max_queues per port, then + * one extra interrupt for the hardware channel communication. + */ + if (nvec - 1 == num_online_cpus()) { + irq_start = 1; + cpu_first = cpumask_first(cpu_online_mask); + irq_set_affinity_and_hint(irqs[0], cpumask_of(cpu_first)); + } else { + irq_start = 0; + } + + /* reset the core_count and num_node to 0. + */ + core_count = 0; + + /* for each interrupt find the cpu of a particular + * sibling set and if it belongs to the specific numa + * then assign irq to it and clear the cpu bit from + * the corresponding avail_cpus. + * Increase the cpu_count for that node. + * Once all cpus for a numa node is assigned, then + * move to different numa node and continue the same. + */ + for (i = irq_start; i < nvec; ) { + + /* check if the numa node has cpu or not + * to avoid infinite loop. + */ + if (cpumask_empty(cpumask_of_node(numa_node))) { + numa_node++; + if (++node_count == num_online_nodes()) { + err = -EAGAIN; + goto free_irq; + } + } + cpu_first = cpumask_first_and(avail_cpus, + topology_sibling_cpumask(core_id_list[core_count])); + if (cpu_first < nr_cpu_ids && cpu_to_node(cpu_first) == numa_node) { + irq_set_affinity_and_hint(irqs[i], cpumask_of(cpu_first)); + cpumask_clear_cpu(cpu_first, avail_cpus); + cpu_count = cpu_count + 1; + i = i + 1; + + /* checking if all the cpus are used from the + * particular node. + */ + if (cpu_count == nr_cpus_node(numa_node)) { + numa_node = numa_node + 1; + if (numa_node == num_online_nodes()) + numa_node = 0; + + /* wrap around once numa nodes + * are traversed. + */ + if (numa_node == start_numa_node) { + node_count = 0; + cpumask_copy(avail_cpus, cpu_online_mask); + } + cpu_count = 0; + core_count = 0; + continue; + } + } + if (++core_count == cores) + core_count = 0; + } +free_irq: + free_cpumask_var(filter_mask); + free_cpumask_var(avail_cpus); + if (core_id_list) + kfree(core_id_list); + return err; +} + static int mana_gd_setup_irqs(struct pci_dev *pdev) { - unsigned int max_queues_per_port = num_online_cpus(); + unsigned int max_queues_per_port; struct gdma_context *gc = pci_get_drvdata(pdev); struct gdma_irq_context *gic; - unsigned int max_irqs, cpu; - int nvec, irq; + unsigned int max_irqs; + int nvec, *irqs, irq; int err, i = 0, j; + cpus_read_lock(); + max_queues_per_port = num_online_cpus(); if (max_queues_per_port > MANA_MAX_NUM_QUEUES) max_queues_per_port = MANA_MAX_NUM_QUEUES; @@ -1261,6 +1366,11 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev) nvec = pci_alloc_irq_vectors(pdev, 2, max_irqs, PCI_IRQ_MSIX); if (nvec < 0) return nvec; + irqs = kmalloc_array(nvec, sizeof(int), GFP_KERNEL); + if (!irqs) { + err = -ENOMEM; + goto free_irq_vector; + } gc->irq_contexts = kcalloc(nvec, sizeof(struct gdma_irq_context), GFP_KERNEL); @@ -1281,27 +1391,27 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev) snprintf(gic->name, MANA_IRQ_NAME_SZ, "mana_q%d@pci:%s", i - 1, pci_name(pdev)); - irq = pci_irq_vector(pdev, i); - if (irq < 0) { - err = irq; + irqs[i] = pci_irq_vector(pdev, i); + if (irqs[i] < 0) { + err = irqs[i]; goto free_irq; } - err = request_irq(irq, mana_gd_intr, 0, gic->name, gic); + err = request_irq(irqs[i], mana_gd_intr, 0, gic->name, gic); if (err) goto free_irq; - - cpu = cpumask_local_spread(i, gc->numa_node); - irq_set_affinity_and_hint(irq, cpumask_of(cpu)); } + err = irq_setup(irqs, nvec, gc->numa_node); + if (err) + goto free_irq; err = mana_gd_alloc_res_map(nvec, &gc->msix_resource); if (err) goto free_irq; gc->max_num_msix = nvec; gc->num_msix_usable = nvec; - + cpus_read_unlock(); return 0; free_irq: @@ -1314,8 +1424,10 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev) } kfree(gc->irq_contexts); + kfree(irqs); gc->irq_contexts = NULL; free_irq_vector: + cpus_read_unlock(); pci_free_irq_vectors(pdev); return err; }