浏览代码

virtio_net: fix PAGE_SIZE > 64k

I don't have any guests with PAGE_SIZE > 64k but the
code seems to be clearly broken in that case
as PAGE_SIZE / MERGEABLE_BUFFER_ALIGN will need
more than 8 bit and so the code in mergeable_ctx_to_buf_address
does not give us the actual true size.

Cc: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Michael S. Tsirkin 8 年之前
父节点
当前提交
d0fa28f000
共有 1 个文件被更改,包括 9 次插入1 次删除
  1. 9 1
      drivers/net/virtio_net.c

+ 9 - 1
drivers/net/virtio_net.c

@@ -48,8 +48,16 @@ module_param(gso, bool, 0444);
  */
  */
 DECLARE_EWMA(pkt_len, 1, 64)
 DECLARE_EWMA(pkt_len, 1, 64)
 
 
+/* With mergeable buffers we align buffer address and use the low bits to
+ * encode its true size. Buffer size is up to 1 page so we need to align to
+ * square root of page size to ensure we reserve enough bits to encode the true
+ * size.
+ */
+#define MERGEABLE_BUFFER_MIN_ALIGN_SHIFT ((PAGE_SHIFT + 1) / 2)
+
 /* Minimum alignment for mergeable packet buffers. */
 /* Minimum alignment for mergeable packet buffers. */
-#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
+#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, \
+				   1 << MERGEABLE_BUFFER_MIN_ALIGN_SHIFT)
 
 
 #define VIRTNET_DRIVER_VERSION "1.0.0"
 #define VIRTNET_DRIVER_VERSION "1.0.0"