From patchwork Wed Dec 13 11:37:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Otcheretianski X-Patchwork-Id: 1875601 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=c8VKNxkS; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=GE4cd6f2; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SqtmM0tsWz20H6 for ; Wed, 13 Dec 2023 22:38:57 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=F9871RMq+kXIQsciWZCX2w36aaB/xp/w/zQoiCo3yRI=; b=c8VKNxkSs/lHL6 ntlxSxkY9sWTJopiaSvTgnfWDU15PCffczkn3tn6aHu1dy/mKcjpekmljd6T043VPwzWfmsfqlO44 9CKo+d4TFC8iWY92mfuvkA03yyQ9ahIQo/3fLavWbpm1vfAz3p1JYX6+CEbPQo1Dou294NE5n1QdV JPbkKkv3FVyMywJeG1N9yFkGtMjqEc3TmRgyQBahno1kFmSa8krCZ921fx5+BIdR8VvQN9PKpKyzX V5XXWBChYceXCNAXpVbbfi21gVz143yQGjgZ+ZCy7N2rAbKXT+YUp2ZFBdYT1T2wQKSpzX586dhq9 bH2wODRAlA/xSephjzBA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rDNZ0-00EUj2-2C; Wed, 13 Dec 2023 11:38:06 +0000 Received: from mgamail.intel.com ([192.55.52.93]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rDNYy-00EUho-2S for hostap@lists.infradead.org; Wed, 13 Dec 2023 11:38:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702467484; x=1734003484; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=IXxvGiUBfJU798ZXozBN17FbwLe12G1F9ngUMch36Ew=; b=GE4cd6f23FZ0M8CxijXz23AV1UFHN7bFCZl1bytTzl3MGPV+B4Ew3Qow Z60MfCN5wiJXnpXK1hXbAqaLmInAxyQoN2pIVdhAPGI9f0Ah2a6OZbWq1 PI3KGnjnINNdQPGNdWT5V1DZc1uUtRoNXcMwfcwpiHxAGBvkRQA6ZjQ/A ESMQ8nzFpEfH4RWDH6G8CJo4JOiYhTxFSz3nv26WubjvsPCzFnVmp67yK u1bvYv54j0af+dhuyo9elieTXvo7GZTLwWUOejj3SqoHAd9ZguH+iymr1 /JDXYDzuNSyCb0d36wsjNahYMG+yumn9/Y8jN0/taKth7CubZQ5cPA8ch w==; X-IronPort-AV: E=McAfee;i="6600,9927,10922"; a="392126111" X-IronPort-AV: E=Sophos;i="6.04,272,1695711600"; d="scan'208";a="392126111" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Dec 2023 03:38:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,272,1695711600"; d="scan'208";a="15382225" Received: from mwaksma1-mobl1.ger.corp.intel.com (HELO localhost.localdomain) ([10.254.159.208]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Dec 2023 03:38:00 -0800 From: Andrei Otcheretianski To: hostap@lists.infradead.org Cc: johannes@sipsolutions.net, linux-wireless@vger.kernel.org, Ilan Peer Subject: [PATCH] tests: Modify the QoS mapping tests Date: Wed, 13 Dec 2023 13:37:35 +0200 Message-Id: <20231213113735.289408-1-andrei.otcheretianski@intel.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231213_033804_809589_74193858 X-CRM114-Status: GOOD ( 10.55 ) X-Spam-Score: -2.7 (--) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Ilan Peer The cfg80211 default QoS mapping was updated to align with the recommendations in section 4 in RFC8325. Align the QoS mapping test accordingly. Signed-off-by: Ilan Peer --- This patch depends on the corresponding pending kernel change: https://patchwork.kernel.org/project/linux-wireless/patch/20231211085121.8a1c7d1f0034. [...] Content analysis details: (-2.7 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [192.55.52.93 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.2 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Ilan Peer The cfg80211 default QoS mapping was updated to align with the recommendations in section 4 in RFC8325. Align the QoS mapping test accordingly. Signed-off-by: Ilan Peer --- This patch depends on the corresponding pending kernel change: https://patchwork.kernel.org/project/linux-wireless/patch/20231211085121.8a1c7d1f0034.I50aed38be78ae9aea052938e2cb6b5800010ecd4@changeid/ --- tests/hwsim/test_ap_qosmap.py | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/tests/hwsim/test_ap_qosmap.py b/tests/hwsim/test_ap_qosmap.py index fb26474871..8ed3fe4734 100644 --- a/tests/hwsim/test_ap_qosmap.py +++ b/tests/hwsim/test_ap_qosmap.py @@ -89,8 +89,20 @@ def test_ap_qosmap_default(dev, apdev): dev[0].request("DATA_TEST_CONFIG 1") hapd.request("DATA_TEST_CONFIG 1") Wlantest.setup(hapd) + + # build initial default mapping + dscp_to_tid = {} for dscp in [0, 7, 8, 15, 16, 23, 24, 31, 32, 39, 40, 47, 48, 55, 56, 63]: - check_qos_map(apdev[0], hapd, dev[0], addr, dscp, dscp >> 3) + dscp_to_tid[dscp] = dscp >> 3 + + # update the mapping based on the recommendations in section 4 in RFC8325 + dscp_to_tid[16] = 0 + dscp_to_tid[24] = 4 + dscp_to_tid[48] = 7 + + for dscp, tid in dscp_to_tid.items(): + check_qos_map(apdev[0], hapd, dev[0], addr, dscp, tid) + dev[0].request("DATA_TEST_CONFIG 0") hapd.request("DATA_TEST_CONFIG 0") @@ -127,9 +139,19 @@ def test_ap_qosmap_default_acm(dev, apdev): dev[0].request("DATA_TEST_CONFIG 1") hapd.request("DATA_TEST_CONFIG 1") Wlantest.setup(hapd) + # build initial default mapping + dscp_to_tid = {} for dscp in [0, 7, 8, 15, 16, 23, 24, 31, 32, 39, 40, 47, 48, 55, 56, 63]: - ap_tid = dscp >> 3 - tid = ap_tid + dscp_to_tid[dscp] = dscp >> 3 + + # update the mapping based on the recommendations in section 4 in RFC8325 + dscp_to_tid[16] = 0 + dscp_to_tid[24] = 4 + dscp_to_tid[48] = 7 + + for dscp, tid in dscp_to_tid.items(): + ap_tid = tid + # downgrade VI/VO to BE if tid in [4, 5, 6, 7]: tid = 3