| Message ID | 1dd6dd782121d0b9cc32dec6a01db474e568ffb2.1563030033.git.lorenzo@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | mac80211: add IEEE80211_KEY_FLAG_PUT_MMIE_SPACE to ieee80211_key_flags | expand |
On Sat, 2019-07-13 at 17:03 +0200, Lorenzo Bianconi wrote: > Add IEEE80211_KEY_FLAG_PUT_MMIE_SPACE flag to ieee80211_key_flags in order > to allow the driver to notify mac80211 to allocate mmie space for AES_CMAC > hw cipher. Moreover mac80211 will set MMIE pn while MIC will be computed > in hw. Hmm. It probably should be called something like GENERATE_MMIE in line with GENERATE_IV_MGMT etc.? Purely adding the *space* wouldn't really be all that useful, we're not really going to apply our tailroom request to this since it's a (relatively rare) mgmt. frame, so ... johannes
> On Sat, 2019-07-13 at 17:03 +0200, Lorenzo Bianconi wrote: > > Add IEEE80211_KEY_FLAG_PUT_MMIE_SPACE flag to ieee80211_key_flags in order > > to allow the driver to notify mac80211 to allocate mmie space for AES_CMAC > > hw cipher. Moreover mac80211 will set MMIE pn while MIC will be computed > > in hw. > > Hmm. It probably should be called something like GENERATE_MMIE in line > with GENERATE_IV_MGMT etc.? > > Purely adding the *space* wouldn't really be all that useful, we're not > really going to apply our tailroom request to this since it's a > (relatively rare) mgmt. frame, so ... Hi Johannes, ack, I will post v2 fixing it. Regards, Lorenzo > > johannes >
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index d26da013f7c0..204e5537def6 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1702,6 +1702,9 @@ struct wireless_dev *ieee80211_vif_to_wdev(struct ieee80211_vif *vif); * a TKIP key if it only requires MIC space. Do not set together with * @IEEE80211_KEY_FLAG_GENERATE_MMIC on the same key. * @IEEE80211_KEY_FLAG_NO_AUTO_TX: Key needs explicit Tx activation. + * @IEEE80211_KEY_FLAG_PUT_MMIE_SPACE: This flag should be set by the driver + * for a AES_CMAC key if it only requires MMIE space. Moreover mac80211 + * will compute PN MMIE */ enum ieee80211_key_flags { IEEE80211_KEY_FLAG_GENERATE_IV_MGMT = BIT(0), @@ -1714,6 +1717,7 @@ enum ieee80211_key_flags { IEEE80211_KEY_FLAG_RESERVE_TAILROOM = BIT(7), IEEE80211_KEY_FLAG_PUT_MIC_SPACE = BIT(8), IEEE80211_KEY_FLAG_NO_AUTO_TX = BIT(9), + IEEE80211_KEY_FLAG_PUT_MMIE_SPACE = BIT(10), }; /** diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c index a51c7909366e..969597ddbb76 100644 --- a/net/mac80211/wpa.c +++ b/net/mac80211/wpa.c @@ -946,7 +946,8 @@ ieee80211_crypto_aes_cmac_encrypt(struct ieee80211_tx_data *tx) info = IEEE80211_SKB_CB(skb); - if (info->control.hw_key) + if (info->control.hw_key && + !(key->conf.flags & IEEE80211_KEY_FLAG_PUT_MMIE_SPACE)) return TX_CONTINUE; if (WARN_ON(skb_tailroom(skb) < sizeof(*mmie))) @@ -962,6 +963,9 @@ ieee80211_crypto_aes_cmac_encrypt(struct ieee80211_tx_data *tx) bip_ipn_set64(mmie->sequence_number, pn64); + if (info->control.hw_key) + return TX_CONTINUE; + bip_aad(skb, aad); /*
Add IEEE80211_KEY_FLAG_PUT_MMIE_SPACE flag to ieee80211_key_flags in order to allow the driver to notify mac80211 to allocate mmie space for AES_CMAC hw cipher. Moreover mac80211 will set MMIE pn while MIC will be computed in hw. This is a preliminary patch to add BIP_CMAC_128 hw support to mt7615 driver Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> --- include/net/mac80211.h | 4 ++++ net/mac80211/wpa.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)