From nobody Thu Nov 2 13:40:09 2023 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 4SLlP55PBZz50Lv1; Thu, 2 Nov 2023 13:40:09 +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 4SLlP54xSWz4PFg; Thu, 2 Nov 2023 13:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932409; 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=EHX2TjCl6dH09yzM4vSlZG3yHN6xuvwVT0LNXff+8Dk=; b=tDDdP9yfPIffe8HsnD42H8yP1O0nzCn83V2kPf9ajUc2s3ZEAy8cLkF6pkVAp/jUWpqLig k4luO62hAq22EYtGVuj0RUiuKYyMKEhJ2ccydKshoDdTiK0OKhNK8wl3fpgjAuqrCbshI5 Fxl0T1oFnHOVTwKggINJS2lnDKJPeRSN0J0QNKu6QWalZrL2evIQSecKL84Egd3bAA9/ky 3PmvX7pJESGGY9CMAlvXq3ODAFhrQNiCdNNveoLlI4igSDGsf2XKMLyojersZ/7qEHJS1s /FhpECJHSk0C5sKHrochZx0W1cKkLKraFSWVPvBbso30RQrYKjWCEPPwvSxK+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932409; 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=EHX2TjCl6dH09yzM4vSlZG3yHN6xuvwVT0LNXff+8Dk=; b=RPf7HsVXLqKZR5ArJiIeeWCSedkZmFIGfWzmtcgFPmOM6uPH1bgfu4DkwwiIGNjA0WJDe7 nrB1RfJooMtH3J5p9nfY5CCMzIQPLKem16NO7CdVd8VoEQkV/M5rDb+UwFBQQ8jvGoXBir 6waGpQ5zTBA3ZpDW4e8OzodMoFWdTTOiBWS4S8iv4a9cAf/lWah7LsKQXVzrVddnjvlE0P 7Txi2ir3TFnzwa4ZivE97Ca2FWUjlaGvJ7cbq2w4vtQxPZOos92Oyz7CmMW9cUpy1+Ysjp GBqIpeA3OUV1wvxcM9SgYY8PXUiFWV2Sj1wT9AdzufctUquEH8XX5CJL0ES3ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698932409; a=rsa-sha256; cv=none; b=WQqb01nksDheR4q5kHm1kZQmyUO9mZoe9JRx3aQc1eXL7XV5TxDppypN3znGBrzJYz62mv Slc8bZjn1nWr77Ae5dYOZCzG6SXoMzZ6hA4dSWND/mQWQe2tncSlF5ME7gc06Qa1B8X1jS BdGM1PRFL4el0tqsj9TQrHbQL9+eEaQ3XO0aF2nBaeExMqHCFTNm6OpuCod6d4atFqi8eb sIze0qYiLBUBQKyhQazphfiJfwuybyGQ86KRPcdgK8sL8LTaGfES0Km0fRfcgIk9Qsh/f3 v67Cnik82ylAu8+QD9nK2etsza/P1EBTWOdN3WsgDRAH/Sv1/SFjh7DTvE/ZNw== 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 4SLlP53x75zXFK; Thu, 2 Nov 2023 13:40:09 +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 3A2De9Nr029251; Thu, 2 Nov 2023 13:40:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2De9T8029246; Thu, 2 Nov 2023 13:40:09 GMT (envelope-from git) Date: Thu, 2 Nov 2023 13:40:09 GMT Message-Id: <202311021340.3A2De9T8029246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 87090f5e5a7b - main - uma: New check_align_mask(): Validate alignments (INVARIANTS) 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87090f5e5a7b927a2ab30878435f6dcba0705a1d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=87090f5e5a7b927a2ab30878435f6dcba0705a1d commit 87090f5e5a7b927a2ab30878435f6dcba0705a1d Author: Olivier Certner AuthorDate: 2023-10-13 14:09:51 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 13:30:03 +0000 uma: New check_align_mask(): Validate alignments (INVARIANTS) New function check_align_mask() asserts (under INVARIANTS) that the mask fits in a (signed) integer (see the comment) and that the corresponding alignment is a power of two. Use check_align_mask() in uma_set_align_mask() and also in uma_zcreate() to replace the KASSERT() there (that was checking only for a power of 2). Reviewed by: kib, markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42263 --- sys/vm/uma_core.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index a27dba4b01f1..661c98b272da 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -3249,19 +3249,31 @@ uma_kcreate(uma_zone_t zone, size_t size, uma_init uminit, uma_fini fini, return (zone_alloc_item(kegs, &args, UMA_ANYDOMAIN, M_WAITOK)); } -/* Public functions */ -/* See uma.h */ -void -uma_set_cache_align_mask(unsigned int mask) + +static void +check_align_mask(unsigned int mask) { + KASSERT(powerof2(mask + 1), + ("UMA: %s: Not the mask of a power of 2 (%#x)", __func__, mask)); /* * Make sure the stored align mask doesn't have its highest bit set, * which would cause implementation-defined behavior when passing it as * the 'align' argument of uma_zcreate(). Such very large alignments do * not make sense anyway. */ - uma_cache_align_mask = mask & ~(1U << 31); + KASSERT(mask <= INT_MAX, + ("UMA: %s: Mask too big (%#x)", __func__, mask)); +} + +/* Public functions */ +/* See uma.h */ +void +uma_set_cache_align_mask(unsigned int mask) +{ + + check_align_mask(mask); + uma_cache_align_mask = mask; } /* Returns the alignment mask to use to request cache alignment. */ @@ -3280,8 +3292,7 @@ uma_zcreate(const char *name, size_t size, uma_ctor ctor, uma_dtor dtor, struct uma_zctor_args args; uma_zone_t res; - KASSERT(powerof2(align + 1), ("invalid zone alignment %d for \"%s\"", - align, name)); + check_align_mask(align); /* This stuff is essential for the zone ctor */ memset(&args, 0, sizeof(args));