From patchwork Thu Sep 26 07:21:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalle Valo X-Patchwork-Id: 2946741 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 48B129F288 for ; Thu, 26 Sep 2013 07:21:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D997B202AE for ; Thu, 26 Sep 2013 07:21:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D6BAE2025B for ; Thu, 26 Sep 2013 07:21:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755713Ab3IZHV0 (ORCPT ); Thu, 26 Sep 2013 03:21:26 -0400 Received: from sabertooth01.qualcomm.com ([65.197.215.72]:20203 "EHLO sabertooth01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753361Ab3IZHVZ (ORCPT ); Thu, 26 Sep 2013 03:21:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1380180085; x=1411716085; h=from:to:cc:subject:references:date:in-reply-to: message-id:mime-version; bh=qIHErY+JARFfTiK2HHkd+htr4exTYMHOErKaF732t64=; b=uo/crTOxwyA0ORqV6ZcmvJioUxlazndEvtiZGzK/MsBg7msB4uNTqmz/ tpEMHUahMcLMTZk2sWgPHwmjZ/ta5PuAqRj3WNHJ0iD/k+/URs4dGU+wB jAWku9xg/H6uGgd4gR+n3ZCl1DNi+Tw9DLVGDtEXJWtSioircl+clMwTK Y=; X-IronPort-AV: E=McAfee;i="5400,1158,7209"; a="52162602" Received: from ironmsg04-l.qualcomm.com ([172.30.48.19]) by sabertooth01.qualcomm.com with ESMTP; 26 Sep 2013 00:21:11 -0700 X-IronPort-AV: E=McAfee;i="5400,1158,7209"; a="517635846" Received: from nasanexhc15.na.qualcomm.com ([129.46.52.215]) by Ironmsg04-L.qualcomm.com with ESMTP/TLS/RC4-SHA; 26 Sep 2013 00:21:10 -0700 Received: from nasanexhc05.na.qualcomm.com (172.30.48.2) by nasanexhc15.na.qualcomm.com (129.46.52.215) with Microsoft SMTP Server (TLS) id 14.3.158.1; Thu, 26 Sep 2013 00:21:10 -0700 Received: from potku.qca.qualcomm.com (172.30.48.1) by qcmail1.qualcomm.com (172.30.48.2) with Microsoft SMTP Server (TLS) id 14.3.158.1; Thu, 26 Sep 2013 00:21:09 -0700 From: Kalle Valo To: Michal Kazior CC: , Subject: Re: [PATCH 0/5] ath10k: improve RX performance References: <1380028158-861-1-git-send-email-michal.kazior@tieto.com> Date: Thu, 26 Sep 2013 10:21:02 +0300 In-Reply-To: <1380028158-861-1-git-send-email-michal.kazior@tieto.com> (Michal Kazior's message of "Tue, 24 Sep 2013 15:09:13 +0200") Message-ID: <87a9j0t5ep.fsf@kamboji.qca.qualcomm.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 X-Originating-IP: [172.30.48.1] Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Michal Kazior writes: > This patchset gives clear RX performance > improvement on AP135. Throughput is at least > doubled (300mbps -> 600mbps, UDP RX, 2x2). > > This contains a workaround for > retransmission/duplication recovery. > > There's a pending patch for mac80211 that will > allow proper individiual A-MSDU subframe > reporting. > > Changes since RFC: > * comments fixes (Kalle) > * one patch extracted/split (Kalle) > * commit message adjustments > > > Michal Kazior (5): > ath10k: report A-MSDU subframes individually > ath10k: document decap modes > ath10k: cleanup RX decap handling > ath10k: fix Native Wifi decap mode RX > ath10k: align RX frames properly All five applies, thanks. There were few long lines, I fixed those myself. Can you please double check that I didn't break anything? Kalle For patch 1 I did: And for patch 3: diff --cc drivers/net/wireless/ath/ath10k/htt_rx.c index c5f1800,c94ced8..0000000 --- a/drivers/net/wireless/ath/ath10k/htt_rx.c +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c @@@ -672,14 -671,18 +673,18 @@@ static void ath10k_htt_rx_amsdu(struct skb_trim(skb, skb->len - FCS_LEN); break; case RX_MSDU_DECAP_NATIVE_WIFI: + /* nothing to do */ break; case RX_MSDU_DECAP_ETHERNET2_DIX: + /* strip ethernet header and insert decapped 802.11 + * header, amsdu subframe header and rfc1042 header */ + - decap_len = 0; - decap_len += sizeof(struct rfc1042_hdr); - decap_len += sizeof(struct amsdu_subframe_hdr); + len = 0; + len += sizeof(struct rfc1042_hdr); + len += sizeof(struct amsdu_subframe_hdr); skb_pull(skb, sizeof(struct ethhdr)); - memcpy(skb_push(skb, decap_len), decap_hdr, decap_len); + memcpy(skb_push(skb, len), decap_hdr, len); memcpy(skb_push(skb, hdr_len), hdr, hdr_len); break; case RX_MSDU_DECAP_8023_SNAP_LLC: --- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c index e30b95c..c5f1800 100644 --- a/drivers/net/wireless/ath/ath10k/htt_rx.c +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c @@ -650,7 +650,7 @@ static void ath10k_htt_rx_amsdu(struct ath10k_htt *htt, first = skb; while (skb) { void *decap_hdr; - int decap_len; + int len; rxd = (void *)skb->data - sizeof(*rxd); fmt = MS(__le32_to_cpu(rxd->msdu_start.info1), @@ -661,8 +661,10 @@ static void ath10k_htt_rx_amsdu(struct ath10k_htt *htt, /* First frame in an A-MSDU chain has more decapped data. */ if (skb == first) { - decap_hdr += round_up(ieee80211_hdrlen(hdr->frame_control), 4); - decap_hdr += round_up(ath10k_htt_rx_crypto_param_len(enctype), 4); + len = round_up(ieee80211_hdrlen(hdr->frame_control), 4); + len += round_up(ath10k_htt_rx_crypto_param_len(enctype), + 4); + decap_hdr += len; } switch (fmt) { @@ -672,12 +674,12 @@ static void ath10k_htt_rx_amsdu(struct ath10k_htt *htt, case RX_MSDU_DECAP_NATIVE_WIFI: break; case RX_MSDU_DECAP_ETHERNET2_DIX: - decap_len = 0; - decap_len += sizeof(struct rfc1042_hdr); - decap_len += sizeof(struct amsdu_subframe_hdr); + len = 0; + len += sizeof(struct rfc1042_hdr); + len += sizeof(struct amsdu_subframe_hdr); skb_pull(skb, sizeof(struct ethhdr)); - memcpy(skb_push(skb, decap_len), decap_hdr, decap_len); + memcpy(skb_push(skb, len), decap_hdr, len); memcpy(skb_push(skb, hdr_len), hdr, hdr_len); break; case RX_MSDU_DECAP_8023_SNAP_LLC: