From: Mike Danese <mikedanese@google.com>
To: netdev@vger.kernel.org
Cc: Mike Danese <mikedanese@google.com>,
"David S. Miller" <davem@davemloft.net>,
Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>,
James Morris <jmorris@namei.org>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
Patrick McHardy <kaber@trash.net>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH] net: refactor icmp_global_allow to improve readability and performance.
Date: Thu, 31 Dec 2015 23:58:11 -0800 [thread overview]
Message-ID: <1451635091-109673-1-git-send-email-mikedanese@google.com> (raw)
We can reduce the number of operations performed by icmp_global_allow
and make the routine more readable by refactoring it in two ways:
First, this patch refactors the meaning of the "delta" variable. Before
this change, it meant min("time since last refill of token bucket", HZ).
After this change, it means "time since last refill". The original
definition is required only once but was being calculated twice. The new
meaning is also more intuitive for a variable named "delta".
Second, by calculating "delta" (time since last refill of token bucket)
and "cbr" (token bucket can be refilled) at the beginning of the
routine, we reduce the number of repeated calculations of these two
variables.
There should be no functional difference.
Signed-off-by: Mike Danese <mikedanese@google.com>
---
net/ipv4/icmp.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 36e2697..4e5942d 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -252,22 +252,21 @@ static struct {
*/
bool icmp_global_allow(void)
{
- u32 credit, delta, incr = 0, now = (u32)jiffies;
+ u32 credit, incr = 0, now = (u32)jiffies;
+ u32 delta = now - icmp_global.stamp;
bool rc = false;
+ /* Token bucket can be refilled every (HZ/50) jiffies if necessary. */
+ bool cbr = delta >= HZ / 50;
/* Check if token bucket is empty and cannot be refilled
* without taking the spinlock.
*/
- if (!icmp_global.credit) {
- delta = min_t(u32, now - icmp_global.stamp, HZ);
- if (delta < HZ / 50)
- return false;
- }
+ if (!icmp_global.credit && !cbr)
+ return false;
spin_lock(&icmp_global.lock);
- delta = min_t(u32, now - icmp_global.stamp, HZ);
- if (delta >= HZ / 50) {
- incr = sysctl_icmp_msgs_per_sec * delta / HZ ;
+ if (cbr) {
+ incr = sysctl_icmp_msgs_per_sec * min_t(u32, delta, HZ) / HZ;
if (incr)
icmp_global.stamp = now;
}
--
2.5.0
next reply other threads:[~2016-01-01 7:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-01 7:58 Mike Danese [this message]
2016-01-01 23:07 ` Eric Dumazet
2016-01-02 3:20 ` Mike Danese
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=1451635091-109673-1-git-send-email-mikedanese@google.com \
--to=mikedanese@google.com \
--cc=davem@davemloft.net \
--cc=jmorris@namei.org \
--cc=kaber@trash.net \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=yoshfuji@linux-ipv6.org \
/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
all inboxes | Powered by JetHome®