From owner-svn-src-head@freebsd.org Wed Jun 6 15:31:48 2018 Return-Path: Delivered-To: svn-src-head@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 1995CFD15F4; Wed, 6 Jun 2018 15:31:48 +0000 (UTC) (envelope-from hselasky@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 C3B247A093; Wed, 6 Jun 2018 15:31:47 +0000 (UTC) (envelope-from hselasky@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 A4CCF4E62; Wed, 6 Jun 2018 15:31:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w56FVl73069784; Wed, 6 Jun 2018 15:31:47 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w56FVltF069783; Wed, 6 Jun 2018 15:31:47 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201806061531.w56FVltF069783@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 6 Jun 2018 15:31:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334718 - head/sys/compat/linuxkpi/common/include/asm X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/compat/linuxkpi/common/include/asm X-SVN-Commit-Revision: 334718 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.26 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: Wed, 06 Jun 2018 15:31:48 -0000 Author: hselasky Date: Wed Jun 6 15:31:47 2018 New Revision: 334718 URL: https://svnweb.freebsd.org/changeset/base/334718 Log: Rewrite code using atomic_fcmpset_int() in the LinuxKPI. Suggested by: mjg@ MFC after: 1 week Sponsored by: Mellanox Technologies Sponsored by: Limelight Networks Modified: head/sys/compat/linuxkpi/common/include/asm/atomic.h Modified: head/sys/compat/linuxkpi/common/include/asm/atomic.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/asm/atomic.h Wed Jun 6 15:19:30 2018 (r334717) +++ head/sys/compat/linuxkpi/common/include/asm/atomic.h Wed Jun 6 15:31:47 2018 (r334718) @@ -239,15 +239,16 @@ static inline int atomic_dec_if_positive(atomic_t *v) { int retval; - int curr; + int old; - do { - curr = atomic_read(v); - retval = curr - 1; + old = atomic_read(v); + for (;;) { + retval = old - 1; if (unlikely(retval < 0)) break; - } while (!likely(atomic_cmpset_int(&v->counter, curr, retval))); - + if (likely(atomic_fcmpset_int(&v->counter, &old, retval))) + break; + } return (retval); }