From owner-svn-src-all@freebsd.org Wed May 18 16:03:26 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AE445B414EB for ; Wed, 18 May 2016 16:03:26 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x22f.google.com (mail-io0-x22f.google.com [IPv6:2607:f8b0:4001:c06::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 76E6E1A08 for ; Wed, 18 May 2016 16:03:26 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x22f.google.com with SMTP id f89so71078143ioi.0 for ; Wed, 18 May 2016 09:03:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc; bh=BbS798kSWRIZvFu2+JMYdjhZo0i+WNI52k06w3jQY5M=; b=RUsEucyhWQoE2IrP8P2LCCJU8KWoeTeiwqD1czQpmcPnt32gSQYtO5g1owo++jXi6X k0v6wLht6zozKsztHmzZlZxlMiQg1E29fxfrFecGUiTGv/z23koCgiSIT/N8M7UoKlbC wtWuojM+etX3AgK7d6zaomju4acSZgiS6Iwkqd02o5itzVeT8KJWOb+Sy6bFHbf+nvxm QexOVJaJhXklOyGnzHWcY+lf5hbOkoc9Cg/MSQhL6D9yBNczTO7+WUPXAdm72YurU8Xt jA5o7cD5sYMBTPyYwsWFMGA16UO/4VQY9eDCwWkS5ebjcgsvVKs5sZdqMbxb1EoXYxEw 6FdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:date :message-id:subject:from:to:cc; bh=BbS798kSWRIZvFu2+JMYdjhZo0i+WNI52k06w3jQY5M=; b=HGTpla7WP+xRUCPb42XeTYyyGaCBkxdLnS2NtOHymckV/WIvFqvu+Lmnls4xkDXgS3 t4Sap8HU5qISYnb2ADHMolaInSsbMOPR3lV9LZKsYdv9w4FTxvGeIdf2vVuBMOhojGZ8 BE8WQmKzJtpGx9RSBj6XUQbpXNxZTB0ung8oNIakPrBe0482SxhnRM+57veHuIEgFcGU HU9aqnyP2vW8D5mgt+XCI3kN8KlPNjz+JB9DcbChmGJ1R9DfzuVxxLHeoenESllHhq8m lDMu6GlTGZPI50tAGDvkmO4hb9pdBLDHJjRlMdlMnq3CoVgmsUNBs5SwYiPHuUDWjw/d OY6g== X-Gm-Message-State: AOPr4FXzSADhorG3sPql2Z8zBFn4RrqlPp82LiZ2eWQsra4h7s2cCkFG23LK5JEc0q1RKV93oiG9jRk9epWd5Q== MIME-Version: 1.0 X-Received: by 10.107.143.3 with SMTP id r3mr5871223iod.16.1463587404935; Wed, 18 May 2016 09:03:24 -0700 (PDT) Sender: wlosh@bsdimp.com Received: by 10.79.75.68 with HTTP; Wed, 18 May 2016 09:03:24 -0700 (PDT) X-Originating-IP: [69.53.245.200] In-Reply-To: <20160518105033.1eae7432@zhabar.knownspace> References: <201605181545.u4IFjCKD030751@repo.freebsd.org> <20160518105033.1eae7432@zhabar.knownspace> Date: Wed, 18 May 2016 10:03:24 -0600 X-Google-Sender-Auth: HVkUMPUoo6v7ZPjqnKAadeISYzM Message-ID: Subject: Re: svn commit: r300154 - head/sys/net From: Warner Losh To: Justin Hibbits Cc: Scott Long , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.22 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 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: Wed, 18 May 2016 16:03:26 -0000 Ditto with mips. On Wed, May 18, 2016 at 9:50 AM, Justin Hibbits wrote: > On Wed, 18 May 2016 15:45:12 +0000 (UTC) > Scott Long wrote: > > > Author: scottl > > Date: Wed May 18 15:45:12 2016 > > New Revision: 300154 > > URL: https://svnweb.freebsd.org/changeset/base/300154 > > > > Log: > > Activate the NO_64BIT_ATOMICS code for mips and powerpc > > > > Modified: > > head/sys/net/mp_ring.c > > > > Modified: head/sys/net/mp_ring.c > > > ============================================================================== > > --- head/sys/net/mp_ring.c Wed May 18 15:44:45 2016 > > (r300153) +++ head/sys/net/mp_ring.c Wed May 18 15:45:12 > > 2016 (r300154) @@ -37,15 +37,17 @@ __FBSDID("$FreeBSD$"); > > #include > > #include > > > > - > > - > > -#include > > +#if defined(__powerpc__) || defined(__mips__) > > +#define NO_64BIT_ATOMICS > > +#endif > > > > #if defined(__i386__) > > #define atomic_cmpset_acq_64 atomic_cmpset_64 > > #define atomic_cmpset_rel_64 atomic_cmpset_64 > > #endif > > > > +#include > > + > > union ring_state { > > struct { > > uint16_t pidx_head; > > > > powerpc64 defines both __powerpc__ and __powerpc64__, so you're killing > atomics on powerpc64 with this. > > - Justin > >