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 b84f6aa..f9ff470 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 3943d4b..ce1aeba 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
HW/driver should set NEED_ALIGNED4_SKBS flag in case require
aligned skbs to four-byte boundaries.
Before we have to do memmove() in the driver before
pass this to HW and memmove() back in tx completion.
This patch allow to save CPU and skip such memmoves.
For each skb we call memmove(ieee80211_hdrsize()) twice.
Currently this was tested with ath9k, both hw/sw crypt for
tkip/ccmp.
Signed-off-by: Janusz Dziedzic <[email protected]>
---
not sure __ieee80211_hdrlen is the best choice here ...
include/net/mac80211.h | 4 ++++
net/mac80211/debugfs.c | 1 +
net/mac80211/ieee80211_i.h | 11 +++++++++++
net/mac80211/sta_info.h | 4 ++--
net/mac80211/status.c | 13 +++++++++++++
net/mac80211/tkip.c | 3 ++-
net/mac80211/tx.c | 22 +++++++++++++++++-----
net/mac80211/util.c | 2 +-
8 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 7c30faf..0ea9b51 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1910,6 +1910,9 @@ struct ieee80211_txq {
* by just its MAC address; this prevents, for example, the same station
* from connecting to two virtual AP interfaces at the same time.
*
+ * @IEEE80211_HW_NEEDS_ALIGNED4_SKBS: Driver need aligned skbs to four-byte.
+ * Padding will be added after ieee80211_hdr.
+ *
* @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays
*/
enum ieee80211_hw_flags {
@@ -1946,6 +1949,7 @@ enum ieee80211_hw_flags {
IEEE80211_HW_SUPPORTS_AMSDU_IN_AMPDU,
IEEE80211_HW_BEACON_TX_STATUS,
IEEE80211_HW_NEEDS_UNIQUE_STA_ADDR,
+ 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 abbdff0..fd45830 100644
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@ -126,6 +126,7 @@ static const char *hw_flag_names[NUM_IEEE80211_HW_FLAGS + 1] = {
FLAG(SUPPORTS_AMSDU_IN_AMPDU),
FLAG(BEACON_TX_STATUS),
FLAG(NEEDS_UNIQUE_STA_ADDR),
+ FLAG(NEEDS_ALIGNED4_SKBS),
/* keep last for the build bug below */
(void *)0x1
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index f9ff470..99e3cef 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1470,6 +1470,17 @@ ieee80211_have_rx_timestamp(struct ieee80211_rx_status *status)
return status->flag & (RX_FLAG_MACTIME_START | RX_FLAG_MACTIME_END);
}
+static inline unsigned int
+__ieee80211_hdrlen(struct ieee80211_hw *hw, __le16 fc) {
+ unsigned int hdrlen;
+
+ hdrlen = ieee80211_hdrlen(fc);
+ if (ieee80211_hw_check(hw, NEEDS_ALIGNED4_SKBS))
+ hdrlen += hdrlen & 3;
+
+ 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 d605162..3e1cd70 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -268,8 +268,8 @@ 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 +
- sizeof(rfc1042_header)];
+ u8 hdr[round_up(30 + 2 + IEEE80211_FAST_XMIT_MAX_IV +
+ sizeof(rfc1042_header), 4)];
struct rcu_head rcu_head;
};
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 5bad05e..84b0b1a 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -678,9 +678,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 padsize, hdrlen;
int rtap_len;
+ /* Remove padding if was added */
+ if (ieee80211_hw_check(&local->hw, NEEDS_ALIGNED4_SKBS)) {
+ hdrlen = ieee80211_hdrlen(hdr->frame_control);
+ padsize = hdrlen & 3;
+
+ 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..6f78975 100644
--- a/net/mac80211/tkip.c
+++ b/net/mac80211/tkip.c
@@ -201,10 +201,11 @@ 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_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..692b76d 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_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_hdrlen(&local->hw, hdr->frame_control);
if (skb->len < len_rthdr + hdrlen)
goto fail;
@@ -2020,6 +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 padsize = 0;
int ret;
if (IS_ERR(sta))
@@ -2237,6 +2237,10 @@ static struct sk_buff *ieee80211_build_hdr(struct ieee80211_sub_if_data *sdata,
hdrlen += 2;
}
+ /* Check if HW require skb to be aligned */
+ if (ieee80211_hw_check(&sdata->local->hw, NEEDS_ALIGNED4_SKBS))
+ padsize = hdrlen & 3;
+
/*
* Drop unicast frames to unauthorised stations unless they are
* EAPOL frames from the local station.
@@ -2323,6 +2327,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 +2366,9 @@ static struct sk_buff *ieee80211_build_hdr(struct ieee80211_sub_if_data *sdata,
}
#endif
+ if (padsize)
+ skb_push(skb, padsize);
+
if (ieee80211_is_data_qos(fc)) {
__le16 *qos_control;
@@ -2374,8 +2382,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 +2552,10 @@ void ieee80211_check_fast_xmit(struct sta_info *sta)
fc |= cpu_to_le16(IEEE80211_STYPE_QOS_DATA);
}
+ /* Check if aligned skb required */
+ if (ieee80211_hw_check(&local->hw, NEEDS_ALIGNED4_SKBS))
+ build.hdr_len += build.hdr_len & 3;
+
/* 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 ce1aeba..9231ac2 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1250,7 +1250,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_hdrlen(&local->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 Thu, 2016-01-21 at 10:30 +0100, Janusz Dziedzic wrote:
>
> +static inline unsigned int
> +__ieee80211_hdrlen(struct ieee80211_hw *hw, __le16 fc) {
coding style - should have that brace on the next line
perhaps this really ought to be called
ieee80211_padded_hdrlen() or so instead of just the __.
> + unsigned int hdrlen;
> +
> + hdrlen = ieee80211_hdrlen(fc);
> + if (ieee80211_hw_check(hw, NEEDS_ALIGNED4_SKBS))
> + hdrlen += hdrlen & 3;
This needs a a comment, it only works because the hdrlen is guaranteed
to be a multiple of 2 already. Perhaps it should be & 2 ;-)
> - u8 hdr[30 + 2 + IEEE80211_FAST_XMIT_MAX_IV +
> - sizeof(rfc1042_header)];
> + u8 hdr[round_up(30 + 2 + IEEE80211_FAST_XMIT_MAX_IV +
> + sizeof(rfc1042_header), 4)];
I'm still not sure this is right, given the position of the padding. It
probably works since MAX_IV and sizeof() are divisible by 4, but
shouldn't it really be
round_up(30 + 2, 4) + MAX_IV + sizeof()?
> + /* Remove padding if was added */
> + if (ieee80211_hw_check(&local->hw, NEEDS_ALIGNED4_SKBS)) {
> + hdrlen = ieee80211_hdrlen(hdr->frame_control);
> + padsize = hdrlen & 3;
same as above
> + /* Check if HW require skb to be aligned */
> + if (ieee80211_hw_check(&sdata->local->hw,
> NEEDS_ALIGNED4_SKBS))
> + padsize = hdrlen & 3;
>
ditto
Perhaps also extract this if (...) padsize=... into a helper? Although
then the "hdrlen += 0" would remain for !ALIGNED4 drivers.
> + if (padsize)
> + skb_push(skb, padsize);
You should initialize the memory, imho, just in case it goes out
anywhere by accident.
> + /* Check if aligned skb required */
> + if (ieee80211_hw_check(&local->hw, NEEDS_ALIGNED4_SKBS))
> + build.hdr_len += build.hdr_len & 3;
As above.
You also need to clarify - IIRC the PN/IV fields are considered part of
the MAC header even if we don't really take them into account in
hdrlen(), so you should clearly document that the padding is before
those.
johannes