From nobody Tue May 30 16:23:49 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 4QVyPy0rKSz4Xm6k; Tue, 30 May 2023 16:23:50 +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 4QVyPy0R1jz3J75; Tue, 30 May 2023 16:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685463830; 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=h+LfJto0zCpoPFKBhkKXskmx76restlO8m5IhEbAzCg=; b=v95LXT2gV1/2m0p1m6cmcR//egRRuhxtO/BWCT9eWotiTSmDDvL9WUMUNF1ZjGYexeVlvM +I0p6yd0O0bEk8jnKBnEG5kyPOEqE0GUkCH81QJHHkGX1Wj3TVm2ofllhRx/PwFU7vTBet Lj08mAaNw5EwumLVhUgWKig1YeEiWDrG4pnRUq/GqqCQ+sMsGVcxdoOp5Ob1gtHa/A1wzc qQHLWBGWMGXaNHyQ5khZ9v2DFWjxr2dCB7FpL43UVoZpVVuc3GifwxVnCCrjPrzvK3L7Jm 6MXzP1aHEVz/syL4aB4DMMzeRC5Q1VX2H+EI976iXr5LJzNz6s6LcregJMX/GQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685463830; 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=h+LfJto0zCpoPFKBhkKXskmx76restlO8m5IhEbAzCg=; b=dPW6rtKlcRN1h9/DV2hzII0Kt8K+SDzgAxfvWsGzQMMPlj2qqf2W/AqR8Qn8S6xDaaMY4d KwXIVB89yoJzsVtmELawiDOgGk/TcaRZGqstDbthORH1peB7UPdldIfXQIVkjQ25yRXWuw 515q8q0UwSlLjPajccZ7oSSRtwSt65Ry911xTvn9jnZDPrmfKlftzi3DWfNJtoccSvPPqV XaaG6F22YQWrCMI9UFkqmDVyVvTHy/rr7hxpliScQXP7FTz9IaGAJkR/+Mltawe1YytZLK oRt2SLVaW1jlxOjlWl0StPUYs6WZ7oaSTz1etodnkH3YUki+1NnD/LbjpNkCtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685463830; a=rsa-sha256; cv=none; b=bgPg/KmHJAUjUtA6ClcHMraGpncHfTYtWxEidSTv0/9y7z0zXOSCnueP6XnKOsR6svHWrD 23Pr5yjozQst7vdsXHSfOF7EUJQUtGMzopvf56n/xQcVf9RKPBwKK75+u4ICqivyE3v7tt 0h0AReD9sZT62mliwUsHPt8aQGJgPmp50YoCcKV8tIHgjrvj9MXBzOyYBmT1J8oe//QFre qSHCfa+iBEPpI69En3deRI4gvR13c42xd74xTZzhhM1blyA7moIGia1pdVIJ2KLlTbd6oL ov3ofWxhXu2R47L6BiaGyO0BAStmGX26DeFI8VF1mf31VvBAf0K7rnkz/dQI6A== 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 4QVyPx6fmyz10yM; Tue, 30 May 2023 16:23:49 +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 34UGNnST047525; Tue, 30 May 2023 16:23:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34UGNnaf047524; Tue, 30 May 2023 16:23:49 GMT (envelope-from git) Date: Tue, 30 May 2023 16:23:49 GMT Message-Id: <202305301623.34UGNnaf047524@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cheng Cui Subject: git: 7a52b570e758 - main - siftr: bring back the siftr_pkts_per_log feature 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: cc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a52b570e758a5f607c4071e260065633632c868 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=7a52b570e758a5f607c4071e260065633632c868 commit 7a52b570e758a5f607c4071e260065633632c868 Author: Cheng Cui AuthorDate: 2023-05-30 11:02:45 +0000 Commit: Cheng Cui CommitDate: 2023-05-30 12:23:36 +0000 siftr: bring back the siftr_pkts_per_log feature Summary: this missing feature is introduced by commit aa61cff4249c Test Plan: verified in Emulab.net Reviewers: rscheff, tuexen Approved by: tuexen (mentor) Subscribers: imp, melifaro, glebius Differential Revision: https://reviews.freebsd.org/D40336 --- sys/netinet/siftr.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sys/netinet/siftr.c b/sys/netinet/siftr.c index 2c02130bbcca..cbcd2b2ead42 100644 --- a/sys/netinet/siftr.c +++ b/sys/netinet/siftr.c @@ -379,6 +379,22 @@ siftr_process_pkt(struct pkt_node * pkt_node) if (hash_node == NULL) { return; + } else if (siftr_pkts_per_log > 1) { + /* + * Taking the remainder of the counter divided + * by the current value of siftr_pkts_per_log + * and storing that in counter provides a neat + * way to modulate the frequency of log + * messages being written to the log file. + */ + hash_node->counter = (hash_node->counter + 1) % + siftr_pkts_per_log; + /* + * If we have not seen enough packets since the last time + * we wrote a log message for this connection, return. + */ + if (hash_node->counter > 0) + return; } log_buf = alq_getn(siftr_alq, MAX_LOG_MSG_LEN, ALQ_WAITOK);