From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
jogreene@redhat.com, Jacob Keller <jacob.e.keller@intel.com>
Subject: [net-next 23/25] fm10k: mbx_update_max_size does not drop all oversized messages
Date: Tue, 14 Apr 2015 16:51:09 -0700 [thread overview]
Message-ID: <1429055471-401-24-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1429055471-401-1-git-send-email-jeffrey.t.kirsher@intel.com>
When we call update_max_size it does not drop all oversized messages.
This is due to the difficulty in performing this operation, since it is
a FIFO which makes updating anything other than head or tail very
difficult. To fix this, modify validate_msg_size to ensure that we error
out later when trying to transmit the message that could be oversized.
This will generally be a rare condition, as it requires the FIFO to
include a message larger than the max_size negotiated during mailbox
connect. Note that max_size is always smaller than rx.size so it should
be safe to use here.
Also, update the update_max_size function header comment to clearly
indicate that it does not drop all oversized messages, but only those at
the head of the FIFO.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Acked-by: Matthew Vick <matthew.vick@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
---
drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c b/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c
index 27f8279..1b27383 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c
@@ -327,7 +327,7 @@ static u16 fm10k_mbx_validate_msg_size(struct fm10k_mbx_info *mbx, u16 len)
} while (total_len < len);
/* message extends out of pushed section, but fits in FIFO */
- if ((len < total_len) && (msg_len <= mbx->rx.size))
+ if ((len < total_len) && (msg_len <= mbx->max_size))
return 0;
/* return length of invalid section */
@@ -1063,8 +1063,11 @@ static void fm10k_mbx_reset_work(struct fm10k_mbx_info *mbx)
* @mbx: pointer to mailbox
* @size: new value for max_size
*
- * This function will update the max_size value and drop any outgoing messages
- * from the head of the Tx FIFO that are larger than max_size.
+ * This function updates the max_size value and drops any outgoing messages
+ * at the head of the Tx FIFO if they are larger than max_size. It does not
+ * drop all messages, as this is too difficult to parse and remove them from
+ * the FIFO. Instead, rely on the checking to ensure that messages larger
+ * than max_size aren't pushed into the memory buffer.
**/
static void fm10k_mbx_update_max_size(struct fm10k_mbx_info *mbx, u16 size)
{
--
1.9.3
next prev parent reply other threads:[~2015-04-14 23:51 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-14 23:50 [net-next 00/25][pull request] Intel Wired LAN Driver Updates 2015-04-14 Jeff Kirsher
2015-04-14 23:50 ` [net-next 01/25] fm10k: Corrected an error in Tx statistics Jeff Kirsher
2015-04-14 23:50 ` [net-next 02/25] fm10k: Remove redundant rx_errors in ethtool Jeff Kirsher
2015-04-14 23:50 ` [net-next 03/25] fm10k: Correct spelling mistake Jeff Kirsher
2015-04-14 23:50 ` [net-next 04/25] fm10k: Have the VF get the default VLAN during init Jeff Kirsher
2015-04-14 23:50 ` [net-next 05/25] fm10k: Add netconsole support Jeff Kirsher
2015-04-14 23:50 ` [net-next 06/25] fm10k: fix unused warnings Jeff Kirsher
2015-04-14 23:50 ` [net-next 07/25] fm10k: allow creation of VLAN on default vid Jeff Kirsher
2015-04-14 23:50 ` [net-next 08/25] fm10k: only show actual queues, not the maximum in hardware Jeff Kirsher
2015-04-14 23:50 ` [net-next 09/25] fm10k: use hw->mac.max_queues for stats Jeff Kirsher
2015-04-14 23:50 ` [net-next 10/25] fm10k: separate PF only stats so that VF does not display them Jeff Kirsher
2015-04-14 23:50 ` [net-next 11/25] fm10k: remove extraneous "Reset interface" message Jeff Kirsher
2015-04-14 23:50 ` [net-next 12/25] fm10k: only increment tx_timeout_count in Tx hang path Jeff Kirsher
2015-04-14 23:50 ` [net-next 13/25] fm10k: expose tx_timeout_count as an ethtool stat Jeff Kirsher
2015-04-14 23:51 ` [net-next 14/25] fm10k: Set PF queues to unlimited bandwidth during virtualization Jeff Kirsher
2015-04-14 23:51 ` [net-next 15/25] fm10k: use separate workqueue for fm10k driver Jeff Kirsher
2015-04-14 23:51 ` [net-next 16/25] fm10k: don't handle mailbox events in iov_event path and always process mailbox Jeff Kirsher
2015-04-14 23:51 ` [net-next 17/25] fm10k: comment next_vf_mbx flow Jeff Kirsher
2015-04-14 23:51 ` [net-next 18/25] fm10k: fix function header comment Jeff Kirsher
2015-04-14 23:51 ` [net-next 19/25] fm10k: start service timer on probe Jeff Kirsher
2015-04-14 23:51 ` [net-next 20/25] fm10k: update xcast mode before synchronizing multicast addresses Jeff Kirsher
2015-04-14 23:51 ` [net-next 21/25] fm10k: renamed mbx_tx_dropped to mbx_tx_oversized Jeff Kirsher
2015-04-14 23:51 ` [net-next 22/25] fm10k: reset head instead of calling update_max_size Jeff Kirsher
2015-04-14 23:51 ` Jeff Kirsher [this message]
2015-04-14 23:51 ` [net-next 24/25] fm10k: corrected VF multicast update Jeff Kirsher
2015-04-14 23:51 ` [net-next 25/25] fm10k: Bump driver version to 0.15.2 Jeff Kirsher
2015-04-15 2:38 ` [net-next 00/25][pull request] Intel Wired LAN Driver Updates 2015-04-14 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1429055471-401-24-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=jacob.e.keller@intel.com \
--cc=jogreene@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).