From owner-svn-src-head@freebsd.org Wed Oct 28 21:24:07 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6F4DA450F81 for ; Wed, 28 Oct 2020 21:24:07 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x82c.google.com (mail-qt1-x82c.google.com [IPv6:2607:f8b0:4864:20::82c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CM1m62RNrz4cMT for ; Wed, 28 Oct 2020 21:24:06 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x82c.google.com with SMTP id h12so595871qtc.9 for ; Wed, 28 Oct 2020 14:24:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=6uWUSmEuceWdWSEvZCN62HyJVi0c4ICA+HU+2D0LGj0=; b=Ta/qbGWgsV1ce3gdtWhHONcQq2CiTCw2ZmrSvvJ0LPElaqeGXItQZkJVK55v/n0fbb RNM8yDFn33JeHgxiXPnmrZrMlY5c1ZxelwNnyN2UC9JBBEaRHktYQMM2TGtU1oKrh8LK gGV/2qwwNhRucJR/Zp09o9ZcTN9vxb9j4loGIZxxSw2iCZ9uXKdD7vUG+A96NYuQ+N0Q SAWAO75/CQxQ7Ob9ePdZh+z9clguLukRyV9f30GKZtlnNdSOf5yfKSIFyeGt075GXWxD uARuMPfN/IOvnaX5U+4rtO57Vvm/C0xUi3RV6I1jvu9kcr19NcdFdBzneBGVJPbI/CoZ PIYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=6uWUSmEuceWdWSEvZCN62HyJVi0c4ICA+HU+2D0LGj0=; b=ZMWpUXBdQRZPftP2ihl21eCQSq+i2JRX52vVaHXVF40zJjyMtv5M27zBM0pTDYjg9h wihsRPsXKDbiX10gUooWPw78beez2n2a1y3Pmn9LzIm2n6iI9Zecs3VicVxyJ9rAibbU XF/rUe/6y22m82kDXltr7s7s1VJbi3t2uEvFWslZW0s2bz14fFBe6yRZ/kD4LIocmRaf P8FwvupjdsIEQqg2DdHkyeW4awpmzmaYTYmBZtlzQ6rx/RlVdu7lFyxvlJmAp334bcUz AAx/zUGhlvmIL4EHTmHaflc9LpqGQz3wSxoe9KQLuZVV8nKEvPeyMEjOtmhZOdYsUJ5L FubQ== X-Gm-Message-State: AOAM532JAppDHYAStYsm3sAiUQXvu6uu+y1HtW7We/MbbMU9jUuiBjof mp7tHLlrriREaSlTzeBNe7X3ZnTU7Dy3GkxiqHAqMw== X-Google-Smtp-Source: ABdhPJynzp009YLIVziARphsn9ueCtPy5V0u9qBUZ2UWnqsBJiYejq7Nl2pePgqOVBw3W0F0w/ga5BWJoVuR93ytxww= X-Received: by 2002:a05:622a:10b:: with SMTP id u11mr837924qtw.235.1603920245202; Wed, 28 Oct 2020 14:24:05 -0700 (PDT) MIME-Version: 1.0 References: <202010282118.09SLI4uj043576@repo.freebsd.org> In-Reply-To: <202010282118.09SLI4uj043576@repo.freebsd.org> From: Warner Losh Date: Wed, 28 Oct 2020 15:23:54 -0600 Message-ID: Subject: Re: svn commit: r367119 - head/stand/libsa/zfs To: Warner Losh Cc: src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 4CM1m62RNrz4cMT X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=Ta/qbGWg; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::82c) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-1.62 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.002]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_SPAM_SHORT(0.36)[0.362]; NEURAL_HAM_LONG(-0.98)[-0.984]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::82c:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[svn-src-head]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 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, 28 Oct 2020 21:24:07 -0000 This looks like it is missing something, but it isn't. I should have updated the commit message to say that it's just the makefile part of this since these commits were in upstream when it was last brought in. So it looks like things are missing but they are already in the tree... Warner On Wed, Oct 28, 2020 at 3:18 PM Warner Losh wrote: > Author: imp > Date: Wed Oct 28 21:18:04 2020 > New Revision: 367119 > URL: https://svnweb.freebsd.org/changeset/base/367119 > > Log: > loader: add aarch64 support for zstd > > We don't have NEON available in the boot loader, so we have to disable > it. OpenZFS included ZSTD which used the wrong symbol to bring in neon > support. Change to use the code that's been submitted upstream as a > pull request to both. > > __ARM_NEON is the proper symbol, defined in ARM C Language Extensions > Release 2.1 (https://developer.arm.com/documentation/ihi0053/d/). Some > sources suggest __ARM_NEON__, but that's the obsolete spelling from > prior versions of the standard. > > OpenZFS Pull Request: https://github.com/openzfs/zfs/pull/11055 > ZSTD Pull Request: https://github.com/facebook/zstd/pull/2356 > > Modified: > head/stand/libsa/zfs/Makefile.inc > > Modified: head/stand/libsa/zfs/Makefile.inc > > ============================================================================== > --- head/stand/libsa/zfs/Makefile.inc Wed Oct 28 21:09:56 2020 > (r367118) > +++ head/stand/libsa/zfs/Makefile.inc Wed Oct 28 21:18:04 2020 > (r367119) > @@ -5,10 +5,8 @@ > .PATH: ${ZFSOSSRC}/spl > .PATH: ${OZFS}/module/zstd/lib > ZFSSRC= zfs.c nvlist.c skein.c skein_block.c list.c > -.if ${MACHINE_ARCH} != aarch64 > ZFSSRC+= zstd_shim.c zstd.c > CFLAGS+= -DHAS_ZSTD_ZFS > -.endif > SRCS+= ${ZFSSRC} > > CFLAGS+= -I${LDRSRC} >