From nobody Thu Dec 21 13:43:53 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 4Sws8p3j64z54pv6; Thu, 21 Dec 2023 13:43:54 +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 4Sws8p1XxGz4P4S; Thu, 21 Dec 2023 13:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703166234; 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=BCd5NBIlPMmd8a7yaEOMztSJRO27nPtJb2jysDCuBk0=; b=uSwaqpgSA2iQCLYa3yOo4d3SiKl6Q/lblUwko0KHly65d0VxkQmQXNy3HW3j2ai+ER1TGb pNLNvDPrQf7dxk6B8ziCC0bv/a+I8+c57suTbSbvY6znml7UvJoSbfaL7uo2TakbgHgOqm 5b6X2sNDI3CQ459987EHTq1fUqmoD9epEAUmLmixbYPxXgekBoxhdTUk5pEBftArmQSSJJ O9v2/Vf9248r9OfG4zt0bwJtCyYQBkGwhiuUZc7zmpMer3mtpYJA/FxHmUUhGsWui6e24z 94l9EUTIXbVwezGIRwNV3n95DT/HnQ2xss6TgqrW0L1dnlOg8ZNisGYL7QZdhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703166234; a=rsa-sha256; cv=none; b=E1+aa/7X+6T75n3H04vKVKEx4mqm2E6X0ocJEfdgkvjKqCqq0JBxKSq5mSDApya5Ahq16M ng3D4d9Z+kdRWxWetRpYaI3hTheUctEBxEerqfs/qkf88ksqNtK/k+Dd1I3r+WPISnZND+ Hi7pO5m1EpCR9+uwoKEqhqD30tc0cBFNYprrqYXuxLwjmbfB1KOy9fQW7ce5rIqbP9T8GL bUdXCtIPyioy83WuF3xyFhI1LDJ1wD/RvofaWz3DbayK/Xth10qNi8sENfjxd3Cfn7CXua KFlu1VVKpQEXD7HddINisKLNAFms3+v2j+kQB5T9nicyFR4sjZHEeZLVrCBQ8Q== 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=1703166234; 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=BCd5NBIlPMmd8a7yaEOMztSJRO27nPtJb2jysDCuBk0=; b=Mbikiz1dyj6iVfIXx+XFWrQxluar/PJB2/enA+8J877qeQTTol2/sUPaYDcZaT8lbB50u/ M3ScRRfLdIqNhsncSyUMLYwQkfpcYbC6Y+IlzS1pgGBLWwI1lXAHW44KnNCNUZ9B66rkDd X4GN2a00Atw6YXod3nqd/jV0K5OVXvOnD0fThG/tOjgmSecfD5vGxXXsNMDs/NtLo/wi70 YKXk0CbFR8EZEAgCzWUqKm2FZdUaiXd/IZlmzE4/NtIqwZDqdmWlPL0KEO4ucYyEF9Pcg3 nZWa7lk+zj0KTFCChDzGytEq6Ps5l6/SjRzbcvZZQWomN/ekv73h1gagWLAfAw== 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 4Sws8p0dz4zZfw; Thu, 21 Dec 2023 13:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BLDhr2f079869; Thu, 21 Dec 2023 13:43:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BLDhrWX079866; Thu, 21 Dec 2023 13:43:53 GMT (envelope-from git) Date: Thu, 21 Dec 2023 13:43:53 GMT Message-Id: <202312211343.3BLDhrWX079866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 4e00940e9f1f - stable/13 - uma: UMA_ALIGN_CACHE: Resolve the proper value at use point 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4e00940e9f1f7dc1210a094d916ef930ff447e4a Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=4e00940e9f1f7dc1210a094d916ef930ff447e4a commit 4e00940e9f1f7dc1210a094d916ef930ff447e4a Author: Olivier Certner AuthorDate: 2023-10-13 12:13:30 +0000 Commit: Olivier Certner CommitDate: 2023-12-21 13:39:34 +0000 uma: UMA_ALIGN_CACHE: Resolve the proper value at use point Having a special value of -1 that is resolved internally to 'uma_align_cache' provides no significant advantages and prevents changing that variable to an unsigned type, which is natural for an alignment mask. So suppress it and replace its use with a call to uma_get_align_mask(). The small overhead of the added function call is irrelevant since UMA_ALIGN_CACHE is only used when creating new zones, which is not performance critical. Reviewed by: markj, kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42259 (cherry picked from commit e557eafe7233f8231c1f5f5b098e4bab8e818645) Approved by: markj (mentor) --- sys/vm/uma.h | 2 +- sys/vm/uma_core.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/vm/uma.h b/sys/vm/uma.h index 4225bd83ba23..c748a7843374 100644 --- a/sys/vm/uma.h +++ b/sys/vm/uma.h @@ -301,7 +301,7 @@ uma_zone_t uma_zcache_create(const char *name, int size, uma_ctor ctor, #define UMA_ALIGN_INT (sizeof(int) - 1) /* "" int */ #define UMA_ALIGN_SHORT (sizeof(short) - 1) /* "" short */ #define UMA_ALIGN_CHAR (sizeof(char) - 1) /* "" char */ -#define UMA_ALIGN_CACHE (0 - 1) /* Cache line size align */ +#define UMA_ALIGN_CACHE (uma_get_cache_align_mask()) /* Cache line size align */ #define UMA_ALIGNOF(type) (_Alignof(type) - 1) /* Alignment fit for 'type' */ #define UMA_ANYDOMAIN -1 /* Special value for domain search. */ diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index 506bc63033ba..19ea5433559d 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -3182,7 +3182,7 @@ uma_kcreate(uma_zone_t zone, size_t size, uma_init uminit, uma_fini fini, args.size = size; args.uminit = uminit; args.fini = fini; - args.align = (align == UMA_ALIGN_CACHE) ? uma_cache_align_mask : align; + args.align = align; args.flags = flags; args.zone = zone; return (zone_alloc_item(kegs, &args, UMA_ANYDOMAIN, M_WAITOK)); @@ -3195,7 +3195,6 @@ uma_set_cache_align_mask(int mask) { if (mask >= 0) - /* UMA_ALIGN_CACHE is also not permitted here. */ uma_cache_align_mask = mask; }