* [PATCH] myri10ge: optimize 4k-boundary check when stocking rx pages
@ 2010-02-24 22:11 Brice Goglin
2010-02-26 12:19 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Brice Goglin @ 2010-02-24 22:11 UTC (permalink / raw)
To: David S. Miller; +Cc: Linux Network Development list
Small optimization to the code which checks to see if we'd cross
a 4K boundary when stocking RX ring.
Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Andrew Gallatin <gallatin@myri.com>
Signed-off-by: Guillaume Morin <guillaume@morinfr.org>
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index c0884a9..03f9fc0 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -75,7 +75,7 @@
#include "myri10ge_mcp.h"
#include "myri10ge_mcp_gen_header.h"
-#define MYRI10GE_VERSION_STR "1.5.1-1.453"
+#define MYRI10GE_VERSION_STR "1.5.2-1.459"
MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");
MODULE_AUTHOR("Maintainer: help@myri.com");
@@ -1201,6 +1201,9 @@ myri10ge_alloc_rx_pages(struct myri10ge_priv *mgp, struct myri10ge_rx_buf *rx,
{
struct page *page;
int idx;
+#if MYRI10GE_ALLOC_SIZE > 4096
+ int end_offset;
+#endif
if (unlikely(rx->watchdog_needed && !watchdog))
return;
@@ -1242,9 +1245,9 @@ myri10ge_alloc_rx_pages(struct myri10ge_priv *mgp, struct myri10ge_rx_buf *rx,
#if MYRI10GE_ALLOC_SIZE > 4096
/* don't cross a 4KB boundary */
- if ((rx->page_offset >> 12) !=
- ((rx->page_offset + bytes - 1) >> 12))
- rx->page_offset = (rx->page_offset + 4096) & ~4095;
+ end_offset = rx->page_offset + bytes - 1;
+ if ((unsigned)(rx->page_offset ^ end_offset) > 4095)
+ rx->page_offset = end_offset & ~4095;
#endif
rx->fill_cnt++;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] myri10ge: optimize 4k-boundary check when stocking rx pages
2010-02-24 22:11 [PATCH] myri10ge: optimize 4k-boundary check when stocking rx pages Brice Goglin
@ 2010-02-26 12:19 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-02-26 12:19 UTC (permalink / raw)
To: brice; +Cc: netdev
From: Brice Goglin <brice@myri.com>
Date: Wed, 24 Feb 2010 23:11:19 +0100
> Small optimization to the code which checks to see if we'd cross
> a 4K boundary when stocking RX ring.
>
> Signed-off-by: Brice Goglin <brice@myri.com>
> Signed-off-by: Andrew Gallatin <gallatin@myri.com>
> Signed-off-by: Guillaume Morin <guillaume@morinfr.org>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-02-26 12:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-24 22:11 [PATCH] myri10ge: optimize 4k-boundary check when stocking rx pages Brice Goglin
2010-02-26 12:19 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).