From owner-svn-src-head@freebsd.org Thu Sep 19 19:38:22 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 7361712C8B1; Thu, 19 Sep 2019 19:38:22 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 46Z6b20YX4z4BSP; Thu, 19 Sep 2019 19:38:21 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id B2FtiYasRsAGkB2Fui1mt6; Thu, 19 Sep 2019 13:38:19 -0600 X-Authority-Analysis: v=2.3 cv=WeVylHpX c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=kj9zAlcOel0A:10 a=J70Eh1EUuV4A:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=A-G1zzc3P0URKbUEIbsA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy8 [10.2.2.6]) by spqr.komquats.com (Postfix) with ESMTPS id 58E024E8; Thu, 19 Sep 2019 12:38:16 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id x8JJcFSr064445; Thu, 19 Sep 2019 12:38:15 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id x8JJcFSb064442; Thu, 19 Sep 2019 12:38:15 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201909191938.x8JJcFSb064442@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Dimitry Andric cc: Cy Schubert , src-committers , svn-src-all , svn-src-head@freebsd.org Subject: Re: svn commit: r352304 - in head: . usr.sbin/ntp usr.sbin/ntp/ntpd In-reply-to: References: <201909132020.x8DKK62j025066@repo.freebsd.org> <4ccdcc18-6412-e606-4a74-314033a5f9c1@FreeBSD.org> <201909191246.x8JCke4Y003916@slippy.cwsent.com> Comments: In-reply-to Dimitry Andric message dated "Thu, 19 Sep 2019 19:38:37 +0200." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 19 Sep 2019 12:38:15 -0700 X-CMAE-Envelope: MS4wfP8XZIx2JXZTW0FqfbX5HFiZky6dCCBehg2mZqKSHC/ZvqZIYaiWy4ugwsc2mwDdSnngyM0SWQKqsji9Sg0r+c/2I07rJNLJ1Heb0oTJ675en8hiskfQ 7GbfLF/tDlGRntpFxnbItEU4N1YvJc0N8msGnqr+OjfFE/K751uuVmzt0veicUMcmcq1HhjoHSB4jYJezYACjQ/HkzzMti0RL0GikCFfLDYQ8nJX01buP/6a 29kbzhCqeuMCe+6qHxaAQEkNcwxuff8e2Vb3XipwNxQUNRy1YG3xFnHdxdhHMaRP X-Rspamd-Queue-Id: 46Z6b20YX4z4BSP X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-6.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.995,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] 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: Thu, 19 Sep 2019 19:38:22 -0000 In message , Dimitry Andric w rites: > > On 19 Sep 2019, at 14:46, Cy Schubert wrote: > >=20 > > In message <4ccdcc18-6412-e606-4a74-314033a5f9c1@FreeBSD.org>, Dimitry = > Andric writes: > >> On 2019-09-13 22:20, Cy Schubert wrote: > >>> Author: cy > >>> Date: Fri Sep 13 20:20:05 2019 > >>> New Revision: 352304 > >>> URL: https://svnweb.freebsd.org/changeset/base/352304 > >>>=20 > >>> Log: > >>> No longer mlock() ntpd pages by default in memory thus allowing = > its > >>> pages to page as necessary. > >>>=20 > >>> To restore historic BSD behaviour add the following to ntp.conf: > >>> rlimit memlock 32 > >>=20 > >> Apparently this does not completely work, as I still see: > >>=20 > >> ntpd[824]: ntpd 4.2.8p12-a (1): Starting > >> ntpd[825]: Cannot set RLIMIT_MEMLOCK: Operation not permitted > >>=20 > >> even while my ntp.conf is almost entirely vanilla (it only has a > >> different "server" line). > >>=20 > >> Even explicitly adding: > >>=20 > >> rlimit memlock -1 > >>=20 > >> does not work, it results in the same error. > >>=20 > >> -Dimitry > >=20 > > Can you try this please? > >=20 > > diff --git a/contrib/ntp/ntpd/ntpd.c b/contrib/ntp/ntpd/ntpd.c > > index 2b14431dc7b..bcfca27a535 100644 > > --- a/contrib/ntp/ntpd/ntpd.c > > +++ b/contrib/ntp/ntpd/ntpd.c > > @@ -999,7 +999,7 @@ ntpdmain( > > # if defined(HAVE_MLOCKALL) > > # ifdef HAVE_SETRLIMIT > > ntp_rlimit(RLIMIT_STACK, DFLT_RLIMIT_STACK * 4096, 4096, "4k"); > > -# ifdef RLIMIT_MEMLOCK > > +# if defined(RLIMIT_MEMLOCK) && defined(DFLT_RLIMIT_MEMLOCK) && > > DFLT_RLIMIT_MEMLOCK !=3D -1 > > /* > > * The default RLIMIT_MEMLOCK is very low on Linux systems. > > * Unless we increase this limit malloc calls are likely to > > Yes, I already had something similar edited in (though I tested > DLT_RLIMIT_MEMLOCK > 0), and that works for me. That would work too, as it sets defaults before it reads the config file, which overrides the defaults. I'll commit the fix and put a corresponding fix into both ports as well and let our upstrem know. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.