diff options
| author | Jon Mason <jon.mason@intel.com> | 2013-02-01 15:45:16 -0700 |
|---|---|---|
| committer | Jon Mason <jon.mason@intel.com> | 2013-05-15 10:57:59 -0700 |
| commit | c9d534c8cbaedbb522a1d2cb037c6c394f610317 (patch) | |
| tree | eaea8a1c31a0a0a0d850b07590704a3b57fdbca5 /drivers/ntb | |
| parent | 90f9e934647e652a69396e18c779215a493271cf (diff) | |
| download | linux-3.10-c9d534c8cbaedbb522a1d2cb037c6c394f610317.tar.gz linux-3.10-c9d534c8cbaedbb522a1d2cb037c6c394f610317.tar.bz2 linux-3.10-c9d534c8cbaedbb522a1d2cb037c6c394f610317.zip | |
NTB: Correctly handle receive buffers of the minimal size
The ring logic of the NTB receive buffer/transmit memory window requires
there to be at least 2 payload sized allotments. For the minimal size
case, split the buffer into two and set the transport_mtu to the
appropriate size.
Signed-off-by: Jon Mason <jon.mason@intel.com>
Diffstat (limited to 'drivers/ntb')
| -rw-r--r-- | drivers/ntb/ntb_transport.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/ntb/ntb_transport.c b/drivers/ntb/ntb_transport.c index 73a000ed7a9..cd9745b062e 100644 --- a/drivers/ntb/ntb_transport.c +++ b/drivers/ntb/ntb_transport.c @@ -490,11 +490,12 @@ static void ntb_transport_setup_qp_mw(struct ntb_transport *nt, rx_size -= sizeof(struct ntb_rx_info); qp->rx_buff = qp->remote_rx_info + 1; - qp->rx_max_frame = min(transport_mtu, rx_size); + /* Due to housekeeping, there must be atleast 2 buffs */ + qp->rx_max_frame = min(transport_mtu, rx_size / 2); qp->rx_max_entry = rx_size / qp->rx_max_frame; qp->rx_index = 0; - qp->remote_rx_info->entry = qp->rx_max_entry; + qp->remote_rx_info->entry = qp->rx_max_entry - 1; /* setup the hdr offsets with 0's */ for (i = 0; i < qp->rx_max_entry; i++) { @@ -818,7 +819,8 @@ static void ntb_transport_init_queue(struct ntb_transport *nt, tx_size -= sizeof(struct ntb_rx_info); qp->tx_mw = qp->rx_info + 1; - qp->tx_max_frame = min(transport_mtu, tx_size); + /* Due to housekeeping, there must be atleast 2 buffs */ + qp->tx_max_frame = min(transport_mtu, tx_size / 2); qp->tx_max_entry = tx_size / qp->tx_max_frame; if (nt->debugfs_dir) { |