From owner-svn-src-all@freebsd.org Sat Oct 24 01:13:48 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 2D29742B357; Sat, 24 Oct 2020 01:13:48 +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 4CJ35S0JRCz3YVS; Sat, 24 Oct 2020 01:13:48 +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 DC42010535; Sat, 24 Oct 2020 01:13:47 +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 09O1Dl4P036428; Sat, 24 Oct 2020 01:13:47 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09O1DluD036427; Sat, 24 Oct 2020 01:13:47 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202010240113.09O1DluD036427@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sat, 24 Oct 2020 01:13:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366986 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 366986 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.33 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: Sat, 24 Oct 2020 01:13:48 -0000 Author: mjg Date: Sat Oct 24 01:13:47 2020 New Revision: 366986 URL: https://svnweb.freebsd.org/changeset/base/366986 Log: cache: fold branch prediction into cache_ncp_canuse Modified: head/sys/kern/vfs_cache.c Modified: head/sys/kern/vfs_cache.c ============================================================================== --- head/sys/kern/vfs_cache.c Sat Oct 24 01:13:16 2020 (r366985) +++ head/sys/kern/vfs_cache.c Sat Oct 24 01:13:47 2020 (r366986) @@ -233,14 +233,15 @@ cache_ncp_invalidate(struct namecache *ncp) * All places which elide locks are supposed to call this after they are * done with reading from an entry. */ -static bool -cache_ncp_canuse(struct namecache *ncp) -{ +#define cache_ncp_canuse(ncp) ({ \ + struct namecache *_ncp = (ncp); \ + u_char _nc_flag; \ + \ + atomic_thread_fence_acq(); \ + _nc_flag = atomic_load_char(&_ncp->nc_flag); \ + __predict_true((_nc_flag & (NCF_INVALID | NCF_WIP)) == 0); \ +}) - atomic_thread_fence_acq(); - return ((atomic_load_char(&ncp->nc_flag) & (NCF_INVALID | NCF_WIP)) == 0); -} - /* * Name caching works as follows: * @@ -1056,7 +1057,7 @@ cache_neg_promote_cond(struct vnode *dvp, struct compo goto out_abort; } - if (__predict_false(!cache_ncp_canuse(ncp))) { + if (!cache_ncp_canuse(ncp)) { goto out_abort; } @@ -1834,7 +1835,7 @@ negative_success: cache_out_ts(ncp, tsp, ticksp); whiteout = (ncp->nc_flag & NCF_WHITE); neg_promote = cache_neg_hit_prep(ncp); - if (__predict_false(!cache_ncp_canuse(ncp))) { + if (!cache_ncp_canuse(ncp)) { cache_neg_hit_abort(ncp); vfs_smr_exit(); goto out_fallback; @@ -4008,7 +4009,7 @@ cache_fplookup_dotdot(struct cache_fpl *fpl) fpl->tvp = ncp->nc_dvp; } - if (__predict_false(!cache_ncp_canuse(ncp))) { + if (!cache_ncp_canuse(ncp)) { return (cache_fpl_aborted(fpl)); } @@ -4041,7 +4042,7 @@ cache_fplookup_neg(struct cache_fpl *fpl, struct namec return (cache_fpl_partial(fpl)); } neg_promote = cache_neg_hit_prep(ncp); - if (__predict_false(!cache_ncp_canuse(ncp))) { + if (!cache_ncp_canuse(ncp)) { cache_neg_hit_abort(ncp); return (cache_fpl_partial(fpl)); } @@ -4096,7 +4097,7 @@ cache_fplookup_next(struct cache_fpl *fpl) return (cache_fplookup_neg(fpl, ncp, hash)); } - if (__predict_false(!cache_ncp_canuse(ncp))) { + if (!cache_ncp_canuse(ncp)) { return (cache_fpl_partial(fpl)); }