From owner-svn-src-head@freebsd.org Wed Jan 29 18:26:29 2020 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 E19741F8B73 for ; Wed, 29 Jan 2020 18:26:29 +0000 (UTC) (envelope-from jroberson@jroberson.net) Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) (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 487Bl90Y8kz3QdS for ; Wed, 29 Jan 2020 18:26:28 +0000 (UTC) (envelope-from jroberson@jroberson.net) Received: by mail-pf1-x42f.google.com with SMTP id y5so53787pfb.11 for ; Wed, 29 Jan 2020 10:26:28 -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=Tpzo0AFypy/6lL592pUjtVS6GQM5jGopm3O6TWGGDDU=; b=j+L/jB+KYPG407/CPDr5G2swjheZSEkwOOk1DqbbCkzdx7AQfimFIbnbHxtBMbOyD0 eseJQn2aLUvv55n59248KKWpsOLUQWFn4kemlPzLViUexblhEgz9ZHjWOLLQ3AQO3Po8 59sSFCU91yZwLqTQOGIQ/DMeEBTEL5nCX3YyRCdOcp/wTDArhGhVEGzMwFMEENASUs/7 z2jTvQVin9HQPMWKWwDL/GshFXxd98ddDA/CyhrR4ct//iH7xYKhp+soUDlM8OYISUiL Kn0PtL85p8FxKXs9TJEuSgLZOV+CwMtq0iCwNYkYwvAIyQ6D35wko5xppBaQC+8i/MyP S2MQ== 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=Tpzo0AFypy/6lL592pUjtVS6GQM5jGopm3O6TWGGDDU=; b=mEM7DwJOG5dcf2kXUu4ibNZJYQM8uPqEQtuKd1T1dYDiPpBdM/S8x4dqhobVKv/TS8 nZD7qCkDdbDwVhzx5CTHLjsDtpHhc8/jWxSuhFPzpy+jX9lenlwZqkfMc/qerml7libI 9HMPyWtBEGr4Tc1U1oToh3xHDIKH36zpbuFDNCSDjsXNo4BUb9VivTs9iNKvz99RU6vd 5D/mCIiS6/A3bEKPKhSsQz8is1xaBLwyNw1pDsYi4jwkxny+GrrHNbxpanb/1FQHw5Oo lU0xvYO34kul5JmduapE5pk2UHcaQJ1/V8YsIz28K22vAZgpdUZ5PjvhDBjEFs6sYoHs nEFw== X-Gm-Message-State: APjAAAVA6QPicDdhuDNWF3I6QWNvJ0C4zEJwl3XdQuyP3iGYgYafjUbn ZXoXyYhdrcBtM+cBU+bc25Mq0w== X-Google-Smtp-Source: APXvYqx36GK5boTvMGg4jLXES+o2/44fPRy7nxW/NIaujzDb28uHT3XZJwsesp1G9pZDLHJEtnTooQ== X-Received: by 2002:aa7:8149:: with SMTP id d9mr864343pfn.170.1580322387493; Wed, 29 Jan 2020 10:26:27 -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 200sm3388641pfz.121.2020.01.29.10.26.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jan 2020 10:26:26 -0800 (PST) Date: Wed, 29 Jan 2020 08:26:24 -1000 (HST) From: Jeff Roberson X-X-Sender: jroberson@desktop To: Konstantin Belousov cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r357253 - head/sys/vm In-Reply-To: <202001291202.00TC2lIa055211@repo.freebsd.org> Message-ID: References: <202001291202.00TC2lIa055211@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: 487Bl90Y8kz3QdS X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=jroberson-net.20150623.gappssmtp.com header.s=20150623 header.b=j+L/jB+K; dmarc=none; spf=none (mx1.freebsd.org: domain of jroberson@jroberson.net has no SPF policy when checking 2607:f8b0:4864:20::42f) smtp.mailfrom=jroberson@jroberson.net X-Spamd-Result: default: False [-4.36 / 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)[f.2.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.56)[ip: (-8.94), ipnet: 2607:f8b0::/32(-2.03), asn: 15169(-1.78), 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: Wed, 29 Jan 2020 18:26:29 -0000 Thank you, Jeff On Wed, 29 Jan 2020, Konstantin Belousov wrote: > Author: kib > Date: Wed Jan 29 12:02:47 2020 > New Revision: 357253 > URL: https://svnweb.freebsd.org/changeset/base/357253 > > Log: > Restore OOM logic on page fault after r357026. > > Right now OOM is initiated unconditionally on the page allocation > failure, after the wait. > > Reported by: Mark Millard > Reviewed by: cy, markj > Sponsored by: The FreeBSD Foundation > Differential revision: https://reviews.freebsd.org/D23409 > > Modified: > head/sys/vm/vm_fault.c > > Modified: head/sys/vm/vm_fault.c > ============================================================================== > --- head/sys/vm/vm_fault.c Wed Jan 29 09:36:59 2020 (r357252) > +++ head/sys/vm/vm_fault.c Wed Jan 29 12:02:47 2020 (r357253) > @@ -1073,12 +1073,14 @@ vm_fault_allocate(struct faultstate *fs) > fs->oom < vm_pfault_oom_attempts) { > fs->oom++; > vm_waitpfault(dset, vm_pfault_oom_wait * hz); > + } else { > + if (bootverbose) > + printf( > + "proc %d (%s) failed to alloc page on fault, starting OOM\n", > + curproc->p_pid, curproc->p_comm); > + vm_pageout_oom(VM_OOM_MEM_PF); > + fs->oom = 0; > } > - if (bootverbose) > - printf( > -"proc %d (%s) failed to alloc page on fault, starting OOM\n", > - curproc->p_pid, curproc->p_comm); > - vm_pageout_oom(VM_OOM_MEM_PF); > return (KERN_RESOURCE_SHORTAGE); > } > fs->oom = 0; >