From nobody Mon Jan 10 19:50:40 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 840A51954903; Mon, 10 Jan 2022 19:50:43 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JXkvj3lX4z3NmQ; Mon, 10 Jan 2022 19:50:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5658432A8; Mon, 10 Jan 2022 19:50:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20AJoeRA009044; Mon, 10 Jan 2022 19:50:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20AJoeZa009043; Mon, 10 Jan 2022 19:50:40 GMT (envelope-from git) Date: Mon, 10 Jan 2022 19:50:40 GMT Message-Id: <202201101950.20AJoeZa009043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 2fb5be7978c2 - main - LinuxKPI: Implement smp_*mb barriers with atomic_thread_fence_* List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2fb5be7978c27505c02b667a21ce3a79f72e2091 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641844242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8HjFJrJxkSDfniFIo+T6nskPnHuKQwUyL+mK0mLwNnY=; b=UHkqJ+RDGjgJSZ8H0uBbsEOyELWDx3Qk7D0fyWQaBoyAxExpSRQv7kykkXX0qFBIaZrvLP iHAyj/rhc5369loHcKJVSlh/dB+u9GS70IU8ImGy6h3hHCAfddGuPwJ5gv8S0Q2oe/xtPB xJMSi7UhCw7U6fltU45vEz/ePd0AyRMoicJTzWmSZC7EW0VfRl2uXo2vuj0gEFYRjxzg3u ygmxPAoBO/wSranSgmY5xEbjjUt1dTbbpuitqI1WbD+5dkhcP40SPjssMj07dzDH/cToup w9iOSNDQOlM+I7yCdpI/An7KyrcWiIuaf1TrtesRYPL4hJe6SZAUgZPZiPYBZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641844242; a=rsa-sha256; cv=none; b=wjJe+maE1BxLPtKNsVdParenU97fvzKxB1AJ5VmLvScB8zcfyH1co5zj3dDvcJw538md++ sxr2xm1lx8+SmI8P8aq3SPSezEVa0DkB5zJvNLhrZAU7urzagYlItJAMW1BVKPfml47QxR eHSWuSNaKK5rlESn8ocuUfCd//KwRQ6IFOd1OWssYQMeW0J6LZnwei6LOlOVVTVyybpQFZ vYD6tTZk3+eeVBRYLM3E+7+63iMT4gSehRJyLhtZKQzV+Ni2cGJkdQ00Vcqeb4LhMmHv2P osgK0NkSbMWOZTYMFNuUvj39bKBCIEgE3VZmzWg/GA+07MS6HLWd/312B+KxTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=2fb5be7978c27505c02b667a21ce3a79f72e2091 commit 2fb5be7978c27505c02b667a21ce3a79f72e2091 Author: Vladimir Kondratyev AuthorDate: 2021-07-04 14:13:09 +0000 Commit: Vladimir Kondratyev CommitDate: 2022-01-10 19:49:37 +0000 LinuxKPI: Implement smp_*mb barriers with atomic_thread_fence_* for x86 and move them to asm/barrier.h MFC after: 1 week Reviewed by: bz, hselasky, manu Differential Revision: https://reviews.freebsd.org/D33296 --- sys/compat/linuxkpi/common/include/asm/barrier.h | 58 ++++++++++++++++++++++ sys/compat/linuxkpi/common/include/linux/atomic.h | 1 + .../linuxkpi/common/include/linux/compiler.h | 1 - 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/asm/barrier.h b/sys/compat/linuxkpi/common/include/asm/barrier.h new file mode 100644 index 000000000000..10aa24a7ae8b --- /dev/null +++ b/sys/compat/linuxkpi/common/include/asm/barrier.h @@ -0,0 +1,58 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2021 Vladimir Kondratyev + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _ASM_BARRIER_H_ +#define _ASM_BARRIER_H_ + +#include +#include + +#include +#include + +/* TODO: Check other archs for atomic_thread_fence_* useability */ +#if defined(__amd64__) || defined(__i386__) +#define smp_mb() atomic_thread_fence_seq_cst() +#define smp_wmb() atomic_thread_fence_rel() +#define smp_rmb() atomic_thread_fence_acq() +#define smp_store_mb(x, v) do { (void)xchg(&(x), v); } while (0) +#endif + +#ifndef smp_mb +#define smp_mb() mb() +#endif +#ifndef smp_wmb +#define smp_wmb() wmb() +#endif +#ifndef smp_rmb +#define smp_rmb() rmb() +#endif +#ifndef smp_store_mb +#define smp_store_mb(x, v) do { WRITE_ONCE(x, v); smp_mb(); } while (0) +#endif + +#endif /* _ASM_BARRIER_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/atomic.h b/sys/compat/linuxkpi/common/include/linux/atomic.h index f8aa5c9276e7..969af384e3ba 100644 --- a/sys/compat/linuxkpi/common/include/linux/atomic.h +++ b/sys/compat/linuxkpi/common/include/linux/atomic.h @@ -32,5 +32,6 @@ #include #include #include +#include #endif /* _LINUX_ATOMIC_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/compiler.h b/sys/compat/linuxkpi/common/include/linux/compiler.h index e641b1b096c3..c4c189c2505f 100644 --- a/sys/compat/linuxkpi/common/include/linux/compiler.h +++ b/sys/compat/linuxkpi/common/include/linux/compiler.h @@ -80,7 +80,6 @@ #define __printf(a,b) __printflike(a,b) #define barrier() __asm__ __volatile__("": : :"memory") -#define smp_mb() mb() #define lower_32_bits(n) ((u32)(n)) #define upper_32_bits(n) ((u32)(((n) >> 16) >> 16))