From nobody Tue Jan 24 23:26:28 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 4P1jlm614Jz30yqP; Tue, 24 Jan 2023 23:26:28 +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 4P1jlm5Xgmz3hC9; Tue, 24 Jan 2023 23:26:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674602788; 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=nkHNO4MiZuhZI7QTJfefK+5S8JPo0VW0oG1ALWBdaf8=; b=QgC1qtzpxzByrz+pn9on7ehJe6FkhPqb0xLiru+vkFw0JAg9epaGVpzsT3BLFNTowXIFNm nMTIyM1aAyR5mtGsTip25SBpo+uQx5OVeGUTaB08oTnTAagENMs5t5iJV9AjlqJ/1Hb75d +PvgBOk10NxFzKd1ZnZgpChKIkhgFBcPeE2RMVX7XBku6y47YUJ3o07BtJQKU2DfCqJShb 8K8QpRwzqZRrAnFgt6QS9Zp4TURdmWAg1yfEPKa7dMhg5zQIpibte92viYgpK8c1vCrNhn GUcSMUKxO0Fx3zZDAmHeb6Ar29ekLRJFc6m4liiAcx05zha4IYHTXRVXmryKKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674602788; 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=nkHNO4MiZuhZI7QTJfefK+5S8JPo0VW0oG1ALWBdaf8=; b=ml4AjSDTM7zPk7l2/Kgz7u9PP9bRoJ1BoK2aBlmicJZeFnfJsIRHCo7MAa+6tIGjcPM7fp BSwhR5xqKzNjZ5lwR0hbTObpJs0PtqLe1fleL6hLD5s/lE+iQShRclfIrj09/jvIjPcxAe EZ0w0yv6EUrMWaTSIUxViieyxlQllCPPjawAOzbunspjtZcn7oTC/TXrFSW/wXyPKGB8mt Bb3H9VqwMnF6VoZTAuLpi1yCmjbsRFJT+Hkk5x7ytQtCbnsuOItjleDSQ90C/+KMYq0+1B 8LqDn+TAmqI6eQ8MomsSvtKGed7UBOvgfbqhBPEYcWcikIkFZDGsAIOBZHqkPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674602788; a=rsa-sha256; cv=none; b=HYegZtHslt8H//3KfD34pvEE7fn2p2X5dCoWwPIvVwKJ3V1xBxcAYlltLOKsy20oCeaxJ6 6EJSlgdkP4u8zR+pWpws9U4PLtzfxE3F+Iszxd1cXVl+FV8XSwQShU0a1HkJoq3Am/qDdV AlfHxs47dvSTMNvvCOAyXMEIWiFMh7x0AwCQ73T5k+UxMobz1vAXtcLcGXVj4UpqXpyW4a eigmwGKQA0S3mtCDmGUdOw0BUnnD/VhKDN7Y2EOYBr6Q5Y3mMn2TJY7bRRGrSGvDuegzwf 0T1sZz/JslFZyShDJT53UTRnmCvktRnHxFbOxQdXihZnaOaP2EhFE9AcMyU2kw== 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 4P1jlm4f18zS2t; Tue, 24 Jan 2023 23:26:28 +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 30ONQSwK091814; Tue, 24 Jan 2023 23:26:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30ONQSx0091813; Tue, 24 Jan 2023 23:26:28 GMT (envelope-from git) Date: Tue, 24 Jan 2023 23:26:28 GMT Message-Id: <202301242326.30ONQSx0091813@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: c91bf3cb34f0 - stable/13 - epoch: replace hand coded assertion 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c91bf3cb34f0c1238a70e674bf23f89cccddfaec Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=c91bf3cb34f0c1238a70e674bf23f89cccddfaec commit c91bf3cb34f0c1238a70e674bf23f89cccddfaec Author: Brooks Davis AuthorDate: 2023-01-20 18:03:39 +0000 Commit: Brooks Davis CommitDate: 2023-01-24 22:46:31 +0000 epoch: replace hand coded assertion The assertion is equivalent to kstack_contains() so use that rather than spelling it out. Suggested by: jhb Reviewed by: jhb MFC after: 1 week Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D38107 (cherry picked from commit fa1d803c0f652d72840a3c59139baf9d30792860) --- sys/kern/subr_epoch.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/kern/subr_epoch.c b/sys/kern/subr_epoch.c index 651fd8b419f0..7d4457428bc8 100644 --- a/sys/kern/subr_epoch.c +++ b/sys/kern/subr_epoch.c @@ -443,9 +443,7 @@ _epoch_enter_preempt(epoch_t epoch, epoch_tracker_t et EPOCH_FILE_LINE) MPASS(cold || epoch != NULL); td = curthread; - MPASS((vm_offset_t)et >= td->td_kstack && - (vm_offset_t)et + sizeof(struct epoch_tracker) <= - td->td_kstack + td->td_kstack_pages * PAGE_SIZE); + MPASS(kstack_contains(td, (vm_offset_t)et, sizeof(*et))); INIT_CHECK(epoch); MPASS(epoch->e_flags & EPOCH_PREEMPT);