Received: by 2002:a05:7412:3784:b0:e2:908c:2ebd with SMTP id jk4csp2857212rdb; Wed, 4 Oct 2023 13:46:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE9b7o5hA9i09BZJ0GlkSX0vQne+Suz7hOoFAApvnLJSSD4nQbMbHnxQx78jHAChcr2fH8l X-Received: by 2002:a17:903:26c3:b0:1c5:de65:f8a8 with SMTP id jg3-20020a17090326c300b001c5de65f8a8mr3290285plb.1.1696452372864; Wed, 04 Oct 2023 13:46:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696452372; cv=none; d=google.com; s=arc-20160816; b=PqPSNgAXF1vW0VkEe3u3EW+Y5tA/h96ZrBYkr+1onjYc5OX2UwabN9bsBdQh97g5Kr pDpkTYDHbOdqgeHDCzqTRutsv0+nYRJq8EQsntpgUTh3h4tJ+50zosEbbtHDLSL7oCzL GEcj5vszZ8x5HkCSW2+IlHubwmcwYCvuy3TfpIlAb/4nL0hFz9ZHqxUJ280iHhG0grWA EeWSViM/8zjow9pdRFNUt3e4HOKR9NivqLD2fY69bP3li/0yhwp4NOGrLce8lMISCNLR ZrmuD9a1YRsxVQ2RqDHaOR/V0F/lWZ/lj6FBOqI+TPyEHaHnurT+1qptbwukO0esJfjQ KOCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to :organization:from:references:to:content-language:subject:user-agent :mime-version:date:message-id:dkim-signature:dkim-filter; bh=n9b+1OCTdJFwW9wk/SPggXsUAsuTTyIqEIS8wjbqRoc=; fh=LbOKWJHTo8IGkH9PGmpeU6ndo1Q5/V9bDrUebU2BHmk=; b=A6l+Up87DG489+lJEg2+Zv0rHCFxxuOHEIDJYQtXhe22SQkm8nEH/IxLNsK2DI5cCO O+jtSyCkxUXWcwo/RhpXF4RyL8F7wLo1ODw5fGJlhYpgDNgJ19f5UB+bEeggv5ITvM5d zrERydAAHlnZ6jRvgn1RwBRea81UDoPriaY4pj5CoJi29wOLdSWYmgz/IqHUnwercPNB zAcTGuP2FDoem8zzZjmjWYgHxdXCL9YgtgKNm4wAaIgweCAknukF5khgleRMVPOqzte5 8pfsDZCYN3EkzR80CGZ0Qx1LiPwdnNcunpG3RJnH5/pxyYO1ATHXYHFnAE/EYWwOwJ17 dimg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@candelatech.com header.s=default header.b=nAkhd+eP; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=candelatech.com Return-Path: Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id z3-20020a1709027e8300b001b7ea20dbf2si4161782pla.224.2023.10.04.13.46.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 13:46:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@candelatech.com header.s=default header.b=nAkhd+eP; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=candelatech.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id BF39081441A7; Wed, 4 Oct 2023 13:46:01 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243754AbjJDUqD (ORCPT + 53 others); Wed, 4 Oct 2023 16:46:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242584AbjJDUqC (ORCPT ); Wed, 4 Oct 2023 16:46:02 -0400 Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59028B8 for ; Wed, 4 Oct 2023 13:45:59 -0700 (PDT) X-Virus-Scanned: Proofpoint Essentials engine Received: from mail3.candelatech.com (mail2.candelatech.com [208.74.158.173]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 7E583500085; Wed, 4 Oct 2023 20:45:56 +0000 (UTC) Received: from [192.168.100.159] (50-251-239-81-static.hfc.comcastbusiness.net [50.251.239.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail3.candelatech.com (Postfix) with ESMTPSA id E45FA13C2B0; Wed, 4 Oct 2023 13:45:55 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com E45FA13C2B0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1696452356; bh=6csj/bOAu3xQ3LyjSvljspZi7AoHRit5iYnamd2mQx8=; h=Date:Subject:To:References:From:In-Reply-To:From; b=nAkhd+ePXGq/RQiZVA3ZPr7e7d3AAscGwSRDGxmvF9aWxfpm0XCxHnwlpHrq11Sld zliGRmJN/qr7ggufuUtaG25ht1XUjnm13r3LsFwgsw6hc8pK6SiMGiBxKsKKCO0BHY YDlJsO56rYIvXWKxRl4+Q9ogDhGnKeOEGv6JT6QQ= Message-ID: Date: Wed, 4 Oct 2023 13:45:55 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: [PATCH] mac80211: ethtool: check link sta if deflink sta not found. Content-Language: en-US To: Johannes Berg , linux-wireless@vger.kernel.org References: <20231003215839.981227-1-greearb@candelatech.com> <5b1aeb36dbc7316e5de0b0cfdf429b754c5cfd82.camel@sipsolutions.net> From: Ben Greear Organization: Candela Technologies In-Reply-To: <5b1aeb36dbc7316e5de0b0cfdf429b754c5cfd82.camel@sipsolutions.net> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-MDID: 1696452357-91BZNm98EyYe X-MDID-O: us5;ut7;1696452357;91BZNm98EyYe;;b42792dba290a1257c3f0aaf1c60b0ff X-Spam-Status: No, score=1.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, NICE_REPLY_A,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 04 Oct 2023 13:46:02 -0700 (PDT) X-Spam-Level: * On 10/4/23 12:36, Johannes Berg wrote: > On Tue, 2023-10-03 at 14:58 -0700, greearb@candelatech.com wrote: >> From: Ben Greear >> >> While testing with wifi-7 radio put into AX mode, link-0 is created. >> sdata->deflink.u.mgd.bssid was 00 in this case, so sta was not >> found. >> >> Use link-0 for sta if it is available to do a better job of reporting >> ethtool stats. >> >> Signed-off-by: Ben Greear >> --- >> net/mac80211/ethtool.c | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/net/mac80211/ethtool.c b/net/mac80211/ethtool.c >> index 6bd7fba8a867..1b58304fc68a 100644 >> --- a/net/mac80211/ethtool.c >> +++ b/net/mac80211/ethtool.c >> @@ -96,6 +96,7 @@ static void ieee80211_get_stats2(struct net_device *dev, >> struct ieee80211_local *local = sdata->local; >> struct station_info sinfo; >> struct survey_info survey; >> + struct ieee80211_link_data *link; >> int i, q; >> int z; >> #define STA_STATS_SURVEY_LEN 7 >> @@ -128,6 +129,12 @@ static void ieee80211_get_stats2(struct net_device *dev, >> if (sdata->vif.type == NL80211_IFTYPE_STATION) { >> sta = sta_info_get_bss(sdata, sdata->deflink.u.mgd.bssid); > > Just don't even try this, link[0] is always valid. What is 'deflink' even used for then? Is that only for non MLO connections? Or you mean link[0] is valid even in non MLO connections? Note I'm not changing that line above in my patch, though maybe it should be changed... > >> + if (!sta) { >> + link = sdata_dereference(sdata->link[0], sdata); > > but link[0] is a bad idea anyway ... what if the AP only assigned link 1 > and 2? Or you connected only there? > > I'm not even sure this is really worth fixing, do you really want a > random link's statistics? I'd like it to at least have a chance of reporting something useful. So maybe 'sta' can be the connected link with highest band. And then I can add new ethtool stats for link-0, link-1, link-2 (and one of those would be duplicated, since the 'best' stats are already added). Or I could have the default stats always be link-0, and add new ethtool stats for link-1, link-2. That would make it less backwards compatible since link-0 may not be connected and would show no useful stats for the old default ethtool strings. I do not want to change existing ethtool stats strings since that would break my user-space API and I'd rather not hack around that if possible. Thanks, Ben > > johannes > -- Ben Greear Candela Technologies Inc http://www.candelatech.com