From nobody Fri Aug 2 16:39:45 2024 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 4WbBPs6wgkz5S1lG; Fri, 02 Aug 2024 16:39:45 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WbBPs6PC0z41sS; Fri, 2 Aug 2024 16:39:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722616785; 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=YrbFPHb/aGdXXH5hXpbzpxIGn6OS2lV8/g8dFeM8WXY=; b=nswLc6nt0olyQyHiFUy3ftaD1D/6R+Yr5Kydj1V4cchDvVB5z6vp5tf4XlAJnCyr2P9OfK EHNniqyUmwyH45OD0n+tjs8QoZpvKoAurVyLjl0C9TVJle1XcPGkYGebjfAPlnsjuIDfU9 OBr/9RejiGlOW/E7c4/8qUvh+e6czBD1bzYlatvKSIHMvnXGcuk4Pm6rm51TggJrQi3uOf xUGJyv1AzMz95/dltJ3oUo0lu8aXJae0TBbsgBKLtsn0zE4D7LykcRDMnXrD6YHVxm/xkf fSC61rEmY8y8xF8E7bPbtqLnKYmW7kfUyRMVrm04EW5mYoQEyq5SFEo0A0N6eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722616785; a=rsa-sha256; cv=none; b=DO0aQbdzzuJcT86jlvEBs91sfPDp6gIV+GHxhs4elVZmVnV/iXyfDgW/5cfTiuxTr0/OTq LHQxEbeFWQp0diliTKGIaS0QWDooJg62jLZPE2NMJZSzXLqT9jI5yJSeQTSKoPXIUaMI4P KvMZNPBjAJNdLTBSxfH4RANO7Az1q89r2Or1Hgl7TL6XszGoxCPJWwWvgEEqk7il7JReIn CQ6+XgFWPfb73trIN/PUefVHwF5h/d1svwO/M0Ag9aAsW3UGK1IozA+VG/fxRLPL4iMUA7 vDpE/+dV9eyjRJbFIqkNlKKpFy+HXXcOjbpKprd+2Wd5WOKPuotREFD79GHq6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722616785; 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=YrbFPHb/aGdXXH5hXpbzpxIGn6OS2lV8/g8dFeM8WXY=; b=EcZm0GYh+kNo7HgYVcZ6ThHohW5ITxjHHqFRwfhyl1WBm1IgGKkck48a3SFwj0CysUuyH/ mHt0p5PtMqlXIDQk8uUP8m8ot+4oP1/vLTkGs58PUHiSg47ykW0VoqH47g3Wq3iMP4r3dE QgOVdRMpT1We/9SLWCINx2SpjZetqapNvfyFiDGhi2jru6PS+q8h7raG118IuY4/3rIg7C Bt74FfCfgiy/cjXOZh6rnLYOOUmeFMvnCR6FgugbzM7oILuByEae2o2oTigq3CsBxlXjhr 9f9JpYlx1Ho5h/aWtwEk+8Dy6rDrlmyHcA+n5nToRzEWorH6oD8dm+BkSHIkAA== 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 4WbBPs5ZbhzbjY; Fri, 2 Aug 2024 16:39:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 472GdjEK071866; Fri, 2 Aug 2024 16:39:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 472Gdjns071863; Fri, 2 Aug 2024 16:39:45 GMT (envelope-from git) Date: Fri, 2 Aug 2024 16:39:45 GMT Message-Id: <202408021639.472Gdjns071863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: c1f711fd359f - stable/14 - siftr: remove the shutdown_pre_sync event handler on unload 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: c1f711fd359f41f9cdb18dd7a02d1fb0ce8866a2 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c1f711fd359f41f9cdb18dd7a02d1fb0ce8866a2 commit c1f711fd359f41f9cdb18dd7a02d1fb0ce8866a2 Author: Kristof Provost AuthorDate: 2024-07-19 06:08:14 +0000 Commit: Kristof Provost CommitDate: 2024-08-02 07:30:38 +0000 siftr: remove the shutdown_pre_sync event handler on unload PR: 280351 MFC after: 2 weeks (cherry picked from commit fb05f761ac0b28b03eb057e36fe118f007d43d73) --- sys/netinet/siftr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/netinet/siftr.c b/sys/netinet/siftr.c index 52e2b8838b0f..255714cec0b1 100644 --- a/sys/netinet/siftr.c +++ b/sys/netinet/siftr.c @@ -273,6 +273,7 @@ static struct mtx siftr_pkt_queue_mtx; static struct mtx siftr_pkt_mgr_mtx; static struct thread *siftr_pkt_manager_thr = NULL; static char direction[2] = {'i','o'}; +static eventhandler_tag siftr_shutdown_tag; /* Required function prototypes. */ static int siftr_sysctl_enabled_handler(SYSCTL_HANDLER_ARGS); @@ -1281,6 +1282,7 @@ static int deinit_siftr(void) { /* Cleanup. */ + EVENTHANDLER_DEREGISTER(shutdown_pre_sync, siftr_shutdown_tag); siftr_manage_ops(SIFTR_DISABLE); hashdestroy(counter_hash, M_SIFTR, siftr_hashmask); mtx_destroy(&siftr_pkt_queue_mtx); @@ -1295,8 +1297,8 @@ deinit_siftr(void) static int init_siftr(void) { - EVENTHANDLER_REGISTER(shutdown_pre_sync, siftr_shutdown_handler, NULL, - SHUTDOWN_PRI_FIRST); + siftr_shutdown_tag = EVENTHANDLER_REGISTER(shutdown_pre_sync, + siftr_shutdown_handler, NULL, SHUTDOWN_PRI_FIRST); /* Initialise our flow counter hash table. */ counter_hash = hashinit(SIFTR_EXPECTED_MAX_TCP_FLOWS, M_SIFTR,