From nobody Sat Jan 21 19:30:55 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 4NzmgM51HPz2t27V; Sat, 21 Jan 2023 19:30:55 +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 4NzmgM4Wpxz4ch2; Sat, 21 Jan 2023 19:30:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674329455; 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=Gd1A2cKJqfOyfR7xtmMNJLOGCfK75RWAg8BYWzS5bBc=; b=jXok7vVrhj9Jo4hZQCD+IRF4r53/pMMWRlXHw/QFkYfM6Xk/C4OaPrwWawu7Oxhd6t9dyU 3A+zsOxOKPzK76Vyd+odjtCX6omJWFlklDXizsXY6G6y0GcxnLVdBmw2ye1rUFt7Dh9cal kKNPeP/DyZ7v8JWJoGtwe8uG3eCrq8ScvW0gDBv32Li7F7RPGNf/O0ocG3vPa/o9bY7v2m auRBTO2SfRu8w8cwkIO8+zpMhMI3HIFvN7iTcfldKgds8xDWLtW9uMFhRkN5Et1/uEnR8p UxQHa2J2rdDaS3HnFk9rIrk7M0W6TsdNNrldrcpq/paalVemaGCGuoERnYKlKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674329455; 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=Gd1A2cKJqfOyfR7xtmMNJLOGCfK75RWAg8BYWzS5bBc=; b=jLhRtwL3f0T81izGPSCOBb0IrMdC/fGbxdna2RXX+PieCiN6dcI1HVU7wke6S1PLvq8u87 Vc+OsNqzRO9LzcWEKReWaJMCWc+7BPiVH0QiSlSoSIUUweLdZMWtZ8ViJykLm91TjxjAVq 9Im78kJCRyUZCmRd2ooyvxy4b3t0A0fSfN4Dh+CuRpvOvrg13k1hNGl/+boo3IE49WPHOm ykPa2lw+CS8Ip8YQFssmTemEEXlvztZaAnNj2Hx3dvrk9SfKJnTqcaDEUuz6J9uA7yKQ1H z4cnpUf5uIKJLq0UApb6SSKNrENhj1NByk/fPVmzzV+Hefcq66ex8Hnre4ryeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674329455; a=rsa-sha256; cv=none; b=rvdG94aSvilI+qz//MUxzxct0T3mA/dlvSXnby9y2TAWeLLGFIPXQIVhhumCB+p0liW46s ribUn/mwAkykRoj1FplzbY5qPomufzFtVMDmnEuwCCoLMk8ijZ7pCJ2r1LQKF/CZ1tSgj7 rs8UzIcZ7QJ3Oi24nQoZOnZzWrFcEFtwyJho46KEGZW8SWcN86qLaMWo+hhAgBT3ZdoCs5 aJ7bwgPr/mN5H+G/JNio5ohw3Ar6oK9O2Uttu7/XQ6Nlkx1i68IAZqmzCJ4DaG9uxApIXI yf6skx4XOEDY6s5Ovh7ZT3ZgxtWVjbaGSaWw+kjuiW76FnsSAZR60KEJSelI/w== 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 4NzmgM3Vf7zLYd; Sat, 21 Jan 2023 19:30:55 +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 30LJUtTu075618; Sat, 21 Jan 2023 19:30:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30LJUt1l075617; Sat, 21 Jan 2023 19:30:55 GMT (envelope-from git) Date: Sat, 21 Jan 2023 19:30:55 GMT Message-Id: <202301211930.30LJUt1l075617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 9cb6ba29cb70 - main - vm: centralize VM_BATCHQUEUE_SIZE definition 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: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9cb6ba29cb704c180d5b82f409e280377a641a28 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=9cb6ba29cb704c180d5b82f409e280377a641a28 commit 9cb6ba29cb704c180d5b82f409e280377a641a28 Author: Andrew Gallatin AuthorDate: 2023-01-21 19:26:25 +0000 Commit: Andrew Gallatin CommitDate: 2023-01-21 19:30:00 +0000 vm: centralize VM_BATCHQUEUE_SIZE definition Remove the platform-specific definitions of VM_BATCHQUEUE_SIZE for amd64 and powerpc64, and instead treat all 64-bit platforms identically. This has the effect of increasing the arm64 and riscv VM_BATCHQUEUE_SIZE to match that of other platforms. Reviewed by: jhb, markj Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D37707 --- sys/amd64/include/vmparam.h | 6 ------ sys/powerpc/include/vmparam.h | 8 -------- sys/vm/vm_pagequeue.h | 4 +++- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/sys/amd64/include/vmparam.h b/sys/amd64/include/vmparam.h index 205848489644..880c46bba84d 100644 --- a/sys/amd64/include/vmparam.h +++ b/sys/amd64/include/vmparam.h @@ -289,12 +289,6 @@ #define ZERO_REGION_SIZE (2 * 1024 * 1024) /* 2MB */ -/* - * Use a fairly large batch size since we expect amd64 systems to have lots of - * memory. - */ -#define VM_BATCHQUEUE_SIZE 63 - /* * The pmap can create non-transparent large page mappings. */ diff --git a/sys/powerpc/include/vmparam.h b/sys/powerpc/include/vmparam.h index 1b9873aede4a..0f3321379b47 100644 --- a/sys/powerpc/include/vmparam.h +++ b/sys/powerpc/include/vmparam.h @@ -258,14 +258,6 @@ extern int vm_level_0_order; #define ZERO_REGION_SIZE (64 * 1024) /* 64KB */ #endif -/* - * Use a fairly large batch size since we expect ppc64 systems to have lots of - * memory. - */ -#ifdef __powerpc64__ -#define VM_BATCHQUEUE_SIZE 63 -#endif - /* * On 32-bit OEA, the only purpose for which sf_buf is used is to implement * an opaque pointer required by the machine-independent parts of the kernel. diff --git a/sys/vm/vm_pagequeue.h b/sys/vm/vm_pagequeue.h index 268d53a391db..9624d31a75b7 100644 --- a/sys/vm/vm_pagequeue.h +++ b/sys/vm/vm_pagequeue.h @@ -74,7 +74,9 @@ struct vm_pagequeue { uint64_t pq_pdpages; } __aligned(CACHE_LINE_SIZE); -#ifndef VM_BATCHQUEUE_SIZE +#if __SIZEOF_LONG__ == 8 +#define VM_BATCHQUEUE_SIZE 63 +#else #define VM_BATCHQUEUE_SIZE 15 #endif