| Message ID | 20240930175635.1670111-2-nnac123@linux.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,1/2] ibmvnic: Add stat for tx direct vs tx batched | expand |
On Mon, Sep 30, 2024 at 12:56:35PM -0500, Nick Child wrote: > Previously, the TX header requirement for standard frames was ignored. > This requirement is a bitstring sent from the VIOS which maps to the > type of header information needed during TX. If no header information, > is needed then send subcrq direct can be used (which can be more > performant). > > This bitstring was previously ignored for standard packets (AKA non LSO, > non CSO) due to the belief that the bitstring was over-cautionary. It > turns out that there are some configurations where the backing device > does need header information for transmission of standard packets. If > the information is not supplied then this causes continuous "Adapter > error" transport events. Therefore, this bitstring should be respected > and observed before considering the use of send subcrq direct. > > Fixes: 1c33e29245cc ("ibmvnic: Only record tx completed bytes once per handler") > nit: No blank line between Fixes and other tags please. Slightly more importantly, perhaps naively, I would have thought this Fixes: 076ae667be9f ("net: netconsole: do not pass userdata up to the tail") > Signed-off-by: Nick Child <nnac123@linux.ibm.com> ...
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 53b309ddc63b..cca2ed6ad289 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -2473,9 +2473,11 @@ static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) /* if we are going to send_subcrq_direct this then we need to * update the checksum before copying the data into ltb. Essentially * these packets force disable CSO so that we can guarantee that - * FW does not need header info and we can send direct. + * FW does not need header info and we can send direct. Also, vnic + * server must be able to xmit standard packets without header data */ - if (!skb_is_gso(skb) && !ind_bufp->index && !netdev_xmit_more()) { + if (*hdrs == 0 && !skb_is_gso(skb) && + !ind_bufp->index && !netdev_xmit_more()) { use_scrq_send_direct = true; if (skb->ip_summed == CHECKSUM_PARTIAL && skb_checksum_help(skb))
Previously, the TX header requirement for standard frames was ignored. This requirement is a bitstring sent from the VIOS which maps to the type of header information needed during TX. If no header information, is needed then send subcrq direct can be used (which can be more performant). This bitstring was previously ignored for standard packets (AKA non LSO, non CSO) due to the belief that the bitstring was over-cautionary. It turns out that there are some configurations where the backing device does need header information for transmission of standard packets. If the information is not supplied then this causes continuous "Adapter error" transport events. Therefore, this bitstring should be respected and observed before considering the use of send subcrq direct. Fixes: 1c33e29245cc ("ibmvnic: Only record tx completed bytes once per handler") Signed-off-by: Nick Child <nnac123@linux.ibm.com> --- drivers/net/ethernet/ibm/ibmvnic.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)