From owner-svn-src-head@freebsd.org Sun Dec 13 18:06:25 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 B23814BF5AD; Sun, 13 Dec 2020 18:06:25 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CvCBn4f0Rz4hJS; Sun, 13 Dec 2020 18:06:25 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 91A1513DED; Sun, 13 Dec 2020 18:06:25 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BDI6PPb082476; Sun, 13 Dec 2020 18:06:25 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BDI6Puj082474; Sun, 13 Dec 2020 18:06:25 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202012131806.0BDI6Puj082474@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sun, 13 Dec 2020 18:06:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368609 - in head/sys: kern sys X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys: kern sys X-SVN-Commit-Revision: 368609 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.34 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: Sun, 13 Dec 2020 18:06:25 -0000 Author: mjg Date: Sun Dec 13 18:06:24 2020 New Revision: 368609 URL: https://svnweb.freebsd.org/changeset/base/368609 Log: fd: fix fdrop prediction when closing a fd Most of the time this is the last reference, contrary to typical fdrop use. Modified: head/sys/kern/kern_descrip.c head/sys/sys/file.h Modified: head/sys/kern/kern_descrip.c ============================================================================== --- head/sys/kern/kern_descrip.c Sun Dec 13 16:26:37 2020 (r368608) +++ head/sys/kern/kern_descrip.c Sun Dec 13 18:06:24 2020 (r368609) @@ -2766,7 +2766,7 @@ closef(struct file *fp, struct thread *td) FILEDESC_XUNLOCK(fdp); } } - return (fdrop(fp, td)); + return (fdrop_close(fp, td)); } /* Modified: head/sys/sys/file.h ============================================================================== --- head/sys/sys/file.h Sun Dec 13 16:26:37 2020 (r368608) +++ head/sys/sys/file.h Sun Dec 13 18:06:24 2020 (r368609) @@ -299,6 +299,17 @@ fhold(struct file *fp) _error; \ }) +#define fdrop_close(fp, td) ({ \ + struct file *_fp; \ + int _error; \ + \ + _error = 0; \ + _fp = (fp); \ + if (__predict_true(refcount_release(&_fp->f_count))) \ + _error = _fdrop(_fp, td); \ + _error; \ +}) + static __inline fo_rdwr_t fo_read; static __inline fo_rdwr_t fo_write; static __inline fo_truncate_t fo_truncate;