Date: Wed, 17 Jun 2020 14:04:19 +0300 From: Konstantin Belousov <kostikbel@gmail.com> To: Conrad Meyer <cem@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r362253 - head/sys/vm Message-ID: <20200617110419.GF45690@kib.kiev.ua> In-Reply-To: <202006162253.05GMruKi046200@repo.freebsd.org> References: <202006162253.05GMruKi046200@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Jun 16, 2020 at 10:53:56PM +0000, Conrad Meyer wrote: > Author: cem > Date: Tue Jun 16 22:53:56 2020 > New Revision: 362253 > URL: https://svnweb.freebsd.org/changeset/base/362253 > > Log: > vm: Drop vm_map_clip_{start,end} macro wrappers > > No functional change. > > Reviewed by: dougm, markj > Sponsored by: Dell EMC Isilon > Differential Revision: https://reviews.freebsd.org/D25282 > > Modified: > head/sys/vm/vm_map.c > > Modified: head/sys/vm/vm_map.c > ============================================================================== > --- head/sys/vm/vm_map.c Tue Jun 16 21:30:30 2020 (r362252) > +++ head/sys/vm/vm_map.c Tue Jun 16 22:53:56 2020 (r362253) > @@ -2377,24 +2377,17 @@ vm_map_entry_clone(vm_map_t map, vm_map_entry_t entry) > * the specified address; if necessary, > * it splits the entry into two. > */ > -#define vm_map_clip_start(map, entry, startaddr) \ > -{ \ > - if (startaddr > entry->start) \ > - _vm_map_clip_start(map, entry, startaddr); \ > -} > - > -/* > - * This routine is called only when it is known that > - * the entry must be split. > - */ > static inline void > -_vm_map_clip_start(vm_map_t map, vm_map_entry_t entry, vm_offset_t start) > +vm_map_clip_start(vm_map_t map, vm_map_entry_t entry, vm_offset_t start) > { > vm_map_entry_t new_entry; > > + if (start <= entry->start) > + return; > + > VM_MAP_ASSERT_LOCKED(map); > KASSERT(entry->end > start && entry->start < start, > - ("_vm_map_clip_start: invalid clip of entry %p", entry)); > + ("%s: invalid clip of entry %p", __func__, entry)); > > new_entry = vm_map_entry_clone(map, entry); > > @@ -2435,24 +2428,17 @@ vm_map_lookup_clip_start(vm_map_t map, vm_offset_t sta > * the specified address; if necessary, > * it splits the entry into two. > */ > -#define vm_map_clip_end(map, entry, endaddr) \ > -{ \ > - if ((endaddr) < (entry->end)) \ > - _vm_map_clip_end((map), (entry), (endaddr)); \ > -} > - > -/* > - * This routine is called only when it is known that > - * the entry must be split. > - */ > static inline void > -_vm_map_clip_end(vm_map_t map, vm_map_entry_t entry, vm_offset_t end) > +vm_map_clip_end(vm_map_t map, vm_map_entry_t entry, vm_offset_t end) > { > vm_map_entry_t new_entry; > > + if (end >= entry->end) > + return; > + > VM_MAP_ASSERT_LOCKED(map); > KASSERT(entry->start < end && entry->end > end, > - ("_vm_map_clip_end: invalid clip of entry %p", entry)); > + ("%s: invalid clip of entry %p", __func__, entry)); > > new_entry = vm_map_entry_clone(map, entry); > I would highly appreciate if you revert this commit. It conflicts with https://reviews.freebsd.org/D24652, which must revert your change to remain functional. I probably should not allowed that review to rott silently.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20200617110419.GF45690>