From nobody Wed Aug 21 15:21:43 2024 X-Original-To: dev-commits-src-main@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 4Wpqn34xzYz5V34f; Wed, 21 Aug 2024 15:21:43 +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 4Wpqn33Y9Rz4PBy; Wed, 21 Aug 2024 15:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724253703; 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=x75nIPkAb0cE6iFn/UCQfYvgfFHDIy5266W+V/qOAl0=; b=QKfIC4yD2Q3B+Htt9aEWgaY4IAQmP32HiTPz9AJEmEFe8/8UxIyFPy/HYGIzx1q/W7Tv/a bcvM6Ig/jQ+TuhQpuCURAAw4VUtSzi5qukeF61qpgB+sLgp4z51D1ZiROnHGKiQAEpK48S 4tI2gFdoE7682mAshGPWYRdpJ9sQ2yvlH4im9h+0Hg91JoN9BQTtmbY2m3Y83KdGCeJYot NJfik3EklEZAhzq8Ylql4m4VULskpFPNjNGYo29NQuRP7Sn/1txhMTZgyxl5NtW2OQMkwE joMjWYcnL6LEFzpb7U059tJFjMVzeH/BvZTAgBobke15aoAlv+SVwQUqMQHK6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724253703; a=rsa-sha256; cv=none; b=Llxx4ZpaImoRndvU3DPHEhs5C5HI/stk/ETFDOScBigYy/1CCyDe0lwOh1vQAZUg6gQQW4 Z9TfHnUm5bstzOm+P/iFFCV2eBIjb2ad1PW2y3nYEB/bCT0cmcptnLAvYnJ8Z0GLQg5gTU Vs/C5kBKKEyW+2d3Zr4O3e8o6jqSLX16OG2UKqzplJ4bp9G0+GLRmiOTvi7y+f8C96QwdH QU+GdY4mcruSXqTOXWkwOIIDspPpo/iUcFwWegskT7fWS9M7Ae3d8t+i+FKIo/EQc9flJ3 /1t+piI9oh9aT6MFUo3kXwK/W+oPL3Gx0CGpFlJI5WbByqE4sxe9ViGAITVyZg== 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=1724253703; 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=x75nIPkAb0cE6iFn/UCQfYvgfFHDIy5266W+V/qOAl0=; b=G6f62Ry6eVNpVy79PnyWEMvLykZAxb6kmZR3zXOidilXMJamrX3VI+sOgxkkYzEEYMVk7T B7ofkUbh7PoTUUrmChOShOucuwOM1ECD0mZ2mioZ2Wvr+BhN7ACTraL3VKaCoKyPtoS8Jm Fd8GPQIzL2NjQP+APMQPV2G1TW7J9f0+iKEZ6vnCdqEa8yesKVgDWq2WLOQMcSjkUTWxvZ 5fG/lMaxEPhW64pX869puqintdZSdJhecsLX0dllRxlL1RRE24KBEVQdgO67ZTGu0hiZgI syTyKol26zpXoHxN09+WoES2OVjPzmXQt/U9oDYyJKCx09bD9pZhgHIDHil8Bw== 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 4Wpqn330MCzpjj; Wed, 21 Aug 2024 15:21:43 +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 47LFLhlw067272; Wed, 21 Aug 2024 15:21:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47LFLhE2067269; Wed, 21 Aug 2024 15:21:43 GMT (envelope-from git) Date: Wed, 21 Aug 2024 15:21:43 GMT Message-Id: <202408211521.47LFLhE2067269@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 9467c1a69b81 - main - rangelock: assert that we never insert or remove our entry after a logically deleted one List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9467c1a69b81fff65b85f1e142c6dff196e66ba7 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9467c1a69b81fff65b85f1e142c6dff196e66ba7 commit 9467c1a69b81fff65b85f1e142c6dff196e66ba7 Author: Konstantin Belousov AuthorDate: 2024-08-11 04:25:21 +0000 Commit: Konstantin Belousov CommitDate: 2024-08-21 15:19:15 +0000 rangelock: assert that we never insert or remove our entry after a logically deleted one Tested by: markj, pho Sponsored by: The FreeBSD Foundation --- sys/kern/kern_rangelock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/kern_rangelock.c b/sys/kern/kern_rangelock.c index 992a19701611..2667bf30fb6f 100644 --- a/sys/kern/kern_rangelock.c +++ b/sys/kern/kern_rangelock.c @@ -478,6 +478,7 @@ static bool rl_q_cas(struct rl_q_entry **prev, struct rl_q_entry *old, struct rl_q_entry *new) { + MPASS(!rl_e_is_marked(old)); return (atomic_cmpset_rel_ptr((uintptr_t *)prev, (uintptr_t)old, (uintptr_t)new) != 0); } @@ -647,6 +648,7 @@ again: } } + MPASS(!rl_e_is_marked(cur)); r = rl_e_compare(cur, e); if (r == -1) { prev = &cur->rl_q_next;