From owner-svn-src-head@freebsd.org Sat Dec 28 19:22:44 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 64F0E1EEFB9 for ; Sat, 28 Dec 2019 19:22:44 +0000 (UTC) (envelope-from jroberson@jroberson.net) Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47lYVq2PSbz4fBk for ; Sat, 28 Dec 2019 19:22:42 +0000 (UTC) (envelope-from jroberson@jroberson.net) Received: by mail-pf1-x430.google.com with SMTP id x185so16369747pfc.5 for ; Sat, 28 Dec 2019 11:22:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jroberson-net.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=DHDerCatWOjQRbOnQNX93ulqAGUjEz12Z+9JCd1ffTY=; b=jC7kQDrV5HjNMIbtGISN33reNlr1s36aG2Pg9J7j27P5n5oWC6F1VoL7nlOojPd6dw 1zt9okYl/q41RVZhGDQ9cMkf/6M8JkMtkISW/lSA1+uNV0E2iCZh1zzz0gPqUHviPO+D 879CnnNLyMkpuPIiVjKsPgW1UYBMpjUTL8+HNXEt3Sof/mSON6iCqD0alzUAkWj2mO/k FAslN/zsGnKpi2qT2e9oaIAB+d6N2Hk3r0GVJ5i1xuU9pysoqmT0J5bIAQqrs2vP65Zj 0JlKK59iPDmKUmGBCJntMlf+eZjW30j1dZQwoS7KihJp87SF5RQRmlpahI5IBwvN0q5i jBwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=DHDerCatWOjQRbOnQNX93ulqAGUjEz12Z+9JCd1ffTY=; b=dbOdFLgz1ac0XsESyTL3qTvDTg0q/CT3H2DUweyIQqfEyv9sN9j7zKilmPx3WIg5Ia c7IIXI9rAKpiakF3kxNEpoERCbUx58CEHXwXUsB5E+SpU1isty20OP2CkcXcoCOXv4sG TYV2JuVwowqotUwwjLi7VaU/PtBDYoZuoQjK8LZ81rg8PCbKvMLFZ8FnxRODHuYFDTqF uKBan+oItTYdSvmSviJrk7KFWdn41Onqs9rfNlfMotQP9GXHAm5znJZ4Y4lDitvHbEpw 4YpfLe/pJwFX/cW2F1zlEr2aQ7vIzoQgGy3lj7CdvtbuCKD8cjqmMjs/SYqukR9S6Ner bPwg== X-Gm-Message-State: APjAAAW0Jad+dEotL5ndZhnvy6s1zyKwKu7XElQ3il+fEmAaLVs0AmWX wATAjU0tjHqEAwh/HfZrNwN7Tw== X-Google-Smtp-Source: APXvYqy7Hko218rb+GWvhHQABLCbPbDfTrrGy2/CH3UQbQSIugc/gHU7G3yxcp6Jx3iuDSj5BnnXJA== X-Received: by 2002:a63:946:: with SMTP id 67mr60994903pgj.277.1577560961333; Sat, 28 Dec 2019 11:22:41 -0800 (PST) Received: from rrcs-76-81-105-82.west.biz.rr.com (rrcs-76-81-105-82.west.biz.rr.com. [76.81.105.82]) by smtp.gmail.com with ESMTPSA id y62sm47039227pfg.45.2019.12.28.11.22.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Dec 2019 11:22:40 -0800 (PST) Date: Sat, 28 Dec 2019 09:22:38 -1000 (HST) From: Jeff Roberson X-X-Sender: jroberson@desktop To: Mark Johnston cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r356159 - head/sys/vm In-Reply-To: <201912281904.xBSJ4T19064948@repo.freebsd.org> Message-ID: References: <201912281904.xBSJ4T19064948@repo.freebsd.org> User-Agent: Alpine 2.21.9999 (BSF 287 2018-06-16) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed X-Rspamd-Queue-Id: 47lYVq2PSbz4fBk X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=jroberson-net.20150623.gappssmtp.com header.s=20150623 header.b=jC7kQDrV; dmarc=none; spf=none (mx1.freebsd.org: domain of jroberson@jroberson.net has no SPF policy when checking 2607:f8b0:4864:20::430) smtp.mailfrom=jroberson@jroberson.net X-Spamd-Result: default: False [-4.42 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[jroberson-net.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[jroberson.net]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[jroberson-net.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[0.3.4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MID_RHS_NOT_FQDN(0.50)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_TLS_ALL(0.00)[]; IP_SCORE(-2.62)[ip: (-9.02), ipnet: 2607:f8b0::/32(-2.15), asn: 15169(-1.88), country: US(-0.05)] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Dec 2019 19:22:44 -0000 Fantastic! On Sat, 28 Dec 2019, Mark Johnston wrote: > Author: markj > Date: Sat Dec 28 19:04:29 2019 > New Revision: 356159 > URL: https://svnweb.freebsd.org/changeset/base/356159 > > Log: > Remove some unused functions. > > The previous series of patches orphaned some vm_page functions, so > remove them. > > Reviewed by: dougm, kib > Sponsored by: Netflix, Intel > Differential Revision: https://reviews.freebsd.org/D22886 > > Modified: > head/sys/vm/vm_page.c > head/sys/vm/vm_page.h > > Modified: head/sys/vm/vm_page.c > ============================================================================== > --- head/sys/vm/vm_page.c Sat Dec 28 19:04:15 2019 (r356158) > +++ head/sys/vm/vm_page.c Sat Dec 28 19:04:29 2019 (r356159) > @@ -3662,52 +3662,6 @@ vm_page_enqueue(vm_page_t m, uint8_t queue) > } > > /* > - * vm_page_requeue: [ internal use only ] > - * > - * Schedule a requeue of the given page. > - * > - * The page must be locked. > - */ > -void > -vm_page_requeue(vm_page_t m) > -{ > - > - vm_page_assert_locked(m); > - KASSERT(vm_page_queue(m) != PQ_NONE, > - ("%s: page %p is not logically enqueued", __func__, m)); > - KASSERT(m->ref_count > 0, > - ("%s: page %p does not carry any references", __func__, m)); > - > - if ((m->a.flags & PGA_REQUEUE) == 0) > - vm_page_aflag_set(m, PGA_REQUEUE); > - vm_page_pqbatch_submit(m, atomic_load_8(&m->a.queue)); > -} > - > -/* > - * vm_page_swapqueue: [ internal use only ] > - * > - * Move the page from one queue to another, or to the tail of its > - * current queue, in the face of a possible concurrent free of the > - * page. > - */ > -void > -vm_page_swapqueue(vm_page_t m, uint8_t oldq, uint8_t newq) > -{ > - vm_page_astate_t new, old; > - > - old = vm_page_astate_load(m); > - do { > - if (old.queue != oldq || (old.flags & PGA_DEQUEUE) != 0) > - return; > - new = old; > - new.flags |= PGA_REQUEUE; > - new.queue = newq; > - } while (!vm_page_pqstate_commit_dequeue(m, &old, new)); > - > - vm_page_pqbatch_submit(m, newq); > -} > - > -/* > * vm_page_free_prep: > * > * Prepares the given page to be put on the free list, > > Modified: head/sys/vm/vm_page.h > ============================================================================== > --- head/sys/vm/vm_page.h Sat Dec 28 19:04:15 2019 (r356158) > +++ head/sys/vm/vm_page.h Sat Dec 28 19:04:29 2019 (r356159) > @@ -649,7 +649,6 @@ bool vm_page_remove_xbusy(vm_page_t); > int vm_page_rename(vm_page_t, vm_object_t, vm_pindex_t); > void vm_page_replace(vm_page_t mnew, vm_object_t object, > vm_pindex_t pindex, vm_page_t mold); > -void vm_page_requeue(vm_page_t m); > int vm_page_sbusied(vm_page_t m); > vm_page_t vm_page_scan_contig(u_long npages, vm_page_t m_start, > vm_page_t m_end, u_long alignment, vm_paddr_t boundary, int options); > @@ -659,7 +658,6 @@ int vm_page_sleep_if_busy(vm_page_t m, const char *msg > int vm_page_sleep_if_xbusy(vm_page_t m, const char *msg); > vm_offset_t vm_page_startup(vm_offset_t vaddr); > void vm_page_sunbusy(vm_page_t m); > -void vm_page_swapqueue(vm_page_t m, uint8_t oldq, uint8_t newq); > bool vm_page_try_remove_all(vm_page_t m); > bool vm_page_try_remove_write(vm_page_t m); > int vm_page_trysbusy(vm_page_t m); > @@ -833,31 +831,6 @@ vm_page_aflag_set(vm_page_t m, uint16_t bits) > addr = (void *)&m->a; > val = bits << VM_PAGE_AFLAG_SHIFT; > atomic_set_32(addr, val); > -} > - > -/* > - * Atomically update the queue state of the page. The operation fails if > - * any of the queue flags in "fflags" are set or if the "queue" field of > - * the page does not match the expected value; if the operation is > - * successful, the flags in "nflags" are set and all other queue state > - * flags are cleared. > - */ > -static inline bool > -vm_page_pqstate_cmpset(vm_page_t m, uint32_t oldq, uint32_t newq, > - uint32_t fflags, uint32_t nflags) > -{ > - vm_page_astate_t new, old; > - > - old = vm_page_astate_load(m); > - do { > - if ((old.flags & fflags) != 0 || old.queue != oldq) > - return (false); > - new = old; > - new.flags = (new.flags & ~PGA_QUEUE_OP_MASK) | nflags; > - new.queue = newq; > - } while (!vm_page_astate_fcmpset(m, &old, new)); > - > - return (true); > } > > /* >