From nobody Fri Jan 20 18:05:17 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 4Nz6q12Yr5z2t9HH; Fri, 20 Jan 2023 18:05:17 +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 4Nz6q123bzz4Mn3; Fri, 20 Jan 2023 18:05:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674237917; 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=qp3AF9QUyQAZVIgyKhzoaswnhnVpEK+NUzo/Os/TDCk=; b=pIAkZY3vW9iWKLw8A98+1RnCLyOHM8+MBQgM/d0zCmu6MNROYjFp2yOF21gc2J/d1lf4P7 FKK1im55VuYW/ZEioe99WCpisbJA7epOgCPSpYFCVR+TwWB1kzs0kaIBTep1tG1kWj/tMZ xzaFwdHrVzlS71as4JzjXqBX44UXYrI5onJxu1YqbShQHpF8U6xlitHPjTSFX4sKRz7Rir hBBXiT5ZV7ZvYJyyAYQOcvokl4IdLscdlXrdMKU8kd2XjDyUPK7gbf4umwqksjU538aR3f l04OTnzI9xMItDv08frYsFglklzNOXiNyK7+0Bn4l7ygJZ2mFTi5bsS0LGynUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674237917; 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=qp3AF9QUyQAZVIgyKhzoaswnhnVpEK+NUzo/Os/TDCk=; b=ArrFOyVWZ6Kl0yvgrlSSmDGx3QCxKYztgPooyCHCovcQl/RBfQ2xOMh+kCvD9mLzLtvKPM fYJH633Nu2m/fpt0luqEmp1TM9YdJeHf9Ga5v8sL1JIu+kA+ihNdesfG+H8m3a/h+k/6XA tK5hU58yLTR42AXhODykq7aVsGrRHYBjaziIMrvRN68+RtZ+9dhPVMYkZvALd7s2d2e96U eBXfXi2tD05R3vUqWCDwwfQu3yQnFviN9Wj3WHKjlDFtl9bs7I3VUJOED2C0cgFE6g3qOG G5D7TxNi+6RjfyRKwBDvQxwEV4ewTrXj3ABFLLnH3Al0MGJDdQfRCO5DNPH1Og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674237917; a=rsa-sha256; cv=none; b=rovQNFxyNOJ+r+wvndqGXaeBvizpUB7KAhPvacH33c7s4ts0QywRdynlVUaD3J/yf9rMTn QhSKy/nlurU8Ne1wWKwpV9tXZQz9/vp1IVfAUkVflSt084w27oQ5szcPHSb3c41eMD/yGp jxHqcdbLG5p3sAm3J6dayVNfaUmilCA5/HAIu1fooBoPYpxWRs9sJgBs+Y8Ew653e4jg7g 9RaAFvgvB4TzDvmf7Q6+nkYYGR/sU8LWVZvoQTaCXqK/51A8FK16siMeTDwQABwdx9IbRv 1u08nsGL12TY23ih5CSamHaJXeDZw51HY2U8ZGGKHFQOHhxqRq9t1DrY1ED2sg== 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 4Nz6q116lhzfgH; Fri, 20 Jan 2023 18:05:17 +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 30KI5HCI099188; Fri, 20 Jan 2023 18:05:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30KI5Ht0099187; Fri, 20 Jan 2023 18:05:17 GMT (envelope-from git) Date: Fri, 20 Jan 2023 18:05:17 GMT Message-Id: <202301201805.30KI5Ht0099187@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: fa1d803c0f65 - main - 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/main X-Git-Reftype: branch X-Git-Commit: fa1d803c0f652d72840a3c59139baf9d30792860 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=fa1d803c0f652d72840a3c59139baf9d30792860 commit fa1d803c0f652d72840a3c59139baf9d30792860 Author: Brooks Davis AuthorDate: 2023-01-20 18:03:39 +0000 Commit: Brooks Davis CommitDate: 2023-01-20 18:04:40 +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 --- 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 100221cd62f9..98a560e44c9d 100644 --- a/sys/kern/subr_epoch.c +++ b/sys/kern/subr_epoch.c @@ -468,9 +468,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);