From: Stephen Hemminger <shemminger@vyatta•com>
To: David Miller <davem@davemloft•net>
Cc: netdev@vger•kernel.org
Subject: [PATCH 2/4] net: add likely/unlikely to skb_header_pointer
Date: Mon, 02 Aug 2010 15:00:32 -0700 [thread overview]
Message-ID: <20100802220113.643085589@vyatta.com> (raw)
In-Reply-To: 20100802220030.991706005@vyatta.com
[-- Attachment #1: u32-header-likely.patch --]
[-- Type: text/plain, Size: 711 bytes --]
The expected case that should be optimized is that the offset is valid
and the data is available.
Signed-off-by: Stephen Hemminger <shemminger@vyatta•com>
--- a/include/linux/skbuff.h 2010-08-01 11:20:15.872942674 -0700
+++ b/include/linux/skbuff.h 2010-08-01 11:20:59.513693007 -0700
@@ -1853,13 +1853,13 @@ static inline void *skb_header_pointer(c
{
int hlen = skb_headlen(skb);
- if (hlen + offset < 0)
+ if (unlikely(hlen + offset < 0))
return NULL;
- if (hlen - offset >= len)
+ if (likely(hlen - offset >= len))
return skb->data + offset;
- if (skb_copy_bits(skb, offset, buffer, len) < 0)
+ if (unlikely(skb_copy_bits(skb, offset, buffer, len) < 0))
return NULL;
return buffer;
next prev parent reply other threads:[~2010-08-02 22:09 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-02 22:00 [PATCH 0/4] u32 classifier fixes Stephen Hemminger
2010-08-02 22:00 ` [PATCH 1/4] net: check for reference outside of skb Stephen Hemminger
2010-08-02 22:59 ` David Miller
2010-08-02 23:11 ` Changli Gao
2010-08-02 23:21 ` Stephen Hemminger
2010-08-02 23:25 ` Changli Gao
2010-08-02 22:00 ` Stephen Hemminger [this message]
2010-08-02 22:00 ` [PATCH 3/4] u32: allow negative offset Stephen Hemminger
2010-08-02 22:00 ` [PATCH 4/4] u32: use get_unaligned_be32 Stephen Hemminger
2010-08-02 22:34 ` Changli Gao
2010-08-02 22:45 ` Stephen Hemminger
2010-08-02 22:55 ` Ben Hutchings
2010-08-02 23:01 ` Changli Gao
2010-08-02 23:44 ` [PATCH] u32: negative offset fix Stephen Hemminger
2010-08-03 5:08 ` David Miller
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=20100802220113.643085589@vyatta.com \
--to=shemminger@vyatta$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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