From owner-svn-src-all@freebsd.org Sun Feb 2 09:38:40 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 F353423ED99; Sun, 2 Feb 2020 09:38:40 +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) server-signature RSA-PSS (4096 bits) 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 489QrJ5zNrz3HJK; Sun, 2 Feb 2020 09:38:40 +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 C84D2DD8F; Sun, 2 Feb 2020 09:38:40 +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 0129cepa023125; Sun, 2 Feb 2020 09:38:40 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0129ceeY023124; Sun, 2 Feb 2020 09:38:40 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202002020938.0129ceeY023124@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sun, 2 Feb 2020 09:38:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357406 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 357406 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Sun, 02 Feb 2020 09:38:41 -0000 Author: mjg Date: Sun Feb 2 09:38:40 2020 New Revision: 357406 URL: https://svnweb.freebsd.org/changeset/base/357406 Log: fd: sprinkle some predits around fget clang inlines fget -> _fget into kern_fstat and eliminates several checkes, but prior to this change it would assume fget_unlocked was likely to fail and consequently avoidable jumps got generated. Modified: head/sys/kern/kern_descrip.c Modified: head/sys/kern/kern_descrip.c ============================================================================== --- head/sys/kern/kern_descrip.c Sun Feb 2 09:37:16 2020 (r357405) +++ head/sys/kern/kern_descrip.c Sun Feb 2 09:38:40 2020 (r357406) @@ -1437,7 +1437,7 @@ kern_fstat(struct thread *td, int fd, struct stat *sbp AUDIT_ARG_FD(fd); error = fget(td, fd, &cap_fstat_rights, &fp); - if (error != 0) + if (__predict_false(error != 0)) return (error); AUDIT_ARG_FILE(td->td_proc, fp); @@ -2792,9 +2792,9 @@ _fget(struct thread *td, int fd, struct file **fpp, in *fpp = NULL; fdp = td->td_proc->p_fd; error = fget_unlocked(fdp, fd, needrightsp, &fp, seqp); - if (error != 0) + if (__predict_false(error != 0)) return (error); - if (fp->f_ops == &badfileops) { + if (__predict_false(fp->f_ops == &badfileops)) { fdrop(fp, td); return (EBADF); }