From nobody Mon Jun 26 12:08:21 2023 X-Original-To: dev-commits-src-branches@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 4QqRSk3F2Tz4k6Yh; Mon, 26 Jun 2023 12:08:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QqRSk1T6Cz3hH0; Mon, 26 Jun 2023 12:08:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687781302; 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=Y73ah+ON2YBzKAE4tfOZzdO6BXrsiLgl1kixIj5PunY=; b=XyajDyoCNTVuyToyXTEVjV+QXJ8d03C3Wgu6WmVmkjov0K3gWK6TGHiM+fNdZJU3wOmhuE GbKay319u11klCDdQIKB32i+htQZclAPYy1jcFEa/T5jHMBxbsxCxQMW2jOFV6Ea/DCmYJ yGxQ4hd6p/SG5ewZdMHu8HWs8z8MoVNKhWnyL9e73MFS3q9Yki6MSc5EyO3wtCvu2EfPX/ qAqx5Bm3XZhx9aHVEpU5cfU3qS2TFfjpRxzVCUCekp/WgJvolEMzwyEGGA6sLPNvX/f3Oa /88ZjdXN+KJNWa4QMAz9F8bkXuausi8qR7assGwZavVSvkVzVMq8HGxHRp9i9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687781302; 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=Y73ah+ON2YBzKAE4tfOZzdO6BXrsiLgl1kixIj5PunY=; b=FJ8Alm6gvaUBWOFRnOAybI//sAWhiSAww23Mruwwuex2AZWIyomeNbE3nnjCIcA5D7nZfz U8g5uEsPSGm/DcSUBf1ri1NUmoB4Wl8bUXiUtcuatzbCM9Lu64D3IiuYP0NVGrsKxufbT+ TITQKintQ23dhabBZGIbMDw+MLXgJryzGD5pfhSs+fpqPbgutWqHy3+3GxbrJ66O2xLaHz NM1+PzzdSmtqlE/y02+pzSbZ616eEl3SYhNOv9cQFtG6ZTR47dxv+rjjGGwuwNEBWfdin0 kn98X+9e5ZEUof3K9NqBR1fbPpv912iw82mbJQhH4mUvMe8RDQUmRlVsXkZ6ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687781302; a=rsa-sha256; cv=none; b=LE26RjA+jldWu2CG9USIPl/lli8Pv/XMvrl9mgOVgKh/6kCaL3brNTekQe9qX87Qc6NrWd tHNbjkQhv2FAMd1FrK2Fm/NC9/KOBSxd2Zz/sGcnxIcyZIQ2t84dyrpwQLaKNR6NoyNQ3z 0coHS3w07hXDpfJCjITquBFKDSHUXw4IZ6/xBZX2KSc4xL7ndekNKNHzwGY9n61Di+aJZr m2np/hWhMk03PYZm5ZSDDsJyc+ZNNDjz50wzIGujlstoJCD+yGED6cnH1fOYJiWaz43x8Y /+3osVUyuzoY4S6RIzGWZyM2PDeo74eoDhx2cde1w1QYjT+BiMX/beLkhOC31g== 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 4QqRSk07t6z18Cf; Mon, 26 Jun 2023 12:08:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35QC8L2b082811; Mon, 26 Jun 2023 12:08:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35QC8LjB082810; Mon, 26 Jun 2023 12:08:21 GMT (envelope-from git) Date: Mon, 26 Jun 2023 12:08:21 GMT Message-Id: <202306261208.35QC8LjB082810@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: ded53e898c7b - stable/13 - rc/WPA: driver_bsd.c: backout upstream IFF_ change and add logging List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: ded53e898c7be6d610e94c1746fd22304f5c5988 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ded53e898c7be6d610e94c1746fd22304f5c5988 commit ded53e898c7be6d610e94c1746fd22304f5c5988 Author: Bjoern A. Zeeb AuthorDate: 2023-03-23 22:37:12 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-06-26 09:00:55 +0000 rc/WPA: driver_bsd.c: backout upstream IFF_ change and add logging This reverts the state to our old supplicant logic setting or clearing IFF_UP if needed. In addition this adds logging for the cases in which we do (not) change the interface state. Depending on testing this seems to help bringing WiFi up or not log any needed changes (which would be the expected wpa_supplicant logic now). People should look out for ``(changed)`` log entries (at least if debugging the issue; this way we will at least have data points). There is a hypothesis still pondered that the entire IFF_UP toggling only exploits a race in net80211 (see further discssussions for more debugging and alternative solutions see D38508 and D38753). That may also explain why the changes to the rc startup script [1] only helped partially for some people to no longer see the continuous CTRL-EVENT-SCAN-FAILED. It is highly likely that we will want further changes and until we know for sure that people are seeing ''(changed)'' events this should stay local. Should we need to upstream this we'll likely need #ifdef __FreeBSD__ around this code. Remove ifconfig down/up workaround (bfb202c4554a) in rc.d/wpa_supplicant as it is no longer needed. [1] 5fcdc19a81115d975e238270754e28557a2fcfc5 and d06d7eb09131edea666bf049d6c0c55672726f76 Sponsored by: The FreeBSD Foundation Reviewed by: cy, enweiwu (earlier) Differential Revision: https://reviews.freebsd.org/D38807 (cherry picked from commit bfb202c4554a72383202a1a401d80721935b8c95) Reviewed by: bz (for wireless) Differential Revision: https://reviews.freebsd.org/D39257 (cherry picked from commit 052211e08c0e227277d0c4dc603bba2253eb3d73) --- contrib/wpa/src/drivers/driver_bsd.c | 50 ++++++++++++++++++++++++++++-------- libexec/rc/rc.d/wpa_supplicant | 6 ----- 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/contrib/wpa/src/drivers/driver_bsd.c b/contrib/wpa/src/drivers/driver_bsd.c index 345bbb892ecf..d5ff51cee456 100644 --- a/contrib/wpa/src/drivers/driver_bsd.c +++ b/contrib/wpa/src/drivers/driver_bsd.c @@ -294,8 +294,9 @@ bsd_send_mlme_param(void *priv, const u8 op, const u16 reason, const u8 *addr) } static int -bsd_get_iface_flags(struct bsd_driver_data *drv) +bsd_ctrl_iface(void *priv, int enable) { + struct bsd_driver_data *drv = priv; struct ifreq ifr; os_memset(&ifr, 0, sizeof(ifr)); @@ -307,6 +308,33 @@ bsd_get_iface_flags(struct bsd_driver_data *drv) return -1; } drv->flags = ifr.ifr_flags; + + + if (enable) { + if (ifr.ifr_flags & IFF_UP) + goto nochange; + ifr.ifr_flags |= IFF_UP; + } else { + if (!(ifr.ifr_flags & IFF_UP)) + goto nochange; + ifr.ifr_flags &= ~IFF_UP; + } + + if (ioctl(drv->global->sock, SIOCSIFFLAGS, &ifr) < 0) { + wpa_printf(MSG_ERROR, "ioctl[SIOCSIFFLAGS]: %s", + strerror(errno)); + return -1; + } + + wpa_printf(MSG_DEBUG, "%s: if %s (changed) enable %d IFF_UP %d ", + __func__, drv->ifname, enable, ((ifr.ifr_flags & IFF_UP) != 0)); + + drv->flags = ifr.ifr_flags; + return 0; + +nochange: + wpa_printf(MSG_DEBUG, "%s: if %s (no change) enable %d IFF_UP %d ", + __func__, drv->ifname, enable, ((ifr.ifr_flags & IFF_UP) != 0)); return 0; } @@ -526,7 +554,7 @@ bsd_set_ieee8021x(void *priv, struct wpa_bss_params *params) __func__); return -1; } - return 0; + return bsd_ctrl_iface(priv, 1); } static void @@ -1030,7 +1058,8 @@ bsd_init(struct hostapd_data *hapd, struct wpa_init_params *params) if (l2_packet_get_own_addr(drv->sock_xmit, params->own_addr)) goto bad; - if (bsd_get_iface_flags(drv) < 0) + /* mark down during setup */ + if (bsd_ctrl_iface(drv, 0) < 0) goto bad; if (bsd_set_mediaopt(drv, IFM_OMASK, IFM_IEEE80211_HOSTAP) < 0) { @@ -1055,12 +1084,13 @@ bsd_deinit(void *priv) { struct bsd_driver_data *drv = priv; + if (drv->ifindex != 0) + bsd_ctrl_iface(drv, 0); if (drv->sock_xmit != NULL) l2_packet_deinit(drv->sock_xmit); os_free(drv); } - static int bsd_set_sta_authorized(void *priv, const u8 *addr, unsigned int total_flags, unsigned int flags_or, @@ -1309,7 +1339,7 @@ wpa_driver_bsd_associate(void *priv, struct wpa_driver_associate_params *params) * NB: interface must be marked UP for association * or scanning (ap_scan=2) */ - if (bsd_get_iface_flags(drv) < 0) + if (bsd_ctrl_iface(drv, 1) < 0) return -1; os_memset(&mlme, 0, sizeof(mlme)); @@ -1354,11 +1384,8 @@ wpa_driver_bsd_scan(void *priv, struct wpa_driver_scan_params *params) } /* NB: interface must be marked UP to do a scan */ - if (!(drv->flags & IFF_UP)) { - wpa_printf(MSG_DEBUG, "%s: interface is not up, cannot scan", - __func__); + if (bsd_ctrl_iface(drv, 1) < 0) return -1; - } #ifdef IEEE80211_IOC_SCAN_MAX_SSID os_memset(&sr, 0, sizeof(sr)); @@ -1664,7 +1691,7 @@ wpa_driver_bsd_init(void *ctx, const char *ifname, void *priv) drv->capa.key_mgmt_iftype[i] = drv->capa.key_mgmt; /* Down interface during setup. */ - if (bsd_get_iface_flags(drv) < 0) + if (bsd_ctrl_iface(drv, 0) < 0) goto fail; /* Proven to work, lets go! */ @@ -1688,6 +1715,9 @@ wpa_driver_bsd_deinit(void *priv) if (drv->ifindex != 0 && !drv->if_removed) { wpa_driver_bsd_set_wpa(drv, 0); + /* NB: mark interface down */ + bsd_ctrl_iface(drv, 0); + wpa_driver_bsd_set_wpa_internal(drv, drv->prev_wpa, drv->prev_privacy); diff --git a/libexec/rc/rc.d/wpa_supplicant b/libexec/rc/rc.d/wpa_supplicant index e7a34e6c5f6e..8a86fec90e4d 100755 --- a/libexec/rc/rc.d/wpa_supplicant +++ b/libexec/rc/rc.d/wpa_supplicant @@ -12,7 +12,6 @@ name="wpa_supplicant" desc="WPA/802.11i Supplicant for wireless network devices" -start_postcmd="wpa_poststart" rcvar= ifn="$2" @@ -28,11 +27,6 @@ is_ndis_interface() esac } -wpa_poststart() { - ifconfig ${ifn} down - ifconfig ${ifn} up -} - if is_wired_interface ${ifn} ; then driver="wired" elif is_ndis_interface ${ifn} ; then