| Message ID | 20220919210559.1509179-3-yury.norov@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | cpumask: repair cpumask_check() | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Guessing tree name failed - patch did not apply, async |
On Mon, 19 Sep 2022 14:05:54 -0700 Yury Norov wrote: > The functions require to be passed with a cpu index prior to one that is > the first to start search, so the valid input range is [-1, nr_cpu_ids-1). > However, the code checks against [-1, nr_cpu_ids). Yup, the analysis looks correct: Acked-by: Jakub Kicinski <kuba@kernel.org>
On Mon, Sep 26, 2022 at 10:34:37AM -0700, Jakub Kicinski wrote: > On Mon, 19 Sep 2022 14:05:54 -0700 Yury Norov wrote: > > The functions require to be passed with a cpu index prior to one that is > > the first to start search, so the valid input range is [-1, nr_cpu_ids-1). > > However, the code checks against [-1, nr_cpu_ids). > > Yup, the analysis looks correct: > > Acked-by: Jakub Kicinski <kuba@kernel.org> Thanks. If no other comments from you and others, I'll take the series in bitmap-for-next.
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 05d6f3facd5a..4d6d5a2dd82e 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3643,9 +3643,8 @@ static inline bool netif_attr_test_online(unsigned long j, static inline unsigned int netif_attrmask_next(int n, const unsigned long *srcp, unsigned int nr_bits) { - /* -1 is a legal arg here. */ - if (n != -1) - cpu_max_bits_warn(n, nr_bits); + /* n is a prior cpu */ + cpu_max_bits_warn(n + 1, nr_bits); if (srcp) return find_next_bit(srcp, nr_bits, n + 1); @@ -3666,9 +3665,8 @@ static inline int netif_attrmask_next_and(int n, const unsigned long *src1p, const unsigned long *src2p, unsigned int nr_bits) { - /* -1 is a legal arg here. */ - if (n != -1) - cpu_max_bits_warn(n, nr_bits); + /* n is a prior cpu */ + cpu_max_bits_warn(n + 1, nr_bits); if (src1p && src2p) return find_next_and_bit(src1p, src2p, nr_bits, n + 1);
The functions require to be passed with a cpu index prior to one that is the first to start search, so the valid input range is [-1, nr_cpu_ids-1). However, the code checks against [-1, nr_cpu_ids). Signed-off-by: Yury Norov <yury.norov@gmail.com> --- include/linux/netdevice.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)