From owner-svn-src-head@freebsd.org Tue Aug 11 12:34:27 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 E9F453AD4C0 for ; Tue, 11 Aug 2020 12:34:27 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qv1-xf2d.google.com (mail-qv1-xf2d.google.com [IPv6:2607:f8b0:4864:20::f2d]) (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 4BQshy5dGvz4Stj for ; Tue, 11 Aug 2020 12:34:26 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qv1-xf2d.google.com with SMTP id j10so5816366qvo.13 for ; Tue, 11 Aug 2020 05:34:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=UixUOCz2M3HCMzLw7FIfJsLC53SCRSM+fPTHeYxvJCA=; b=SKWEilvfWv1LBIC9zxo0bRAWaEOS1RnuwO1PNd9zSQA6SrQVUbLq2XuWrT0POXFBw/ DawAADmsOOqbLHJbC8nlYEfjxIA9jAIVxSkxEmFO5lWkLh4C4fuRP55uD2zKLX77GJBH HPc1M/RizZfOveOSQIIfcKxGaVbuhpxeQz1rUEWYY/y9kPXsg7tFZmaBTvNoSo+iBnl/ iirbj+OUjyg31TKUE2VHYRlQlH5DH/fmS4nCiXRTNmioMq2AsRTVMo/rs8ht6etrrYw1 0hRciRsrvFAv8K+ajDzoLmXZS+5jh2eBcGLCATHOUYYP9Ey+hrjLy69WlJeoS2UHMk7W BVjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=UixUOCz2M3HCMzLw7FIfJsLC53SCRSM+fPTHeYxvJCA=; b=JHxjVCesVeE71xOBUrNICmPujJtsg6u3xS/e3RnFoNFg9g+egSs7dmeQv0GOFi80JF npnXUENAOyD4Cv6+ca8N1xtvSPydlGXFOdR6zob2m+Arqr4IWfXMZTRkLy1hEdXL0kMs Ys1MQiUc5tUzGF153EIikmPno/IaeRbOnZubQ9LYVv1wtb95KbAqv8aVXLbfK1mSYEri UCmYqdTKroX2KkluZ0ROZ+uUOoxcGeYxq47NYgTTBSAEJz70WMwH3Ton0v3C8+YkDNUL hNvXOTfOfZwgziVPQFb3R7b9uFNrMSRqXsjZoK065dCJ8UwOKw+eyyh49hfEkkfXlLv+ Z6ug== X-Gm-Message-State: AOAM531JskPvdzzYNZ0zXcRhR2HBCUhkh83ylYIpgkEwOpY0rEzptvi3 x1vo5/+LBNf43gPbbNjFB5eG8rAZv54= X-Google-Smtp-Source: ABdhPJy3/aOMGDnFOTNIHOUwWFbEJQ+DBeFDRqMHkKwWJAsqw6J+YyiRahLCQOxU0byDxitxZ7G0Ew== X-Received: by 2002:a0c:b312:: with SMTP id s18mr1001792qve.34.1597149265451; Tue, 11 Aug 2020 05:34:25 -0700 (PDT) Received: from mutt-hbsd (75-148-2-186-WashingtonDC.hfc.comcastbusiness.net. [75.148.2.186]) by smtp.gmail.com with ESMTPSA id o21sm16610977qkk.94.2020.08.11.05.34.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Aug 2020 05:34:24 -0700 (PDT) Date: Tue, 11 Aug 2020 08:34:22 -0400 From: Shawn Webb To: Mateusz Guzik Cc: Emmanuel Vadot , Alan Cox , Emmanuel Vadot , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r363842 - head/sys/compat/linuxkpi/common/include/linux Message-ID: <20200811123422.sf63z62buxqcnv3c@mutt-hbsd> X-Operating-System: FreeBSD mutt-hbsd 13.0-CURRENT-HBSD FreeBSD 13.0-CURRENT-HBSD X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0xFF2E67A277F8E1FA References: <202008041525.074FPNLh043749@repo.freebsd.org> <1c90911b-d5f6-f8b1-8f4d-97a88fa028bd@rice.edu> <20200804202541.0b6b3eb6ce26522ee12a796c@bidouilliste.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="mjzj2rmpidkza7u7" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4BQshy5dGvz4Stj X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=hardenedbsd.org header.s=google header.b=SKWEilvf; dmarc=none; spf=pass (mx1.freebsd.org: domain of shawn.webb@hardenedbsd.org designates 2607:f8b0:4864:20::f2d as permitted sender) smtp.mailfrom=shawn.webb@hardenedbsd.org X-Spamd-Result: default: False [-4.39 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[hardenedbsd.org:s=google]; NEURAL_HAM_MEDIUM(-0.98)[-0.978]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; NEURAL_HAM_LONG(-1.02)[-1.020]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[hardenedbsd.org]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[hardenedbsd.org:+]; NEURAL_HAM_SHORT(-0.29)[-0.294]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::f2d:from]; SIGNED_PGP(-2.00)[]; FREEMAIL_TO(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; MID_RHS_NOT_FQDN(0.50)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_TLS_ALL(0.00)[] 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: Tue, 11 Aug 2020 12:34:28 -0000 --mjzj2rmpidkza7u7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable If you use git, you can easily cherry-pick the fix from HardenedBSD: https://github.com/HardenedBSD/hardenedBSD/commit/e7ee74598b987fdc702614668= b7ea85884289cf1 On Tue, Aug 11, 2020 at 02:31:26PM +0200, Mateusz Guzik wrote: > Hi. This remains unfixed. >=20 > On 8/4/20, Emmanuel Vadot wrote: > > On Tue, 4 Aug 2020 13:11:02 -0500 > > Alan Cox wrote: > > > >> > >> On 8/4/20 10:25 AM, Emmanuel Vadot wrote: > >> > Author: manu > >> > Date: Tue Aug 4 15:25:22 2020 > >> > New Revision: 363842 > >> > URL: https://svnweb.freebsd.org/changeset/base/363842 > >> > > >> > Log: > >> > linuxkpi: Add clear_bit_unlock > >> > > >> > This calls clear_bit and adds a memory barrier. > >> > > >> > Sponsored by: The FreeBSD Foundation > >> > > >> > Reviewed by: hselasky > >> > MFC after: 1 week > >> > Differential Revision: https://reviews.freebsd.org/D25943 > >> > > >> > Modified: > >> > head/sys/compat/linuxkpi/common/include/linux/bitops.h > >> > > >> > Modified: head/sys/compat/linuxkpi/common/include/linux/bitops.h > >> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D > >> > --- head/sys/compat/linuxkpi/common/include/linux/bitops.h Tue Aug 4 > >> > 15:00:02 2020 (r363841) > >> > +++ head/sys/compat/linuxkpi/common/include/linux/bitops.h Tue Aug 4 > >> > 15:25:22 2020 (r363842) > >> > @@ -275,6 +275,13 @@ find_next_zero_bit(const unsigned long *addr, > >> > unsigned > >> > #define test_bit(i, a) \ > >> > !!(READ_ONCE(((volatile const unsigned long *)(a))[BIT_WORD(i)= ]) & > >> > BIT_MASK(i)) > >> > > >> > +static inline void > >> > +clear_bit_unlock(long bit, volatile unsigned long *var) > >> > +{ > >> > + clear_bit(bit, var); > >> > + wmb(); > >> > >> > >> For an unlock operation, the memory barrier should come before the > >> clear_bit() call, not after.?? See, for example, the alpha implementat= ion > >> in Linux.?? Also, the correct "spelling" for this memory barrier in > >> FreeBSD would be atomic_thread_fence_rel(). See, for example, the > >> comment at the top of sys/amd64/include/atomic.h. > > > > Ah yes, thanks. I probably got lost looking for the linux implem but > > that does make sense, I'll fix that probably tomorow. > > > > Thanks. > > > >> > >> > +} > >> > + > >> > static inline int > >> > test_and_clear_bit(long bit, volatile unsigned long *var) > >> > { > > > > > > -- > > Emmanuel Vadot > > >=20 >=20 > --=20 > Mateusz Guzik > _______________________________________________ > svn-src-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD GPG Key ID: 0xFF2E67A277F8E1FA GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Sha= wn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --mjzj2rmpidkza7u7 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAl8ykEwACgkQ/y5nonf4 4fpS7A//V2iZ37Ya8JjEUlinCTwY3xpP77vHbx9c4KEofwI+av2BWFFLcYA9lIxG k2DjWfwjuPgqUYCL4/NPN6hGy2NrpNXl4IT1gpo1hKiWH9M5m4vI0ZP5+SW1bqi6 92ytAZUshzpLacklVbmG+GZT1BIpydjjA7tSNvA4YRWjPy65BATQYdzjlNCdgcSe OnF2VIyMFzdwycZn+a3+N14jEnv6+EqxJYJZroJLqHMK+rlS1v4LZvaZVky4qm9U eP7jbwaRbdJ+CTUooQPEwmcjcfqdGDuXyaBdutWLyz7dOZI/IjLjaAywbTAcBX3l E4XGa1qHrrOlaiP7yJjLS7efZn1Sr+d0ZdKQ7By1un7JEh+FCz90tK2qYuGK1QxI pMnX1SsPpshsi1Dk6zYmosdWVlZQZNmS9n+SLWKy4jPzbhbJSq2kjNRn+GvvaxpJ J/BqkfB+XTWJKDkIzIAQdlDrcknMuPsV08NC4Jd1OtT5gqKAZehIsb7o/0wbadiu Ll3ree/n/+mr6wSou1h2pdSLy3U4nSGAvDPPacz2nR3uVg1MGAs+turtd6CHNknu eFGnGu5KD9I+Ygg7tPm5JiUK9U8sKlMEvY9gIXwrYEnp9scwTb4i4zxt/G5Jmf5r YETkeQU3S5u94vEdbMg+5SQLbxW2UXknERpyD+hW6UtcyDG2gD0= =5HEO -----END PGP SIGNATURE----- --mjzj2rmpidkza7u7--