From nobody Sun Jul 30 10:30:37 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 4RDHhf6Cygz4q8Yq; Sun, 30 Jul 2023 10:30:49 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Received: from heemeyer.club (heemeyer.club [195.93.173.158]) (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 4RDHhR1NzJz3wWZ; Sun, 30 Jul 2023 10:30:46 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Authentication-Results: mx1.freebsd.org; dkim=none; spf=none (mx1.freebsd.org: domain of dchagin@heemeyer.club has no SPF policy when checking 195.93.173.158) smtp.mailfrom=dchagin@heemeyer.club; dmarc=none Received: from heemeyer.club (localhost [127.0.0.1]) by heemeyer.club (8.17.2/8.16.1) with ESMTP id 36UAUbcN016978; Sun, 30 Jul 2023 13:30:37 +0300 (MSK) (envelope-from dchagin@heemeyer.club) Received: (from dchagin@localhost) by heemeyer.club (8.17.2/8.16.1/Submit) id 36UAUbjj016977; Sun, 30 Jul 2023 13:30:37 +0300 (MSK) (envelope-from dchagin) Date: Sun, 30 Jul 2023 13:30:37 +0300 From: Dmitry Chagin To: Alan Cox Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 50d663b14b31 - main - vm: Fix vm_map_find_min() Message-ID: References: <202307260525.36Q5PbRm027006@gitrepo.freebsd.org> 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=us-ascii Content-Disposition: inline In-Reply-To: <202307260525.36Q5PbRm027006@gitrepo.freebsd.org> X-Spamd-Result: default: False [-1.80 / 15.00]; AUTH_NA(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[dchagin@freebsd.org,dchagin@heemeyer.club]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; R_DKIM_NA(0.00)[]; R_SPF_NA(0.00)[no SPF record]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; DMARC_NA(0.00)[freebsd.org]; FREEFALL_USER(0.00)[dchagin]; ARC_NA(0.00)[]; ASN(0.00)[asn:61400, ipnet:195.93.173.0/24, country:RU]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FROM_NEQ_ENVFROM(0.00)[dchagin@freebsd.org,dchagin@heemeyer.club] X-Rspamd-Queue-Id: 4RDHhR1NzJz3wWZ X-Spamd-Bar: - On Wed, Jul 26, 2023 at 05:25:37AM +0000, Alan Cox wrote: > The branch main has been updated by alc: > > URL: https://cgit.FreeBSD.org/src/commit/?id=50d663b14b310d6020b4b6cc92d4fae985f086f2 > > commit 50d663b14b310d6020b4b6cc92d4fae985f086f2 > Author: Alan Cox > AuthorDate: 2023-07-25 07:24:19 +0000 > Commit: Alan Cox > CommitDate: 2023-07-26 05:24:50 +0000 > > vm: Fix vm_map_find_min() > > Fix the handling of address hints that are less than min_addr by > vm_map_find_min(). > Thank you for fixing that, however it still fails under Linuxulator. #include #include #include #include #include #include #include #include int main(int argc, char** argv) { struct stat sb; void *s32; int f, r; f = open(argv[0], O_RDONLY); assert(f > 0); r = fstat(f, &sb); assert(r == 0); s32 = mmap(NULL, sb.st_size, PROT_READ, MAP_32BIT|MAP_PRIVATE, f, 0); assert(s32 != MAP_FAILED); assert((uintptr_t)s32 < 0x80000000); close(f); munmap(s32, sb.st_size); return (0); } > Reported by: dchagin > Reviewed by: kib > Fixes: d8e6f4946cec0 "vm: Fix anonymous memory clustering under ASLR" > Differential Revision: https://reviews.freebsd.org/D41159 > --- > sys/vm/vm_map.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c > index 444e09986d4e..eb607d519247 100644 > --- a/sys/vm/vm_map.c > +++ b/sys/vm/vm_map.c > @@ -2255,10 +2255,10 @@ vm_map_find_min(vm_map_t map, vm_object_t object, vm_ooffset_t offset, > int rv; > > hint = *addr; > - if (hint == 0) > + if (hint == 0) { > cow |= MAP_NO_HINT; > - if (hint < min_addr) > *addr = hint = min_addr; > + } > for (;;) { > rv = vm_map_find(map, object, offset, addr, length, max_addr, > find_space, prot, max, cow);