From nobody Sat Jun 11 01:38:25 2022 X-Original-To: dev-commits-src-main@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 550BC85C32B for ; Sat, 11 Jun 2022 01:38:32 +0000 (UTC) (envelope-from junchoon@dec.sakura.ne.jp) Received: from www121.sakura.ne.jp (www121.sakura.ne.jp [153.125.133.21]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4LKgTL56Btz4bhX; Sat, 11 Jun 2022 01:38:30 +0000 (UTC) (envelope-from junchoon@dec.sakura.ne.jp) Received: from kalamity.joker.local (123-1-85-147.area1b.commufa.jp [123.1.85.147]) (authenticated bits=0) by www121.sakura.ne.jp (8.16.1/8.16.1/[SAKURA-WEB]/20201212) with ESMTPA id 25B1cQSV041531; Sat, 11 Jun 2022 10:38:26 +0900 (JST) (envelope-from junchoon@dec.sakura.ne.jp) Date: Sat, 11 Jun 2022 10:38:25 +0900 From: Tomoaki AOKI To: dev-commits-src-main@freebsd.org Cc: bz@FreeBSD.org Subject: Re: git: d0d291103519 - main - LinuxKPI: 802.11: rework handling of the special IEEE80211_NUM_TIDS queue Message-Id: <20220611103825.4916ce95622f09268b5cac6d@dec.sakura.ne.jp> Organization: Junchoon corps X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd13.0) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4LKgTL56Btz4bhX X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of junchoon@dec.sakura.ne.jp has no SPF policy when checking 153.125.133.21) smtp.mailfrom=junchoon@dec.sakura.ne.jp X-Spamd-Result: default: False [1.30 / 15.00]; FAKE_REPLY(1.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; DMARC_NA(0.00)[sakura.ne.jp]; AUTH_NA(1.00)[]; NEURAL_SPAM_SHORT(0.71)[0.712]; HAS_ORG_HEADER(0.00)[]; RCVD_TLS_LAST(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.992]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_MEDIUM(-0.82)[-0.816]; MLMMJ_DEST(0.00)[dev-commits-src-main]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:7684, ipnet:153.125.128.0/18, country:JP]; RCVD_COUNT_TWO(0.00)[2]; MID_RHS_MATCH_FROM(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[123.1.85.147:received] X-ThisMailContainsUnwantedMimeParts: N Hi. This broke build with LINUXKPI_DEBUG_80211 defined. Format string in printf() at line 3093 looks mis-matching with parameters. Don't know which is intended, though. Line No. in error log below differs as I've applied the patch you requested before, set linuxkpi_debug_80211 to 0x12, define LINUXKPI_DEBUG_80211, and #if 0 ... #endif for 3 parts. Reverting the patch (so LINUXKPI_DEBUG_80211 is NOT defined) aloowed build. === Quot error log === --- all_subdir_linuxkpi_wlan --- ./machine/pcpu_aux.h:59:20: note: expanded from macro 'curthread' #define curthread (__curthread()) ^ /usr/src/sys/compat/linuxkpi/common/src/linux_80211.c:3102:8: error: format specifies type 'int' but the argument has type 'struct lkpi_sta *' [-Werror,-Wformat] lsta, sta, ni, ni->ni_macaddr, ":", skb, ltxq, ^~~~ /usr/src/sys/compat/linuxkpi/common/src/linux_80211.c:3102:14: error: format specifies type 'unsigned int' but the argument has type 'struct ieee80211_sta *' [-Werror,-Wformat] lsta, sta, ni, ni->ni_macaddr, ":", skb, ltxq, ^~~ /usr/src/sys/compat/linuxkpi/common/src/linux_80211.c:3102:49: error: format specifies type 'char *' but the argument has type 'struct lkpi_txq *' [-Werror,-Wformat] lsta, sta, ni, ni->ni_macaddr, ":", skb, ltxq, ^~~~ --- all_subdir_linux_common --- Building /usr/obj/usr/src/amd64.amd64/sys/TEST18/modules/usr/src/sys/modules/linux_common/linux.o --- all_subdir_linuxkpi_wlan --- /usr/src/sys/compat/linuxkpi/common/src/linux_80211.c:3103:8: error: format specifies type 'void *' but the argument has type 'uint32_t' (aka 'unsigned int') [-Werror,-Wformat] skb_queue_len(<xq->skbq), ltxq->txq.ac, ^~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/src/sys/compat/linuxkpi/common/src/linux_80211.c: 3103:36: error: format specifies type 'void *' but the argument has type 'int' [-Werror,-Wformat] skb_queue_len(<xq->skbq), ltxq->txq.ac, ^~~~~~~~~~~~ /usr/src/sys/compat/linuxkpi/common/src/linux_80211.c: 3100:31: error: more '%' conversions than data arguments [-Werror,-Wformat-insufficient-args] "WAKE_TX_Q ac %d prio %u qmap %u\n", ~^ --- all_subdir_linuxkpi --- Building /usr/obj/usr/src/amd64.amd64/sys/TEST18/modules/usr/src/sys/modules/linuxkpi/linux_firmware.o --- all_subdir_linuxkpi_wlan --- 7 errors generated. --- all_subdir_mac_bsdextended --- Building /usr/obj/usr/src/amd64.amd64/sys/TEST18/modules/usr/src/sys/modules/mac_bsdextended/mac_bsdextended.ko.full --- all_subdir_linuxkpi_wlan --- *** [linux_80211.o] Error code 1 make[4]: stopped in /usr/src/sys/modules/linuxkpi_wlan .ERROR_TARGET='linux_80211.o' .ERROR_META_FILE='/usr/obj/usr/src/amd64.amd64/sys/TEST18/modules/usr/src/sys/modules/linuxkpi_wlan/linux_80211.o.meta' .MAKE.LEVEL='4' MAKEFILE='' .MAKE.MODE='meta missing-filemon=yes missing-meta=yes silent=yes verbose' 147.14 real 326.16 user 10.34 sys make[1]: stopped in /usr/src make: stopped in /usr/src === End quot === > The branch main has been updated by bz: > > URL: https://cgit.FreeBSD.org/src/commit/?id=d0d2911035192473e8bd3f6b99ed5ca9b1b29e47 > > commit d0d2911035192473e8bd3f6b99ed5ca9b1b29e47 > Author: Bjoern A. Zeeb > AuthorDate: 2022-06-10 14:18:57 +0000 > Commit: Bjoern A. Zeeb > CommitDate: 2022-06-10 14:18:57 +0000 > > LinuxKPI: 802.11: rework handling of the special IEEE80211_NUM_TIDS queue > > Rework the way we are dealing with the last queue. If the driver > opts in to STA_MMPDU_TXQ then preferably send all non-data frames > via the last (IEEE80211_NUM_TIDS) queue which otherwise is not used > in station mode. > If we do not have that queue we do individual tx() calls for non-data > frames now. > Everything else goes via the selected queue if possible for as long as > we have a ni (sta) and otherwise resorts to direct tx. > > Tested on: Intel AX200 and AX210 > Sponsored by: The FreeBSD Foundation > MFC after: 3 days > --- > sys/compat/linuxkpi/common/src/linux_80211.c | 54 +++++++++++++++++ +---------- > 1 file changed, 36 insertions(+), 18 deletions(-) (snip) -- Tomoaki AOKI