From nobody Wed Jun 11 09:14:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bHKjP5WsFz600FN; Wed, 11 Jun 2025 09:14:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bHKjP37Fsz3lnl; Wed, 11 Jun 2025 09:14:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749633257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RkBrYwt6u4UtZ3dTsiHk4FW54l7YU/T4itCFBZiWtXM=; b=pG3SPUI5aFYVqmQUvFjK1tVPeW/swQydNA1t/MHIv3Fi68chA6ppeeyl5imJTswK485/WE Izvakm2uPuWG+1jTKs3nEo2XvygrzNq61orH+RvxIuHpPvS5Bgk3T5Sj8i9V/mNqzCL1uY I3H8tWkIkTnQXV4gruZ8atXKmU2a9hx7GXcePVxmdF6frGG3REB0JtWbWC8lwU7STdGE2Q s4/zPv/2ZH6sJA4SxYe3VWNwV2WYYCJdnWgk7YVy1hDvxJNomnhm2KWGda9RbHTE1eSv9z u0Bc5M8xiZbdRyWzaeZMZdFIsuBE4xSjkwp8jIMmw82TYP1RUzR60UYgH7qCUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749633257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RkBrYwt6u4UtZ3dTsiHk4FW54l7YU/T4itCFBZiWtXM=; b=G8uIfHELVcJ2u/wuI+74N1AZCveNL78+jtwjfrUs4IZ5M8dK9YGkttW8mj57d5A0ksrnen 8AS/TpHrPJOjow78HrfqLfSWfYLh6p+LP/eb9hx+r4p7x8pLtQ+trMfEcwrPZd3tWdPaaa LmtfRIScnwNICieJuI2RIBsKLPwoiNBgz1rNuUmfcM72VeQS2tOxhq9u6Ps8AEBjnEN0Bi whjUt7iQNBuYzmP/9e8QHXP8E4F93fERS6hMswyDpntXjzW/hNP+goUIQFni7yv0KqKZvX YSIMQUBAw8FHZXOSm6dQ8NUwaSf3Zgj8h0Uu4iRKu1gVKBy/VcbfHZkF9gh8Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749633257; a=rsa-sha256; cv=none; b=qqt1/GIejTlJAoTq5298yebMtqirsXZEKHfaNSWb2756f4/a1FhoEoQ4fPLO9/wVEPb3/r cfOP1ChbmrrtWZ8CsrpZpwEmSY0uXloDP6LZsC1OeULcywdp/qlRcOHqSd9IC0D4owAJrL 2jiojFdkpnDRo1KdTZ45K8edhnHLshV4Pk2o1PokUC9yvs0V7Mb2j9oiT4fOtQAa2lPzLt reQGViTxxc7DG1yK/5/aPX/NTV354V7TPB5n8Ly7h1ohEv+bCz9T+zN4gsZZBg8/WEFD/+ /uoRfIrKlIVyN2fSqpLhykvVzZKoXCY+C+KY14T4oeVUpQPpqZ66qIFXCINZ1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bHKjP2g0tz5hC; Wed, 11 Jun 2025 09:14:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55B9EHWj062019; Wed, 11 Jun 2025 09:14:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55B9EHap062015; Wed, 11 Jun 2025 09:14:17 GMT (envelope-from git) Date: Wed, 11 Jun 2025 09:14:17 GMT Message-Id: <202506110914.55B9EHap062015@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: e7a49e39d261 - stable/14 - LinuxKPI: 802.11: add support for GCMP hw crypto offload List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e7a49e39d261b3cfd3549405cce16865ad89d7d2 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e7a49e39d261b3cfd3549405cce16865ad89d7d2 commit e7a49e39d261b3cfd3549405cce16865ad89d7d2 Author: Bjoern A. Zeeb AuthorDate: 2025-04-22 20:10:32 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-06-10 23:38:24 +0000 LinuxKPI: 802.11: add support for GCMP hw crypto offload For iwlwifi, rtw88, and rtw89 we can treat GCMP the same way as we treat CCMP which allows us to re-use the CCMP code for now. Add the missing case statements and factor out some common code. Allow IEEE80211_CRYPTO_AES_GCM_128 through our filter of supported cipher suites to announce it to net80211. Sponsored by; The FreeBSD Foundation (cherry picked from commit 29ddd583693aced69be48b545e1c7e7249bdfb9c) --- sys/compat/linuxkpi/common/src/linux_80211.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 6e65b49fb81b..5653bc2ffba2 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1415,11 +1415,12 @@ lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) lcipher = lkpi_net80211_to_l80211_cipher_suite( k->wk_cipher->ic_cipher, k->wk_keylen); switch (lcipher) { - case WLAN_CIPHER_SUITE_CCMP: - break; case WLAN_CIPHER_SUITE_TKIP: keylen += 2 * k->wk_cipher->ic_miclen; break; + case WLAN_CIPHER_SUITE_CCMP: + case WLAN_CIPHER_SUITE_GCMP: + break; default: ic_printf(ic, "%s: CIPHER SUITE %#x (%s) not supported\n", __func__, lcipher, lkpi_cipher_suite_to_name(lcipher)); @@ -1454,16 +1455,16 @@ lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) if (k->wk_flags & IEEE80211_KEY_GROUP) kc->flags &= ~IEEE80211_KEY_FLAG_PAIRWISE; + kc->iv_len = k->wk_cipher->ic_header; + kc->icv_len = k->wk_cipher->ic_trailer; + switch (kc->cipher) { - case WLAN_CIPHER_SUITE_CCMP: - kc->iv_len = k->wk_cipher->ic_header; - kc->icv_len = k->wk_cipher->ic_trailer; - break; case WLAN_CIPHER_SUITE_TKIP: memcpy(kc->key + NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY, k->wk_txmic, k->wk_cipher->ic_miclen); memcpy(kc->key + NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY, k->wk_rxmic, k->wk_cipher->ic_miclen); - kc->iv_len = k->wk_cipher->ic_header; - kc->icv_len = k->wk_cipher->ic_trailer; + break; + case WLAN_CIPHER_SUITE_CCMP: + case WLAN_CIPHER_SUITE_GCMP: break; default: /* currently UNREACH */ @@ -1528,6 +1529,7 @@ lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) #endif break; case WLAN_CIPHER_SUITE_CCMP: + case WLAN_CIPHER_SUITE_GCMP: exp_flags = (IEEE80211_KEY_FLAG_PAIRWISE | IEEE80211_KEY_FLAG_PUT_IV_SPACE | IEEE80211_KEY_FLAG_GENERATE_IV | @@ -4809,6 +4811,7 @@ encrypt: TODO("sw encrypt"); return (ENXIO); } + static int lkpi_hw_crypto_prepare_ccmp(struct ieee80211_key *k, struct ieee80211_key_conf *kc, struct sk_buff *skb) @@ -4876,10 +4879,11 @@ lkpi_hw_crypto_prepare(struct lkpi_sta *lsta, struct ieee80211_key *k, return (lkpi_hw_crypto_prepare_tkip(k, kc, skb)); case WLAN_CIPHER_SUITE_CCMP: return (lkpi_hw_crypto_prepare_ccmp(k, kc, skb)); + case WLAN_CIPHER_SUITE_GCMP: + return (lkpi_hw_crypto_prepare_ccmp(k, kc, skb)); case WLAN_CIPHER_SUITE_WEP40: case WLAN_CIPHER_SUITE_WEP104: case WLAN_CIPHER_SUITE_CCMP_256: - case WLAN_CIPHER_SUITE_GCMP: case WLAN_CIPHER_SUITE_GCMP_256: case WLAN_CIPHER_SUITE_AES_CMAC: case WLAN_CIPHER_SUITE_BIP_CMAC_256: @@ -6124,6 +6128,7 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) * Also permit TKIP if turned on. */ hwciphers &= (IEEE80211_CRYPTO_AES_CCM | + IEEE80211_CRYPTO_AES_GCM_128 | (lkpi_hwcrypto_tkip ? (IEEE80211_CRYPTO_TKIP | IEEE80211_CRYPTO_TKIPMIC) : 0)); ieee80211_set_hardware_ciphers(ic, hwciphers);