genirq/affinity: Abstract APIs from managed irq affinity spread
Subsystems (3)
v4 cover genirq/affinity: Abstract APIs from managed irq affinity spread
Hello,
irq_build_affinity_masks() actually grouping CPUs evenly into each managed irq vector according to NUMA and CPU locality, and it is reasonable to abstract one generic API for grouping CPUs evenly, the idea is suggested by Thomas Gleixner.
group_cpus_evenly() is abstracted and put into lib/, so blk-mq can re-use it to build default queue mapping.
blk-mq IO perf data is observed as more stable, meantime with big improvement, see detailed data in the last patch.
Please consider it for v6.3!
V4:
- address comments from John, not export the API, given so far no module uses this symbol
- add maintainer entry for new added lib/group_cpus.c
- rebase on 6.2
V3:
- fix build failure in case of !CONFIG_SMP, only 6/7 is changed
V2:
- fix build failure in case of !CONFIG_SMP
- fix commit log typo
- fix memory leak in last patch
- add reviewed-by
Since RFC:
- remove RFC
- rebase on -next tree
Ming Lei (6):
genirq/affinity: Remove the 'firstvec' parameter from
irq_build_affinity_masks
genirq/affinity: Pass affinity managed mask array to
irq_build_affinity_masks
genirq/affinity: Don't pass irq_affinity_desc array to
irq_build_affinity_masks
genirq/affinity: Rename irq_build_affinity_masks as group_cpus_evenly genirq/affinity: Move group_cpus_evenly() into lib/
blk-mq: Build default queue map via group_cpus_evenly()
MAINTAINERS | 2 + block/blk-mq-cpumap.c | 63 ++---- include/linux/group_cpus.h | 14 ++ kernel/irq/affinity.c | 405 +---------------------------------- lib/Makefile | 2 + lib/group_cpus.c | 427 +++++++++++++++++++++++++++++++++++++ 6 files changed, 467 insertions(+), 446 deletions(-) create mode 100644 include/linux/group_cpus.h create mode 100644 lib/group_cpus.c
Signature · 1 line
2.31.1
PATCH v4 1/6 genirq/affinity: Remove the 'firstvec' parameter from irq_build_affinity_masks
The 'firstvec' parameter is always same with the parameter of 'startvec', so use 'startvec' directly inside irq_build_affinity_masks().
--- kernel/irq/affinity.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
kernel/irq/affinity.c +2 -3
@@ -337,10 +337,10 @@ static int __irq_build_affinity_masks(unsigned int startvec,* 2) spread other possible CPUs on these vectors */ static int irq_build_affinity_masks (unsigned int startvec,unsigned int numvecs, -unsigned int firstvec,struct irq_affinity_desc *masks) {unsigned int curvec = startvec, nr_present =0 , nr_others =0 ; +unsigned int firstvec = startvec;cpumask_var_t *node_to_cpumask;cpumask_var_t nmsk, npresmsk;int ret = -ENOMEM ;
@@ -463,8 +463,7 @@ irq_create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd)unsigned int this_vecs = affd->set_size[i];int ret; - ret =irq_build_affinity_masks (curvec, this_vecs, - curvec, masks); + ret =irq_build_affinity_masks (curvec, this_vecs, masks);if (ret) {kfree (masks);return NULL ;
Signature · 1 line
2.31.1
Re: [PATCH V4 1/6] genirq/affinity: Remove the 'firstvec' parameter from irq_build_affinity_masks
Quoted 5 lines · Ming Lei
The 'firstvec' parameter is always same with the parameter of 'startvec', so use 'startvec' directly inside
irq_build_affinity_masks().Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Ming Lei <[email protected]>
I also note that local variable firstvec == startvec always in irq_build_affinity_masks(), so may not need to introduce firstvec variable at all. However that code seems to be removed later, so FWIW:
Quoted 30 lines
--- kernel/irq/affinity.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)kernel/irq/affinity.c +2
-3@@ -337,10 +337,10 @@ static int __irq_build_affinity_masks(unsigned int startvec,* 2) spread other possible CPUs on these vectors */ static int irq_build_affinity_masks (unsigned int startvec,unsigned int numvecs, -unsigned int firstvec,struct irq_affinity_desc *masks) {unsigned int curvec = startvec, nr_present =0 , nr_others =0 ; +unsigned int firstvec = startvec;cpumask_var_t *node_to_cpumask;cpumask_var_t nmsk, npresmsk;int ret = -ENOMEM ;@@ -463,8 +463,7 @@ irq_create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd)unsigned int this_vecs = affd->set_size[i];int ret; - ret =irq_build_affinity_masks (curvec, this_vecs, - curvec, masks); + ret =irq_build_affinity_masks (curvec, this_vecs, masks);if (ret) {kfree (masks);return NULL ;
[tip: irq/core] genirq/affinity: Remove the 'firstvec' parameter from irq_build_affinity_masks
In reply to Ming LeiThe following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: cdf07f0ea48a3b52f924714d477366ac510ee870 Gitweb: https://git.kernel.org/tip/cdf07f0ea48a3b52f924714d477366ac510ee870 Author: Ming Lei <[email protected]> AuthorDate: Tue, 27 Dec 2022 10:29:00 +08:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 17 Jan 2023 18:50:06 +01:00
genirq/affinity: Remove the 'firstvec' parameter from irq_build_affinity_masks
The 'firstvec' parameter is always same with the parameter of 'startvec', so use 'startvec' directly inside irq_build_affinity_masks().
--- kernel/irq/affinity.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
kernel/irq/affinity.c +2 -3
@@ -337,10 +337,10 @@ static int __irq_build_affinity_masks(unsigned int startvec,* 2) spread other possible CPUs on these vectors */ static int irq_build_affinity_masks (unsigned int startvec,unsigned int numvecs, -unsigned int firstvec,struct irq_affinity_desc *masks) {unsigned int curvec = startvec, nr_present =0 , nr_others =0 ; +unsigned int firstvec = startvec;cpumask_var_t *node_to_cpumask;cpumask_var_t nmsk, npresmsk;int ret = -ENOMEM ;
@@ -463,8 +463,7 @@ irq_create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd)unsigned int this_vecs = affd->set_size[i];int ret; - ret =irq_build_affinity_masks (curvec, this_vecs, - curvec, masks); + ret =irq_build_affinity_masks (curvec, this_vecs, masks);if (ret) {kfree (masks);return NULL ;
PATCH v4 2/6 genirq/affinity: Pass affinity managed mask array to irq_build_affinity_masks
In reply to Ming LeiPass affinity managed mask array to irq_build_affinity_masks() so that index of the first affinity managed vector is always zero, then we can simplify the implementation a bit.
--- kernel/irq/affinity.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-)
kernel/irq/affinity.c +12 -16
@@ -246,14 +246,13 @@ static void alloc_nodes_vectors(unsigned int numvecs,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 =0 ; -unsigned int last_affv = firstvec + numvecs; +unsigned int last_affv = numvecs;unsigned int curvec = startvec;nodemask_t nodemsk =NODE_MASK_NONE ;struct node_vectors *node_vectors;
@@ -273,7 +272,7 @@ static int __irq_build_affinity_masks(unsigned int startvec,cpumask_and (nmsk, cpu_mask, node_to_cpumask[n]);cpumask_or (&masks[curvec].mask, &masks[curvec].mask, nmsk);if (++curvec == last_affv) - curvec = firstvec; + curvec =0 ; }return numvecs; }
@@ -321,7 +320,7 @@ static int __irq_build_affinity_masks(unsigned int startvec,* may start anywhere */ if (curvec >= last_affv) - curvec = firstvec; + curvec =0 ;irq_spread_init_one (&masks[curvec].mask, nmsk, cpus_per_vec); }
@@ -336,11 +335,10 @@ static int __irq_build_affinity_masks(unsigned int startvec,* 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 numvecs, +static int irq_build_affinity_masks (unsigned int numvecs,struct irq_affinity_desc *masks) { -unsigned int curvec = startvec, nr_present =0 , nr_others =0 ; -unsigned int firstvec = startvec; +unsigned int curvec =0 , nr_present =0 , nr_others =0 ;cpumask_var_t *node_to_cpumask;cpumask_var_t nmsk, npresmsk;int ret = -ENOMEM ;
@@ -360,9 +358,8 @@ static int irq_build_affinity_masks(unsigned int startvec, unsigned int numvecs,build_node_to_cpumask (node_to_cpumask);/* Spread on present CPUs starting from affd->pre_vectors */ - ret =__irq_build_affinity_masks (curvec, numvecs, firstvec, - node_to_cpumask, cpu_present_mask, - nmsk, masks); + ret =__irq_build_affinity_masks (curvec, numvecs, node_to_cpumask, + cpu_present_mask, nmsk, masks);if (ret <0 ) goto fail_build_affinity; nr_present = ret;
@@ -374,13 +371,12 @@ static int irq_build_affinity_masks(unsigned int startvec, unsigned int numvecs,* out vectors. */ if (nr_present >= numvecs) - curvec = firstvec; + curvec =0 ;else - curvec = firstvec + nr_present; + curvec = nr_present;cpumask_andnot (npresmsk, cpu_possible_mask, cpu_present_mask); - ret =__irq_build_affinity_masks (curvec, numvecs, firstvec, - node_to_cpumask, npresmsk, nmsk, - masks); + ret =__irq_build_affinity_masks (curvec, numvecs, node_to_cpumask, + npresmsk, nmsk, masks);if (ret >=0 ) nr_others = ret;
@@ -463,7 +459,7 @@ irq_create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd)unsigned int this_vecs = affd->set_size[i];int ret; - ret =irq_build_affinity_masks (curvec, this_vecs, masks); + ret =irq_build_affinity_masks (this_vecs, &masks[curvec]);if (ret) {kfree (masks);return NULL ;
Signature · 1 line
2.31.1
Re: [PATCH V4 2/6] genirq/affinity: Pass affinity managed mask array to irq_build_affinity_masks
Quoted 6 lines · Ming Lei
Pass affinity managed mask array to
irq_build_affinity_masks()so that index of the first affinity managed vector is always zero, then we can simplify the implementation a bit.Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Ming Lei <[email protected]>
Apart from a couple of nits, FWIW:
Quoted 43 lines
--- kernel/irq/affinity.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-)kernel/irq/affinity.c +3
-4@@ -246,14 +246,13 @@ static void alloc_nodes_vectors(unsigned int numvecs,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 =0 ; -unsigned int last_affv = firstvec + numvecs; +unsigned int last_affv = numvecs;unsigned int curvec = startvec;nodemask_t nodemsk =NODE_MASK_NONE ;struct node_vectors *node_vectors;@@ -273,7 +272,7 @@ static int __irq_build_affinity_masks(unsigned int startvec,cpumask_and (nmsk, cpu_mask, node_to_cpumask[n]);cpumask_or (&masks[curvec].mask, &masks[curvec].mask, nmsk);if (++curvec == last_affv) - curvec = firstvec; + curvec =0 ; }return numvecs; }@@ -321,7 +320,7 @@ static int __irq_build_affinity_masks(unsigned int startvec,* may start anywhere */ if (curvec >= last_affv) - curvec = firstvec; + curvec =0 ;irq_spread_init_one (&masks[curvec].mask, nmsk, cpus_per_vec); }
kernel/irq/affinity.c static int __irq_build_affinity_masks(unsigned int startvec, · line 341
Quoted 10 lines
kernel/irq/affinity.c +2
-3@@ -336,11 +335,10 @@ static int __irq_build_affinity_masks(unsigned int startvec,* 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 numvecs, +static int irq_build_affinity_masks (unsigned int numvecs,struct irq_affinity_desc *masks) { -unsigned int curvec = startvec, nr_present =0 , nr_others =0 ; -unsigned int firstvec = startvec; +unsigned int curvec =0
nit: curvec is used only as irq_build_affinity_masks() startvec param, so not sure why you use a different name in this function
kernel/irq/affinity.c static int irq_build_affinity_masks(unsigned int startvec, unsigned int numvecs, · line 361
Quoted 12 lines
kernel/irq/affinity.c +0
-0, nr_present = 0, nr_others = 0;cpumask_var_t *node_to_cpumask;cpumask_var_t nmsk, npresmsk;int ret = -ENOMEM;kernel/irq/affinity.c +1
-3@@ -360,9 +358,8 @@ static int irq_build_affinity_masks(unsigned int startvec, unsigned int numvecs,build_node_to_cpumask (node_to_cpumask);/* Spread on present CPUs starting from affd->pre_vectors */ - ret =__irq_build_affinity_masks (curvec, numvecs, firstvec, - node_to_cpumask, cpu_present_mask, - nmsk, masks); + ret = __irq_build_affinity_masks(curvec, numvecs, node_to_cpumask,
nit: maybe you can /s/curvec/0/ to be more explicit in intention
Quoted 31 lines
kernel/irq/affinity.c +6
-6+ cpu_present_mask, nmsk, masks);if (ret <0 ) goto fail_build_affinity; nr_present = ret;@@ -374,13 +371,12 @@ static int irq_build_affinity_masks(unsigned int startvec, unsigned int numvecs,* out vectors. */ if (nr_present >= numvecs) - curvec = firstvec; + curvec =0 ;else - curvec = firstvec + nr_present; + curvec = nr_present;cpumask_andnot (npresmsk, cpu_possible_mask, cpu_present_mask); - ret =__irq_build_affinity_masks (curvec, numvecs, firstvec, - node_to_cpumask, npresmsk, nmsk, - masks); + ret =__irq_build_affinity_masks (curvec, numvecs, node_to_cpumask, + npresmsk, nmsk, masks);if (ret >=0 ) nr_others = ret;@@ -463,7 +459,7 @@ irq_create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd)unsigned int this_vecs = affd->set_size[i];int ret; - ret =irq_build_affinity_masks (curvec, this_vecs, masks); + ret =irq_build_affinity_masks (this_vecs, &masks[curvec]);if (ret) {kfree (masks);return NULL ;
[tip: irq/core] genirq/affinity: Pass affinity managed mask array to irq_build_affinity_masks
In reply to Ming LeiThe following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: 1f962d91a15af54301c63febb8ac2ba07aa3654f Gitweb: https://git.kernel.org/tip/1f962d91a15af54301c63febb8ac2ba07aa3654f Author: Ming Lei <[email protected]> AuthorDate: Tue, 27 Dec 2022 10:29:01 +08:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 17 Jan 2023 18:50:06 +01:00
genirq/affinity: Pass affinity managed mask array to irq_build_affinity_masks
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.
--- kernel/irq/affinity.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-)
kernel/irq/affinity.c +12 -16
@@ -246,14 +246,13 @@ static void alloc_nodes_vectors(unsigned int numvecs,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 =0 ; -unsigned int last_affv = firstvec + numvecs; +unsigned int last_affv = numvecs;unsigned int curvec = startvec;nodemask_t nodemsk =NODE_MASK_NONE ;struct node_vectors *node_vectors;
@@ -273,7 +272,7 @@ static int __irq_build_affinity_masks(unsigned int startvec,cpumask_and (nmsk, cpu_mask, node_to_cpumask[n]);cpumask_or (&masks[curvec].mask, &masks[curvec].mask, nmsk);if (++curvec == last_affv) - curvec = firstvec; + curvec =0 ; }return numvecs; }
@@ -321,7 +320,7 @@ static int __irq_build_affinity_masks(unsigned int startvec,* may start anywhere */ if (curvec >= last_affv) - curvec = firstvec; + curvec =0 ;irq_spread_init_one (&masks[curvec].mask, nmsk, cpus_per_vec); }
@@ -336,11 +335,10 @@ static int __irq_build_affinity_masks(unsigned int startvec,* 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 numvecs, +static int irq_build_affinity_masks (unsigned int numvecs,struct irq_affinity_desc *masks) { -unsigned int curvec = startvec, nr_present =0 , nr_others =0 ; -unsigned int firstvec = startvec; +unsigned int curvec =0 , nr_present =0 , nr_others =0 ;cpumask_var_t *node_to_cpumask;cpumask_var_t nmsk, npresmsk;int ret = -ENOMEM ;
@@ -360,9 +358,8 @@ static int irq_build_affinity_masks(unsigned int startvec, unsigned int numvecs,build_node_to_cpumask (node_to_cpumask);/* Spread on present CPUs starting from affd->pre_vectors */ - ret =__irq_build_affinity_masks (curvec, numvecs, firstvec, - node_to_cpumask, cpu_present_mask, - nmsk, masks); + ret =__irq_build_affinity_masks (curvec, numvecs, node_to_cpumask, + cpu_present_mask, nmsk, masks);if (ret <0 ) goto fail_build_affinity; nr_present = ret;
@@ -374,13 +371,12 @@ static int irq_build_affinity_masks(unsigned int startvec, unsigned int numvecs,* out vectors. */ if (nr_present >= numvecs) - curvec = firstvec; + curvec =0 ;else - curvec = firstvec + nr_present; + curvec = nr_present;cpumask_andnot (npresmsk, cpu_possible_mask, cpu_present_mask); - ret =__irq_build_affinity_masks (curvec, numvecs, firstvec, - node_to_cpumask, npresmsk, nmsk, - masks); + ret =__irq_build_affinity_masks (curvec, numvecs, node_to_cpumask, + npresmsk, nmsk, masks);if (ret >=0 ) nr_others = ret;
@@ -463,7 +459,7 @@ irq_create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd)unsigned int this_vecs = affd->set_size[i];int ret; - ret =irq_build_affinity_masks (curvec, this_vecs, masks); + ret =irq_build_affinity_masks (this_vecs, &masks[curvec]);if (ret) {kfree (masks);return NULL ;
PATCH v4 3/6 genirq/affinity: Don't pass irq_affinity_desc array to irq_build_affinity_masks
In reply to Ming LeiPrepare for abstracting irq_build_affinity_masks() into one public helper for assigning all CPUs evenly into several groups. Don't pass irq_affinity_desc array to irq_build_affinity_masks, instead return a cpumask array by storing each assigned group into one element of the array.
This way helps us to provide generic interface for grouping all CPUs evenly from NUMA and CPU locality viewpoint, and the cost is one extra allocation in irq_build_affinity_masks(), which should be fine since it is done via GFP_KERNEL and irq_build_affinity_masks() is called very less.
--- kernel/irq/affinity.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-)
kernel/irq/affinity.c +24 -10
@@ -249,7 +249,7 @@ static int __irq_build_affinity_masks(unsigned int startvec,cpumask_var_t *node_to_cpumask, const struct cpumask *cpu_mask, struct cpumask *nmsk, - struct irq_affinity_desc *masks) + struct cpumask *masks) { unsigned int i, n, nodes, cpus_per_vec, extra_vecs, done = 0;unsigned int last_affv = numvecs;
@@ -270,7 +270,7 @@ static int __irq_build_affinity_masks(unsigned int startvec,for_each_node_mask (n, nodemsk) {/* Ensure that only CPUs which are in both masks are set */ cpumask_and (nmsk, cpu_mask, node_to_cpumask[n]); -cpumask_or (&masks[curvec].mask, &masks[curvec].mask, nmsk); +cpumask_or (&masks[curvec], &masks[curvec], nmsk);if (++curvec == last_affv) curvec =0 ; }
@@ -321,7 +321,7 @@ static int __irq_build_affinity_masks(unsigned int startvec,*/ if (curvec >= last_affv) curvec =0 ; -irq_spread_init_one (&masks[curvec].mask, nmsk, +irq_spread_init_one (&masks[curvec], nmsk, cpus_per_vec); } done += nv->nvectors;
@@ -335,16 +335,16 @@ static int __irq_build_affinity_masks(unsigned int startvec,* 1) spread present CPU on these vectors * 2) spread other possible CPUs on these vectors */ -static int irq_build_affinity_masks (unsigned int numvecs, -struct irq_affinity_desc *masks) +static struct cpumask *irq_build_affinity_masks (unsigned int numvecs) {unsigned int curvec =0 , nr_present =0 , nr_others =0 ;cpumask_var_t *node_to_cpumask;cpumask_var_t nmsk, npresmsk;int ret = -ENOMEM ; +struct cpumask *masks =NULL ;if (!zalloc_cpumask_var (&nmsk,GFP_KERNEL )) -return ret; +return NULL ;if (!zalloc_cpumask_var (&npresmsk,GFP_KERNEL )) goto fail_nmsk;
@@ -353,6 +353,10 @@ static int irq_build_affinity_masks(unsigned int numvecs,if (!node_to_cpumask) goto fail_npresmsk; + masks =kcalloc (numvecs,sizeof (*masks),GFP_KERNEL ); +if (!masks) + goto fail_node_to_cpumask; +/* Stabilize the cpumasks */ cpus_read_lock ();build_node_to_cpumask (node_to_cpumask);
@@ -386,6 +390,7 @@ static int irq_build_affinity_masks(unsigned int numvecs,if (ret >=0 )WARN_ON (nr_present + nr_others < numvecs); + fail_node_to_cpumask:free_node_to_cpumask (node_to_cpumask); fail_npresmsk:
@@ -393,7 +398,11 @@ static int irq_build_affinity_masks(unsigned int numvecs, fail_nmsk:free_cpumask_var (nmsk); -return ret <0 ? ret :0 ; +if (ret <0 ) { +kfree (masks); +return NULL ; + } +return masks; }static void default_calc_sets (struct irq_affinity *affd,unsigned int affvecs)
@@ -457,13 +466,18 @@ irq_create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd)*/ for (i =0 , usedvecs =0 ; i < affd->nr_sets; i++) {unsigned int this_vecs = affd->set_size[i]; -int ret; +int j; +struct cpumask *result =irq_build_affinity_masks (this_vecs); - ret =irq_build_affinity_masks (this_vecs, &masks[curvec]); -if (ret) { +if (!result) {kfree (masks);return NULL ; } + +for (j =0 ; j < this_vecs; j++) +cpumask_copy (&masks[curvec + j].mask, &result[j]); +kfree (result); + curvec += this_vecs; usedvecs += this_vecs; }
Signature · 1 line
2.31.1
Re: [PATCH V4 3/6] genirq/affinity: Don't pass irq_affinity_desc array to irq_build_affinity_masks
Quoted 6 lines · Ming Lei
Prepare for abstracting
irq_build_affinity_masks()into one public helper for assigning all CPUs evenly into several groups. Don't passirq_affinity_descarray toirq_build_affinity_masks, instead return a cpumask array by storing each assigned group into one element of the array.
Quoted 8 lines
This way helps us to provide generic interface for grouping all CPUs evenly from NUMA and CPU locality viewpoint, and the cost is one extra allocation in
irq_build_affinity_masks(), which should be fine since it is done viaGFP_KERNELandirq_build_affinity_masks()is called very less.Reviewed-by Christoph Hellwig<[email protected]>Signed-off-by Ming Lei<[email protected]>
Quoted 14 lines
--- kernel/irq/affinity.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-)kernel/irq/affinity.c +0
-0@@ -249,7 +249,7 @@ static int __irq_build_affinity_masks(unsigned int startvec, fail_npresmsk:
kernel/irq/affinity.c static int irq_build_affinity_masks(unsigned int numvecs, · line 403
Quoted 7 lines
kernel/irq/affinity.c +3
-1@@ -393,7 +398,11 @@ static int irq_build_affinity_masks(unsigned int numvecs, fail_nmsk:free_cpumask_var (nmsk); -return ret <0 ? ret :0 ; +if (ret <0 ) { +kfree (masks); +return NULL ;
I dislike non-failure path passing through "fail" labels, but that is how the current code is...
Quoted 4 lines
kernel/irq/affinity.c +2
-0+ } +return masks; }
[tip: irq/core] genirq/affinity: Don't pass irq_affinity_desc array to irq_build_affinity_masks
In reply to Ming LeiThe following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: e7bdd7f0cbd1c001bb9b4d3313edc5ee094bc3f8 Gitweb: https://git.kernel.org/tip/e7bdd7f0cbd1c001bb9b4d3313edc5ee094bc3f8 Author: Ming Lei <[email protected]> AuthorDate: Tue, 27 Dec 2022 10:29:02 +08:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 17 Jan 2023 18:50:06 +01:00
genirq/affinity: Don't pass irq_affinity_desc array to irq_build_affinity_masks
Prepare for abstracting irq_build_affinity_masks() into a public function for assigning all CPUs evenly into several groups.
Don't pass irq_affinity_desc array to irq_build_affinity_masks, instead return a cpumask array by storing each assigned group into one element of the array.
This allows to provide a generic interface for grouping all CPUs evenly from a NUMA and CPU locality viewpoint, and the cost is one extra allocation in irq_build_affinity_masks(), which should be fine since it is done via GFP_KERNEL and irq_build_affinity_masks() is a slow path anyway.
--- kernel/irq/affinity.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-)
kernel/irq/affinity.c +24 -10
@@ -249,7 +249,7 @@ static int __irq_build_affinity_masks(unsigned int startvec,cpumask_var_t *node_to_cpumask, const struct cpumask *cpu_mask, struct cpumask *nmsk, - struct irq_affinity_desc *masks) + struct cpumask *masks) { unsigned int i, n, nodes, cpus_per_vec, extra_vecs, done = 0;unsigned int last_affv = numvecs;
@@ -270,7 +270,7 @@ static int __irq_build_affinity_masks(unsigned int startvec,for_each_node_mask (n, nodemsk) {/* Ensure that only CPUs which are in both masks are set */ cpumask_and (nmsk, cpu_mask, node_to_cpumask[n]); -cpumask_or (&masks[curvec].mask, &masks[curvec].mask, nmsk); +cpumask_or (&masks[curvec], &masks[curvec], nmsk);if (++curvec == last_affv) curvec =0 ; }
@@ -321,7 +321,7 @@ static int __irq_build_affinity_masks(unsigned int startvec,*/ if (curvec >= last_affv) curvec =0 ; -irq_spread_init_one (&masks[curvec].mask, nmsk, +irq_spread_init_one (&masks[curvec], nmsk, cpus_per_vec); } done += nv->nvectors;
@@ -335,16 +335,16 @@ static int __irq_build_affinity_masks(unsigned int startvec,* 1) spread present CPU on these vectors * 2) spread other possible CPUs on these vectors */ -static int irq_build_affinity_masks (unsigned int numvecs, -struct irq_affinity_desc *masks) +static struct cpumask *irq_build_affinity_masks (unsigned int numvecs) {unsigned int curvec =0 , nr_present =0 , nr_others =0 ;cpumask_var_t *node_to_cpumask;cpumask_var_t nmsk, npresmsk;int ret = -ENOMEM ; +struct cpumask *masks =NULL ;if (!zalloc_cpumask_var (&nmsk,GFP_KERNEL )) -return ret; +return NULL ;if (!zalloc_cpumask_var (&npresmsk,GFP_KERNEL )) goto fail_nmsk;
@@ -353,6 +353,10 @@ static int irq_build_affinity_masks(unsigned int numvecs,if (!node_to_cpumask) goto fail_npresmsk; + masks =kcalloc (numvecs,sizeof (*masks),GFP_KERNEL ); +if (!masks) + goto fail_node_to_cpumask; +/* Stabilize the cpumasks */ cpus_read_lock ();build_node_to_cpumask (node_to_cpumask);
@@ -386,6 +390,7 @@ static int irq_build_affinity_masks(unsigned int numvecs,if (ret >=0 )WARN_ON (nr_present + nr_others < numvecs); + fail_node_to_cpumask:free_node_to_cpumask (node_to_cpumask); fail_npresmsk:
@@ -393,7 +398,11 @@ static int irq_build_affinity_masks(unsigned int numvecs, fail_nmsk:free_cpumask_var (nmsk); -return ret <0 ? ret :0 ; +if (ret <0 ) { +kfree (masks); +return NULL ; + } +return masks; }static void default_calc_sets (struct irq_affinity *affd,unsigned int affvecs)
@@ -457,13 +466,18 @@ irq_create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd)*/ for (i =0 , usedvecs =0 ; i < affd->nr_sets; i++) {unsigned int this_vecs = affd->set_size[i]; -int ret; +int j; +struct cpumask *result =irq_build_affinity_masks (this_vecs); - ret =irq_build_affinity_masks (this_vecs, &masks[curvec]); -if (ret) { +if (!result) {kfree (masks);return NULL ; } + +for (j =0 ; j < this_vecs; j++) +cpumask_copy (&masks[curvec + j].mask, &result[j]); +kfree (result); + curvec += this_vecs; usedvecs += this_vecs; }
PATCH v4 4/6 genirq/affinity: Rename irq_build_affinity_masks as group_cpus_evenly
In reply to Ming LeiMap irq vector into group, so we can abstract the algorithm for generic use case.
Rename irq_build_affinity_masks as group_cpus_evenly, so we can reuse the API for blk-mq to make default queue mapping even though irq vectors aren't involved.
No functional change, just rename vector as group.
--- kernel/irq/affinity.c | 242 +++++++++++++++++++++--------------------- 1 file changed, 121 insertions(+), 121 deletions(-)
kernel/irq/affinity.c +121 -121
@@ -9,13 +9,13 @@#include <linux/cpu.h> #include <linux/sort.h> -static void irq_spread_init_one (struct cpumask *irqmsk,struct cpumask *nmsk, -unsigned int cpus_per_vec) +static void grp_spread_init_one (struct cpumask *irqmsk,struct cpumask *nmsk, +unsigned int cpus_per_grp) {const struct cpumask *siblmsk;int cpu, sibl; -for ( ; cpus_per_vec >0 ; ) { +for ( ; cpus_per_grp >0 ; ) { cpu =cpumask_first (nmsk);/* Should not happen, but I'm too lazy to think about it */
@@ -24,18 +24,18 @@ static void irq_spread_init_one(struct cpumask *irqmsk, struct cpumask *nmsk,cpumask_clear_cpu (cpu, nmsk);cpumask_set_cpu (cpu, irqmsk); - cpus_per_vec--; + cpus_per_grp--;/* If the cpu has siblings, use them first */ siblmsk =topology_sibling_cpumask (cpu); -for (sibl =-1 ; cpus_per_vec >0 ; ) { +for (sibl =-1 ; cpus_per_grp >0 ; ) { sibl =cpumask_next (sibl, siblmsk);if (sibl >= nr_cpu_ids)break ;if (!cpumask_test_and_clear_cpu (sibl, nmsk))continue ;cpumask_set_cpu (sibl, irqmsk); - cpus_per_vec--; + cpus_per_grp--; } } }
@@ -95,48 +95,48 @@ static int get_nodes_in_cpumask(cpumask_var_t *node_to_cpumask,return nodes; } -struct node_vectors { +struct node_groups {unsigned id;union { -unsigned nvectors; +unsigned ngroups;unsigned ncpus; }; };static int ncpus_cmp_func (const void *l,const void *r) { -const struct node_vectors *ln = l; -const struct node_vectors *rn = r; +const struct node_groups *ln = l; +const struct node_groups *rn = r;return ln->ncpus - rn->ncpus; }/* -* Allocate vector number for each node, so that for each node: +* Allocate group number for each node, so that for each node: * * 1) the allocated number is >= 1 * -* 2) the allocated numbver is <= active CPU number of this node +* 2) the allocated number is <= active CPU number of this node * -* The actual allocated total vectors may be less than @numvecs when -* active total CPU number is less than @numvecs. +* The actual allocated total groups may be less than @numgrps when +* active total CPU number is less than @numgrps. * * Active CPUs means the CPUs in '@cpu_mask AND @node_to_cpumask[]' * for each node. */ -static void alloc_nodes_vectors (unsigned int numvecs, -cpumask_var_t *node_to_cpumask, -const struct cpumask *cpu_mask, -const nodemask_t nodemsk, -struct cpumask *nmsk, -struct node_vectors *node_vectors) +static void alloc_nodes_groups (unsigned int numgrps, +cpumask_var_t *node_to_cpumask, +const struct cpumask *cpu_mask, +const nodemask_t nodemsk, +struct cpumask *nmsk, +struct node_groups *node_groups) {unsigned n, remaining_ncpus =0 ;for (n =0 ; n < nr_node_ids; n++) { - node_vectors[n].id = n; - node_vectors[n].ncpus =UINT_MAX ; + node_groups[n].id = n; + node_groups[n].ncpus =UINT_MAX ; }for_each_node_mask (n, nodemsk) {
@@ -148,61 +148,61 @@ static void alloc_nodes_vectors(unsigned int numvecs,if (!ncpus)continue ; remaining_ncpus += ncpus; - node_vectors[n].ncpus = ncpus; + node_groups[n].ncpus = ncpus; } - numvecs =min_t (unsigned, remaining_ncpus, numvecs); + numgrps =min_t (unsigned, remaining_ncpus, numgrps); -sort (node_vectors, nr_node_ids,sizeof (node_vectors[0 ]), +sort (node_groups, nr_node_ids,sizeof (node_groups[0 ]), ncpus_cmp_func,NULL );/* -* Allocate vectors for each node according to the ratio of this -* node's nr_cpus to remaining un-assigned ncpus. 'numvecs' is +* Allocate groups for each node according to the ratio of this +* node's nr_cpus to remaining un-assigned ncpus. 'numgrps' is * bigger than number of active numa nodes. Always start the * allocation from the node with minimized nr_cpus. * * This way guarantees that each active node gets allocated at -* least one vector, and the theory is simple: over-allocation -* is only done when this node is assigned by one vector, so -* other nodes will be allocated >= 1 vector, since 'numvecs' is +* least one group, and the theory is simple: over-allocation +* is only done when this node is assigned by one group, so +* other nodes will be allocated >= 1 groups, since 'numgrps' is * bigger than number of numa nodes. * -* One perfect invariant is that number of allocated vectors for +* One perfect invariant is that number of allocated groups for * each node is <= CPU count of this node: * * 1) suppose there are two nodes: A and B * ncpu(X) is CPU count of node X -* vecs(X) is the vector count allocated to node X via this +* grps(X) is the group count allocated to node X via this * algorithm * * ncpu(A) <= ncpu(B) * ncpu(A) + ncpu(B) = N -* vecs(A) + vecs(B) = V +* grps(A) + grps(B) = G * -* vecs(A) = max(1, round_down(V * ncpu(A) / N)) -* vecs(B) = V - vecs(A) +* grps(A) = max(1, round_down(G * ncpu(A) / N)) +* grps(B) = G - grps(A) * -* both N and V are integer, and 2 <= V <= N, suppose -* V = N - delta, and 0 <= delta <= N - 2 +* both N and G are integer, and 2 <= G <= N, suppose +* G = N - delta, and 0 <= delta <= N - 2 * -* 2) obviously vecs(A) <= ncpu(A) because: +* 2) obviously grps(A) <= ncpu(A) because: * -* if vecs(A) is 1, then vecs(A) <= ncpu(A) given +* if grps(A) is 1, then grps(A) <= ncpu(A) given * ncpu(A) >= 1 * * otherwise, -* vecs(A) <= V * ncpu(A) / N <= ncpu(A), given V <= N +* grps(A) <= G * ncpu(A) / N <= ncpu(A), given G <= N * -* 3) prove how vecs(B) <= ncpu(B): +* 3) prove how grps(B) <= ncpu(B): * -* if round_down(V * ncpu(A) / N) == 0, vecs(B) won't be -* over-allocated, so vecs(B) <= ncpu(B), +* if round_down(G * ncpu(A) / N) == 0, vecs(B) won't be +* over-allocated, so grps(B) <= ncpu(B), * * otherwise: * -* vecs(A) = -* round_down(V * ncpu(A) / N) = +* grps(A) = +* round_down(G * ncpu(A) / N) = * round_down((N - delta) * ncpu(A) / N) = * round_down((N * ncpu(A) - delta * ncpu(A)) / N) >= * round_down((N * ncpu(A) - delta * N) / N) =
@@ -210,52 +210,50 @@ static void alloc_nodes_vectors(unsigned int numvecs,* * then: * -* vecs(A) - V >= ncpu(A) - delta - V +* grps(A) - G >= ncpu(A) - delta - G * => -* V - vecs(A) <= V + delta - ncpu(A) +* G - grps(A) <= G + delta - ncpu(A) * => -* vecs(B) <= N - ncpu(A) +* grps(B) <= N - ncpu(A) * => -* vecs(B) <= cpu(B) +* grps(B) <= cpu(B) * * For nodes >= 3, it can be thought as one node and another big * node given that is exactly what this algorithm is implemented, -* and we always re-calculate 'remaining_ncpus' & 'numvecs', and -* finally for each node X: vecs(X) <= ncpu(X). +* and we always re-calculate 'remaining_ncpus' & 'numgrps', and +* finally for each node X: grps(X) <= ncpu(X). * */ for (n =0 ; n < nr_node_ids; n++) { -unsigned nvectors, ncpus; +unsigned ngroups, ncpus; -if (node_vectors[n].ncpus ==UINT_MAX ) +if (node_groups[n].ncpus ==UINT_MAX )continue ; -WARN_ON_ONCE (numvecs ==0 ); +WARN_ON_ONCE (numgrps ==0 ); - ncpus = node_vectors[n].ncpus; - nvectors =max_t (unsigned,1 , - numvecs * ncpus / remaining_ncpus); -WARN_ON_ONCE (nvectors > ncpus); + ncpus = node_groups[n].ncpus; + ngroups =max_t (unsigned,1 , + numgrps * ncpus / remaining_ncpus); +WARN_ON_ONCE (ngroups > ncpus); - node_vectors[n].nvectors = nvectors; + node_groups[n].ngroups = ngroups; remaining_ncpus -= ncpus; - numvecs -= nvectors; + numgrps -= ngroups; } } -static int __irq_build_affinity_masks (unsigned int startvec, -unsigned int numvecs, -cpumask_var_t *node_to_cpumask, -const struct cpumask *cpu_mask, -struct cpumask *nmsk, -struct cpumask *masks) +static int __group_cpus_evenly (unsigned int startgrp,unsigned int numgrps, +cpumask_var_t *node_to_cpumask, +const struct cpumask *cpu_mask, +struct cpumask *nmsk,struct cpumask *masks) { -unsigned int i, n, nodes, cpus_per_vec, extra_vecs, done =0 ; -unsigned int last_affv = numvecs; -unsigned int curvec = startvec; +unsigned int i, n, nodes, cpus_per_grp, extra_grps, done =0 ; +unsigned int last_grp = numgrps; +unsigned int curgrp = startgrp;nodemask_t nodemsk =NODE_MASK_NONE ; -struct node_vectors *node_vectors; +struct node_groups *node_groups;if (cpumask_empty (cpu_mask))return 0 ;
@@ -264,34 +262,33 @@ static int __irq_build_affinity_masks(unsigned int startvec,/* * If the number of nodes in the mask is greater than or equal the -* number of vectors we just spread the vectors across the nodes. +* number of groups we just spread the groups across the nodes. */ -if (numvecs <= nodes) { +if (numgrps <= nodes) {for_each_node_mask (n, nodemsk) {/* Ensure that only CPUs which are in both masks are set */ cpumask_and (nmsk, cpu_mask, node_to_cpumask[n]); -cpumask_or (&masks[curvec], &masks[curvec], nmsk); -if (++curvec == last_affv) - curvec =0 ; +cpumask_or (&masks[curgrp], &masks[curgrp], nmsk); +if (++curgrp == last_grp) + curgrp =0 ; } -return numvecs; +return numgrps; } - node_vectors =kcalloc (nr_node_ids, -sizeof (struct node_vectors ), + node_groups =kcalloc (nr_node_ids, +sizeof (struct node_groups ),GFP_KERNEL ); -if (!node_vectors) +if (!node_groups)return -ENOMEM ; -/* allocate vector number for each node */ -alloc_nodes_vectors (numvecs, node_to_cpumask, cpu_mask, - nodemsk, nmsk, node_vectors); - +/* allocate group number for each node */ +alloc_nodes_groups (numgrps, node_to_cpumask, cpu_mask, + nodemsk, nmsk, node_groups);for (i =0 ; i < nr_node_ids; i++) {unsigned int ncpus, v; -struct node_vectors *nv = &node_vectors[i]; +struct node_groups *nv = &node_groups[i]; -if (nv->nvectors ==UINT_MAX ) +if (nv->ngroups ==UINT_MAX )continue ;/* Get the cpus on this node which are in the mask */
@@ -300,44 +297,47 @@ static int __irq_build_affinity_masks(unsigned int startvec,if (!ncpus)continue ; -WARN_ON_ONCE (nv->nvectors > ncpus); +WARN_ON_ONCE (nv->ngroups > ncpus);/* Account for rounding errors */ - extra_vecs = ncpus - nv->nvectors * (ncpus / nv->nvectors); + extra_grps = ncpus - nv->ngroups * (ncpus / nv->ngroups); -/* Spread allocated vectors on CPUs of the current node */ -for (v =0 ; v < nv->nvectors; v++, curvec++) { - cpus_per_vec = ncpus / nv->nvectors; +/* Spread allocated groups on CPUs of the current node */ +for (v =0 ; v < nv->ngroups; v++, curgrp++) { + cpus_per_grp = ncpus / nv->ngroups; -/* Account for extra vectors to compensate rounding errors */ -if (extra_vecs) { - cpus_per_vec++; - --extra_vecs; +/* Account for extra groups to compensate rounding errors */ +if (extra_grps) { + cpus_per_grp++; + --extra_grps; }/* -* wrapping has to be considered given 'startvec' +* wrapping has to be considered given 'startgrp' * may start anywhere */ -if (curvec >= last_affv) - curvec =0 ; -irq_spread_init_one (&masks[curvec], nmsk, - cpus_per_vec); +if (curgrp >= last_grp) + curgrp =0 ; +grp_spread_init_one (&masks[curgrp], nmsk, + cpus_per_grp); } - done += nv->nvectors; + done += nv->ngroups; } -kfree (node_vectors); +kfree (node_groups);return done; }/* -* build affinity in two stages: -* 1) spread present CPU on these vectors -* 2) spread other possible CPUs on these vectors +* build affinity in two stages for each group, and try to put close CPUs +* in viewpoint of CPU and NUMA locality into same group, and we run +* two-stage grouping: +* +* 1) allocate present CPUs on these groups evenly first +* 2) allocate other possible CPUs on these groups evenly */ -static struct cpumask *irq_build_affinity_masks (unsigned int numvecs) +static struct cpumask *group_cpus_evenly (unsigned int numgrps) { -unsigned int curvec =0 , nr_present =0 , nr_others =0 ; +unsigned int curgrp =0 , nr_present =0 , nr_others =0 ;cpumask_var_t *node_to_cpumask;cpumask_var_t nmsk, npresmsk;int ret = -ENOMEM ;
@@ -353,7 +353,7 @@ static struct cpumask *irq_build_affinity_masks(unsigned int numvecs)if (!node_to_cpumask) goto fail_npresmsk; - masks =kcalloc (numvecs,sizeof (*masks),GFP_KERNEL ); + masks =kcalloc (numgrps,sizeof (*masks),GFP_KERNEL );if (!masks) goto fail_node_to_cpumask;
@@ -361,26 +361,26 @@ static struct cpumask *irq_build_affinity_masks(unsigned int numvecs)cpus_read_lock ();build_node_to_cpumask (node_to_cpumask); -/* Spread on present CPUs starting from affd->pre_vectors */ - ret =__irq_build_affinity_masks (curvec, numvecs, node_to_cpumask, - cpu_present_mask, nmsk, masks); +/* grouping present CPUs first */ + ret =__group_cpus_evenly (curgrp, numgrps, node_to_cpumask, + cpu_present_mask, nmsk, masks);if (ret <0 ) goto fail_build_affinity; nr_present = ret;/* -* Spread on non present CPUs starting from the next vector to be -* handled. If the spreading of present CPUs already exhausted the -* vector space, assign the non present CPUs to the already spread -* out vectors. +* Allocate non present CPUs starting from the next group to be +* handled. If the grouping of present CPUs already exhausted the +* group space, assign the non present CPUs to the already +* allocated out groups. */ -if (nr_present >= numvecs) - curvec =0 ; +if (nr_present >= numgrps) + curgrp =0 ;else - curvec = nr_present; + curgrp = nr_present;cpumask_andnot (npresmsk, cpu_possible_mask, cpu_present_mask); - ret =__irq_build_affinity_masks (curvec, numvecs, node_to_cpumask, - npresmsk, nmsk, masks); + ret =__group_cpus_evenly (curgrp, numgrps, node_to_cpumask, + npresmsk, nmsk, masks);if (ret >=0 ) nr_others = ret;
@@ -388,7 +388,7 @@ static struct cpumask *irq_build_affinity_masks(unsigned int numvecs)cpus_read_unlock ();if (ret >=0 ) -WARN_ON (nr_present + nr_others < numvecs); +WARN_ON (nr_present + nr_others < numgrps); fail_node_to_cpumask:free_node_to_cpumask (node_to_cpumask);
@@ -467,7 +467,7 @@ irq_create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd)for (i =0 , usedvecs =0 ; i < affd->nr_sets; i++) {unsigned int this_vecs = affd->set_size[i];int j; -struct cpumask *result =irq_build_affinity_masks (this_vecs); +struct cpumask *result =group_cpus_evenly (this_vecs);if (!result) {kfree (masks);
Signature · 1 line
2.31.1
[tip: irq/core] genirq/affinity: Rename irq_build_affinity_masks as group_cpus_evenly
The following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: 523f1ea76aad9025f9bd5258d77f4406fa9dbe5d Gitweb: https://git.kernel.org/tip/523f1ea76aad9025f9bd5258d77f4406fa9dbe5d Author: Ming Lei <[email protected]> AuthorDate: Tue, 27 Dec 2022 10:29:03 +08:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 17 Jan 2023 18:50:06 +01:00
genirq/affinity: Rename irq_build_affinity_masks as group_cpus_evenly
Map irq vector into group, which allows to abstract the algorithm for a generic use case outside of the interrupt core.
Rename irq_build_affinity_masks as group_cpus_evenly, so the API can be reused for blk-mq to make default queue mapping even though irq vectors aren't involved.
No functional change, just rename vector as group.
--- kernel/irq/affinity.c | 242 ++++++++++++++++++++--------------------- 1 file changed, 121 insertions(+), 121 deletions(-)
kernel/irq/affinity.c +121 -121
@@ -9,13 +9,13 @@#include <linux/cpu.h> #include <linux/sort.h> -static void irq_spread_init_one (struct cpumask *irqmsk,struct cpumask *nmsk, -unsigned int cpus_per_vec) +static void grp_spread_init_one (struct cpumask *irqmsk,struct cpumask *nmsk, +unsigned int cpus_per_grp) {const struct cpumask *siblmsk;int cpu, sibl; -for ( ; cpus_per_vec >0 ; ) { +for ( ; cpus_per_grp >0 ; ) { cpu =cpumask_first (nmsk);/* Should not happen, but I'm too lazy to think about it */
@@ -24,18 +24,18 @@ static void irq_spread_init_one(struct cpumask *irqmsk, struct cpumask *nmsk,cpumask_clear_cpu (cpu, nmsk);cpumask_set_cpu (cpu, irqmsk); - cpus_per_vec--; + cpus_per_grp--;/* If the cpu has siblings, use them first */ siblmsk =topology_sibling_cpumask (cpu); -for (sibl =-1 ; cpus_per_vec >0 ; ) { +for (sibl =-1 ; cpus_per_grp >0 ; ) { sibl =cpumask_next (sibl, siblmsk);if (sibl >= nr_cpu_ids)break ;if (!cpumask_test_and_clear_cpu (sibl, nmsk))continue ;cpumask_set_cpu (sibl, irqmsk); - cpus_per_vec--; + cpus_per_grp--; } } }
@@ -95,48 +95,48 @@ static int get_nodes_in_cpumask(cpumask_var_t *node_to_cpumask,return nodes; } -struct node_vectors { +struct node_groups {unsigned id;union { -unsigned nvectors; +unsigned ngroups;unsigned ncpus; }; };static int ncpus_cmp_func (const void *l,const void *r) { -const struct node_vectors *ln = l; -const struct node_vectors *rn = r; +const struct node_groups *ln = l; +const struct node_groups *rn = r;return ln->ncpus - rn->ncpus; }/* -* Allocate vector number for each node, so that for each node: +* Allocate group number for each node, so that for each node: * * 1) the allocated number is >= 1 * -* 2) the allocated numbver is <= active CPU number of this node +* 2) the allocated number is <= active CPU number of this node * -* The actual allocated total vectors may be less than @numvecs when -* active total CPU number is less than @numvecs. +* The actual allocated total groups may be less than @numgrps when +* active total CPU number is less than @numgrps. * * Active CPUs means the CPUs in '@cpu_mask AND @node_to_cpumask[]' * for each node. */ -static void alloc_nodes_vectors (unsigned int numvecs, -cpumask_var_t *node_to_cpumask, -const struct cpumask *cpu_mask, -const nodemask_t nodemsk, -struct cpumask *nmsk, -struct node_vectors *node_vectors) +static void alloc_nodes_groups (unsigned int numgrps, +cpumask_var_t *node_to_cpumask, +const struct cpumask *cpu_mask, +const nodemask_t nodemsk, +struct cpumask *nmsk, +struct node_groups *node_groups) {unsigned n, remaining_ncpus =0 ;for (n =0 ; n < nr_node_ids; n++) { - node_vectors[n].id = n; - node_vectors[n].ncpus =UINT_MAX ; + node_groups[n].id = n; + node_groups[n].ncpus =UINT_MAX ; }for_each_node_mask (n, nodemsk) {
@@ -148,61 +148,61 @@ static void alloc_nodes_vectors(unsigned int numvecs,if (!ncpus)continue ; remaining_ncpus += ncpus; - node_vectors[n].ncpus = ncpus; + node_groups[n].ncpus = ncpus; } - numvecs =min_t (unsigned, remaining_ncpus, numvecs); + numgrps =min_t (unsigned, remaining_ncpus, numgrps); -sort (node_vectors, nr_node_ids,sizeof (node_vectors[0 ]), +sort (node_groups, nr_node_ids,sizeof (node_groups[0 ]), ncpus_cmp_func,NULL );/* -* Allocate vectors for each node according to the ratio of this -* node's nr_cpus to remaining un-assigned ncpus. 'numvecs' is +* Allocate groups for each node according to the ratio of this +* node's nr_cpus to remaining un-assigned ncpus. 'numgrps' is * bigger than number of active numa nodes. Always start the * allocation from the node with minimized nr_cpus. * * This way guarantees that each active node gets allocated at -* least one vector, and the theory is simple: over-allocation -* is only done when this node is assigned by one vector, so -* other nodes will be allocated >= 1 vector, since 'numvecs' is +* least one group, and the theory is simple: over-allocation +* is only done when this node is assigned by one group, so +* other nodes will be allocated >= 1 groups, since 'numgrps' is * bigger than number of numa nodes. * -* One perfect invariant is that number of allocated vectors for +* One perfect invariant is that number of allocated groups for * each node is <= CPU count of this node: * * 1) suppose there are two nodes: A and B * ncpu(X) is CPU count of node X -* vecs(X) is the vector count allocated to node X via this +* grps(X) is the group count allocated to node X via this * algorithm * * ncpu(A) <= ncpu(B) * ncpu(A) + ncpu(B) = N -* vecs(A) + vecs(B) = V +* grps(A) + grps(B) = G * -* vecs(A) = max(1, round_down(V * ncpu(A) / N)) -* vecs(B) = V - vecs(A) +* grps(A) = max(1, round_down(G * ncpu(A) / N)) +* grps(B) = G - grps(A) * -* both N and V are integer, and 2 <= V <= N, suppose -* V = N - delta, and 0 <= delta <= N - 2 +* both N and G are integer, and 2 <= G <= N, suppose +* G = N - delta, and 0 <= delta <= N - 2 * -* 2) obviously vecs(A) <= ncpu(A) because: +* 2) obviously grps(A) <= ncpu(A) because: * -* if vecs(A) is 1, then vecs(A) <= ncpu(A) given +* if grps(A) is 1, then grps(A) <= ncpu(A) given * ncpu(A) >= 1 * * otherwise, -* vecs(A) <= V * ncpu(A) / N <= ncpu(A), given V <= N +* grps(A) <= G * ncpu(A) / N <= ncpu(A), given G <= N * -* 3) prove how vecs(B) <= ncpu(B): +* 3) prove how grps(B) <= ncpu(B): * -* if round_down(V * ncpu(A) / N) == 0, vecs(B) won't be -* over-allocated, so vecs(B) <= ncpu(B), +* if round_down(G * ncpu(A) / N) == 0, vecs(B) won't be +* over-allocated, so grps(B) <= ncpu(B), * * otherwise: * -* vecs(A) = -* round_down(V * ncpu(A) / N) = +* grps(A) = +* round_down(G * ncpu(A) / N) = * round_down((N - delta) * ncpu(A) / N) = * round_down((N * ncpu(A) - delta * ncpu(A)) / N) >= * round_down((N * ncpu(A) - delta * N) / N) =
@@ -210,52 +210,50 @@ static void alloc_nodes_vectors(unsigned int numvecs,* * then: * -* vecs(A) - V >= ncpu(A) - delta - V +* grps(A) - G >= ncpu(A) - delta - G * => -* V - vecs(A) <= V + delta - ncpu(A) +* G - grps(A) <= G + delta - ncpu(A) * => -* vecs(B) <= N - ncpu(A) +* grps(B) <= N - ncpu(A) * => -* vecs(B) <= cpu(B) +* grps(B) <= cpu(B) * * For nodes >= 3, it can be thought as one node and another big * node given that is exactly what this algorithm is implemented, -* and we always re-calculate 'remaining_ncpus' & 'numvecs', and -* finally for each node X: vecs(X) <= ncpu(X). +* and we always re-calculate 'remaining_ncpus' & 'numgrps', and +* finally for each node X: grps(X) <= ncpu(X). * */ for (n =0 ; n < nr_node_ids; n++) { -unsigned nvectors, ncpus; +unsigned ngroups, ncpus; -if (node_vectors[n].ncpus ==UINT_MAX ) +if (node_groups[n].ncpus ==UINT_MAX )continue ; -WARN_ON_ONCE (numvecs ==0 ); +WARN_ON_ONCE (numgrps ==0 ); - ncpus = node_vectors[n].ncpus; - nvectors =max_t (unsigned,1 , - numvecs * ncpus / remaining_ncpus); -WARN_ON_ONCE (nvectors > ncpus); + ncpus = node_groups[n].ncpus; + ngroups =max_t (unsigned,1 , + numgrps * ncpus / remaining_ncpus); +WARN_ON_ONCE (ngroups > ncpus); - node_vectors[n].nvectors = nvectors; + node_groups[n].ngroups = ngroups; remaining_ncpus -= ncpus; - numvecs -= nvectors; + numgrps -= ngroups; } } -static int __irq_build_affinity_masks (unsigned int startvec, -unsigned int numvecs, -cpumask_var_t *node_to_cpumask, -const struct cpumask *cpu_mask, -struct cpumask *nmsk, -struct cpumask *masks) +static int __group_cpus_evenly (unsigned int startgrp,unsigned int numgrps, +cpumask_var_t *node_to_cpumask, +const struct cpumask *cpu_mask, +struct cpumask *nmsk,struct cpumask *masks) { -unsigned int i, n, nodes, cpus_per_vec, extra_vecs, done =0 ; -unsigned int last_affv = numvecs; -unsigned int curvec = startvec; +unsigned int i, n, nodes, cpus_per_grp, extra_grps, done =0 ; +unsigned int last_grp = numgrps; +unsigned int curgrp = startgrp;nodemask_t nodemsk =NODE_MASK_NONE ; -struct node_vectors *node_vectors; +struct node_groups *node_groups;if (cpumask_empty (cpu_mask))return 0 ;
@@ -264,34 +262,33 @@ static int __irq_build_affinity_masks(unsigned int startvec,/* * If the number of nodes in the mask is greater than or equal the -* number of vectors we just spread the vectors across the nodes. +* number of groups we just spread the groups across the nodes. */ -if (numvecs <= nodes) { +if (numgrps <= nodes) {for_each_node_mask (n, nodemsk) {/* Ensure that only CPUs which are in both masks are set */ cpumask_and (nmsk, cpu_mask, node_to_cpumask[n]); -cpumask_or (&masks[curvec], &masks[curvec], nmsk); -if (++curvec == last_affv) - curvec =0 ; +cpumask_or (&masks[curgrp], &masks[curgrp], nmsk); +if (++curgrp == last_grp) + curgrp =0 ; } -return numvecs; +return numgrps; } - node_vectors =kcalloc (nr_node_ids, -sizeof (struct node_vectors ), + node_groups =kcalloc (nr_node_ids, +sizeof (struct node_groups ),GFP_KERNEL ); -if (!node_vectors) +if (!node_groups)return -ENOMEM ; -/* allocate vector number for each node */ -alloc_nodes_vectors (numvecs, node_to_cpumask, cpu_mask, - nodemsk, nmsk, node_vectors); - +/* allocate group number for each node */ +alloc_nodes_groups (numgrps, node_to_cpumask, cpu_mask, + nodemsk, nmsk, node_groups);for (i =0 ; i < nr_node_ids; i++) {unsigned int ncpus, v; -struct node_vectors *nv = &node_vectors[i]; +struct node_groups *nv = &node_groups[i]; -if (nv->nvectors ==UINT_MAX ) +if (nv->ngroups ==UINT_MAX )continue ;/* Get the cpus on this node which are in the mask */
@@ -300,44 +297,47 @@ static int __irq_build_affinity_masks(unsigned int startvec,if (!ncpus)continue ; -WARN_ON_ONCE (nv->nvectors > ncpus); +WARN_ON_ONCE (nv->ngroups > ncpus);/* Account for rounding errors */ - extra_vecs = ncpus - nv->nvectors * (ncpus / nv->nvectors); + extra_grps = ncpus - nv->ngroups * (ncpus / nv->ngroups); -/* Spread allocated vectors on CPUs of the current node */ -for (v =0 ; v < nv->nvectors; v++, curvec++) { - cpus_per_vec = ncpus / nv->nvectors; +/* Spread allocated groups on CPUs of the current node */ +for (v =0 ; v < nv->ngroups; v++, curgrp++) { + cpus_per_grp = ncpus / nv->ngroups; -/* Account for extra vectors to compensate rounding errors */ -if (extra_vecs) { - cpus_per_vec++; - --extra_vecs; +/* Account for extra groups to compensate rounding errors */ +if (extra_grps) { + cpus_per_grp++; + --extra_grps; }/* -* wrapping has to be considered given 'startvec' +* wrapping has to be considered given 'startgrp' * may start anywhere */ -if (curvec >= last_affv) - curvec =0 ; -irq_spread_init_one (&masks[curvec], nmsk, - cpus_per_vec); +if (curgrp >= last_grp) + curgrp =0 ; +grp_spread_init_one (&masks[curgrp], nmsk, + cpus_per_grp); } - done += nv->nvectors; + done += nv->ngroups; } -kfree (node_vectors); +kfree (node_groups);return done; }/* -* build affinity in two stages: -* 1) spread present CPU on these vectors -* 2) spread other possible CPUs on these vectors +* build affinity in two stages for each group, and try to put close CPUs +* in viewpoint of CPU and NUMA locality into same group, and we run +* two-stage grouping: +* +* 1) allocate present CPUs on these groups evenly first +* 2) allocate other possible CPUs on these groups evenly */ -static struct cpumask *irq_build_affinity_masks (unsigned int numvecs) +static struct cpumask *group_cpus_evenly (unsigned int numgrps) { -unsigned int curvec =0 , nr_present =0 , nr_others =0 ; +unsigned int curgrp =0 , nr_present =0 , nr_others =0 ;cpumask_var_t *node_to_cpumask;cpumask_var_t nmsk, npresmsk;int ret = -ENOMEM ;
@@ -353,7 +353,7 @@ static struct cpumask *irq_build_affinity_masks(unsigned int numvecs)if (!node_to_cpumask) goto fail_npresmsk; - masks =kcalloc (numvecs,sizeof (*masks),GFP_KERNEL ); + masks =kcalloc (numgrps,sizeof (*masks),GFP_KERNEL );if (!masks) goto fail_node_to_cpumask;
@@ -361,26 +361,26 @@ static struct cpumask *irq_build_affinity_masks(unsigned int numvecs)cpus_read_lock ();build_node_to_cpumask (node_to_cpumask); -/* Spread on present CPUs starting from affd->pre_vectors */ - ret =__irq_build_affinity_masks (curvec, numvecs, node_to_cpumask, - cpu_present_mask, nmsk, masks); +/* grouping present CPUs first */ + ret =__group_cpus_evenly (curgrp, numgrps, node_to_cpumask, + cpu_present_mask, nmsk, masks);if (ret <0 ) goto fail_build_affinity; nr_present = ret;/* -* Spread on non present CPUs starting from the next vector to be -* handled. If the spreading of present CPUs already exhausted the -* vector space, assign the non present CPUs to the already spread -* out vectors. +* Allocate non present CPUs starting from the next group to be +* handled. If the grouping of present CPUs already exhausted the +* group space, assign the non present CPUs to the already +* allocated out groups. */ -if (nr_present >= numvecs) - curvec =0 ; +if (nr_present >= numgrps) + curgrp =0 ;else - curvec = nr_present; + curgrp = nr_present;cpumask_andnot (npresmsk, cpu_possible_mask, cpu_present_mask); - ret =__irq_build_affinity_masks (curvec, numvecs, node_to_cpumask, - npresmsk, nmsk, masks); + ret =__group_cpus_evenly (curgrp, numgrps, node_to_cpumask, + npresmsk, nmsk, masks);if (ret >=0 ) nr_others = ret;
@@ -388,7 +388,7 @@ static struct cpumask *irq_build_affinity_masks(unsigned int numvecs)cpus_read_unlock ();if (ret >=0 ) -WARN_ON (nr_present + nr_others < numvecs); +WARN_ON (nr_present + nr_others < numgrps); fail_node_to_cpumask:free_node_to_cpumask (node_to_cpumask);
@@ -467,7 +467,7 @@ irq_create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd)for (i =0 , usedvecs =0 ; i < affd->nr_sets; i++) {unsigned int this_vecs = affd->set_size[i];int j; -struct cpumask *result =irq_build_affinity_masks (this_vecs); +struct cpumask *result =group_cpus_evenly (this_vecs);if (!result) {kfree (masks);
PATCH v4 5/6 genirq/affinity: Move group_cpus_evenly() into lib/
In reply to Ming Leigroup_cpus_evenly() has become one generic helper which can be used for other subsystems, so move it into lib/.
--- MAINTAINERS | 2 + include/linux/group_cpus.h | 14 ++ kernel/irq/affinity.c | 398 +--------------------------------- lib/Makefile | 2 + lib/group_cpus.c | 427 +++++++++++++++++++++++++++++++++++++ 5 files changed, 446 insertions(+), 397 deletions(-) create mode 100644 include/linux/group_cpus.h create mode 100644 lib/group_cpus.c
MAINTAINERS +2 -0
@@ -10881,6 +10881,8 @@ L: [email protected] S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core F: kernel/irq/ +F: include/linux/group_cpus.h +F: lib/group_cpus.c IRQCHIP DRIVERS M: Thomas Gleixner <[email protected]>
include/linux/group_cpus.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (C) 2016 Thomas Gleixner. +* Copyright (C) 2016-2017 Christoph Hellwig. +*/ + +#ifndef __LINUX_GROUP_CPUS_H +#define __LINUX_GROUP_CPUS_H +#include <linux/kernel.h> +#include <linux/cpu.h> + +struct cpumask *group_cpus_evenly (unsigned int numgrps); + +#endif
kernel/irq/affinity.c +1 -397
404 lines not on this page · raw message
lib/Makefile +2 -0
@@ -355,6 +355,8 @@ obj-$(CONFIG_SBITMAP) += sbitmap.o obj-$(CONFIG_PARMAN) += parman.o +obj-y += group_cpus.o + # GCC library routines obj-$(CONFIG_GENERIC_LIB_ASHLDI3) += ashldi3.o obj-$(CONFIG_GENERIC_LIB_ASHRDI3) += ashrdi3.o
lib/group_cpus.c new file +427 -0
427 lines not on this page · raw message
Signature · 1 line
2.31.1
[tip: irq/core] genirq/affinity: Move group_cpus_evenly() into lib/
The following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: f7b3ea8cf72f3d6060fe08e461805181e7450a13 Gitweb: https://git.kernel.org/tip/f7b3ea8cf72f3d6060fe08e461805181e7450a13 Author: Ming Lei <[email protected]> AuthorDate: Tue, 27 Dec 2022 10:29:04 +08:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 17 Jan 2023 18:50:06 +01:00
genirq/affinity: Move group_cpus_evenly() into lib/
group_cpus_evenly() has become a generic function which can be used for other subsystems than the interrupt subsystem, so move it into lib/.
--- MAINTAINERS | 2 +- include/linux/group_cpus.h | 14 +- kernel/irq/affinity.c | 398 +---------------------------------- lib/Makefile | 2 +- lib/group_cpus.c | 427 ++++++++++++++++++++++++++++++++++++- 5 files changed, 446 insertions(+), 397 deletions(-) create mode 100644 include/linux/group_cpus.h create mode 100644 lib/group_cpus.c
MAINTAINERS +2 -0
@@ -10935,6 +10935,8 @@ L: [email protected] S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core F: kernel/irq/ +F: include/linux/group_cpus.h +F: lib/group_cpus.c IRQCHIP DRIVERS M: Thomas Gleixner <[email protected]>
include/linux/group_cpus.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (C) 2016 Thomas Gleixner. +* Copyright (C) 2016-2017 Christoph Hellwig. +*/ + +#ifndef __LINUX_GROUP_CPUS_H +#define __LINUX_GROUP_CPUS_H +#include <linux/kernel.h> +#include <linux/cpu.h> + +struct cpumask *group_cpus_evenly (unsigned int numgrps); + +#endif
kernel/irq/affinity.c +1 -397
404 lines not on this page · raw message
lib/Makefile +2 -0
@@ -353,6 +353,8 @@ obj-$(CONFIG_SBITMAP) += sbitmap.o obj-$(CONFIG_PARMAN) += parman.o +obj-y += group_cpus.o + # GCC library routines obj-$(CONFIG_GENERIC_LIB_ASHLDI3) += ashldi3.o obj-$(CONFIG_GENERIC_LIB_ASHRDI3) += ashrdi3.o
lib/group_cpus.c new file +427 -0
427 lines not on this page · raw message
[tip: irq/core] genirq/affinity: Only build SMP-only helper functions on SMP kernels
In reply to Ming LeiThe following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: 188a569658584e93930ab60334c5a1079c0330d8 Gitweb: https://git.kernel.org/tip/188a569658584e93930ab60334c5a1079c0330d8 Author: Ingo Molnar <[email protected]> AuthorDate: Wed, 18 Jan 2023 12:14:01 +01:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Wed, 18 Jan 2023 12:16:47 +01:00
genirq/affinity: Only build SMP-only helper functions on SMP kernels
allnoconfig grew these new build warnings in lib/group_cpus.c:
lib/group_cpus.c:247:12: warning: ‘__group_cpus_evenly’ defined but not used [-Wunused-function] lib/group_cpus.c:75:13: warning: ‘build_node_to_cpumask’ defined but not used [-Wunused-function] lib/group_cpus.c:66:13: warning: ‘free_node_to_cpumask’ defined but not used [-Wunused-function] lib/group_cpus.c:43:23: warning: ‘alloc_node_to_cpumask’ defined but not used [-Wunused-function]
Widen the #ifdef CONFIG_SMP block to not expose unused helpers on non-SMP builds.
Also annotate the preprocessor branches for better readability.
--- lib/group_cpus.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
lib/group_cpus.c +4 -3
@@ -9,6 +9,8 @@#include <linux/sort.h> #include <linux/group_cpus.h> +#ifdef CONFIG_SMP +static void grp_spread_init_one (struct cpumask *irqmsk,struct cpumask *nmsk,unsigned int cpus_per_grp) {
@@ -327,7 +329,6 @@ static int __group_cpus_evenly(unsigned int startgrp, unsigned int numgrps,return done; } -#ifdef CONFIG_SMP /** * group_cpus_evenly - Group all CPUs evenly per NUMA/CPU locality * @numgrps: number of groups
@@ -412,7 +413,7 @@ struct cpumask *group_cpus_evenly(unsigned int numgrps) }return masks; } -#else +#else /* CONFIG_SMP */ struct cpumask *group_cpus_evenly (unsigned int numgrps) {struct cpumask *masks =kcalloc (numgrps,sizeof (*masks),GFP_KERNEL );
@@ -424,4 +425,4 @@ struct cpumask *group_cpus_evenly(unsigned int numgrps)cpumask_copy (&masks[0 ], cpu_possible_mask); return masks; } -#endif +#endif /* CONFIG_SMP */
PATCH v4 6/6 blk-mq: Build default queue map via group_cpus_evenly()
In reply to Ming LeiThe default queue mapping builder of blk_mq_map_queues doesn't take NUMA topo into account, so the built mapping is pretty bad, since CPUs belonging to different NUMA node are assigned to same queue. It is observed that IOPS drops by ~30% when running two jobs on same hctx of null_blk from two CPUs belonging to two NUMA nodes compared with from same NUMA node.
Address the issue by reusing group_cpus_evenly() for building queue mapping since group_cpus_evenly() does group cpus according to CPU/NUMA locality.
Also performance data becomes more stable with this patchset given correct queue mapping is applied wrt. numa locality viewpoint, for example, on one two nodes arm64 machine with 160 cpus, node 0(cpu 0~79), node 1(cpu 80~159):
1) modprobe null_blk nr_devices=1 submit_queues=2
2) run 'fio(t/io_uring -p 0 -n 4 -r 20 /dev/nullb0)', and observe that IOPS becomes much stable on multiple tests:
- without patched: IOPS is 2.5M ~ 4.5M
- patched: IOPS is 4.3 ~ 5M
Lots of drivers may benefit from the change, such as nvme pci poll, nvme tcp, ...
--- block/blk-mq-cpumap.c | 63 +++++++++---------------------------------- 1 file changed, 13 insertions(+), 50 deletions(-)
block/blk-mq-cpumap.c +13 -50
@@ -10,66 +10,29 @@#include <linux/mm.h> #include <linux/smp.h> #include <linux/cpu.h> +#include <linux/group_cpus.h> #include <linux/blk-mq.h> #include "blk.h" #include "blk-mq.h" -static int queue_index (struct blk_mq_queue_map *qmap, -unsigned int nr_queues,const int q) -{ -return qmap->queue_offset + (q % nr_queues); -} - -static int get_first_sibling (unsigned int cpu) -{ -unsigned int ret; - - ret =cpumask_first (topology_sibling_cpumask (cpu)); -if (ret < nr_cpu_ids) -return ret; - -return cpu; -} -void blk_mq_map_queues (struct blk_mq_queue_map *qmap) { -unsigned int *map = qmap->mq_map; -unsigned int nr_queues = qmap->nr_queues; -unsigned int cpu, first_sibling, q =0 ; - -for_each_possible_cpu (cpu) - map[cpu] =-1 ; - -/* -* Spread queues among present CPUs first for minimizing -* count of dead queues which are mapped by all un-present CPUs -*/ -for_each_present_cpu (cpu) { -if (q >= nr_queues) -break ; - map[cpu] =queue_index (qmap, nr_queues, q++); +const struct cpumask *masks; +unsigned int queue, cpu; + + masks =group_cpus_evenly (qmap->nr_queues); +if (!masks) { +for_each_possible_cpu (cpu) + qmap->mq_map[cpu] = qmap->queue_offset; +return ; } -for_each_possible_cpu (cpu) { -if (map[cpu] !=-1 ) -continue ; -/* -* First do sequential mapping between CPUs and queues. -* In case we still have CPUs to map, and we have some number of -* threads per cores then map sibling threads to the same queue -* for performance optimizations. -*/ -if (q < nr_queues) { - map[cpu] =queue_index (qmap, nr_queues, q++); - }else { - first_sibling =get_first_sibling (cpu); -if (first_sibling == cpu) - map[cpu] =queue_index (qmap, nr_queues, q++); -else - map[cpu] = map[first_sibling]; - } +for (queue =0 ; queue < qmap->nr_queues; queue++) { +for_each_cpu (cpu, &masks[queue]) + qmap->mq_map[cpu] = qmap->queue_offset + queue; } +kfree (masks); }EXPORT_SYMBOL_GPL (blk_mq_map_queues);
Signature · 1 line
2.31.1
Re: [PATCH V4 6/6] blk-mq: Build default queue map via group_cpus_evenly()
Quoted 21 lines · Ming Lei
The default queue mapping builder of
blk_mq_map_queuesdoesn't take NUMA topo into account, so the built mapping is pretty bad, since CPUs belonging to different NUMA node are assigned to same queue. It is observed that IOPS drops by ~30% when running two jobs on same hctx ofnull_blkfrom two CPUs belonging to two NUMA nodes compared with from same NUMA node.Address the issue by reusing
group_cpus_evenly()for building queue mapping sincegroup_cpus_evenly()does group cpus according to CPU/NUMA locality.Also performance data becomes more stable with this patchset given correct queue mapping is applied wrt. numa locality viewpoint, for example, on one two nodes arm64 machine with 160 cpus, node 0(cpu 0~79), node 1(cpu 80~159):
1) modprobe
null_blknr_devices=1 submit_queues=22) run '
fio(t/io_uring -p 0 -n 4 -r 20 /dev/nullb0)', and observe that IOPS becomes much stable on multiple tests:
Quoted 8 lines
- without patched: IOPS is 2.5M ~ 4.5M
- patched: IOPS is 4.3 ~ 5MLots of drivers may benefit from the change, such as nvme pci poll, nvme tcp, ...
Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Ming Lei <[email protected]>
FWIW, but just a comment below:
Quoted 49 lines
--- block/blk-mq-cpumap.c | 63 +++++++++---------------------------------- 1 file changed, 13 insertions(+), 50 deletions(-)block/blk-mq-cpumap.c +1
-29@@ -10,66 +10,29 @@#include <linux/mm.h> #include <linux/smp.h> #include <linux/cpu.h> +#include <linux/group_cpus.h> #include <linux/blk-mq.h> #include "blk.h" #include "blk-mq.h" -static int queue_index (struct blk_mq_queue_map *qmap, -unsigned int nr_queues,const int q) -{ -return qmap->queue_offset + (q % nr_queues); -} - -static int get_first_sibling (unsigned int cpu) -{ -unsigned int ret; - - ret =cpumask_first (topology_sibling_cpumask (cpu)); -if (ret < nr_cpu_ids) -return ret; - -return cpu; -} -void blk_mq_map_queues (struct blk_mq_queue_map *qmap) { -unsigned int *map = qmap->mq_map; -unsigned int nr_queues = qmap->nr_queues; -unsigned int cpu, first_sibling, q =0 ; - -for_each_possible_cpu (cpu) - map[cpu] =-1 ; - -/* -* Spread queues among present CPUs first for minimizing -* count of dead queues which are mapped by all un-present CPUs -*/ -for_each_present_cpu (cpu) {
block/blk-mq-cpumap.c line 27
Quoted 10 lines
block/blk-mq-cpumap.c +7
-3-if (q >= nr_queues) -break ; - map[cpu] =queue_index (qmap, nr_queues, q++); +const struct cpumask *masks; +unsigned int queue, cpu; + + masks =group_cpus_evenly (qmap->nr_queues); +if (!masks) { +for_each_possible_cpu (cpu) + qmap->mq_map[cpu] = qmap->queue_offset;
I'm not sure if we should try something better than just assigning all CPUs to a single queue (which we seem to be doing), but I suppose we don't expect masks alloc to fail and there are bigger issues to deal with if it does ....
Quoted 29 lines
block/blk-mq-cpumap.c +5
-18+return ; } -for_each_possible_cpu (cpu) { -if (map[cpu] !=-1 ) -continue ; -/* -* First do sequential mapping between CPUs and queues. -* In case we still have CPUs to map, and we have some number of -* threads per cores then map sibling threads to the same queue -* for performance optimizations. -*/ -if (q < nr_queues) { - map[cpu] =queue_index (qmap, nr_queues, q++); - }else { - first_sibling =get_first_sibling (cpu); -if (first_sibling == cpu) - map[cpu] =queue_index (qmap, nr_queues, q++); -else - map[cpu] = map[first_sibling]; - } +for (queue =0 ; queue < qmap->nr_queues; queue++) { +for_each_cpu (cpu, &masks[queue]) + qmap->mq_map[cpu] = qmap->queue_offset + queue; } +kfree (masks); }EXPORT_SYMBOL_GPL (blk_mq_map_queues);
[tip: irq/core] blk-mq: Build default queue map via group_cpus_evenly()
In reply to Ming LeiThe following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: 6a6dcae8f486c3f3298d0767d34505121c7b0b81 Gitweb: https://git.kernel.org/tip/6a6dcae8f486c3f3298d0767d34505121c7b0b81 Author: Ming Lei <[email protected]> AuthorDate: Tue, 27 Dec 2022 10:29:05 +08:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 17 Jan 2023 18:50:06 +01:00
blk-mq: Build default queue map via group_cpus_evenly()
The default queue mapping builder of blk_mq_map_queues doesn't take NUMA topo into account, so the built mapping is pretty bad, since CPUs belonging to different NUMA node are assigned to same queue. It is observed that IOPS drops by ~30% when running two jobs on same hctx of null_blk from two CPUs belonging to two NUMA nodes compared with from same NUMA node.
Address the issue by reusing group_cpus_evenly() for building queue mapping since group_cpus_evenly() does group cpus according to CPU/NUMA locality.
Also performance data becomes more stable with this given correct queue mapping is applied wrt. numa locality viewpoint, for example, on one two nodes arm64 machine with 160 cpus, node 0(cpu 0~79), node 1(cpu 80~159):
1) modprobe null_blk nr_devices=1 submit_queues=2
2) run 'fio(t/io_uring -p 0 -n 4 -r 20 /dev/nullb0)', and observe that IOPS becomes much stable on multiple tests:
- unpatched: IOPS is 2.5M ~ 4.5M
- patched: IOPS is 4.3M ~ 5.0M
Lots of drivers may benefit from the change, such as nvme pci poll, nvme tcp, ...
--- block/blk-mq-cpumap.c | 63 ++++++++---------------------------------- 1 file changed, 13 insertions(+), 50 deletions(-)
block/blk-mq-cpumap.c +13 -50
@@ -10,66 +10,29 @@#include <linux/mm.h> #include <linux/smp.h> #include <linux/cpu.h> +#include <linux/group_cpus.h> #include <linux/blk-mq.h> #include "blk.h" #include "blk-mq.h" -static int queue_index (struct blk_mq_queue_map *qmap, -unsigned int nr_queues,const int q) -{ -return qmap->queue_offset + (q % nr_queues); -} - -static int get_first_sibling (unsigned int cpu) -{ -unsigned int ret; - - ret =cpumask_first (topology_sibling_cpumask (cpu)); -if (ret < nr_cpu_ids) -return ret; - -return cpu; -} -void blk_mq_map_queues (struct blk_mq_queue_map *qmap) { -unsigned int *map = qmap->mq_map; -unsigned int nr_queues = qmap->nr_queues; -unsigned int cpu, first_sibling, q =0 ; - -for_each_possible_cpu (cpu) - map[cpu] =-1 ; - -/* -* Spread queues among present CPUs first for minimizing -* count of dead queues which are mapped by all un-present CPUs -*/ -for_each_present_cpu (cpu) { -if (q >= nr_queues) -break ; - map[cpu] =queue_index (qmap, nr_queues, q++); +const struct cpumask *masks; +unsigned int queue, cpu; + + masks =group_cpus_evenly (qmap->nr_queues); +if (!masks) { +for_each_possible_cpu (cpu) + qmap->mq_map[cpu] = qmap->queue_offset; +return ; } -for_each_possible_cpu (cpu) { -if (map[cpu] !=-1 ) -continue ; -/* -* First do sequential mapping between CPUs and queues. -* In case we still have CPUs to map, and we have some number of -* threads per cores then map sibling threads to the same queue -* for performance optimizations. -*/ -if (q < nr_queues) { - map[cpu] =queue_index (qmap, nr_queues, q++); - }else { - first_sibling =get_first_sibling (cpu); -if (first_sibling == cpu) - map[cpu] =queue_index (qmap, nr_queues, q++); -else - map[cpu] = map[first_sibling]; - } +for (queue =0 ; queue < qmap->nr_queues; queue++) { +for_each_cpu (cpu, &masks[queue]) + qmap->mq_map[cpu] = qmap->queue_offset + queue; } +kfree (masks); }EXPORT_SYMBOL_GPL (blk_mq_map_queues);
Hello Thomas, Jens and guys,
Quoted 13 lines · Ming Lei
Hello,
irq_build_affinity_masks()actually grouping CPUs evenly into each managed irq vector according to NUMA and CPU locality, and it is reasonable to abstract one generic API for grouping CPUs evenly, the idea is suggested by Thomas Gleixner.
group_cpus_evenly()is abstracted and put intolib/, so blk-mq can re-use it to build default queue mapping.blk-mq IO perf data is observed as more stable, meantime with big improvement, see detailed data in the last patch.
Quoted 7 lines
Please consider it for v6.3!
V4:
- address comments from John, not export the API, given so far no module uses this symbol
- add maintainer entry for new addedlib/group_cpus.c
- rebase on 6.2
Any chance to take a look at this patchset?
thanks,
Ming
Quoted 16 lines · Ming Lei
Quoted 15 lines · Ming Lei
Hello,
irq_build_affinity_masks()actually grouping CPUs evenly into each managed irq vector according to NUMA and CPU locality, and it is reasonable to abstract one generic API for grouping CPUs evenly, the idea is suggested by Thomas Gleixner.
group_cpus_evenly()is abstracted and put intolib/, so blk-mq can re-use it to build default queue mapping.blk-mq IO perf data is observed as more stable, meantime with big improvement, see detailed data in the last patch.
Please consider it for v6.3!
Quoted 7 lines
Quoted 5 lines
V4:
- address comments from John, not export the API, given so far no module uses this symbol
- add maintainer entry for new addedlib/group_cpus.c
- rebase on 6.2Any chance to take a look at this patchset?
I'm at it. My sickness+vacation induced backlog is horrible ....
Quoted 23 lines · Thomas Gleixner
Quoted 22 lines · Ming Lei
Quoted 20 lines · Ming Lei
Hello,
irq_build_affinity_masks()actually grouping CPUs evenly into each managed irq vector according to NUMA and CPU locality, and it is reasonable to abstract one generic API for grouping CPUs evenly, the idea is suggested by Thomas Gleixner.
group_cpus_evenly()is abstracted and put intolib/, so blk-mq can re-use it to build default queue mapping.blk-mq IO perf data is observed as more stable, meantime with big improvement, see detailed data in the last patch.
Please consider it for v6.3!
V4:
- address comments from John, not export the API, given so far no module uses this symbol
- add maintainer entry for new addedlib/group_cpus.c
- rebase on 6.2
Quoted 3 lines
Quoted 1 line
Any chance to take a look at this patchset?
I'm at it. My sickness+vacation induced backlog is horrible ....
Thanks for the response, and wish you good health.
thanks,
Ming
Jens Axboe
maintainerQuoted 1 line · Ming Lei
Hello Thomas, Jens and guys,
I took a look and it looks good to me, no immediate issues spotted.
Signature · 1 line
Jens Axboe
Jens!
Quoted 4 lines · Jens Axboe
Quoted 1 line · Ming Lei
Hello Thomas, Jens and guys,
I took a look and it looks good to me, no immediate issues spotted.
Want me to take the blk-mq change through tip too or do you prefer to merge that into your tree?
If this goes through tip, I'd appreciate an Ack. If you want it through block, then I give you a tag with the irq parts for you to pull.
Thanks,
tglx
Quoted 6 lines · Thomas Gleixner
Jens!
Quoted 3 lines · Jens Axboe
Quoted 1 line · Ming Lei
Hello Thomas, Jens and guys,
Quoted 7 lines
Quoted 1 line
I took a look and it looks good to me, no immediate issues spotted.
Want me to take the blk-mq change through tip too or do you prefer to merge that into your tree?
If this goes through tip, I'd appreciate an Ack. If you want it through block, then I give you a tag with the irq parts for you to pull.
I think the risk of conflicts there is going to be very small, so please just take it through the tip tree. You can add my:
to the series. Thanks!
Signature · 1 line
Jens Axboe
Quoted 5 lines · Ming Lei
irq_build_affinity_masks()actually grouping CPUs evenly into each managed irq vector according to NUMA and CPU locality, and it is reasonable to abstract one generic API for grouping CPUs evenly, the idea is suggested by Thomas Gleixner.
Quoted 7 lines
group_cpus_evenly()is abstracted and put intolib/, so blk-mq can re-use it to build default queue mapping.blk-mq IO perf data is observed as more stable, meantime with big improvement, see detailed data in the last patch.
Please consider it for v6.3!
Just wondering could this be a better alternative for some drivers than using cpumask_local_spread()?
Thanks,
John