From owner-svn-src-head@freebsd.org Sun Feb 18 18:46:56 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 C06F5F20B74; Sun, 18 Feb 2018 18:46:56 +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 7228C8491E; Sun, 18 Feb 2018 18:46:56 +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 6898A7DBB; Sun, 18 Feb 2018 18:46:56 +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 w1IIkua2016426; Sun, 18 Feb 2018 18:46:56 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1IIkush016425; Sun, 18 Feb 2018 18:46:56 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201802181846.w1IIkush016425@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Sun, 18 Feb 2018 18:46:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329524 - 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: 329524 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.25 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, 18 Feb 2018 18:46:56 -0000 Author: hselasky Date: Sun Feb 18 18:46:56 2018 New Revision: 329524 URL: https://svnweb.freebsd.org/changeset/base/329524 Log: Optimise xchg() to use atomic_swap_32() and atomic_swap_64(). Suggested by: kib@ MFC after: 1 week Sponsored by: Mellanox Technologies 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 Sun Feb 18 17:37:23 2018 (r329523) +++ head/sys/compat/linuxkpi/common/include/asm/atomic.h Sun Feb 18 18:46:56 2018 (r329524) @@ -205,31 +205,31 @@ atomic_cmpxchg(atomic_t *v, int old, int new) u16 u16[0]; \ u32 u32[0]; \ u64 u64[0]; \ - } __ret = { .val = READ_ONCE(*ptr) }, __new = { .val = (new) }; \ + } __ret, __new = { .val = (new) }; \ \ CTASSERT(sizeof(__ret.val) == 1 || sizeof(__ret.val) == 2 || \ sizeof(__ret.val) == 4 || sizeof(__ret.val) == 8); \ \ switch (sizeof(__ret.val)) { \ case 1: \ + __ret.val = READ_ONCE(*ptr); \ while (!atomic_fcmpset_8((volatile u8 *)(ptr), \ __ret.u8, __new.u8[0])) \ ; \ break; \ case 2: \ + __ret.val = READ_ONCE(*ptr); \ while (!atomic_fcmpset_16((volatile u16 *)(ptr), \ __ret.u16, __new.u16[0])) \ ; \ break; \ case 4: \ - while (!atomic_fcmpset_32((volatile u32 *)(ptr), \ - __ret.u32, __new.u32[0])) \ - ; \ + __ret.u32[0] = atomic_swap_32((volatile u32 *)(ptr), \ + __new.u32[0]); \ break; \ case 8: \ - while (!atomic_fcmpset_64((volatile u64 *)(ptr), \ - __ret.u64, __new.u64[0])) \ - ; \ + __ret.u64[0] = atomic_swap_64((volatile u64 *)(ptr), \ + __new.u64[0]); \ break; \ } \ __ret.val; \