From nobody Mon Apr 21 10:35:22 2025 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 4Zh1ww2NgCz5tJFK; Mon, 21 Apr 2025 10:35:44 +0000 (UTC) (envelope-from pat@patmaddox.com) Received: from fout-b4-smtp.messagingengine.com (fout-b4-smtp.messagingengine.com [202.12.124.147]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4Zh1ww0c51z3dT8; Mon, 21 Apr 2025 10:35:43 +0000 (UTC) (envelope-from pat@patmaddox.com) Authentication-Results: mx1.freebsd.org; none Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfout.stl.internal (Postfix) with ESMTP id 095DC11401C5; Mon, 21 Apr 2025 06:35:43 -0400 (EDT) Received: from phl-imap-15 ([10.202.2.104]) by phl-compute-06.internal (MEProxy); Mon, 21 Apr 2025 06:35:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=patmaddox.com; h=cc:cc:content-transfer-encoding:content-type:content-type :date:date:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:subject:subject:to:to; s=fm1; t=1745231742; x=1745318142; bh=K2E9hJo88qHMH6IRGup4zKcHneIKjQOA nO0rPFCupIg=; b=S0EfmdB3Zm/Zi5NBIJ0T8O7g4pmU7Y054r4lxC0NHpKMA2cV s7BOjMe2IidoKQF7PA0uff8FyQKLwvIb4d4fjhQofcLrOJpwBbQ9QyF017WdEptG WKqryCFkXNIlAI6N0HowIoKbQkdiF3l9JX1SmzEduX6QxNRRufNhlqBrUWBNsO19 3har9krnB0WjM3zAVEIHLPAUrc/fUz/VX7wbcSJNj+P2KFCjPfAyoeEA5o0E3p7D jR/fuwyJqxxP5+YPW0WPoknq4pkSiIe5o4KoITMpAT46gL/5jk8kMI3DRjPXdZOQ ijQ51U+ewiuh6kNnG8HQ1/6ra8xdq7WwFnNF6w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1745231742; x= 1745318142; bh=K2E9hJo88qHMH6IRGup4zKcHneIKjQOAnO0rPFCupIg=; b=v Kw/aWX63fiLXXzkiM71VYHfVNMK7quQqBq827A3dY+XfN9G5/jie21pSmoONyBd2 pcgxrEUIPIM7PDE/SLONvvzwkI3++t1jWthLf5+r9ERYDUYXowfGjlHC1RZvF1ZX XCSDMI4oJoLIoJKrwz0lBpgH8maq322+Psd3mOqlZ0vs1OHmJvfp3nT7IDOklYe9 HFH64aWh6ZM7y1cQe2IUqF0kSu/fbCrbzq70EkznoaayGYxHa42SAcKKbCmCMDui NWNzYbtvQX3evfod45kqam5aawpX47qceK90kXkxP2to64LChkRoAgyjqJBvWkcW 25QBVcQtcVvSJqAlejanQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvgedtieefucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhepofggfffhvfevkfgjfhfutgfgsehtjeertder tddtnecuhfhrohhmpedfrfgrthcuofgrugguohigfdcuoehprghtsehprghtmhgrugguoh igrdgtohhmqeenucggtffrrghtthgvrhhnpeelveelieduheetgfdtueehgfevueetvdfg ieehjeeutdetjedvvdejjedvhfelgeenucffohhmrghinhepfhhrvggvsghsugdrohhrgh dpnhifthhimhgvrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehm rghilhhfrhhomhepphgrthesphgrthhmrgguughogidrtghomhdpnhgspghrtghpthhtoh epiedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtoheptgihrdhstghhuhgsvghrthes tghstghhuhgsvghrthdrtghomhdprhgtphhtthhopeguvghvqdgtohhmmhhithhsqdhsrh gtqdgrlhhlsehfrhgvvggsshgurdhorhhgpdhrtghpthhtohepuggvvhdqtghomhhmihht shdqshhrtgdqmhgrihhnsehfrhgvvggsshgurdhorhhgpdhrtghpthhtohepughouhhgmh esfhhrvggvsghsugdrohhrghdprhgtphhtthhopehmrghnuhesfhhrvggvsghsugdrohhr ghdprhgtphhtthhopehsrhgtqdgtohhmmhhithhtvghrshesfhhrvggvsghsugdrohhrgh X-ME-Proxy: Feedback-ID: i8b6c40f9:Fastmail Received: by mailuser.phl.internal (Postfix, from userid 501) id 8580978006B; Mon, 21 Apr 2025 06:35:42 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 X-ThreadId: T6baeaf641dae651a Date: Mon, 21 Apr 2025 03:35:22 -0700 From: "Pat Maddox" To: "Cy Schubert" , "Doug Moore" Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, manu@freebsd.org Message-Id: <6e35f593-40d8-42f2-8fe3-c7a1afef2f73@app.fastmail.com> In-Reply-To: <20250421070908.65A1C202@slippy.cwsent.com> References: <202504181927.53IJRsoQ035803@gitrepo.freebsd.org> <20250421070908.65A1C202@slippy.cwsent.com> Subject: Re: git: a3a88ed22cb1 - main - vm_page: drop prev and next Content-Type: text/plain Content-Transfer-Encoding: 7bit X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Queue-Id: 4Zh1ww0c51z3dT8 X-Spamd-Bar: ---- On Mon, Apr 21, 2025, at 12:09 AM, Cy Schubert wrote: > In message <202504181927.53IJRsoQ035803@gitrepo.freebsd.org>, Doug Moore > writes > : >> The branch main has been updated by dougm: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=a3a88ed22cb111da3336f64ec3ba5815 >> a8278f88 >> >> commit a3a88ed22cb111da3336f64ec3ba5815a8278f88 >> Author: Doug Moore >> AuthorDate: 2025-04-18 19:26:56 +0000 >> Commit: Doug Moore >> CommitDate: 2025-04-18 19:26:56 +0000 >> >> vm_page: drop prev and next >> >> Functions vm_page_prev() and vm_page_next() are no longer >> invoked. Remove them. >> >> Reviewed by: kib >> Differential Revision: https://reviews.freebsd.org/D49892 >> --- >> sys/vm/vm_page.c | 40 ---------------------------------------- >> sys/vm/vm_page.h | 2 -- >> 2 files changed, 42 deletions(-) >> >> diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c >> index 65d278caf3fd..db91b7bab2ab 100644 >> --- a/sys/vm/vm_page.c >> +++ b/sys/vm/vm_page.c >> @@ -1894,46 +1894,6 @@ vm_page_find_least(vm_object_t object, vm_pindex_t pin >> dex) >> return (m); >> } >> >> -/* >> - * Returns the given page's successor (by pindex) within the object if it is >> - * resident; if none is found, NULL is returned. >> - * >> - * The object must be locked. >> - */ >> -vm_page_t >> -vm_page_next(vm_page_t m) >> -{ >> - vm_page_t next; >> - >> - VM_OBJECT_ASSERT_LOCKED(m->object); >> - if ((next = TAILQ_NEXT(m, listq)) != NULL) { >> - MPASS(next->object == m->object); >> - if (next->pindex != m->pindex + 1) >> - next = NULL; >> - } >> - return (next); >> -} >> - >> -/* >> - * Returns the given page's predecessor (by pindex) within the object if it >> is >> - * resident; if none is found, NULL is returned. >> - * >> - * The object must be locked. >> - */ >> -vm_page_t >> -vm_page_prev(vm_page_t m) >> -{ >> - vm_page_t prev; >> - >> - VM_OBJECT_ASSERT_LOCKED(m->object); >> - if ((prev = TAILQ_PREV(m, pglist, listq)) != NULL) { >> - MPASS(prev->object == m->object); >> - if (prev->pindex != m->pindex - 1) >> - prev = NULL; >> - } >> - return (prev); >> -} >> - >> /* >> * Uses the page mnew as a replacement for an existing page at index >> * pindex which must be already present in the object. >> diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h >> index 0a40b42ffb62..bf2e850612d7 100644 >> --- a/sys/vm/vm_page.h >> +++ b/sys/vm/vm_page.h >> @@ -664,12 +664,10 @@ bool vm_page_iter_rename(struct pctrie_iter *old_pages, >> vm_page_t m, >> void vm_page_launder(vm_page_t m); >> vm_page_t vm_page_lookup(vm_object_t, vm_pindex_t); >> vm_page_t vm_page_lookup_unlocked(vm_object_t, vm_pindex_t); >> -vm_page_t vm_page_next(vm_page_t m); >> void vm_page_pqbatch_drain(void); >> void vm_page_pqbatch_submit(vm_page_t m, uint8_t queue); >> bool vm_page_pqstate_commit(vm_page_t m, vm_page_astate_t *old, >> vm_page_astate_t new); >> -vm_page_t vm_page_prev(vm_page_t m); >> bool vm_page_ps_test(vm_page_t m, int psind, int flags, vm_page_t skip_m); >> void vm_page_putfake(vm_page_t m); >> void vm_page_readahead_finish(vm_page_t m); >> > > This breaks ports/graphics/drm-*-kmod. X will no longer start due to > missing vm_page_next(). > > cc: manu > > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e^(i*pi)+1=0 Also drm-kmod cannot build: --- i915_gem_mman.o --- /wrkdirs/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/drivers/gpu/drm/i915/gem/i915_gem_mman.c:171:77: error: call to undeclared function 'vm_page_next'; ISO C99 and later do not support implicit function declarations [-Werror,-Wimplicit-function-declaration] 171 | for (vm_page_t page = vm_page_find_least(vmobj, 0); page != NULL; page = vm_page_next(page)) { | ^ --- intel_guc_log_debugfs.o --- --- i915_gem_mman.o --- /wrkdirs/usr/ports/graphics/drm-61-kmod/work/drm-kmod-drm_v6.1.128_1/drivers/gpu/drm/i915/gem/i915_gem_mman.c:171:75: error: incompatible integer to pointer conversion assigning to 'vm_page_t' (aka 'struct vm_page *') from 'int' [-Wint-conversion] 171 | for (vm_page_t page = vm_page_find_least(vmobj, 0); page != NULL; page = vm_page_next(page)) { | ^ ~~~~~~~~~~~~~~~~~~ --- intel_guc_log_debugfs.o ---