From patchwork Mon Jan 22 16:00:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souradeep Chakrabarti X-Patchwork-Id: 190232 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp2714957dyb; Mon, 22 Jan 2024 09:16:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IFqaqhdJ0MWs+LZdOzW+jrPJsJzHXgt546PTEw5iT8rxjvGBYRRn4fE386C0Au4lcfccytb X-Received: by 2002:a17:903:1248:b0:1d5:ecfe:4d69 with SMTP id u8-20020a170903124800b001d5ecfe4d69mr6102330plh.49.1705943771888; Mon, 22 Jan 2024 09:16:11 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705943771; cv=pass; d=google.com; s=arc-20160816; b=emr0F4Usoc4ajZB5dZkwYO7T1ySfHmdcaz49yvcWQFkRdKAHgJp5UXsbwwDyMKf8BI wEtTVU2MgA/mxhxDcfYLJNwmDLq3xmDb7pLedsO7xy2yUGSwWoqhlz/H/y+nsC8ChENr //TbbTrbJ47/SQIDhc4mmIWLN4ud54Zj+HDYdEhA6Y1hoYvqbIYjR4ehwiIgm6xx2J49 zTuJpnVKXPQ1OtYrkQ2clKLfXSTHJHHS92FsGUBQpKHx0RnqCgviB/5uL4zu1kIl4vQd LbSTt9BAwcp/JTxQMZPQPTgQHNJ9x8MS4hfhtZfeZqCEVvB/I/9iBr2DH7eRHH43cgbg qhcw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-id:precedence:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :dkim-filter; bh=xk+J9offpgOWbG5/MefCVQrVZHtpJxME2AVu0bJoiYU=; fh=i0uHiUPKHfc1dSxTUTgp1cL8PKSGIUKO6qVCzrDTDzE=; b=r3Py6M/peobQ3y0pqU5JeXUhJO7fWuAa/GjAo30fSnYu4kajFazccG0f2W97t6eu1t KnQwiFCWIomaLTNB114NGLU/uf83Uae7wtdPyGjaloijn/j5pfQv05DhF1CrwQHXNGfN 1tB/6cUjbbeys/PmWeb0PRSbwGo+6fCa9EDddF0Qq/2+ZM+RMtUPJnhatOIM5/osfzEE Ma00Iv0VWam7Lvr+zh331IbjFG0ZuOqm/sibFZ/c8Q3d9M9FYFwtRV6csiUPkJphMJh+ FiXaFP3LUxcrDCwGzHO8TJMqxNxd/IP3AsRPKnoelMXEqnhCWr/e0vpbkjqoGOfLUWCc hULA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=bHcvl2ma; arc=pass (i=1 spf=pass spfdomain=linux.microsoft.com dkim=pass dkdomain=linux.microsoft.com dmarc=pass fromdomain=linux.microsoft.com); spf=pass (google.com: domain of linux-kernel+bounces-33645-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33645-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id jj18-20020a170903049200b001d6f7b3f65csi8284206plb.43.2024.01.22.09.16.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 09:16:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-33645-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=bHcvl2ma; arc=pass (i=1 spf=pass spfdomain=linux.microsoft.com dkim=pass dkdomain=linux.microsoft.com dmarc=pass fromdomain=linux.microsoft.com); spf=pass (google.com: domain of linux-kernel+bounces-33645-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33645-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 85B1D286959 for ; Mon, 22 Jan 2024 17:13:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CB1374CDFF; Mon, 22 Jan 2024 16:01:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="bHcvl2ma" Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 715BF4D117; Mon, 22 Jan 2024 16:01:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705939268; cv=none; b=f5hMBI6aV+aZKx8rQlIEDX5F5aaGWznoxd5qw4V2Ijvobh8GyoX3ZDoaDajr4eMqrOUDMNtXCeQjI/jdLpvdbTUj3x8C2ljQZORSw8MKsVb/Mn5c/0KTxeAEfzGMClHzzeR8NZ+cTbqjZx5GiZkOIeq9CtVe2suzeja4LdYzyWU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705939268; c=relaxed/simple; bh=/V4sb8LgDiZWE3Juc5rPE5tfHJq1izPIerz9v0keYy0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=LxmBnZ6XwfVFnaK/90y00EQt4h4nYaysH5yw5yIxjjHzfCEpXhUf5A4EyaUb5QjiErvO+l0rc8YYNN+4kD6HsNScYEDeIGs7qtxUHzqBEm6QQtoxO6I0l7u/TEWRm4bQ3o5DeIlcDTLFdnaRYu2Wm4aqvZe/nURGRBcFGbv7jp4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=bHcvl2ma; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Received: by linux.microsoft.com (Postfix, from userid 1099) id 5796220E2C09; Mon, 22 Jan 2024 08:01:07 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 5796220E2C09 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1705939267; bh=xk+J9offpgOWbG5/MefCVQrVZHtpJxME2AVu0bJoiYU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bHcvl2mayTfpazeaOQG9hVEQXa1ILyF8kUGfhE6iASJYmYhatoicq0AOly7Z4LuxU H8pbA507JOC4hRlF4LhZTc2OqPFEtH+7i6rGcIkjT6Pi8J4XzqVb6iTQRtHFpwW2zl aUezifPhXwAXFcDmV/+9GazlNkX72BqxTEoZr+IY= 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, yury.norov@gmail.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 4/4 V2 net-next] net: mana: Assigning IRQ affinity on HT cores Date: Mon, 22 Jan 2024 08:00:59 -0800 Message-Id: <1705939259-2859-5-git-send-email-schakrabarti@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1705939259-2859-1-git-send-email-schakrabarti@linux.microsoft.com> References: <1705939259-2859-1-git-send-email-schakrabarti@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788811647643093881 X-GMAIL-MSGID: 1788811696685915164 Existing MANA design assigns IRQ to every CPU, including sibling hyper-threads. This may cause multiple IRQs to be active simultaneously in the same core and may reduce the network performance. Improve the performance by assigning IRQ to non sibling CPUs in local NUMA node. The performance improvement we are getting using ntttcp with following patch is around 15 percent against existing design and approximately 11 percent, when trying to assign one IRQ in each core across NUMA nodes, if enough cores are present. The change will improve the performance for the system with high number of CPU, where number of CPUs in a node is more than 64 CPUs. Nodes with 64 CPUs or less than 64 CPUs will not be affected by this change. The performance study was done using ntttcp tool in Azure. The node had 2 nodes with 32 cores each, total 128 vCPU and number of channels were 32 for 32 RX rings. The below table shows a comparison between existing design and new design: IRQ node-num core-num CPU performance(%) 1 0 | 0 0 | 0 0 | 0-1 0 2 0 | 0 0 | 1 1 | 2-3 3 3 0 | 0 1 | 2 2 | 4-5 10 4 0 | 0 1 | 3 3 | 6-7 15 5 0 | 0 2 | 4 4 | 8-9 15 --- --- 25 0 | 0 12| 24 24| 48-49 12 --- 32 0 | 0 15| 31 31| 62-63 12 33 0 | 0 16| 0 32| 0-1 10 --- 64 0 | 0 31| 31 63| 62-63 0 Signed-off-by: Souradeep Chakrabarti --- .../net/ethernet/microsoft/mana/gdma_main.c | 61 +++++++++++++++---- 1 file changed, 50 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c b/drivers/net/ethernet/microsoft/mana/gdma_main.c index 05a0ac054823..1332db9a08eb 100644 --- a/drivers/net/ethernet/microsoft/mana/gdma_main.c +++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c @@ -1249,7 +1249,7 @@ void mana_gd_free_res_map(struct gdma_resource *r) r->size = 0; } -static __maybe_unused int irq_setup(unsigned int *irqs, unsigned int len, int node) +static int irq_setup(unsigned int *irqs, unsigned int len, int node) { const struct cpumask *next, *prev = cpu_none_mask; cpumask_var_t cpus __free(free_cpumask_var); @@ -1280,13 +1280,16 @@ static __maybe_unused int irq_setup(unsigned int *irqs, unsigned int len, int no static int mana_gd_setup_irqs(struct pci_dev *pdev) { - unsigned int max_queues_per_port = num_online_cpus(); struct gdma_context *gc = pci_get_drvdata(pdev); + unsigned int max_queues_per_port; struct gdma_irq_context *gic; unsigned int max_irqs, cpu; - int nvec, irq; + int start_irq_index = 1; + 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; @@ -1294,8 +1297,18 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev) max_irqs = max_queues_per_port + 1; nvec = pci_alloc_irq_vectors(pdev, 2, max_irqs, PCI_IRQ_MSIX); - if (nvec < 0) + if (nvec < 0) { + cpus_read_unlock(); return nvec; + } + if (nvec <= num_online_cpus()) + start_irq_index = 0; + + irqs = kmalloc_array((nvec - start_irq_index), sizeof(int), GFP_KERNEL); + if (!irqs) { + err = -ENOMEM; + goto free_irq_vector; + } gc->irq_contexts = kcalloc(nvec, sizeof(struct gdma_irq_context), GFP_KERNEL); @@ -1323,17 +1336,41 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev) goto free_irq; } - err = request_irq(irq, 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)); + if (!i) { + err = request_irq(irq, mana_gd_intr, 0, gic->name, gic); + if (err) + goto free_irq; + + /* If number of IRQ is one extra than number of online CPUs, + * then we need to assign IRQ0 (hwc irq) and IRQ1 to + * same CPU. + * Else we will use different CPUs for IRQ0 and IRQ1. + * Also we are using cpumask_local_spread instead of + * cpumask_first for the node, because the node can be + * mem only. + */ + if (start_irq_index) { + cpu = cpumask_local_spread(i, gc->numa_node); + irq_set_affinity_and_hint(irq, cpumask_of(cpu)); + } else { + irqs[start_irq_index] = irq; + } + } else { + irqs[i - start_irq_index] = irq; + err = request_irq(irqs[i - start_irq_index], mana_gd_intr, 0, + gic->name, gic); + if (err) + goto free_irq; + } } + err = irq_setup(irqs, (nvec - start_irq_index), gc->numa_node); + if (err) + goto free_irq; + gc->max_num_msix = nvec; gc->num_msix_usable = nvec; - + cpus_read_unlock(); return 0; free_irq: @@ -1346,8 +1383,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; }