From owner-svn-src-all@freebsd.org Mon Aug 20 18:45:59 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4B3D1078CB2; Mon, 20 Aug 2018 18:45:59 +0000 (UTC) (envelope-from alc@rice.edu) Received: from mx0a-0010f301.pphosted.com (mx0a-0010f301.pphosted.com [148.163.149.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.pphosted.com", Issuer "thawte SHA256 SSL CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 22E737BCE8; Mon, 20 Aug 2018 18:45:58 +0000 (UTC) (envelope-from alc@rice.edu) Received: from pps.filterd (m0102856.ppops.net [127.0.0.1]) by mx0b-0010f301.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w7KIjNo1020035; Mon, 20 Aug 2018 18:45:52 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rice.edu; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=ricemail; bh=XiOXINijtpqiVnbl0t3TiokEzlRa8+1iEVcolgMhslU=; b=crIL0qf94vr2d05r0MVx6BZjMImKJU/6oFaSo8r8KMuhSSEUOP2a3Hd+lP83m7aJ6b6U 8COUUI1hFcLhCM8braR5NP5dnVN8yQWtUnzYq7t1G+2E77+6iHnQlO8MvWFCR3eo9yJl VSnbeBDCptp9xbBEwDEDmHvMaSzoWNZKZu+WvYYDC9hmjSwdMqbhw+a6q9vVlZrVkKRf d+iJ7iVNw/Czyyrd8PzSy53qJBpxL0n9ywlPDG0UxoZMUv3MYiiCrIAvJzf+Bgrkbmmv 3CyyQtKyhjWDpPmLTezP22kN+TwD5B7ineKSFBchLkGl5LwhMGAZRdNWEp2mbqhWZbKs 6w== Received: from mh1.mail.rice.edu (mh1.mail.rice.edu [128.42.201.20]) by mx0b-0010f301.pphosted.com with ESMTP id 2kxc6e2kbh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Aug 2018 18:45:51 +0000 Received-X: from mh1.mail.rice.edu (localhost.localdomain [127.0.0.1]) by mh1.mail.rice.edu (Postfix) with ESMTP id 0B9EF460DF5; Mon, 20 Aug 2018 13:45:51 -0500 (CDT) Received-X: from mh1.mail.rice.edu (localhost.localdomain [127.0.0.1]) by mh1.mail.rice.edu (Postfix) with ESMTP id 0A252460DF2; Mon, 20 Aug 2018 13:45:51 -0500 (CDT) X-Virus-Scanned: by amavis-2.7.0 at mh1.mail.rice.edu, auth channel Received-X: from mh1.mail.rice.edu ([127.0.0.1]) by mh1.mail.rice.edu (mh1.mail.rice.edu [127.0.0.1]) (amavis, port 10026) with ESMTP id k64awsaqctqx; Mon, 20 Aug 2018 13:45:50 -0500 (CDT) Received: from 108-254-203-201.lightspeed.hstntx.sbcglobal.net (108-254-203-201.lightspeed.hstntx.sbcglobal.net [108.254.203.201]) (using TLSv1.2 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: alc) by mh1.mail.rice.edu (Postfix) with ESMTPSA id 67A5A460D17; Mon, 20 Aug 2018 13:45:50 -0500 (CDT) Subject: Re: svn commit: r338018 - head/sys/vm To: "O. Hartmann" , Alan Cox Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201808181833.w7IIXodt040289@repo.freebsd.org> <20180820203633.1bd75a2e@thor.intern.walstatt.dynvpn.de> From: Alan Cox Openpgp: preference=signencrypt Autocrypt: addr=alc@rice.edu; prefer-encrypt=mutual; keydata= xsBNBFG8q4IBCADBE55F7sX+cKhEadxhNkXrbtVSJhw3TQDPvc3nBWxsfdMAhPWozhpLczV/ hr8mDJV5tirit0qhw4ANPwtsn7i/xlcSdC9p8Jvkcpp/AfiA5B78Y08AsC6K6tbNHZ06qPq3 eCXDNbPzsUXyvyt25A+ZnQj4HbW4FpA6C5ITG1eeJPGO8WV9vhBQ4X/BWI61RXaJw68Jxtwo c9eovzdxbWTd5po/oGHL2ganYoBMu1OGpGFWvTDwy2ARCV7i+fSkfKXUPaQm17AuVVbZu8OU Ig6caCEA5MlZVsMpwuJQp7xdEQzPaDML3drkl32l3Rb09g5vKjjLHb+LXx/7PyeEWsG1ABEB AAHNGkFsYW4gQ294IDxhbGNARnJlZUJTRC5vcmc+wsB4BBMBAgAiBQJRvK14AhsDBgsJCAcD AgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCFEwQ8M+KJO7tKB/462f5Zzygqera1acLTIrIfdDXp cfyq3+OhFzbBh91b2Jw+CVKvH+hVpCUSW86Sgfv4sSvgsqdS9nMwN82MZDchNROfkkoY1Nkl 0EgayOmOoYroRp1bM65OZAMrw7qK/iG8FeJ1s6ex4wSSfeRETmFNhK0KMfTeLiKlIjW+KhIQ h+trVIWt9ZlvHI3xw6RUuEQ1CFvzETcwj/+YxLd8aha0Mr6qW/4VDw0G9g+YnqR8jnm1dOsO x8s+vJt2QmRuWGSsj5nk9Dc+Tpzytbvrv3rOCsEwuadWZU53/wL576XnqliWwkte3njN+BwI LoDuKBoqxIvdqI7lqTzYdww5BPd3zsBNBFG8q4IBCAC0hrybH/nTPvIeQm5qa5ZzwThdjb6y otBFjl/5LnMNfa2yhhJp0tQkr/WsJ/RiaYEmp7bGKnowbKR+6X7MF6qcRHwEPpibN8fpxKFg JlvhQhQWmU7nuBWqt8I1/y8aVLci7BPLRk6IKaMQJWWk18Wetijnao5gGEFu/iF9CzbYmJ/U ijVMJj08WlhQCiPnKFkirV8XjAOER5F2ecfLtfPLL/bZ+/Wm6xM+eo1ipc30oRf1Z7Rkcg94 RjiRpVacSnBQEFMXukD33w6WaKYT18B4rwN27tJfzTmGKRKggWEc3EWeQgzi3rD7x35owBJ7 x+G6lIjdSG4o9ytB3qTVazo3ABEBAAHCwF8EGAECAAkFAlG8q4ICGwwACgkQhRMEPDPiiTuH kAgAo3MUNRzGplyvgPezfnLgnwtlDYMF1HWp+67IIvY3WwcC51FQNHWmGis+H7Bor+aeSAfo KREw9l4U0Tu2YC9uiWKZzA4zer2WMhsB4VGMQ8GPuE2R2sFob5n293FsLWDSWM4Midory9zN EAYQ+Ijpv8WaATS217YYygA+iFlfMmQSKDS1G6HBnUjzQe23sX/06JAAxAvwmOI7OjwLlOCU Q5FaHPz6s8UjdHpZ/OUTElc7URPTr/KramlLhwuTRC2p8XyBrzYqz3Kfl42jEcOuxeHy07DG dm1Euqa5/CKTNBhMWjcujz11TUeI9+f5J2xUSlbj7nGJsnL5P34+SvtsKg== Message-ID: Date: Mon, 20 Aug 2018 13:45:49 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD i386; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <20180820203633.1bd75a2e@thor.intern.walstatt.dynvpn.de> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Language: en-US X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-08-20_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=35 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1808200194 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Aug 2018 18:46:00 -0000 On 08/20/2018 13:36, O. Hartmann wrote: > Am Sat, 18 Aug 2018 18:33:50 +0000 (UTC) > Alan Cox schrieb: > > > Author: alc > > Date: Sat Aug 18 18:33:50 2018 > > New Revision: 338018 > > URL: https://svnweb.freebsd.org/changeset/base/338018 > > > Log: > > Eliminate the arena parameter to kmem_malloc_domain(). It is > redundant. > > The domain and flags parameters suffice. In fact, the related > functions > > kmem_alloc_{attr,contig}_domain() don't have an arena parameter. > > > Reviewed by: kib, markj > > Differential Revision: https://reviews.freebsd.org/D16713 > > > Modified: > > head/sys/vm/uma_core.c > > head/sys/vm/vm_extern.h > > head/sys/vm/vm_kern.c > > > Modified: head/sys/vm/uma_core.c > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > --- head/sys/vm/uma_core.c Sat Aug 18 16:03:15 2018 (r338017) > > +++ head/sys/vm/uma_core.c Sat Aug 18 18:33:50 2018 (r338018) > > @@ -1169,7 +1169,7 @@ page_alloc(uma_zone_t zone, vm_size_t bytes, > int domai > > void *p; /* Returned page */ > > > *pflag =3D UMA_SLAB_KERNEL; > > - p =3D (void *) kmem_malloc_domain(kernel_arena, domain, bytes, w= ait); > > + p =3D (void *) kmem_malloc_domain(domain, bytes, wait); > > > return (p); > > } > > @@ -3680,32 +3680,22 @@ uma_zone_exhausted_nolock(uma_zone_t zone) > > void * > > uma_large_malloc_domain(vm_size_t size, int domain, int wait) > > { > > - struct vmem *arena; > > vm_offset_t addr; > > uma_slab_t slab; > > > -#if VM_NRESERVLEVEL > 0 > > - if (__predict_true((wait & M_EXEC) =3D=3D 0)) > > - arena =3D kernel_arena; > > - else > > - arena =3D kernel_rwx_arena; > > -#else > > - arena =3D kernel_arena; > > -#endif > > - > > slab =3D zone_alloc_item(slabzone, NULL, domain, wait); > > if (slab =3D=3D NULL) > > return (NULL); > > if (domain =3D=3D UMA_ANYDOMAIN) > > - addr =3D kmem_malloc(arena, size, wait); > > + addr =3D kmem_malloc(NULL, size, wait); > > else > > - addr =3D kmem_malloc_domain(arena, domain, size, wait); > > + addr =3D kmem_malloc_domain(domain, size, wait); > > if (addr !=3D 0) { > > vsetslab(addr, slab); > > slab->us_data =3D (void *)addr; > > slab->us_flags =3D UMA_SLAB_KERNEL | UMA_SLAB_MALLOC; > > #if VM_NRESERVLEVEL > 0 > > - if (__predict_false(arena =3D=3D kernel_rwx_arena)) > > + if (__predict_false((wait & M_EXEC) !=3D 0)) > > slab->us_flags |=3D UMA_SLAB_KRWX; > > #endif > > slab->us_size =3D size; > > > Modified: head/sys/vm/vm_extern.h > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > --- head/sys/vm/vm_extern.h Sat Aug 18 16:03:15 2018 (r338017) > > +++ head/sys/vm/vm_extern.h Sat Aug 18 18:33:50 2018 (r338018) > > @@ -65,8 +65,7 @@ vm_offset_t kmem_alloc_contig_domain(int domain, vm= _si > > vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t > boundary, > > vm_memattr_t memattr); > > vm_offset_t kmem_malloc(struct vmem *, vm_size_t size, int flags); > > -vm_offset_t kmem_malloc_domain(struct vmem *, int domain, vm_size_t > size, > > - int flags); > > +vm_offset_t kmem_malloc_domain(int domain, vm_size_t size, int flags= ); > > void kmem_free(struct vmem *, vm_offset_t, vm_size_t); > > > /* This provides memory for previously allocated address space. */ > > > Modified: head/sys/vm/vm_kern.c > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > --- head/sys/vm/vm_kern.c Sat Aug 18 16:03:15 2018 (r338017) > > +++ head/sys/vm/vm_kern.c Sat Aug 18 18:33:50 2018 (r338018) > > @@ -372,23 +372,18 @@ kmem_suballoc(vm_map_t parent, vm_offset_t > *min, vm_of > > * Allocate wired-down pages in the kernel's address space. > > */ > > vm_offset_t > > -kmem_malloc_domain(struct vmem *vmem, int domain, vm_size_t size, > int flags) > > +kmem_malloc_domain(int domain, vm_size_t size, int flags) > > { > > vmem_t *arena; > > vm_offset_t addr; > > int rv; > > > #if VM_NRESERVLEVEL > 0 > > - KASSERT(vmem =3D=3D kernel_arena || vmem =3D=3D kernel_rwx_arena= , > > - ("kmem_malloc_domain: Only kernel_arena or kernel_rwx_arena = " > > - "are supported.")); > > - if (__predict_true(vmem =3D=3D kernel_arena)) > > + if (__predict_true((flags & M_EXEC) =3D=3D 0)) > > arena =3D vm_dom[domain].vmd_kernel_arena; > > else > > arena =3D vm_dom[domain].vmd_kernel_rwx_arena; > > #else > > - KASSERT(vmem =3D=3D kernel_arena, > > - ("kmem_malloc_domain: Only kernel_arena is supported.")); > > arena =3D vm_dom[domain].vmd_kernel_arena; > > #endif > > size =3D round_page(size); > > @@ -404,7 +399,7 @@ kmem_malloc_domain(struct vmem *vmem, int > domain, vm_s > > } > > > vm_offset_t > > -kmem_malloc(struct vmem *vmem, vm_size_t size, int flags) > > +kmem_malloc(struct vmem *vmem __unused, vm_size_t size, int flags) > > { > > struct vm_domainset_iter di; > > vm_offset_t addr; > > @@ -412,7 +407,7 @@ kmem_malloc(struct vmem *vmem, vm_size_t size, > int fla > > > vm_domainset_iter_malloc_init(&di, kernel_object, &domain, &flag= s); > > do { > > - addr =3D kmem_malloc_domain(vmem, domain, size, flags); > > + addr =3D kmem_malloc_domain(domain, size, flags); > > if (addr !=3D 0) > > break; > > } while (vm_domainset_iter_malloc(&di, &domain, &flags) =3D=3D 0= ); > > _______________________________________________ > > svn-src-head@freebsd.org mailing list > > https://lists.freebsd.org/mailman/listinfo/svn-src-head > > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.or= g" > > This change has implications at least for port > > x11/nvidia-driver (390.77) > > which now fails in nvidia_subr.c:1131:41 > and > nvidia_subr.c:1269:45: > > to compile. > > See PR 230780 > > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D230780 > > > Thank you. I have posted instructions to the PR on how to address this.