From nobody Thu Jul 28 14:39:19 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 4LttZc2wbqz4XvPW; Thu, 28 Jul 2022 14:39:20 +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 4LttZc11Y2z43sN; Thu, 28 Jul 2022 14:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659019160; 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=pUgNme1xE/H2pEyFLJZedMZvkQYRU01lit0YQePSA0E=; b=Spuln/E0xLPYBf4vaNq43H2Uo9m/d6txpPoNzP3oFNJCRGz/OngpXqHO6Dn3maVTOc3IJJ bs2+UT6Ple+/7O972jgCyhjiBfRVAiC9Ixclj0izwILhDEeSKpFDy5TWy5fPGeYZz0G1kq w97fdQ7DhMm6kMFG2YPJC7lcKm36Gg6rfkhax2HkOGVLY4kSRDllB48/89KxRGUC5olWrC EzudCYIjWDfTDbDoiJaYZEgp6/ag1XrzF9VZGbIUl31l2M+WkQ+uVj6AMwrqI/XcpjhNVs 6M1D1Au6pRVzjn5rTV9d0ezANgn34p0G9RCVu+VtGv2+1vGW8x/Von2Um8yQWA== 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 4LttZc066fzyln; Thu, 28 Jul 2022 14:39:20 +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 26SEdJiT030020; Thu, 28 Jul 2022 14:39:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26SEdJaU030019; Thu, 28 Jul 2022 14:39:19 GMT (envelope-from git) Date: Thu, 28 Jul 2022 14:39:19 GMT Message-Id: <202207281439.26SEdJaU030019@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 713ceb99b685 - main - lagg: fix lagg ifioctl after SIOCSIFCAPNV 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 713ceb99b68568232bf9895bbe1811797bfde63c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659019160; 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=pUgNme1xE/H2pEyFLJZedMZvkQYRU01lit0YQePSA0E=; b=HDg8hS7jnGWTCkSqyRLwjrbQSvMDOYDjMcswyeDovgkBsRxzHc3i5s+ezg3mnL8F5jJviQ jKmSHwKzuZkr7TeDiB8aniPvSJ79eBZSjAjwFIJ6lWl0m7if7UPCZsgQQFyQM5pxVBegWc 3sJDV2LrYcfFi0/NS8gRVJ7mqC6Rtv5/i7QV97CBgGyB6fFy6sZA+EuTQggrzlP7cMArh4 p7vU0smrOc9A4Z0VYvZwBwujRwbqFSBvBH04sprrWrhGikGb23XIwudSV9bjruT3S+qD3d 6mPd8kmycwoXw2O0i1ULlRBQP06ell72zPnwUuWZLNtad4K82QmmdGodHX06pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659019160; a=rsa-sha256; cv=none; b=k5lp8cJGPwz1JdoSTlIU5dDdbf3iiwUmahbdg1xM92GABpRyfpoFqGCpkcDsxFSQtihrv5 +pj7NtIhBCPTo/UkK2UwpXOMD40M5tjLknFFaR3QOY9RAT8GWvKTIxYZ6xYF90eUE6EWBW BYXybnJr5ZZL7XMRed0So57z9Fcoc5HjQ2yewqKkv6nJD44m74wGnA0l4ywuTrvbBN9au8 PHfDPgp5fYMiD7aqi866jC5W7R9rl6g4GxBSCjfO/JeZ6pQeMWTJtzNUxFqvIy0MSHs4sI T9R2+fUQHbfZLFeXK1vR+EIcAMoqhxGDdNN73fwumTy6tKl7Ne+PZ6ZVs43lug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=713ceb99b68568232bf9895bbe1811797bfde63c commit 713ceb99b68568232bf9895bbe1811797bfde63c Author: Andrew Gallatin AuthorDate: 2022-07-28 14:36:22 +0000 Commit: Andrew Gallatin CommitDate: 2022-07-28 14:39:00 +0000 lagg: fix lagg ifioctl after SIOCSIFCAPNV Lagg was broken by SIOCSIFCAPNV when all underlying devices support SIOCSIFCAPNV. This change updates lagg to work with SIOCSIFCAPNV and if_capabilities2. Reviewed by: kib, hselasky Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D35865 --- sys/net/if_lagg.c | 62 +++++++++++++++++++++++++++++++++++++++---------------- sys/net/if_lagg.h | 1 + 2 files changed, 45 insertions(+), 18 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 3894b6d55cea..8e273c4ed391 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -157,7 +157,7 @@ static void lagg_ratelimit_query(struct ifnet *, #endif static int lagg_setmulti(struct lagg_port *); static int lagg_clrmulti(struct lagg_port *); -static int lagg_setcaps(struct lagg_port *, int cap); +static void lagg_setcaps(struct lagg_port *, int cap, int cap2); static int lagg_setflag(struct lagg_port *, int, int, int (*func)(struct ifnet *, int)); static int lagg_setflags(struct lagg_port *, int status); @@ -664,17 +664,20 @@ static void lagg_capabilities(struct lagg_softc *sc) { struct lagg_port *lp; - int cap, ena, pena; + int cap, cap2, ena, ena2, pena, pena2; uint64_t hwa; struct ifnet_hw_tsomax hw_tsomax; LAGG_XLOCK_ASSERT(sc); /* Get common enabled capabilities for the lagg ports */ - ena = ~0; - CK_SLIST_FOREACH(lp, &sc->sc_ports, lp_entries) + ena = ena2 = ~0; + CK_SLIST_FOREACH(lp, &sc->sc_ports, lp_entries) { ena &= lp->lp_ifp->if_capenable; - ena = (ena == ~0 ? 0 : ena); + ena2 &= lp->lp_ifp->if_capenable2; + } + if (CK_SLIST_FIRST(&sc->sc_ports) == NULL) + ena = ena2 = 0; /* * Apply common enabled capabilities back to the lagg ports. @@ -682,30 +685,36 @@ lagg_capabilities(struct lagg_softc *sc) */ do { pena = ena; + pena2 = ena2; CK_SLIST_FOREACH(lp, &sc->sc_ports, lp_entries) { - lagg_setcaps(lp, ena); + lagg_setcaps(lp, ena, ena2); ena &= lp->lp_ifp->if_capenable; + ena2 &= lp->lp_ifp->if_capenable2; } - } while (pena != ena); + } while (pena != ena || pena2 != ena2); /* Get other capabilities from the lagg ports */ - cap = ~0; + cap = cap2 = ~0; hwa = ~(uint64_t)0; memset(&hw_tsomax, 0, sizeof(hw_tsomax)); CK_SLIST_FOREACH(lp, &sc->sc_ports, lp_entries) { cap &= lp->lp_ifp->if_capabilities; + cap2 &= lp->lp_ifp->if_capabilities2; hwa &= lp->lp_ifp->if_hwassist; if_hw_tsomax_common(lp->lp_ifp, &hw_tsomax); } - cap = (cap == ~0 ? 0 : cap); - hwa = (hwa == ~(uint64_t)0 ? 0 : hwa); + if (CK_SLIST_FIRST(&sc->sc_ports) == NULL) + cap = cap2 = hwa = 0; if (sc->sc_ifp->if_capabilities != cap || sc->sc_ifp->if_capenable != ena || + sc->sc_ifp->if_capenable2 != ena2 || sc->sc_ifp->if_hwassist != hwa || if_hw_tsomax_update(sc->sc_ifp, &hw_tsomax) != 0) { sc->sc_ifp->if_capabilities = cap; + sc->sc_ifp->if_capabilities2 = cap2; sc->sc_ifp->if_capenable = ena; + sc->sc_ifp->if_capenable2 = ena2; sc->sc_ifp->if_hwassist = hwa; getmicrotime(&sc->sc_ifp->if_lastchange); @@ -982,7 +991,7 @@ lagg_port_destroy(struct lagg_port *lp, int rundelport) if (lp->lp_detaching == 0) { lagg_setflags(lp, 0); - lagg_setcaps(lp, lp->lp_ifcapenable); + lagg_setcaps(lp, lp->lp_ifcapenable, lp->lp_ifcapenable2); if_setlladdr(ifp, lp->lp_lladdr, ifp->if_addrlen); } @@ -1038,6 +1047,7 @@ lagg_port_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; case SIOCSIFCAP: + case SIOCSIFCAPNV: if (lp->lp_ioctl == NULL) { error = EINVAL; break; @@ -1690,6 +1700,7 @@ lagg_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; case SIOCSIFCAP: + case SIOCSIFCAPNV: LAGG_XLOCK(sc); CK_SLIST_FOREACH(lp, &sc->sc_ports, lp_entries) { if (lp->lp_ioctl != NULL) @@ -1701,6 +1712,10 @@ lagg_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) error = 0; break; + case SIOCGIFCAPNV: + error = 0; + break; + case SIOCSIFMTU: LAGG_XLOCK(sc); CK_SLIST_FOREACH(lp, &sc->sc_ports, lp_entries) { @@ -2013,17 +2028,28 @@ lagg_clrmulti(struct lagg_port *lp) return (0); } -static int -lagg_setcaps(struct lagg_port *lp, int cap) +static void +lagg_setcaps(struct lagg_port *lp, int cap, int cap2) { struct ifreq ifr; + struct siocsifcapnv_driver_data drv_ioctl_data; - if (lp->lp_ifp->if_capenable == cap) - return (0); + if (lp->lp_ifp->if_capenable == cap && + lp->lp_ifp->if_capenable2 == cap2) + return; if (lp->lp_ioctl == NULL) - return (ENXIO); - ifr.ifr_reqcap = cap; - return ((*lp->lp_ioctl)(lp->lp_ifp, SIOCSIFCAP, (caddr_t)&ifr)); + return; + /* XXX */ + if ((lp->lp_ifp->if_capabilities & IFCAP_NV) != 0) { + drv_ioctl_data.reqcap = cap; + drv_ioctl_data.reqcap2 = cap2; + drv_ioctl_data.nvcap = NULL; + (*lp->lp_ioctl)(lp->lp_ifp, SIOCSIFCAPNV, + (caddr_t)&drv_ioctl_data); + } else { + ifr.ifr_reqcap = cap; + (*lp->lp_ioctl)(lp->lp_ifp, SIOCSIFCAP, (caddr_t)&ifr); + } } /* Handle a ref counted flag that should be set on the lagg port as well */ diff --git a/sys/net/if_lagg.h b/sys/net/if_lagg.h index 94f3487af6f7..9fc6e3862712 100644 --- a/sys/net/if_lagg.h +++ b/sys/net/if_lagg.h @@ -273,6 +273,7 @@ struct lagg_port { uint32_t lp_flags; /* port flags */ int lp_ifflags; /* saved ifp flags */ int lp_ifcapenable; /* saved ifp capenable */ + int lp_ifcapenable2;/* saved ifp capenable2 */ void *lh_cookie; /* if state hook */ void *lp_psc; /* protocol data */ int lp_detaching; /* ifnet is detaching */