From nobody Sun Sep 14 22:28:30 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31289C54E76 for ; Tue, 17 Jan 2023 18:17:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231200AbjAQSR2 (ORCPT ); Tue, 17 Jan 2023 13:17:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233191AbjAQSOE (ORCPT ); Tue, 17 Jan 2023 13:14:04 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 312FB59E44; Tue, 17 Jan 2023 09:55:00 -0800 (PST) Date: Tue, 17 Jan 2023 17:54:57 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1673978098; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aCfuJ7iY9K8A4IP3bR9jcsWCiPX2EhlumxfAD9wtaNY=; b=RzgB4hEMfo/ODTuoRpsluG+xNh219w5CMXlwXGxmhlmCA1jdFqZKCwfuFbPjHSctNVyAMN MDsxU7NeidnKQFeB+z4GlJrIUYiAE8XgbrLWdxmeI0tatv7X8cZY9KQc9Ipmi37IqJXwL0 4wiLQ5mZuXUZU+e5qcARgzy+vFyip0ykWDnhDLCoeXaULzbexjFjD+xSYsdXVhWsEkmmhi UsFepEo3mLZytKVHpBHHxT3h7/hBzQSxmC/oYV/reoqiej2R1Cv3J5Uw2fxp/KQekSLzww sdJWX3Zh7IudScsFaz4SI2yjsizUAw5Swj89/4jfiNS6Mytr+msuoZ2Z0D+QSA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1673978098; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aCfuJ7iY9K8A4IP3bR9jcsWCiPX2EhlumxfAD9wtaNY=; b=WGhmFmFjz7NDC7dawj+8rgwiGI27lrHGOyEuBpX6/7nJi5kZKLKeDS/iMYJI5CBy32sfMS Zr0kFA46sXifFnCg== From: "tip-bot2 for Ming Lei" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/core] genirq/affinity: Pass affinity managed mask array to irq_build_affinity_masks Cc: Ming Lei , Thomas Gleixner , Christoph Hellwig , John Garry , Jens Axboe , x86@kernel.org, linux-kernel@vger.kernel.org, maz@kernel.org In-Reply-To: <20221227022905.352674-3-ming.lei@redhat.com> References: <20221227022905.352674-3-ming.lei@redhat.com> MIME-Version: 1.0 Message-ID: <167397809793.4906.10094526787624204112.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the irq/core branch of tip: Commit-ID: 1f962d91a15af54301c63febb8ac2ba07aa3654f Gitweb: https://git.kernel.org/tip/1f962d91a15af54301c63febb8ac2ba07= aa3654f Author: Ming Lei AuthorDate: Tue, 27 Dec 2022 10:29:01 +08:00 Committer: Thomas Gleixner CommitterDate: Tue, 17 Jan 2023 18:50:06 +01:00 genirq/affinity: Pass affinity managed mask array to irq_build_affinity_mas= ks Pass affinity managed mask array to irq_build_affinity_masks() so that the index of the first affinity managed vector is always zero. This allows to simplify the implementation a bit. Signed-off-by: Ming Lei Signed-off-by: Thomas Gleixner Reviewed-by: Christoph Hellwig Reviewed-by: John Garry Reviewed-by: Jens Axboe = = = =20 Link: https://lore.kernel.org/r/20221227022905.352674-3-ming.lei@redhat.com --- kernel/irq/affinity.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/kernel/irq/affinity.c b/kernel/irq/affinity.c index 3361e36..da6379c 100644 --- a/kernel/irq/affinity.c +++ b/kernel/irq/affinity.c @@ -246,14 +246,13 @@ static void alloc_nodes_vectors(unsigned int numvecs, =20 static int __irq_build_affinity_masks(unsigned int startvec, unsigned int numvecs, - unsigned int firstvec, cpumask_var_t *node_to_cpumask, const struct cpumask *cpu_mask, struct cpumask *nmsk, struct irq_affinity_desc *masks) { unsigned int i, n, nodes, cpus_per_vec, extra_vecs, done =3D 0; - unsigned int last_affv =3D firstvec + numvecs; + unsigned int last_affv =3D numvecs; unsigned int curvec =3D startvec; nodemask_t nodemsk =3D NODE_MASK_NONE; struct node_vectors *node_vectors; @@ -273,7 +272,7 @@ static int __irq_build_affinity_masks(unsigned int star= tvec, cpumask_and(nmsk, cpu_mask, node_to_cpumask[n]); cpumask_or(&masks[curvec].mask, &masks[curvec].mask, nmsk); if (++curvec =3D=3D last_affv) - curvec =3D firstvec; + curvec =3D 0; } return numvecs; } @@ -321,7 +320,7 @@ static int __irq_build_affinity_masks(unsigned int star= tvec, * may start anywhere */ if (curvec >=3D last_affv) - curvec =3D firstvec; + curvec =3D 0; irq_spread_init_one(&masks[curvec].mask, nmsk, cpus_per_vec); } @@ -336,11 +335,10 @@ static int __irq_build_affinity_masks(unsigned int st= artvec, * 1) spread present CPU on these vectors * 2) spread other possible CPUs on these vectors */ -static int irq_build_affinity_masks(unsigned int startvec, unsigned int nu= mvecs, +static int irq_build_affinity_masks(unsigned int numvecs, struct irq_affinity_desc *masks) { - unsigned int curvec =3D startvec, nr_present =3D 0, nr_others =3D 0; - unsigned int firstvec =3D startvec; + unsigned int curvec =3D 0, nr_present =3D 0, nr_others =3D 0; cpumask_var_t *node_to_cpumask; cpumask_var_t nmsk, npresmsk; int ret =3D -ENOMEM; @@ -360,9 +358,8 @@ static int irq_build_affinity_masks(unsigned int startv= ec, unsigned int numvecs, build_node_to_cpumask(node_to_cpumask); =20 /* Spread on present CPUs starting from affd->pre_vectors */ - ret =3D __irq_build_affinity_masks(curvec, numvecs, firstvec, - node_to_cpumask, cpu_present_mask, - nmsk, masks); + ret =3D __irq_build_affinity_masks(curvec, numvecs, node_to_cpumask, + cpu_present_mask, nmsk, masks); if (ret < 0) goto fail_build_affinity; nr_present =3D ret; @@ -374,13 +371,12 @@ static int irq_build_affinity_masks(unsigned int star= tvec, unsigned int numvecs, * out vectors. */ if (nr_present >=3D numvecs) - curvec =3D firstvec; + curvec =3D 0; else - curvec =3D firstvec + nr_present; + curvec =3D nr_present; cpumask_andnot(npresmsk, cpu_possible_mask, cpu_present_mask); - ret =3D __irq_build_affinity_masks(curvec, numvecs, firstvec, - node_to_cpumask, npresmsk, nmsk, - masks); + ret =3D __irq_build_affinity_masks(curvec, numvecs, node_to_cpumask, + npresmsk, nmsk, masks); if (ret >=3D 0) nr_others =3D ret; =20 @@ -463,7 +459,7 @@ irq_create_affinity_masks(unsigned int nvecs, struct ir= q_affinity *affd) unsigned int this_vecs =3D affd->set_size[i]; int ret; =20 - ret =3D irq_build_affinity_masks(curvec, this_vecs, masks); + ret =3D irq_build_affinity_masks(this_vecs, &masks[curvec]); if (ret) { kfree(masks); return NULL;