From nobody Sat Aug 12 16:01:25 2023 X-Original-To: dev-commits-src-all@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 4RNQPx4qzMz4qCwK; Sat, 12 Aug 2023 16:01:25 +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 4RNQPx4LZSz3HkJ; Sat, 12 Aug 2023 16:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691856085; 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=en+ofypNgWzsxNzCHY93U0mbm0L4q+pbPrPZ2p8ood4=; b=mqMwY6so5RzqVCcCavnOjqiXvMQAlclOcMr8Uqs1CHc93SxfN1lD61/C23MTDspDIfwldL NkpJi61DLOetmv6VpehVZWpW+nA+rDCWXHcJfIZS6mDNzmJX/yb7Khd1+UgDq1noZ0OFHg Bar3wECeFTp5VqRGjZv+O0jjQlftEbTGa+PM6mUQ/8F2DPvUwegwFopectzPpNQd2wDZ6X J73XZkJtVmuOX58yHURQFtD295lvxNzfVIY2QT+4IqZ/SFzMLZg/aBoDNz102fK0YgFAQu aC7RywyFFJnn3m3WFc8xMUgbLrvdmHkkwmBB8oCc+dENWyELC4HX/0vD988jcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691856085; 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=en+ofypNgWzsxNzCHY93U0mbm0L4q+pbPrPZ2p8ood4=; b=UJfh4nQ4knjWCDFM3o5ZtXnzIYPkdnabc3IRDQhPvTeQkDMV1fE4+1zd7YJlcPNPZ2tCZI LwvpLSn2vB6F1zsXnXU5S2IdckLdCHVXLppivSg0KeWBwAsMsyLvWUQGuRfilcO/efu6Dk Kso3mSasSrpLVrtLJQUnZ/a8phC/79vOaxoY5PyPdtEyfolat1UqrdAg4DSiDJ0d/wbAGk IIYoW6gKNuMF0sZ3P6g9Th3AQ/JxYflr1JWCY/QtwECPWzgQUWZDZOLleR0T2WqhZMGLjP OuyTCAQIhSrggpCVvoAghZaiL6QOWqjiQKiwxxQwZV/yzoBR8HMeGuc04KppUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691856085; a=rsa-sha256; cv=none; b=G4CkhqL+sApEtOgRtFBPhiFokaw2y+mYAFswYZElXmS6y++EG5QC9SdDRXmPXb7M33FrTZ VmpmbSZUAYN/rSs3hC1TTDhDA/TF06SPG1Y84TFJ601JGmJKWQRFKziBHTf+Q/Mor/CRqh 65gDMtzRXURMYyuTn4qadgYjC5g8emKtW+x6q4hflfvPBwex6nPymtG/ZjaAa1yzVVm2oX 09msTy6vlrngnRj6sEx8cVoZ/sIU2aPrbS/kVgd6zIbLrDlpN8GaA/HI/7xZWNuxMj2Fsg srZXBE7/dUiljhSfM7aJ6S1LrMUJn0OF/mRdDuCxdS4K5DR3ongNR5zuYSviaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RNQPx3QB7zBkN; Sat, 12 Aug 2023 16:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37CG1Pfe083215; Sat, 12 Aug 2023 16:01:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37CG1Pb9083212; Sat, 12 Aug 2023 16:01:25 GMT (envelope-from git) Date: Sat, 12 Aug 2023 16:01:25 GMT Message-Id: <202308121601.37CG1Pb9083212@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: fb69ed397e4f - main - Revert "if_vlan: do not enable LRO for bridge interaces" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb69ed397e4f455d4c338edcfa210d763bb87189 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fb69ed397e4f455d4c338edcfa210d763bb87189 commit fb69ed397e4f455d4c338edcfa210d763bb87189 Author: Kristof Provost AuthorDate: 2023-08-12 13:56:21 +0000 Commit: Kristof Provost CommitDate: 2023-08-12 13:56:21 +0000 Revert "if_vlan: do not enable LRO for bridge interaces" This reverts commit 5f11a33ceeb385477cb22d9ad5941061c5a26be9. As requested by Kevin Bowling. He explains: > The subtle bug was that vlan_capabilities() in if_vlan was not obeying > the requested mask from its IFCAP ioctl. --- sys/net/if_vlan.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 92e4e4247e3d..6aa872a19364 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -2067,22 +2067,14 @@ vlan_capabilities(struct ifvlan *ifv) } /* - * If the parent interface is not a bridge and can do LRO and - * checksum offloading on VLANs, then guess it may do LRO on VLANs. - * False positive here cost nothing, while false negative may lead - * to some confusions. According to Wikipedia: - * - * "LRO should not operate on machines acting as routers, as it breaks - * the end-to-end principle and can significantly impact performance." - * - * The same reasoning applies to machines acting as bridges. + * If the parent interface can do LRO and checksum offloading on + * VLANs, then guess it may do LRO on VLANs. False positive here + * cost nothing, while false negative may lead to some confusions. */ - if (ifp->if_bridge == NULL) { - if (p->if_capabilities & IFCAP_VLAN_HWCSUM) - cap |= p->if_capabilities & IFCAP_LRO; - if (p->if_capenable & IFCAP_VLAN_HWCSUM) - ena |= p->if_capenable & IFCAP_LRO; - } + if (p->if_capabilities & IFCAP_VLAN_HWCSUM) + cap |= p->if_capabilities & IFCAP_LRO; + if (p->if_capenable & IFCAP_VLAN_HWCSUM) + ena |= p->if_capenable & IFCAP_LRO; /* * If the parent interface can offload TCP connections over VLANs then