From nobody Tue Jul 12 17:32:36 2022 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 38D201CF9473; Tue, 12 Jul 2022 17:32:37 +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 4Lj79w72dKz3bMH; Tue, 12 Jul 2022 17:32:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657647157; 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=/uqurra9eIKXLMbFmuLHNdzUfc4clJFe0XbjH2kBzNQ=; b=rfp0Mzpf4cQieVbq1Pgt86nph+OTWmUVj9UFUtu9R2KZyTn0PPHKBPSojMdyDV6bJSpBKi RRX7J7vFGJYVnlxPYq3uuJk9OzPFrd2Ojrzo8k/loSoXfxT8zunjbYSWK5VYYw47fHxBal Jt/AzQuwWDeNXJgLN+ZkeP5tGs/ld9E+kM1xsHB3ChMGo1VbB4RgKRafaCDcE5fP4cBrNU aNtjQBivz7O6wzbKDCS8t0KixU8+Q9/5ExlUxlCeZjwH6JZ9j1TIfzUqtfmV3ORZSVHK46 TjRwvxwpBo4LoxRYemtnEGsqLLKoG/QElti3FVHMK7BKHV2gWCfqm0EuUDgRng== 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 4Lj79w5fHfzsfF; Tue, 12 Jul 2022 17:32:36 +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 26CHWads065616; Tue, 12 Jul 2022 17:32:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26CHWaNJ065615; Tue, 12 Jul 2022 17:32:36 GMT (envelope-from git) Date: Tue, 12 Jul 2022 17:32:36 GMT Message-Id: <202207121732.26CHWaNJ065615@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Moore Subject: git: 48d01e24f9d5 - stable/13 - vm_addr_ok: add power2 invariant check 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 48d01e24f9d5673d47063fe7e8edfa540c85526f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657647157; 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=/uqurra9eIKXLMbFmuLHNdzUfc4clJFe0XbjH2kBzNQ=; b=sY9AKWmJwMpEo5feyPfkP5g3tEibCX8v0j6mtxdgscTzFLmjT6RwArpYCloKBnYRQSj+9l 8JDid+KsVYf0ZmCjJVwjCP+i+oLqaklXSe9cKj6taB7SVRgdez3DirS8aCeRwfCTBdssbi 4dRbzaO11M5c4jHYa+KqJI0oh3rXqGSmJdZk5Q3O9RVoSQ8zrYbF2FlcPduC5okrbygMdi 9zBbo10zRhX1ZNDYGLCQec8qXH15QMvY9GwVulABIC17UjEbk9X+260vGFCfbUs+dXmHz9 s5JNDjd3TBfo2GU1Y91NxZd61Vz42gFWah8ojH6m9yH3eiLgunU8uVa3+3jHgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657647157; a=rsa-sha256; cv=none; b=bg0qMlsdT9/7RxpH9T+4n3CkqP4dtPUcc/Rr0VE+tCQDPIz7FGkL9GkLdKMjkKoztlXVHG 4qzBTtdUJg8AIBkIUxdd5UU4QEeWNNSnUi5T8DVvJrNt/P7mIP/Cyk6dLd5OxZvguOj+/H WC/FY+V71dlbS0oh34UqgLTUKncM+YHjb3Uikg5q88fHEmkS3f4aIZSnj/KUUAxcQkr1KT lfACeAkonJ4YebQ688k0ALNTblaDkooaA8AUCfm2LiEPzmU09Dzjrogv/A7FAYBtQ8/PU2 iBCqR2rga4bwFhncRbF1LIomuKp54hH9tVBOyaH3COx+RWF8/BtoaA5BgQddtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=48d01e24f9d5673d47063fe7e8edfa540c85526f commit 48d01e24f9d5673d47063fe7e8edfa540c85526f Author: Doug Moore AuthorDate: 2022-01-10 07:17:25 +0000 Commit: Doug Moore CommitDate: 2022-07-12 16:26:12 +0000 vm_addr_ok: add power2 invariant check With INVARIANTS defined, have vm_addr_align_ok and vm_addr_bound_ok panic when passed an alignment/boundary parameter that is not a power of two. Reviewed by: alc Suggested by: kib, se Differential Revision: https://reviews.freebsd.org/D33725 (cherry picked from commit ae13829ddce0b5fbf12f2b240a26414b41def8ba) --- sys/vm/vm_extern.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h index bc01e5a874f9..93c7118353ba 100644 --- a/sys/vm/vm_extern.h +++ b/sys/vm/vm_extern.h @@ -141,6 +141,11 @@ u_int vm_wait_count(void); static inline bool vm_addr_align_ok(vm_paddr_t pa, u_long alignment) { +#ifdef INVARIANTS + if (!powerof2(alignment)) + panic("%s: alignment is not a power of 2: %#lx", + __func__, alignment); +#endif return ((pa & (alignment - 1)) == 0); } @@ -151,6 +156,11 @@ vm_addr_align_ok(vm_paddr_t pa, u_long alignment) static inline bool vm_addr_bound_ok(vm_paddr_t pa, vm_paddr_t size, vm_paddr_t boundary) { +#ifdef INVARIANTS + if (!powerof2(boundary)) + panic("%s: boundary is not a power of 2: %#jx", + __func__, (uintmax_t)boundary); +#endif return (((pa ^ (pa + size - 1)) & -boundary) == 0); }