This is a note to let you know that I've just added the patch titled
NTB: Correctly handle receive buffers of the minimal size
to the 3.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ntb-correctly-handle-receive-buffers-of-the-minimal-size.patch
and it can be found in the queue-3.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From c9d534c8cbaedbb522a1d2cb037c6c394f610317 Mon Sep 17 00:00:00 2001
From: Jon Mason <[email protected]>
Date: Fri, 1 Feb 2013 15:45:16 -0700
Subject: NTB: Correctly handle receive buffers of the minimal size
From: Jon Mason <[email protected]>
commit c9d534c8cbaedbb522a1d2cb037c6c394f610317 upstream.
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 <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/ntb/ntb_transport.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
--- a/drivers/ntb/ntb_transport.c
+++ b/drivers/ntb/ntb_transport.c
@@ -490,11 +490,12 @@ static void ntb_transport_setup_qp_mw(st
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(str
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) {
Patches currently in stable-queue which might be from [email protected] are
queue-3.9/ntb-fix-pointer-math-issues.patch
queue-3.9/ntb-link-toggle-memory-leak.patch
queue-3.9/ntb-variable-dereferenced-before-check.patch
queue-3.9/ntb-handle-64bit-bar-sizes.patch
queue-3.9/ntb_netdev-remove-from-list-on-exit.patch
queue-3.9/ntb-reset-tx_index-on-link-toggle.patch
queue-3.9/ntb-correctly-handle-receive-buffers-of-the-minimal-size.patch
queue-3.9/ntb-off-by-one-sanity-checks.patch
queue-3.9/ntb-memcpy-lockup-workaround.patch
queue-3.9/ntb-multiple-ntb-client-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
