From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from nbd.name (nbd.name [46.4.11.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1CB4315D5A5 for ; Fri, 7 Jun 2024 10:22:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.4.11.11 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717755750; cv=none; b=cNh5LynwrS54S8uWxyXBoH41VFK2T4Cyquigc8ptTClaTjDSlNSne3IXYwvLm7Q7bvvMQPyecKj31p9/nr8m1T29FSDVN1h9G0rrFluI9cREYAxf8AhglFTWJeEOsZ3H3s3qN5C4L5YDjDHjFcNDSPt1CZI+f4OM8l96/L+J0Jk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717755750; c=relaxed/simple; bh=v3h9ddT8ASNEU+e17xuYD3rpes8fTk6Ed9jPZc+o1bw=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=O3Zqfzp/Jmmggd8Dwy3jzwnzEqk/mTENl0ZceKh9c590T5WJnFUhiQNH7jnqZmqhHiddG4XduEdornqdoV+RJP0xuTnnijMXLs6wO8+h3O2H8qVWqANpA2u5oxa018rmHsV5fDENV2prGjR3oC/OnlLHzaGMCMhN40fqyTCjX5w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nbd.name; spf=none smtp.mailfrom=nbd.name; dkim=pass (1024-bit key) header.d=nbd.name header.i=@nbd.name header.b=ByVYTwOy; arc=none smtp.client-ip=46.4.11.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nbd.name Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=nbd.name Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nbd.name header.i=@nbd.name header.b="ByVYTwOy" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nbd.name; s=20160729; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:From: References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=uq1AHMujd0zVyzETvuqXZKvPmWNCXkBZtDnwT/6YJPY=; b=ByVYTwOyYo0DcNxdRrCm86Z8+t nKQ3F5BpgcRoItCZ11Pu7fjaG1F5AXzlUmvQiNrIjohk35fPKLTyahlQW+YTXS5KfIS9BKm2aEfFm JkIsab12NtIvlYboIID90r9iqTuhjYc5vq9JfKqyebk+eixVOkhoUWV2KCFEwrTDKXAM=; Received: from p4ff13226.dip0.t-ipconnect.de ([79.241.50.38] helo=nf.local) by ds12 with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.96) (envelope-from ) id 1sFWjp-008rpd-1U; Fri, 07 Jun 2024 12:22:25 +0200 Message-ID: <1f32cb6c-6be8-4e3d-8e8f-2d3c728875a9@nbd.name> Date: Fri, 7 Jun 2024 12:22:25 +0200 Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [RFC v3 6/8] wifi: mac80211: extend ifcomb check functions for multi-radio To: Karthikeyan Periyasamy , linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, quic_adisi@quicinc.com, ath12k@lists.infradead.org References: From: Felix Fietkau Content-Language: en-US Autocrypt: addr=nbd@nbd.name; keydata= xsDiBEah5CcRBADIY7pu4LIv3jBlyQ/2u87iIZGe6f0f8pyB4UjzfJNXhJb8JylYYRzIOSxh ExKsdLCnJqsG1PY1mqTtoG8sONpwsHr2oJ4itjcGHfn5NJSUGTbtbbxLro13tHkGFCoCr4Z5 Pv+XRgiANSpYlIigiMbOkide6wbggQK32tC20QxUIwCg4k6dtV/4kwEeiOUfErq00TVqIiEE AKcUi4taOuh/PQWx/Ujjl/P1LfJXqLKRPa8PwD4j2yjoc9l+7LptSxJThL9KSu6gtXQjcoR2 vCK0OeYJhgO4kYMI78h1TSaxmtImEAnjFPYJYVsxrhay92jisYc7z5R/76AaELfF6RCjjGeP wdalulG+erWju710Bif7E1yjYVWeA/9Wd1lsOmx6uwwYgNqoFtcAunDaMKi9xVQW18FsUusM TdRvTZLBpoUAy+MajAL+R73TwLq3LnKpIcCwftyQXK5pEDKq57OhxJVv1Q8XkA9Dn1SBOjNB l25vJDFAT9ntp9THeDD2fv15yk4EKpWhu4H00/YX8KkhFsrtUs69+vZQwc0cRmVsaXggRmll dGthdSA8bmJkQG5iZC5uYW1lPsJgBBMRAgAgBQJGoeQnAhsjBgsJCAcDAgQVAggDBBYCAwEC HgECF4AACgkQ130UHQKnbvXsvgCgjsAIIOsY7xZ8VcSm7NABpi91yTMAniMMmH7FRenEAYMa VrwYTIThkTlQzsFNBEah5FQQCACMIep/hTzgPZ9HbCTKm9xN4bZX0JjrqjFem1Nxf3MBM5vN CYGBn8F4sGIzPmLhl4xFeq3k5irVg/YvxSDbQN6NJv8o+tP6zsMeWX2JjtV0P4aDIN1pK2/w VxcicArw0VYdv2ZCarccFBgH2a6GjswqlCqVM3gNIMI8ikzenKcso8YErGGiKYeMEZLwHaxE Y7mTPuOTrWL8uWWRL5mVjhZEVvDez6em/OYvzBwbkhImrryF29e3Po2cfY2n7EKjjr3/141K DHBBdgXlPNfDwROnA5ugjjEBjwkwBQqPpDA7AYPvpHh5vLbZnVGu5CwG7NAsrb2isRmjYoqk wu++3117AAMFB/9S0Sj7qFFQcD4laADVsabTpNNpaV4wAgVTRHKV/kC9luItzwDnUcsZUPdQ f3MueRJ3jIHU0UmRBG3uQftqbZJj3ikhnfvyLmkCNe+/hXhPu9sGvXyi2D4vszICvc1KL4RD aLSrOsROx22eZ26KqcW4ny7+va2FnvjsZgI8h4sDmaLzKczVRIiLITiMpLFEU/VoSv0m1F4B FtRgoiyjFzigWG0MsTdAN6FJzGh4mWWGIlE7o5JraNhnTd+yTUIPtw3ym6l8P+gbvfoZida0 TspgwBWLnXQvP5EDvlZnNaKa/3oBes6z0QdaSOwZCRA3QSLHBwtgUsrT6RxRSweLrcabwkkE GBECAAkFAkah5FQCGwwACgkQ130UHQKnbvW2GgCeMncXpbbWNT2AtoAYICrKyX5R3iMAoMhw cL98efvrjdstUfTCP2pfetyN In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 07.06.24 12:07, Karthikeyan Periyasamy wrote: > > > On 6/6/2024 11:37 PM, Felix Fietkau wrote: >> Add support for counting global and per-radio max/current number of >> channels, as well as checking radio-specific interface combinations. >> >> Signed-off-by: Felix Fietkau >> --- >> net/mac80211/cfg.c | 7 +- >> net/mac80211/chan.c | 17 +++-- >> net/mac80211/ibss.c | 2 +- >> net/mac80211/ieee80211_i.h | 6 +- >> net/mac80211/iface.c | 2 +- >> net/mac80211/util.c | 131 +++++++++++++++++++++++++++----------- >> 6 files changed, 116 insertions(+), 49 deletions(-) >> >> diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c >> index 62119e957cd8..950b7b72f0b8 100644 >> --- a/net/mac80211/cfg.c >> +++ b/net/mac80211/cfg.c >> @@ -263,7 +263,7 @@ static int ieee80211_start_p2p_device(struct wiphy *wiphy, >> >> lockdep_assert_wiphy(sdata->local->hw.wiphy); >> >> - ret = ieee80211_check_combinations(sdata, NULL, 0, 0); >> + ret = ieee80211_check_combinations(sdata, NULL, 0, 0, -1); >> if (ret < 0) >> return ret; >> >> @@ -285,7 +285,7 @@ static int ieee80211_start_nan(struct wiphy *wiphy, >> >> lockdep_assert_wiphy(sdata->local->hw.wiphy); >> >> - ret = ieee80211_check_combinations(sdata, NULL, 0, 0); >> + ret = ieee80211_check_combinations(sdata, NULL, 0, 0, -1); >> if (ret < 0) >> return ret; >> >> @@ -4001,7 +4001,7 @@ __ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev, >> goto out; >> >> /* if reservation is invalid then this will fail */ >> - err = ieee80211_check_combinations(sdata, NULL, chanctx->mode, 0); >> + err = ieee80211_check_combinations(sdata, NULL, chanctx->mode, 0, -1); > > Once we reach the global limit, all the -1 passing caller get fail > becuase the iface check param (existing and new) is validated against > the global limit. since global limt as a sort of union of all per-radio > limits. > > Ex: > Global iface = 6 (Radio iface 2GHz:4, 5GHz:4, 6GHz:6) > > > So far 6 iface created (Radio iface 2GHz:2, 5GHz:3, 6GHz:1) > > In this case, new iface creation get fail because caller uses > ieee80211_check_combinations() with -1 as radio idx, so it checked > against global limit Use the sum of the number of interfaces from each radio instead of the maximum. - Felix