Add hdrlen to ieee80211_tx_data and use this
when wep/ccmd/tkip. This is preparation for
aligned4 code.
Signed-off-by: Janusz Dziedzic <[email protected]>
---
net/mac80211/ieee80211_i.h | 1 +
net/mac80211/tx.c | 6 +++---
net/mac80211/util.c | 5 ++++-
net/mac80211/wep.c | 11 ++++++-----
net/mac80211/wep.h | 1 +
net/mac80211/wpa.c | 13 +++++--------
6 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index a29f61d..81a476a 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -172,6 +172,7 @@ struct ieee80211_tx_data {
struct ieee80211_tx_rate rate;
unsigned int flags;
+ unsigned int hdrlen;
};
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 3311ce0..cd4c361 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -915,7 +915,7 @@ ieee80211_tx_h_fragment(struct ieee80211_tx_data *tx)
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
struct ieee80211_hdr *hdr = (void *)skb->data;
int frag_threshold = tx->local->hw.wiphy->frag_threshold;
- int hdrlen;
+ int hdrlen = tx->hdrlen;
int fragnum;
/* no matter what happens, tx->skb moves to tx->skbs */
@@ -936,8 +936,6 @@ ieee80211_tx_h_fragment(struct ieee80211_tx_data *tx)
if (WARN_ON(info->flags & IEEE80211_TX_CTL_AMPDU))
return TX_DROP;
- hdrlen = ieee80211_hdrlen(hdr->frame_control);
-
/* internal error, why isn't DONTFRAG set? */
if (WARN_ON(skb->len + FCS_LEN <= frag_threshold))
return TX_DROP;
@@ -1165,6 +1163,8 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata,
hdr = (struct ieee80211_hdr *) skb->data;
+ tx->hdrlen = ieee80211_hdrlen(hdr->frame_control);
+
if (likely(sta)) {
if (!IS_ERR(sta))
tx->sta = sta;
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 54afbf4..b3c6515 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1225,6 +1225,7 @@ void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
struct ieee80211_local *local = sdata->local;
struct sk_buff *skb;
struct ieee80211_mgmt *mgmt;
+ unsigned int hdrlen;
int err;
/* 24 + 6 = header + auth_algo + auth_transaction + status_code */
@@ -1249,8 +1250,10 @@ void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
memcpy(skb_put(skb, extra_len), extra, extra_len);
if (auth_alg == WLAN_AUTH_SHARED_KEY && transaction == 3) {
+ hdrlen = ieee80211_hdrlen(mgmt->frame_control);
mgmt->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
- err = ieee80211_wep_encrypt(local, skb, key, key_len, key_idx);
+ err = ieee80211_wep_encrypt(local, skb, hdrlen, key,
+ key_len, key_idx);
WARN_ON(err);
}
diff --git a/net/mac80211/wep.c b/net/mac80211/wep.c
index efa3f48..d14bdb0 100644
--- a/net/mac80211/wep.c
+++ b/net/mac80211/wep.c
@@ -89,11 +89,11 @@ static void ieee80211_wep_get_iv(struct ieee80211_local *local,
static u8 *ieee80211_wep_add_iv(struct ieee80211_local *local,
struct sk_buff *skb,
+ unsigned int hdrlen,
int keylen, int keyidx)
{
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
- unsigned int hdrlen;
u8 *newhdr;
hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
@@ -101,7 +101,6 @@ static u8 *ieee80211_wep_add_iv(struct ieee80211_local *local,
if (WARN_ON(skb_headroom(skb) < IEEE80211_WEP_IV_LEN))
return NULL;
- hdrlen = ieee80211_hdrlen(hdr->frame_control);
newhdr = skb_push(skb, IEEE80211_WEP_IV_LEN);
memmove(newhdr, newhdr + IEEE80211_WEP_IV_LEN, hdrlen);
@@ -160,6 +159,7 @@ int ieee80211_wep_encrypt_data(struct crypto_cipher *tfm, u8 *rc4key,
*/
int ieee80211_wep_encrypt(struct ieee80211_local *local,
struct sk_buff *skb,
+ unsigned int hdrlen,
const u8 *key, int keylen, int keyidx)
{
u8 *iv;
@@ -169,7 +169,7 @@ int ieee80211_wep_encrypt(struct ieee80211_local *local,
if (WARN_ON(skb_tailroom(skb) < IEEE80211_WEP_ICV_LEN))
return -1;
- iv = ieee80211_wep_add_iv(local, skb, keylen, keyidx);
+ iv = ieee80211_wep_add_iv(local, skb, hdrlen, keylen, keyidx);
if (!iv)
return -1;
@@ -306,13 +306,14 @@ static int wep_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
struct ieee80211_key_conf *hw_key = info->control.hw_key;
if (!hw_key) {
- if (ieee80211_wep_encrypt(tx->local, skb, tx->key->conf.key,
+ if (ieee80211_wep_encrypt(tx->local, skb, tx->hdrlen,
+ tx->key->conf.key,
tx->key->conf.keylen,
tx->key->conf.keyidx))
return -1;
} else if ((hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_IV) ||
(hw_key->flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE)) {
- if (!ieee80211_wep_add_iv(tx->local, skb,
+ if (!ieee80211_wep_add_iv(tx->local, skb, tx->hdrlen,
tx->key->conf.keylen,
tx->key->conf.keyidx))
return -1;
diff --git a/net/mac80211/wep.h b/net/mac80211/wep.h
index 9615749..ad0a52b 100644
--- a/net/mac80211/wep.h
+++ b/net/mac80211/wep.h
@@ -22,6 +22,7 @@ int ieee80211_wep_encrypt_data(struct crypto_cipher *tfm, u8 *rc4key,
size_t klen, u8 *data, size_t data_len);
int ieee80211_wep_encrypt(struct ieee80211_local *local,
struct sk_buff *skb,
+ unsigned int hdrlen,
const u8 *key, int keylen, int keyidx);
int ieee80211_wep_decrypt_data(struct crypto_cipher *tfm, u8 *rc4key,
size_t klen, u8 *data, size_t data_len);
diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c
index d824c38..e8bfb13 100644
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
@@ -42,7 +42,7 @@ ieee80211_tx_h_michael_mic_add(struct ieee80211_tx_data *tx)
skb->len < 24 || !ieee80211_is_data_present(hdr->frame_control))
return TX_CONTINUE;
- hdrlen = ieee80211_hdrlen(hdr->frame_control);
+ hdrlen = tx->hdrlen;
if (skb->len < hdrlen)
return TX_DROP;
@@ -186,7 +186,6 @@ mic_fail_no_key:
static int tkip_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
{
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
struct ieee80211_key *key = tx->key;
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
unsigned int hdrlen;
@@ -200,7 +199,7 @@ static int tkip_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
return 0;
}
- hdrlen = ieee80211_hdrlen(hdr->frame_control);
+ hdrlen = tx->hdrlen;
len = skb->len - hdrlen;
if (info->control.hw_key)
@@ -424,7 +423,7 @@ static int ccmp_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb,
return 0;
}
- hdrlen = ieee80211_hdrlen(hdr->frame_control);
+ hdrlen = tx->hdrlen;
len = skb->len - hdrlen;
if (info->control.hw_key)
@@ -651,7 +650,7 @@ static int gcmp_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
return 0;
}
- hdrlen = ieee80211_hdrlen(hdr->frame_control);
+ hdrlen = tx->hdrlen;
len = skb->len - hdrlen;
if (info->control.hw_key)
@@ -787,7 +786,6 @@ static ieee80211_tx_result
ieee80211_crypto_cs_encrypt(struct ieee80211_tx_data *tx,
struct sk_buff *skb)
{
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
struct ieee80211_key *key = tx->key;
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
int hdrlen;
@@ -803,8 +801,7 @@ ieee80211_crypto_cs_encrypt(struct ieee80211_tx_data *tx,
pskb_expand_head(skb, iv_len, 0, GFP_ATOMIC)))
return TX_DROP;
- hdrlen = ieee80211_hdrlen(hdr->frame_control);
-
+ hdrlen = tx->hdrlen;
pos = skb_push(skb, iv_len);
memmove(pos, pos + iv_len, hdrlen);
--
1.9.1
On 2016-02-23 15:29, Johannes Berg wrote:
> On Fri, 2016-02-19 at 11:01 +0100, Janusz Dziedzic wrote:
>> HW/driver should set NEED_ALIGNED4_SKBS flag in case
>> require aligned skbs to four-byte boundaries.
>> This affect only TX direction.
>>
>> Padding is added after ieee80211_hdr, before IV/LLC.
>
> I'm still not super happy with how invasive these patches are.
>
> Perhaps we could live with this being done only for the fast-xmit case?
I don't think we should pass padded vs non-padded frames depending on
whether fast-xmit was used. The non-fast-xmit codepath could simply do
the memmove at the end of the tx handlers though.
- Felix
On Tue, 2016-02-23 at 15:53 +0100, Felix Fietkau wrote:
> > Perhaps we could live with this being done only for the fast-xmit
> > case?
> I don't think we should pass padded vs non-padded frames depending on
> whether fast-xmit was used. The non-fast-xmit codepath could simply
> do the memmove at the end of the tx handlers though.
I guess that's fair. Would it be sufficent though?
johannes
On Fri, 2016-02-19 at 11:01 +0100, Janusz Dziedzic wrote:
> HW/driver should set NEED_ALIGNED4_SKBS flag in case
> require aligned skbs to four-byte boundaries.
> This affect only TX direction.
>
> Padding is added after ieee80211_hdr, before IV/LLC.
I'm still not super happy with how invasive these patches are.
Perhaps we could live with this being done only for the fast-xmit case?
johannes
HW/driver should set NEED_ALIGNED4_SKBS flag in case
require aligned skbs to four-byte boundaries.
This affect only TX direction.
Padding is added after ieee80211_hdr, before IV/LLC.
Before we have to do memmove(hdrlen) twice in the
dirver. Once before we pass this to HW and next
in tx completion (to be sure monitor will report
this tx frame correctly).
With this patch we can skip this memmove() and save CPU.
Currently this was tested with ath9k, both hw/sw crypt for
wep/tkip/ccmp.
Signed-off-by: Janusz Dziedzic <[email protected]>
---
include/net/mac80211.h | 3 +++
net/mac80211/debugfs.c | 1 +
net/mac80211/ieee80211_i.h | 23 +++++++++++++++++++++++
net/mac80211/sta_info.h | 2 +-
net/mac80211/status.c | 13 +++++++++++++
net/mac80211/tkip.c | 4 +++-
net/mac80211/tx.c | 21 +++++++++++++++------
net/mac80211/util.c | 3 ++-
8 files changed, 61 insertions(+), 9 deletions(-)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 31337f8..561605c 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1961,6 +1961,8 @@ struct ieee80211_txq {
* reordering buffer internally, guaranteeing mac80211 receives frames in
* order and does not need to manage its own reorder buffer or BA session
* timeout.
+ * @IEEE80211_HW_NEEDS_ALIGNED4_SKBS: Driver need aligned skbs to four-byte.
+ * Padding will be added after ieee80211_hdr, before IV/LLC.
*
* @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays
*/
@@ -1999,6 +2001,7 @@ enum ieee80211_hw_flags {
IEEE80211_HW_BEACON_TX_STATUS,
IEEE80211_HW_NEEDS_UNIQUE_STA_ADDR,
IEEE80211_HW_SUPPORTS_REORDERING_BUFFER,
+ IEEE80211_HW_NEEDS_ALIGNED4_SKBS,
/* keep last, obviously */
NUM_IEEE80211_HW_FLAGS
diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
index 4ab5c52..c48905e 100644
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@ -127,6 +127,7 @@ static const char *hw_flag_names[] = {
FLAG(BEACON_TX_STATUS),
FLAG(NEEDS_UNIQUE_STA_ADDR),
FLAG(SUPPORTS_REORDERING_BUFFER),
+ FLAG(NEEDS_ALIGNED4_SKBS),
#undef FLAG
};
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 81a476a..0687f94 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1476,6 +1476,29 @@ ieee80211_have_rx_timestamp(struct ieee80211_rx_status *status)
return false;
}
+static inline unsigned int
+ieee80211_hdr_padsize(struct ieee80211_hw *hw, unsigned int hdrlen)
+{
+ /*
+ * While hdrlen is already aligned to two-byte boundaries,
+ * simple check with & 2 will return correct padsize.
+ */
+ if (ieee80211_hw_check(hw, NEEDS_ALIGNED4_SKBS))
+ return hdrlen & 2;
+ return 0;
+}
+
+static inline unsigned int
+ieee80211_padded_hdrlen(struct ieee80211_hw *hw, __le16 fc)
+{
+ unsigned int hdrlen;
+
+ hdrlen = ieee80211_hdrlen(fc);
+ hdrlen += ieee80211_hdr_padsize(hw, hdrlen);
+
+ return hdrlen;
+}
+
u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local,
struct ieee80211_rx_status *status,
unsigned int mpdu_len,
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index f4d3899..c432f4a 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -271,7 +271,7 @@ struct ieee80211_fast_tx {
u8 hdr_len;
u8 sa_offs, da_offs, pn_offs;
u8 band;
- u8 hdr[30 + 2 + IEEE80211_FAST_XMIT_MAX_IV +
+ u8 hdr[30 + 2 + 2 + IEEE80211_FAST_XMIT_MAX_IV +
sizeof(rfc1042_header)];
struct rcu_head rcu_head;
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 6101deb..d2b0273 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -683,9 +683,22 @@ void ieee80211_tx_monitor(struct ieee80211_local *local, struct sk_buff *skb,
struct sk_buff *skb2;
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
struct ieee80211_sub_if_data *sdata;
+ struct ieee80211_hdr *hdr = (void *)skb->data;
struct net_device *prev_dev = NULL;
+ unsigned int hdrlen, padsize;
int rtap_len;
+ /* Remove padding if was added */
+ if (ieee80211_hw_check(&local->hw, NEEDS_ALIGNED4_SKBS)) {
+ hdrlen = ieee80211_hdrlen(hdr->frame_control);
+ padsize = ieee80211_hdr_padsize(&local->hw, hdrlen);
+
+ if (padsize && skb->len > hdrlen + padsize) {
+ memmove(skb->data + padsize, skb->data, hdrlen);
+ skb_pull(skb, padsize);
+ }
+ }
+
/* send frame to monitor interfaces now */
rtap_len = ieee80211_tx_radiotap_len(info);
if (WARN_ON_ONCE(skb_headroom(skb) < rtap_len)) {
diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c
index 0ae2077..b3ab779 100644
--- a/net/mac80211/tkip.c
+++ b/net/mac80211/tkip.c
@@ -201,10 +201,12 @@ void ieee80211_get_tkip_p2k(struct ieee80211_key_conf *keyconf,
{
struct ieee80211_key *key = (struct ieee80211_key *)
container_of(keyconf, struct ieee80211_key, conf);
+ struct ieee80211_hw *hw = &key->local->hw;
const u8 *tk = &key->conf.key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY];
struct tkip_ctx *ctx = &key->u.tkip.tx;
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
- const u8 *data = (u8 *)hdr + ieee80211_hdrlen(hdr->frame_control);
+ const u8 *data = (u8 *)hdr + ieee80211_padded_hdrlen(hw,
+ hdr->frame_control);
u32 iv32 = get_unaligned_le32(&data[4]);
u16 iv16 = data[2] | (data[0] << 8);
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index cd4c361..3c2fad3 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1162,8 +1162,7 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata,
info->flags &= ~IEEE80211_TX_INTFL_NEED_TXPROCESSING;
hdr = (struct ieee80211_hdr *) skb->data;
-
- tx->hdrlen = ieee80211_hdrlen(hdr->frame_control);
+ tx->hdrlen = ieee80211_padded_hdrlen(&local->hw, hdr->frame_control);
if (likely(sta)) {
if (!IS_ERR(sta))
@@ -1795,7 +1794,7 @@ netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb,
goto fail;
hdr = (struct ieee80211_hdr *)(skb->data + len_rthdr);
- hdrlen = ieee80211_hdrlen(hdr->frame_control);
+ hdrlen = ieee80211_padded_hdrlen(&local->hw, hdr->frame_control);
if (skb->len < len_rthdr + hdrlen)
goto fail;
@@ -2020,7 +2019,7 @@ static struct sk_buff *ieee80211_build_hdr(struct ieee80211_sub_if_data *sdata,
struct ieee80211_chanctx_conf *chanctx_conf;
struct ieee80211_sub_if_data *ap_sdata;
enum ieee80211_band band;
- int ret;
+ int padsize, ret;
if (IS_ERR(sta))
sta = NULL;
@@ -2237,6 +2236,9 @@ static struct sk_buff *ieee80211_build_hdr(struct ieee80211_sub_if_data *sdata,
hdrlen += 2;
}
+ /* Check aligned4 skb required */
+ padsize = ieee80211_hdr_padsize(&sdata->local->hw, hdrlen);
+
/*
* Drop unicast frames to unauthorised stations unless they are
* EAPOL frames from the local station.
@@ -2323,6 +2325,7 @@ static struct sk_buff *ieee80211_build_hdr(struct ieee80211_sub_if_data *sdata,
h_pos -= skip_header_bytes;
head_need = hdrlen + encaps_len + meshhdrlen - skb_headroom(skb);
+ head_need += padsize;
/*
* So we need to modify the skb header and hence need a copy of
@@ -2361,6 +2364,9 @@ static struct sk_buff *ieee80211_build_hdr(struct ieee80211_sub_if_data *sdata,
}
#endif
+ if (padsize)
+ memset(skb_push(skb, padsize), 0, padsize);
+
if (ieee80211_is_data_qos(fc)) {
__le16 *qos_control;
@@ -2374,8 +2380,8 @@ static struct sk_buff *ieee80211_build_hdr(struct ieee80211_sub_if_data *sdata,
} else
memcpy(skb_push(skb, hdrlen), &hdr, hdrlen);
- nh_pos += hdrlen;
- h_pos += hdrlen;
+ nh_pos += hdrlen + padsize;
+ h_pos += hdrlen + padsize;
/* Update skb pointers to various headers since this modified frame
* is going to go through Linux networking code that may potentially
@@ -2544,6 +2550,9 @@ void ieee80211_check_fast_xmit(struct sta_info *sta)
fc |= cpu_to_le16(IEEE80211_STYPE_QOS_DATA);
}
+ /* Check aligned4 skb required */
+ build.hdr_len += ieee80211_hdr_padsize(&local->hw, build.hdr_len);
+
/* We store the key here so there's no point in using rcu_dereference()
* but that's fine because the code that changes the pointers will call
* this function after doing so. For a single CPU that would be enough,
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index b3c6515..6e39835 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1223,6 +1223,7 @@ void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
u32 tx_flags)
{
struct ieee80211_local *local = sdata->local;
+ struct ieee80211_hw *hw = &local->hw;
struct sk_buff *skb;
struct ieee80211_mgmt *mgmt;
unsigned int hdrlen;
@@ -1250,7 +1251,7 @@ void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
memcpy(skb_put(skb, extra_len), extra, extra_len);
if (auth_alg == WLAN_AUTH_SHARED_KEY && transaction == 3) {
- hdrlen = ieee80211_hdrlen(mgmt->frame_control);
+ hdrlen = ieee80211_padded_hdrlen(hw, mgmt->frame_control);
mgmt->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
err = ieee80211_wep_encrypt(local, skb, hdrlen, key,
key_len, key_idx);
--
1.9.1
On Tue, 2016-02-23 at 17:15 +0100, Johannes Berg wrote:
> > > Perhaps we could live with this being done only for the fast-xmit
> > > case?
> > I don't think we should pass padded vs non-padded frames depending
> > on
> > whether fast-xmit was used. The non-fast-xmit codepath could simply
> > do the memmove at the end of the tx handlers though.
> I guess that's fair. Would it be sufficent though?
>
So it turns out the patch 1/2 actually makes the code *bigger* for some
reason.
Janusz, can you see if the above suggestion would be good enough?
Hopefully high-tpt cases would all run through fast-xmit anyway.
johannes