| Message ID | 1493986100-24509-5-git-send-email-huxinming820@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
Xinming Hu <huxinming820@gmail.com> writes: > From: Xinming Hu <huxm@marvell.com> > > Tcp ack should be send as soon to avoid throuput drop during receive tcp > traffic. > > Signed-off-by: Xinming Hu <huxm@marvell.com> > Signed-off-by: Cathy Luo <cluo@marvell.com> > Signed-off-by: Ganapathi Bhat <gbhat@marvell.com> [...] > +static bool is_piggyback_tcp_ack(struct sk_buff *skb) > +{ > + struct ethhdr *ethh = NULL; > + struct iphdr *iph = NULL; > + struct tcphdr *tcph = NULL; > + > + ethh = (struct ethhdr *)skb->data; > + if (ntohs(ethh->h_proto) != ETH_P_IP) > + return false; > + > + iph = (struct iphdr *)((u8 *)ethh + sizeof(struct ethhdr)); > + if (iph->protocol != IPPROTO_TCP) > + return false; > + > + tcph = (struct tcphdr *)((u8 *)iph + iph->ihl * 4); > + /* Piggyback ack without payload*/ > + if (*((u8 *)tcph + 13) == 0x10 && > + ntohs(iph->tot_len) <= (iph->ihl + tcph->doff) * 4) { > + return true; > + } It's rather ugly to use magic values (13 and 0x10) like that. Can't you use some of the existing defines? At least I see TCP_FLAG_ACK and struct tcphdr::ack being available, so you should even have choises what to use.
Hi Kalle, > -----Original Message----- > From: Kalle Valo [mailto:kvalo@codeaurora.org] > Sent: 2017年5月18日 22:33 > To: Xinming Hu > Cc: Linux Wireless; Brian Norris; Dmitry Torokhov; rajatja@google.com; > Zhiyuan Yang; Cathy Luo; Xinming Hu; Ganapathi Bhat > Subject: Re: [PATCH v2 5/6] mwifiex: do not aggregate tcp ack in usb tx > aggregation queue > > Xinming Hu <huxinming820@gmail.com> writes: > > > From: Xinming Hu <huxm@marvell.com> > > > > Tcp ack should be send as soon to avoid throuput drop during receive > > tcp traffic. > > > > Signed-off-by: Xinming Hu <huxm@marvell.com> > > Signed-off-by: Cathy Luo <cluo@marvell.com> > > Signed-off-by: Ganapathi Bhat <gbhat@marvell.com> > > [...] > > > +static bool is_piggyback_tcp_ack(struct sk_buff *skb) { > > + struct ethhdr *ethh = NULL; > > + struct iphdr *iph = NULL; > > + struct tcphdr *tcph = NULL; > > + > > + ethh = (struct ethhdr *)skb->data; > > + if (ntohs(ethh->h_proto) != ETH_P_IP) > > + return false; > > + > > + iph = (struct iphdr *)((u8 *)ethh + sizeof(struct ethhdr)); > > + if (iph->protocol != IPPROTO_TCP) > > + return false; > > + > > + tcph = (struct tcphdr *)((u8 *)iph + iph->ihl * 4); > > + /* Piggyback ack without payload*/ > > + if (*((u8 *)tcph + 13) == 0x10 && > > + ntohs(iph->tot_len) <= (iph->ihl + tcph->doff) * 4) { > > + return true; > > + } > > It's rather ugly to use magic values (13 and 0x10) like that. Can't you use some > of the existing defines? At least I see TCP_FLAG_ACK and struct tcphdr::ack > being available, so you should even have choises what to use. > My wrong. Will resend V3 serials. Thanks for the review. Regards, Simon > -- > Kalle Valo
diff --git a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c index e8ffb26..cbf3bc2 100644 --- a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c +++ b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c @@ -194,6 +194,10 @@ if (tx_info_src->flags & MWIFIEX_BUF_FLAG_TDLS_PKT) tx_info_aggr->flags |= MWIFIEX_BUF_FLAG_TDLS_PKT; + + if (tx_info_src->flags & MWIFIEX_BUF_FLAG_TCP_ACK) + tx_info_aggr->flags |= MWIFIEX_BUF_FLAG_TCP_ACK; + tx_info_aggr->flags |= MWIFIEX_BUF_FLAG_AGGR_PKT; skb_aggr->priority = skb_src->priority; skb_aggr->tstamp = skb_src->tstamp; diff --git a/drivers/net/wireless/marvell/mwifiex/decl.h b/drivers/net/wireless/marvell/mwifiex/decl.h index 188e4c3..0487420 100644 --- a/drivers/net/wireless/marvell/mwifiex/decl.h +++ b/drivers/net/wireless/marvell/mwifiex/decl.h @@ -89,6 +89,7 @@ #define MWIFIEX_BUF_FLAG_EAPOL_TX_STATUS BIT(3) #define MWIFIEX_BUF_FLAG_ACTION_TX_STATUS BIT(4) #define MWIFIEX_BUF_FLAG_AGGR_PKT BIT(5) +#define MWIFIEX_BUF_FLAG_TCP_ACK BIT(6) #define MWIFIEX_BRIDGED_PKTS_THR_HIGH 1024 #define MWIFIEX_BRIDGED_PKTS_THR_LOW 128 diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c index dc79d1a..5c7fbc6 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.c +++ b/drivers/net/wireless/marvell/mwifiex/main.c @@ -851,6 +851,30 @@ struct sk_buff * return skb; } +static bool is_piggyback_tcp_ack(struct sk_buff *skb) +{ + struct ethhdr *ethh = NULL; + struct iphdr *iph = NULL; + struct tcphdr *tcph = NULL; + + ethh = (struct ethhdr *)skb->data; + if (ntohs(ethh->h_proto) != ETH_P_IP) + return false; + + iph = (struct iphdr *)((u8 *)ethh + sizeof(struct ethhdr)); + if (iph->protocol != IPPROTO_TCP) + return false; + + tcph = (struct tcphdr *)((u8 *)iph + iph->ihl * 4); + /* Piggyback ack without payload*/ + if (*((u8 *)tcph + 13) == 0x10 && + ntohs(iph->tot_len) <= (iph->ihl + tcph->doff) * 4) { + return true; + } + + return false; +} + /* * CFG802.11 network device handler for data transmission. */ @@ -904,6 +928,8 @@ struct sk_buff * tx_info->bss_num = priv->bss_num; tx_info->bss_type = priv->bss_type; tx_info->pkt_len = skb->len; + if (is_piggyback_tcp_ack(skb)) + tx_info->flags |= MWIFIEX_BUF_FLAG_TCP_ACK; multicast = is_multicast_ether_addr(skb->data); diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h index a85b89e..a947825 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.h +++ b/drivers/net/wireless/marvell/mwifiex/main.h @@ -49,6 +49,7 @@ #include <linux/pm_runtime.h> #include <linux/slab.h> #include <linux/of_irq.h> +#include <linux/tcp.h> #include "decl.h" #include "ioctl.h" diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c index f230017..e9c3d43 100644 --- a/drivers/net/wireless/marvell/mwifiex/usb.c +++ b/drivers/net/wireless/marvell/mwifiex/usb.c @@ -934,6 +934,7 @@ static int mwifiex_usb_aggr_tx_data(struct mwifiex_adapter *adapter, u8 ep, struct urb_context *context = NULL; struct txpd *local_tx_pd = (struct txpd *)((u8 *)skb->data + adapter->intf_hdr_len); + struct mwifiex_txinfo *tx_info = MWIFIEX_SKB_TXCB(skb); u8 f_send_aggr_buf = 0; u8 f_send_cur_buf = 0; u8 f_precopy_cur_buf = 0; @@ -989,8 +990,9 @@ static int mwifiex_usb_aggr_tx_data(struct mwifiex_adapter *adapter, u8 ep, } } - if (local_tx_pd->flags & MWIFIEX_TxPD_POWER_MGMT_NULL_PACKET) { - /* Send NULL packet immediately*/ + if (local_tx_pd->flags & MWIFIEX_TxPD_POWER_MGMT_NULL_PACKET || + tx_info->flags & MWIFIEX_BUF_FLAG_TCP_ACK) { + /* Send NULL data/TCP ACK packet immediately*/ if (f_precopy_cur_buf) { if (skb_queue_empty(&port->tx_aggr.aggr_list)) { f_precopy_cur_buf = 0;