From owner-svn-src-all@freebsd.org Fri Mar 13 23:48:25 2020 Return-Path: Delivered-To: svn-src-all@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 EF30E26D83C; Fri, 13 Mar 2020 23:48:25 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) (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 48fMpJ4L6Jz3yM3; Fri, 13 Mar 2020 23:48:24 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-pf1-x433.google.com with SMTP id n7so6252796pfn.0; Fri, 13 Mar 2020 16:48:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=35OEZSLBiKnUZ0XLWSws3BDdmU+K9+hQHghvSfLLDaQ=; b=sU3KBnyuGbnzDX1q7k/xvVoEXCuF+h3Fd0gorSk+a1zedcbyQw1neI5aaCGfdodXnG VBMto71uTBlhrHtObSPPhSPdtz7VmqCiG9DkQu3JXiUMQX6en9u8wuajzm8nM44uEhoh SH93hogdwfHMZKfU0IP1Q4LzKIslcE8zv4SSvDaH7MoJhAg6gs8MOP67et3asoc0MycQ tB0i2aJgOlDu8SoTuRwzVmbw+pEZ7am62zZyBZhqRo9dG05x8Hd59wH2FWOF1cTw69x2 e9E1B6eiaLnLaAlQGVrdDAAeYd3OvdWJqL/bKoRpOi6XFmNWIp74ZUP2lPgRVIdnNZQb du6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to; bh=35OEZSLBiKnUZ0XLWSws3BDdmU+K9+hQHghvSfLLDaQ=; b=aO6wn5h0lPnFN7at5dGksDon7ABsEB++nph3VQO0pZ9FBFxoV/d9ZYmFGEnhl3pHd9 r2kDXjVa8QVkY/joBQMTrKV9h4j+O5njSCyINgZv3l9ENMgPIrK9TR1jAVwcnlsB9HbB +Xl/0iOFvWgNkneAYzgi81HlZ4b38MbVrJzD914N3JNyHj9zztIFwZsfR3wVpKvTppHp fmpHsat9tCvYabBw6J965NBuW0RM3NnnoPRhXc/dc7t/Y4BdTHuCxjYm+FMe+R8gDR+F GeZ3vPkqk+h5TrX6pXxlzE5HaMZgjr5yfudXkdLfpfs1E68mlTSifUs7Hj8FTEXv+azM kaKw== X-Gm-Message-State: ANhLgQ0lSggFJ+58f8/wyCbnRqfQ2s1o+gji5cp+KE1RRVKzTHN71GWB OYEoa/dem1u/vv4zie2jdjyOeCrV X-Google-Smtp-Source: ADFU+vuyp57QmQkODiB/9YFQ23SJGkr1XKZM/kKY1B5VimCMxW6HUPXxy7TUhKR2TKouUX0NLglNmQ== X-Received: by 2002:a63:4755:: with SMTP id w21mr13643548pgk.302.1584143302533; Fri, 13 Mar 2020 16:48:22 -0700 (PDT) Received: from spy (S01069050ca464ce3.wk.shawcable.net. [24.67.190.33]) by smtp.gmail.com with ESMTPSA id 189sm12180243pfg.170.2020.03.13.16.48.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 16:48:21 -0700 (PDT) Sender: Mark Johnston Date: Fri, 13 Mar 2020 19:48:17 -0400 From: Mark Johnston To: Chuck Silvers Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r358597 - head/sys/kern Message-ID: <20200313234817.GA10027@spy> References: <202003040022.0240Mpm6074186@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202003040022.0240Mpm6074186@repo.freebsd.org> X-Rspamd-Queue-Id: 48fMpJ4L6Jz3yM3 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=sU3KBnyu; dmarc=none; spf=pass (mx1.freebsd.org: domain of markjdb@gmail.com designates 2607:f8b0:4864:20::433 as permitted sender) smtp.mailfrom=markjdb@gmail.com X-Spamd-Result: default: False [-4.16 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(-2.46)[ip: (-8.76), ipnet: 2607:f8b0::/32(-1.85), asn: 15169(-1.65), country: US(-0.05)]; DKIM_TRACE(0.00)[gmail.com:+]; RCVD_IN_DNSWL_NONE(0.00)[3.3.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]; FORGED_SENDER(0.30)[markj@freebsd.org,markjdb@gmail.com]; RECEIVED_SPAMHAUS_PBL(0.00)[33.190.67.24.khpj7ygk5idzvmvt5x4ziurxhy.zen.dq.spamhaus.net : 127.0.0.11]; MID_RHS_NOT_FQDN(0.50)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[markj@freebsd.org,markjdb@gmail.com]; RCVD_TLS_ALL(0.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 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: Fri, 13 Mar 2020 23:48:26 -0000 On Wed, Mar 04, 2020 at 12:22:51AM +0000, Chuck Silvers wrote: > Author: chs > Date: Wed Mar 4 00:22:50 2020 > New Revision: 358597 > URL: https://svnweb.freebsd.org/changeset/base/358597 > > Log: > if vm_pager_get_pages_async() returns an error, release the sfio->nios > refcount that we took earlier that represents the I/O that ended up > not being started. I think a larger bug is that getpages_async is not consistent about whether it invokes the completion callback in synchronous error cases. For instance, vop_stdgetpages_async() always calls it, as does ffs_getpages_async() when the filesystem fragment size is larger than the page size. But vnode_pager_generic_getpages() does not. So if one is using sendfile on a filesystem that does not implement getpages_async, an error will cause sendfile_swapin() to unbusy the input pages multiple times, and release the sfio refcount twice when it should be done just once. > Reviewed by: glebius > Approved by: imp (mentor) > Sponsored by: Netflix > > Modified: > head/sys/kern/kern_sendfile.c > > Modified: head/sys/kern/kern_sendfile.c > ============================================================================== > --- head/sys/kern/kern_sendfile.c Tue Mar 3 23:15:30 2020 (r358596) > +++ head/sys/kern/kern_sendfile.c Wed Mar 4 00:22:50 2020 (r358597) > @@ -454,6 +454,7 @@ sendfile_swapin(vm_object_t obj, struct sf_io *sfio, i > __func__, pa, j)); > vm_page_unwire(pa[j], PQ_INACTIVE); > } > + refcount_release(&sfio->nios); > return (EIO); > } >