From owner-svn-src-head@freebsd.org Fri Jul 6 15:32:29 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 1D2991031F67; Fri, 6 Jul 2018 15:32:29 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7E2CC86495; Fri, 6 Jul 2018 15:32:28 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id w66FWPtb052843; Fri, 6 Jul 2018 08:32:25 -0700 (PDT) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id w66FWPEN052842; Fri, 6 Jul 2018 08:32:25 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201807061532.w66FWPEN052842@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r336025 - in head/sys: amd64/include i386/include In-Reply-To: <201807061013.w66ADgbJ087546@repo.freebsd.org> To: Hans Petter Selasky Date: Fri, 6 Jul 2018 08:32:25 -0700 (PDT) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Fri, 06 Jul 2018 15:32:29 -0000 > Author: hselasky > Date: Fri Jul 6 10:13:42 2018 > New Revision: 336025 > URL: https://svnweb.freebsd.org/changeset/base/336025 > > Log: > Make sure kernel modules built by default are portable between UP and > SMP systems by extending defined(SMP) to include defined(KLD_MODULE). > > This is a regression issue after r335873 . > > Discussed with: mmacy@ > Sponsored by: Mellanox Technologies Though this fixes the issue, it also means that now when anyone intentionally builds a UP kernel with modules they are getting SMP support in the modules and I am not sure they would want that. I know I don't. > Modified: > head/sys/amd64/include/atomic.h > head/sys/i386/include/atomic.h > > Modified: head/sys/amd64/include/atomic.h > ============================================================================== > --- head/sys/amd64/include/atomic.h Fri Jul 6 10:10:00 2018 (r336024) > +++ head/sys/amd64/include/atomic.h Fri Jul 6 10:13:42 2018 (r336025) > @@ -132,7 +132,7 @@ void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_ > * For userland, always use lock prefixes so that the binaries will run > * on both SMP and !SMP systems. > */ > -#if defined(SMP) || !defined(_KERNEL) > +#if defined(SMP) || !defined(_KERNEL) || defined(KLD_MODULE) > #define MPLOCKED "lock ; " > #else > #define MPLOCKED > @@ -354,7 +354,7 @@ atomic_testandclear_long(volatile u_long *p, u_int v) > */ > #define OFFSETOF_MONITORBUF 0x100 > > -#if defined(SMP) > +#if defined(SMP) || defined(KLD_MODULE) > static __inline void > __storeload_barrier(void) > { > > Modified: head/sys/i386/include/atomic.h > ============================================================================== > --- head/sys/i386/include/atomic.h Fri Jul 6 10:10:00 2018 (r336024) > +++ head/sys/i386/include/atomic.h Fri Jul 6 10:13:42 2018 (r336025) > @@ -143,7 +143,7 @@ void atomic_subtract_64(volatile uint64_t *, uint64_t > * For userland, always use lock prefixes so that the binaries will run > * on both SMP and !SMP systems. > */ > -#if defined(SMP) || !defined(_KERNEL) > +#if defined(SMP) || !defined(_KERNEL) || defined(KLD_MODULE) > #define MPLOCKED "lock ; " > #else > #define MPLOCKED > @@ -302,7 +302,7 @@ atomic_testandclear_int(volatile u_int *p, u_int v) > */ > > #if defined(_KERNEL) > -#if defined(SMP) > +#if defined(SMP) || defined(KLD_MODULE) > #define __storeload_barrier() __mbk() > #else /* _KERNEL && UP */ > #define __storeload_barrier() __compiler_membar() > > -- Rod Grimes rgrimes@freebsd.org