From nobody Thu Aug 01 22:27:24 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 4WZk9S4YD8z5RZWf; Thu, 01 Aug 2024 22:27:24 +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 4WZk9S2ywsz4YSm; Thu, 1 Aug 2024 22:27:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722551244; 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=pfW6qkN2/qeyGVsVLOXWIzt7eVsrXzaPz6Iq7qAOsjk=; b=kk7uLDnCtmuSri2aUYnTJVaSAeneNcH5uHpCHkXFI0thh6bECw9bYQUIrtHRepocf4/g7k LIz4cJBjFLDN+D829p+AF3bDdG0A73k612InSCb1DINOekjLtncKGSIhtBkbIi0yWeRNhl uxuxGEoLeP0L831Jkry/19L0H+pfl9aC9xNjDl7rumxHukXPzfhrSAfxYNlzE+hl0Am8vw BqFejQ46ZKipb3kf7zo0K4177uwWPXBaNE3DNJs1Q9r4dSd6REBKJUCF/VRAZLy1e8fgVR Y44mgg/66IpB5+Lz6/ny+09cXtTCFHxk03qJXCRyYhLfUJ2D/MXEYRjbzpLtPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722551244; a=rsa-sha256; cv=none; b=QvBWGT3Z7+oGdVHTRDDbPwxgnsKrVmLK1rvMiGD5cI33Zvuuo/PpDkUwXfSj3U91oUW33j 3lXg/5UEK1fy7/wTFUBKN4ehH5dDJ+fK50MbhJxYobbjo9dy4yMYxQdUP19OIdFbx0Nkwr j0wnmTt6q3JlghGMKghw4a7hshq5xUHqQJY3597frortnaIxETfMoYOhXJy+TvaH1cnbQh PuLqOYXO0t0dAzFrkgyv6ENa1vNGtRmBkeLtercKdsim5juRMIX3X/u02RaWeq3Ik/YMaD RniBixrbBsJGRcVyEr3Sn5PdR43lrq6kcPfYdiqeBP3ER/Zy7I+v3QTJbFSJpg== 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=1722551244; 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=pfW6qkN2/qeyGVsVLOXWIzt7eVsrXzaPz6Iq7qAOsjk=; b=HdMY1bi9/3ItQ8gTHXdR8maqCeHR5bWQjU1wZ1lnQbjWrG4pWHiXNBfd+XthUE2o2EQe1N 8uBTJsJ4AogoU4fdgtLtorAm5mqdGprY0LeKvvnFjHATbnvZaCokYAAIOJZuQDI4opUYof mU4ie77g7oykPFaTJ42P/POWSYyYhY652y/QKAZaS/hv8YDs3V5Pjnim97VRS2jzR4MjE4 iHKf2+0Z8buT6mO25CNqXsLg5eN0L43wfVp9ZG0fPplAaPj0IwMR6lqEmruX5qtGnTCJkh QKHtX2Kolr9MyJ9W/NfYPytoTrzkd3unuUaZ5QJAvRlYhMj4T9t0IhwZwidOyA== 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 4WZk9S2ZSWz12l7; Thu, 1 Aug 2024 22:27:24 +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 471MRO5M026965; Thu, 1 Aug 2024 22:27:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471MRO8R026962; Thu, 1 Aug 2024 22:27:24 GMT (envelope-from git) Date: Thu, 1 Aug 2024 22:27:24 GMT Message-Id: <202408012227.471MRO8R026962@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 5ea6546660de - stable/14 - LinuxKPI: Improve timer_shutdown_sync 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5ea6546660def3b853208c3eee236a21d9a317f8 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=5ea6546660def3b853208c3eee236a21d9a317f8 commit 5ea6546660def3b853208c3eee236a21d9a317f8 Author: Vladimir Kondratyev AuthorDate: 2024-04-08 06:47:42 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-08-01 21:09:38 +0000 LinuxKPI: Improve timer_shutdown_sync timer_shutdown_sync not only shutdowns a timer but prevents it rearming. Sponsored by: Serenity CyberSecurity, LLC Reviewed by: emaste MFC after: 1 week (cherry picked from commit 61fb195e8dd08d4b006a176c09682f061424cb95) --- sys/compat/linuxkpi/common/src/linux_compat.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index 894e233042e3..90d03d480089 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -1920,6 +1920,10 @@ linux_timer_callback_wrapper(void *context) timer = context; + /* the timer is about to be shutdown permanently */ + if (timer->function == NULL) + return; + if (linux_set_current_flags(curthread, M_NOWAIT)) { /* try again later */ callout_reset(&timer->callout, 1, @@ -1992,6 +1996,7 @@ int timer_shutdown_sync(struct timer_list *timer) { + timer->function = NULL; return (del_timer_sync(timer)); }