From nobody Tue Dec 28 10:55:41 2021 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 6423B190F0B3; Tue, 28 Dec 2021 10:55:42 +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 4JNWfQ0ZqWz3QYw; Tue, 28 Dec 2021 10:55:42 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E912C10537; Tue, 28 Dec 2021 10:55:41 +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 1BSAtfks094028; Tue, 28 Dec 2021 10:55:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BSAtf68094027; Tue, 28 Dec 2021 10:55:41 GMT (envelope-from git) Date: Tue, 28 Dec 2021 10:55:41 GMT Message-Id: <202112281055.1BSAtf68094027@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vincenzo Maffione Subject: git: 4561c4f0ca59 - main - net: iflib: sync isc_capenable to if_capenable 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: vmaffione X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4561c4f0ca59da5b704238074bd488ff907b4b50 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640688942; 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=4s7VFF8zVoyxtt96rya/iV/UIoqLb9+3RznBh+zG6nU=; b=H17BdIVEl66Dgrj0uP998FppuWkCvwmEXReOF8asfImOI1o7KKoCweO94DWptUNNL7wy/L 594b8P3o1B0n7OXotCD2Pps59PyjmJpTcHBH+D17WrI2ANMyGzMklH3oEsQHqlk1xvhVw7 fpMBj7Jp2A4TrhpvgPjENvweSMLQi35oFYM3Te+Plc5fQX3NlkOkEnNXQDP7G+SqpLu2v1 HFGj3vpessC+EeOtxibgvYxCfv3a+MY5hjNP6GW/xItAUfij94T/Qf1vmlidr1kkgd6OeK FZ1+WJOtvzWr+KSW63+WfwdPLMVaEw6b62mi57qJ9sDjO/H0FAKJmcHt0ki2Nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640688942; a=rsa-sha256; cv=none; b=wyfwGfQ7jcKhvVzMF8UNKk4gQXLE1sZA2mRTHfcyk/+qPebS3+JXdqgxNHypGH1PnYXGK5 Zf8FRqnnI/3BhiLTMnlk1K8G7/bKgnjxdL1Laccruop7yHbJcgtBr5wR4Rh8f3ZWNlUsJi 3q4asfzRE2axWAcfupb6nkgKIT+dVeBr/uay62xvb0C6Bs8rXYP5aLeXvrImEp82zvNPXS rHqc41uZLpWmQUmUcyt/ZPBeCakc6RiewH5kkJYl3dD7TsQVA5vpNxAWVny6YWzs9bIJeJ eN8O8PAkIYlqBDMmZoE58rMadLLGscfQizsCwEUyGRKCMIIxlQ4sAYSMW/MzzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=4561c4f0ca59da5b704238074bd488ff907b4b50 commit 4561c4f0ca59da5b704238074bd488ff907b4b50 Author: Vincenzo Maffione AuthorDate: 2021-12-28 10:47:13 +0000 Commit: Vincenzo Maffione CommitDate: 2021-12-28 10:55:21 +0000 net: iflib: sync isc_capenable to if_capenable On SIOCSIFCAP, some bits in ifp->if_capenable may be toggled. When this happens, apply the same change to isc_capenable, which is the iflib private copy of if_capenable (for a subset of the IFCAP_* bits). In this way the iflib drivers can check the bits using isc_capenable rather than if_capenable. This is convenient because the latter access requires an additional indirection through the ifp, and it is also less likely to be in cache. PR: 260068 Reviewed by: kbowling, gallatin MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D33156 --- sys/net/iflib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 1fdda2ef8462..599d9f93bcbc 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -4449,6 +4449,7 @@ iflib_if_ioctl(if_t ifp, u_long command, caddr_t data) iflib_stop(ctx); STATE_LOCK(ctx); if_togglecapenable(ifp, setmask); + ctx->ifc_softc_ctx.isc_capenable ^= setmask; STATE_UNLOCK(ctx); if (bits & IFF_DRV_RUNNING && setmask & ~IFCAP_WOL) iflib_init_locked(ctx);