Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
myri10ge: fix management of the firmware 4KB boundary crossing restriction
Simpler way of dealing with the firmware 4KB boundary crossing
restriction for rx buffers. This fixes a variety of memory
corruption issues when using an "uncommon" MTU with a 16KB
page size.
Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
authored by Brice Goglin and committed by Jeff Garzik ae8509b1 6cdbd77e
+8
-11
drivers/net/myri10ge/myri10ge.c
+8
-11
drivers/net/myri10ge/myri10ge.c
···
900
900
/* try to refill entire ring */
901
901
while (rx->fill_cnt != (rx->cnt + rx->mask + 1)) {
902
902
idx = rx->fill_cnt & rx->mask;
903
-
904
-
if ((bytes < MYRI10GE_ALLOC_SIZE / 2) &&
905
-
(rx->page_offset + bytes <= MYRI10GE_ALLOC_SIZE)) {
903
+
if (rx->page_offset + bytes <= MYRI10GE_ALLOC_SIZE) {
906
904
/* we can use part of previous page */
907
905
get_page(rx->page);
908
-
#if MYRI10GE_ALLOC_SIZE > 4096
909
-
/* Firmware cannot cross 4K boundary.. */
910
-
if ((rx->page_offset >> 12) !=
911
-
((rx->page_offset + bytes - 1) >> 12)) {
912
-
rx->page_offset =
913
-
(rx->page_offset + bytes) & ~4095;
914
-
}
915
-
#endif
916
906
} else {
917
907
/* we need a new page */
918
908
page =
···
931
941
932
942
/* start next packet on a cacheline boundary */
933
943
rx->page_offset += SKB_DATA_ALIGN(bytes);
944
+
945
+
#if MYRI10GE_ALLOC_SIZE > 4096
946
+
/* don't cross a 4KB boundary */
947
+
if ((rx->page_offset >> 12) !=
948
+
((rx->page_offset + bytes - 1) >> 12))
949
+
rx->page_offset = (rx->page_offset + 4096) & ~4095;
950
+
#endif
934
951
rx->fill_cnt++;
935
952
936
953
/* copy 8 descriptors to the firmware at a time */