From owner-svn-src-all@freebsd.org Tue Apr 24 06:10:37 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E6D01FBCD12; Tue, 24 Apr 2018 06:10:36 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9565A7FCBE; Tue, 24 Apr 2018 06:10:36 +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 8C21F74E8; Tue, 24 Apr 2018 06:10:36 +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 w3O6AagW096285; Tue, 24 Apr 2018 06:10:36 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3O6AaUg096284; Tue, 24 Apr 2018 06:10:36 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201804240610.w3O6AaUg096284@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 24 Apr 2018 06:10:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r332911 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 332911 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.25 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: Tue, 24 Apr 2018 06:10:37 -0000 Author: mjg Date: Tue Apr 24 06:10:36 2018 New Revision: 332911 URL: https://svnweb.freebsd.org/changeset/base/332911 Log: lockf: change the owner hash from pid to vnode-based This adds a bit missed due to the patch split, see r332882 Tested by: pho Modified: head/sys/kern/kern_lockf.c Modified: head/sys/kern/kern_lockf.c ============================================================================== --- head/sys/kern/kern_lockf.c Tue Apr 24 05:42:10 2018 (r332910) +++ head/sys/kern/kern_lockf.c Tue Apr 24 06:10:36 2018 (r332911) @@ -105,7 +105,7 @@ struct owner_graph; #define SELF 0x1 #define OTHERS 0x2 static void lf_init(void *); -static int lf_hash_owner(caddr_t, struct flock *, int); +static int lf_hash_owner(caddr_t, struct vnode *, struct flock *, int); static int lf_owner_matches(struct lock_owner *, caddr_t, struct flock *, int); static struct lockf_entry * @@ -301,7 +301,7 @@ SYSINIT(lf_init, SI_SUB_LOCK, SI_ORDER_FIRST, lf_init, * Generate a hash value for a lock owner. */ static int -lf_hash_owner(caddr_t id, struct flock *fl, int flags) +lf_hash_owner(caddr_t id, struct vnode *vp, struct flock *fl, int flags) { uint32_t h; @@ -311,9 +311,7 @@ lf_hash_owner(caddr_t id, struct flock *fl, int flags) } else if (flags & F_FLOCK) { h = ((uintptr_t) id) >> 7; } else { - struct proc *p = (struct proc *) id; - h = HASHSTEP(0, p->p_pid); - h = HASHSTEP(h, 0); + h = ((uintptr_t) vp) >> 7; } return (h % LOCK_OWNER_HASH_SIZE); @@ -500,7 +498,7 @@ retry_setlock: * Map our arguments to an existing lock owner or create one * if this is the first time we have seen this owner. */ - hash = lf_hash_owner(id, fl, flags); + hash = lf_hash_owner(id, vp, fl, flags); sx_xlock(&lf_lock_owners[hash].lock); LIST_FOREACH(lo, &lf_lock_owners[hash].list, lo_link) if (lf_owner_matches(lo, id, fl, flags))