From nobody Thu Jun 15 05:20:08 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 4QhVwn1V1Pz4dlGG; Thu, 15 Jun 2023 05:20:09 +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 4QhVwm6DxSz3mSx; Thu, 15 Jun 2023 05:20:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686806408; 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=gU89UJ3zYLeVQd85RZ27LxZcCoRcHljfKvdMxk29xgs=; b=uwxNan+YzPTs+baT6rv8DRpJ7mlKBaYeX+cJyYGNqwdR71J/IsjDH7nyc6DNb1iMp7ZnaR RSficGVS6XnEf+OevwDLFCD4H5V7LWoDi3O4juU9yYRJ1i8azFeAwPJz+HVlBNW70PIL1s 7DjpO5ukEtL7hfTEeLv/zSqi0YXypj/v+nMi653Nh6SzmZIEmBPVS/5f96qXFDuVQkRjqK 7wstVjECpnlZQtmHUOD41p2MC0sE0iuPr4vPZu9BU8EJD+SF9RujkTcm3AYzh7gLJBHtZ5 n20MajZSd8VIRshjGA+bAiIN6dKAjoZyvV/xFPXozdFR103nWMhlIGfQpy/CRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686806408; 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=gU89UJ3zYLeVQd85RZ27LxZcCoRcHljfKvdMxk29xgs=; b=J3UMFSXrbBhMK+8nlWE0K6rf4xt9HLaWdZd5a02H2/1njgrfRjScekBuP5opIb7hMZGIPu 3jISHsfORTziPx/zUbbcRN35TpH1QmDSpc/FjDTvf8vv+wZ1wukHDYjrvNzuDOyEwxvmwO AiQAikMuHISz6QZnzjZMfvE7dwjzbzh7570mGRcNa8KbIFRijApE+8czQLJyNQHNz2ZM0E G9+JdEWYPASODbVkAAGOBalrngKZt4b3wH8GesYuSLObpMZq3IgqGmOJL4Otu3qCcs60Ek C5lbSrZDqTd3vds3Oo0jZjXkOHqE/MDydMrXCFGeHoEnAer9CZQN75/ShWupFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686806408; a=rsa-sha256; cv=none; b=W1JIoHwo8l6XjPSBz5jqy18jXUJEVO4X9BtlskfksxMeks6F9EDWDoBU/InMvEBWau4YPk QbOK2h++h8nkZ7EbQ562ua4GdlwPvwm213exX8GhuT7KdtyCNmUJ9pnrDdwpPP/x4vDJrS K46TmyE3CSJma9skjfEyXppPifIp6Y8VKoLhkozz7+m/pqQcPn73L6v2M/u84h79Jfx6GA LcIF1vLDP/zzn1Xnlzga+TonXLxOaIfCtkyKuHLTjrinezNIiWeUs01wA9I9V8ZWnUMbQE bM9mm4wuw1VLveRRfvFfAT9/gMLgd4F5w9hXbtH32UG+ulEQ1059ZRNvD7M8/Q== 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 4QhVwm5BLvzY14; Thu, 15 Jun 2023 05:20:08 +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 35F5K8Wt069358; Thu, 15 Jun 2023 05:20:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35F5K8qr069356; Thu, 15 Jun 2023 05:20:08 GMT (envelope-from git) Date: Thu, 15 Jun 2023 05:20:08 GMT Message-Id: <202306150520.35F5K8qr069356@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marko Zec Subject: git: fc17cf76153d - stable/13 - Back out fb31ad53c471e01ba473b2fb038c0cff6253654b, which was committed in error directly to stable/13 instead to main. 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: zec X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fc17cf76153da89ebdcd5d967c83f3b4d2dac0de Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zec: URL: https://cgit.FreeBSD.org/src/commit/?id=fc17cf76153da89ebdcd5d967c83f3b4d2dac0de commit fc17cf76153da89ebdcd5d967c83f3b4d2dac0de Author: Marko Zec AuthorDate: 2023-06-15 05:18:23 +0000 Commit: Marko Zec CommitDate: 2023-06-15 05:18:23 +0000 Back out fb31ad53c471e01ba473b2fb038c0cff6253654b, which was committed in error directly to stable/13 instead to main. --- sbin/route/route.8 | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/sbin/route/route.8 b/sbin/route/route.8 index 25aaf8087343..afcf55ab44c7 100644 --- a/sbin/route/route.8 +++ b/sbin/route/route.8 @@ -28,7 +28,7 @@ .\" @(#)route.8 8.3 (Berkeley) 3/19/94 .\" $FreeBSD$ .\" -.Dd May 27, 2023 +.Dd March 14, 2023 .Dt ROUTE 8 .Os .Sh NAME @@ -439,9 +439,7 @@ Lockless immutable radix, re-created on every rtable change, tailored for a small FIB with <1000 routes. .It dpdk_lpm DPDK DIR24-8-based lookups, lockless datastructure, optimized -for large FIBs. -DIR24-8 relies on a large flat lookup table (64 MB with IPv4) which is -directly indexed by the more significant portion of the lookup key. +for a large FIB. In order to use the dpdk_lpm algorithm one or both of the following kernel modules must be loaded via .Xr loader.conf 5 : @@ -451,16 +449,6 @@ DPDK implementation for IPv4. .It dpdk_lpm6.ko DPDK implementation for IPv6. .El -.It dxr -IPv4 only, lockless, compressed lookup structure -(below 2.5 Bytes per IPv4 prefix for large BGP FIBs) -which easily fits into modern CPU cache hierarchies, -lookup throughput scales linearly with CPU cores. -Loadable as a kernel module at runtime or via -.Xr loader.conf 5 : -.Bl -tag -width fib_dxr.ko -compact -.It fib_dxr.ko -.El .El .Pp The algorithms are selected automatically based on the size of the routing