From nobody Sat Oct 08 10:41:26 2022 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 4Ml1tt3STYz4f5gh; Sat, 8 Oct 2022 10:41:26 +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 4Ml1tt1nZKz3THK; Sat, 8 Oct 2022 10:41:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665225686; 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=CkbExtxl+Bi7+90hVrJNu6XMqTpz1TcvQFSisv0xZlo=; b=hobrC1xAiWzxaILe6lBokgJeN89gi7raM9JqfNGQkszBkX4I0UjA4SCLu+cL1DmYZ69zv5 8lc92VYFPAhBLMEdMqt9ZJ+ta4IX2jznDLnzkDAbiubewD/xd8hUFIYXIWEa0fvJZGzTH/ Ey3y5gaENreXF2djtfkRcimtz5BGY+GaSefm7+bRzQc0MDAsHmpcnWqgVP9ggD29R+zxob aWLi1U9G9IZxVfQYyMaNRvTz3pCwjJCD9C2TNtDevcJqYSJzKUQHA32AFojh4FJJDkhxFu WttZTr7Me87FoLUiZ/y10jn4BdmXUbFXywgZktz8v8I0xp/I2Bl5k5iDIpHuow== 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 4Ml1tt0rlbzvbY; Sat, 8 Oct 2022 10:41:26 +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 298AfQ56088082; Sat, 8 Oct 2022 10:41:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 298AfQ1K088081; Sat, 8 Oct 2022 10:41:26 GMT (envelope-from git) Date: Sat, 8 Oct 2022 10:41:26 GMT Message-Id: <202210081041.298AfQ1K088081@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 143942f9929a - main - unr: remove UNR64_LOCKED 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 143942f9929a36ec7fe56556d0afe0b2d23e08c4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665225686; 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=CkbExtxl+Bi7+90hVrJNu6XMqTpz1TcvQFSisv0xZlo=; b=AOD41xCCQ7T8ZPOEoBcWvXKk3BmWiHsfLedlp2BgdTPU4ZV3I+LyimznooRrnivOmvvm78 8bTRFj/MUsSOLTAOS9V2PghysiP82He3e0pYeVef4TX1/Uc5Z0Frs1TDAG45LNM1NByWg9 I69IVVPB4x1UahfmxnytkHyNPdka/3jnGOOfFmtXx1X2DGYN8oF1EHmdz0j8TR/71gMtHR K5nfhbWcOQjn5ZqtKR/V+sGkM8soFwJCCc79W+QaJGuZudVeqWxL9LXm7eaQm1A+ldpZUJ 3O/K2F/OsnNK7MEGEXrz8IKBEPmnG/PmjJ0fz8Noa4unmNM3qRBUgZUqdD6GLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665225686; a=rsa-sha256; cv=none; b=fkFC+w3Ie5w3eIR6f8JdLs/+jSwJCedvzHCx4T3gC/h1wpyFaEgJwzCJoDresyf2c2esqN 8CqjPX+PvpdF3BgchZNmQ8RjWY3IJVTUKcNFsbmhK2j2xQ+Ek4I/eJ4WxuoIXSj0K6HnQI gVW1oJ9Q208TJbLUeaOpaohTO6F7pNOY+BkhJO19i2+/jSYdJdKKpmzuVLf4M1zlSM4JDm wTudEX8Qv9b7gA7GmPVD/iohe4SXvKfYlAgeD3xohX8b+OCeUQUvKNEpFQtlcVb778HY6g KS+pMP0HzFhuJKPt1Gx4U18nczvbvJJcgozF4SguRejENqQEd6+y4/YVUnuwpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=143942f9929a36ec7fe56556d0afe0b2d23e08c4 commit 143942f9929a36ec7fe56556d0afe0b2d23e08c4 Author: Mateusz Guzik AuthorDate: 2022-10-08 09:38:41 +0000 Commit: Mateusz Guzik CommitDate: 2022-10-08 10:41:21 +0000 unr: remove UNR64_LOCKED All platforms support 64-bit atomics now. --- sys/kern/subr_unit.c | 13 ------------- sys/sys/systm.h | 8 -------- 2 files changed, 21 deletions(-) diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c index 8e5eb94711c3..7931012360ba 100644 --- a/sys/kern/subr_unit.c +++ b/sys/kern/subr_unit.c @@ -98,19 +98,6 @@ static struct mtx unitmtx; MTX_SYSINIT(unit, &unitmtx, "unit# allocation", MTX_DEF); -#ifdef UNR64_LOCKED -uint64_t -alloc_unr64(struct unrhdr64 *unr64) -{ - uint64_t item; - - mtx_lock(&unitmtx); - item = unr64->counter++; - mtx_unlock(&unitmtx); - return (item); -} -#endif - #else /* ...USERLAND */ #include diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 9673d7e93ab5..7664a4506b0c 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -510,10 +510,6 @@ int alloc_unr_specific(struct unrhdr *uh, u_int item); int alloc_unrl(struct unrhdr *uh); void free_unr(struct unrhdr *uh, u_int item); -#ifndef __LP64__ -#define UNR64_LOCKED -#endif - struct unrhdr64 { uint64_t counter; }; @@ -525,16 +521,12 @@ new_unrhdr64(struct unrhdr64 *unr64, uint64_t low) unr64->counter = low; } -#ifdef UNR64_LOCKED -uint64_t alloc_unr64(struct unrhdr64 *); -#else static __inline uint64_t alloc_unr64(struct unrhdr64 *unr64) { return (atomic_fetchadd_64(&unr64->counter, 1)); } -#endif void intr_prof_stack_use(struct thread *td, struct trapframe *frame);