From: Yury Norov <yury.norov@gmail.com>
To: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Simon Horman <horms@kernel.org>,
Felix Maurer <fmaurer@redhat.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Kexin Sun <kexinsun@smail.nju.edu.cn>,
Yury Norov <ynorov@nvidia.com>,
Quan Sun <2022090917019@std.uestc.edu.cn>,
Luka Gejak <luka.gejak@linux.dev>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] net: hsr: simplify fill_last_seq_nrs()
Date: Tue, 9 Jun 2026 13:15:44 -0400 [thread overview]
Message-ID: <20260609171545.1051322-1-ynorov@nvidia.com> (raw)
The function checks the HSR_PT_SLAVE_A and HSR_PT_SLAVE_B bitmaps
for emptiness right before calling find_last_bit().
This pass may be avoided, because if the bitmap is empty, the
find_last_bit() returns >= HSR_SEQ_BLOCK_SIZE
Signed-off-by: Yury Norov <ynorov@nvidia.com>
---
net/hsr/hsr_framereg.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c
index 124619920d38..bf143b86999b 100644
--- a/net/hsr/hsr_framereg.c
+++ b/net/hsr/hsr_framereg.c
@@ -827,18 +827,14 @@ static void fill_last_seq_nrs(struct hsr_node *node, u16 *if1_seq, u16 *if2_seq)
block_sz = hsr_seq_block_size(node);
block = node->block_buf + block_off * block_sz;
- if (!bitmap_empty(block->seq_nrs[HSR_PT_SLAVE_B - 1],
- HSR_SEQ_BLOCK_SIZE)) {
- seq_bit = find_last_bit(block->seq_nrs[HSR_PT_SLAVE_B - 1],
- HSR_SEQ_BLOCK_SIZE);
+ seq_bit = find_last_bit(block->seq_nrs[HSR_PT_SLAVE_B - 1], HSR_SEQ_BLOCK_SIZE);
+ if (seq_bit < HSR_SEQ_BLOCK_SIZE)
*if1_seq = (block->block_idx << HSR_SEQ_BLOCK_SHIFT) | seq_bit;
- }
- if (!bitmap_empty(block->seq_nrs[HSR_PT_SLAVE_A - 1],
- HSR_SEQ_BLOCK_SIZE)) {
- seq_bit = find_last_bit(block->seq_nrs[HSR_PT_SLAVE_A - 1],
- HSR_SEQ_BLOCK_SIZE);
+
+ seq_bit = find_last_bit(block->seq_nrs[HSR_PT_SLAVE_A - 1], HSR_SEQ_BLOCK_SIZE);
+ if (seq_bit < HSR_SEQ_BLOCK_SIZE)
*if2_seq = (block->block_idx << HSR_SEQ_BLOCK_SHIFT) | seq_bit;
- }
+
spin_unlock_bh(&node->seq_out_lock);
}
--
2.53.0
reply other threads:[~2026-06-09 17:15 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260609171545.1051322-1-ynorov@nvidia.com \
--to=yury.norov@gmail.com \
--cc=2022090917019@std.uestc.edu.cn \
--cc=bigeasy@linutronix.de \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=fmaurer@redhat.com \
--cc=horms@kernel.org \
--cc=kexinsun@smail.nju.edu.cn \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luka.gejak@linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=ynorov@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox