]> err.no Git - linux-2.6/commitdiff
I/OAT: tcp_dma_copybreak default value dependent on I/OAT version
authorMaciej Sosnowski <maciej.sosnowski@intel.com>
Wed, 23 Jul 2008 00:30:57 +0000 (17:30 -0700)
committerDan Williams <dan.j.williams@intel.com>
Wed, 23 Jul 2008 00:30:57 +0000 (17:30 -0700)
I/OAT DMA performance tuning showed different optimal values of
tcp_dma_copybreak for different I/OAT versions (4096 for 1.2 and 2048
for 2.0).  This patch lets ioatdma driver set tcp_dma_copybreak value
according to these results.

[dan.j.williams@intel.com: remove some ifdefs]
Signed-off-by: Maciej Sosnowski <maciej.sosnowski@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
drivers/dma/ioat_dma.c
drivers/dma/ioatdma.h
net/core/user_dma.c

index da572968a7db2a9502ef11b13e9408b0d25f0335..ece5a0e3a3353f99b087f5946c25abdc29c2215b 100644 (file)
@@ -1581,6 +1581,8 @@ struct ioatdma_device *ioat_dma_probe(struct pci_dev *pdev,
        if (err)
                goto err_self_test;
 
+       ioat_set_tcp_copy_break(device);
+
        dma_async_device_register(&device->common);
 
        INIT_DELAYED_WORK(&device->work, ioat_dma_chan_watchdog);
index c6ec933f98958bd2e8a8ce5efc603e1ef0745d97..685adb62aa5af7835eefaafa523faeefa5c4a5a3 100644 (file)
@@ -27,6 +27,7 @@
 #include <linux/dmapool.h>
 #include <linux/cache.h>
 #include <linux/pci_ids.h>
+#include <net/tcp.h>
 
 #define IOAT_DMA_VERSION  "2.18"
 
@@ -129,6 +130,20 @@ struct ioat_desc_sw {
        struct dma_async_tx_descriptor async_tx;
 };
 
+static inline void ioat_set_tcp_copy_break(struct ioatdma_device *dev)
+{
+       #ifdef CONFIG_NET_DMA
+       switch (dev->version) {
+       case IOAT_VER_1_2:
+               sysctl_tcp_dma_copybreak = 4096;
+               break;
+       case IOAT_VER_2_0:
+               sysctl_tcp_dma_copybreak = 2048;
+               break;
+       }
+       #endif
+}
+
 #if defined(CONFIG_INTEL_IOATDMA) || defined(CONFIG_INTEL_IOATDMA_MODULE)
 struct ioatdma_device *ioat_dma_probe(struct pci_dev *pdev,
                                      void __iomem *iobase);
index 0ad1cd57bc393b126e5cecbbb0f5638b34d73d97..de760504f6fee9bd94276f7e9b728983cc4a4663 100644 (file)
@@ -34,6 +34,7 @@
 #define NET_DMA_DEFAULT_COPYBREAK 4096
 
 int sysctl_tcp_dma_copybreak = NET_DMA_DEFAULT_COPYBREAK;
+EXPORT_SYMBOL(sysctl_tcp_dma_copybreak);
 
 /**
  *     dma_skb_copy_datagram_iovec - Copy a datagram to an iovec.