From: Nick Terrell <terrelln@meta.com>
To: "Jonathan Neuschäfer" <j.neuschaefer@gmx.net>
Cc: Nick Terrell <terrelln@meta.com>,
Nick Terrell <terrelln@meta.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] zstd: Fix definition of assert()
Date: Fri, 3 Mar 2023 06:30:47 +0000 [thread overview]
Message-ID: <C1912105-5951-4627-83B6-BA84420FED0D@meta.com> (raw)
In-Reply-To: <20230129131436.1343228-1-j.neuschaefer@gmx.net>
[-- Attachment #1: Type: text/plain, Size: 1941 bytes --]
> On Jan 29, 2023, at 5:14 AM, Jonathan Neuschäfer <j.neuschaefer@gmx.net> wrote:
>
> !-------------------------------------------------------------------|
> This Message Is From an External Sender
>
> |-------------------------------------------------------------------!
>
> assert(x) should emit a warning if x is false. WARN_ON(x) emits a
> warning if x is true. Thus, assert(x) should be defined as WARN_ON(!x)
> rather than WARN_ON(x).
>
> Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Hi Jonathan,
I have to apologize, I just submitted my branch for a PR and I realize that
while I intended to take your patch, I took a different equivalent patch. So
I wanted to say thanks for sending the patch!
> ---
>
> Commit e0c1b49f5b674 ("lib: zstd: Upgrade to latest upstream zstd
> version 1.4.10") mentions that the zstd code was generated from the
> upstream version of zstd, so perhaps the definition of assert based on
> WARN_ON should be fixed in the conversion script and/or upstream zstd
> source code.
Yeah, we need to fix it upstream, so if you would like to submit the upstream PR
the file is contrib/linux-kernel/zstd_deps.h [0]. Otherwise, I will update it before
the next import.
Best,
Nick Terrell
[0] https://github.com/facebook/zstd/blob/dev/contrib/linux-kernel/zstd_deps.h
> ---
> lib/zstd/common/zstd_deps.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/zstd/common/zstd_deps.h b/lib/zstd/common/zstd_deps.h
> index 7a5bf44839c9c..f06df065dec01 100644
> --- a/lib/zstd/common/zstd_deps.h
> +++ b/lib/zstd/common/zstd_deps.h
> @@ -84,7 +84,7 @@ static uint64_t ZSTD_div64(uint64_t dividend, uint32_t divisor) {
>
> #include <linux/kernel.h>
>
> -#define assert(x) WARN_ON((x))
> +#define assert(x) WARN_ON(!(x))
>
> #endif /* ZSTD_DEPS_ASSERT */
> #endif /* ZSTD_DEPS_NEED_ASSERT */
> --
> 2.39.0
>
[-- Attachment #2: winmail.dat --]
[-- Type: application/ms-tnef, Size: 13697 bytes --]
WARNING: multiple messages have this Message-ID
From: Nick Terrell <terrelln@meta.com>
To: "Jonathan Neuschäfer" <j.neuschaefer@gmx.net>
Cc: Nick Terrell <terrelln@meta.com>,
Nick Terrell <terrelln@meta.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] zstd: Fix definition of assert()
Date: Fri, 3 Mar 2023 06:51:15 +0000 [thread overview]
Message-ID: <C1912105-5951-4627-83B6-BA84420FED0D@meta.com> (raw)
Message-ID: <20230303065115._ZeR1oOhRy6IUI0DTxDUBP_ACG5PKQKMNv-Tu0QvETo@z> (raw)
In-Reply-To: <20230129131436.1343228-1-j.neuschaefer@gmx.net>
[-- Attachment #1: Type: text/plain, Size: 1941 bytes --]
> On Jan 29, 2023, at 5:14 AM, Jonathan Neuschäfer <j.neuschaefer@gmx.net> wrote:
>
> !-------------------------------------------------------------------|
> This Message Is From an External Sender
>
> |-------------------------------------------------------------------!
>
> assert(x) should emit a warning if x is false. WARN_ON(x) emits a
> warning if x is true. Thus, assert(x) should be defined as WARN_ON(!x)
> rather than WARN_ON(x).
>
> Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Hi Jonathan,
I have to apologize, I just submitted my branch for a PR and I realize that
while I intended to take your patch, I took a different equivalent patch. So
I wanted to say thanks for sending the patch!
> ---
>
> Commit e0c1b49f5b674 ("lib: zstd: Upgrade to latest upstream zstd
> version 1.4.10") mentions that the zstd code was generated from the
> upstream version of zstd, so perhaps the definition of assert based on
> WARN_ON should be fixed in the conversion script and/or upstream zstd
> source code.
Yeah, we need to fix it upstream, so if you would like to submit the upstream PR
the file is contrib/linux-kernel/zstd_deps.h [0]. Otherwise, I will update it before
the next import.
Best,
Nick Terrell
[0] https://github.com/facebook/zstd/blob/dev/contrib/linux-kernel/zstd_deps.h
> ---
> lib/zstd/common/zstd_deps.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/zstd/common/zstd_deps.h b/lib/zstd/common/zstd_deps.h
> index 7a5bf44839c9c..f06df065dec01 100644
> --- a/lib/zstd/common/zstd_deps.h
> +++ b/lib/zstd/common/zstd_deps.h
> @@ -84,7 +84,7 @@ static uint64_t ZSTD_div64(uint64_t dividend, uint32_t divisor) {
>
> #include <linux/kernel.h>
>
> -#define assert(x) WARN_ON((x))
> +#define assert(x) WARN_ON(!(x))
>
> #endif /* ZSTD_DEPS_ASSERT */
> #endif /* ZSTD_DEPS_NEED_ASSERT */
> --
> 2.39.0
>
[-- Attachment #2: winmail.dat --]
[-- Type: application/ms-tnef, Size: 13705 bytes --]
next prev parent reply other threads:[~2023-03-03 6:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-29 13:14 Jonathan Neuschäfer
2023-03-03 6:30 ` Nick Terrell [this message]
2023-03-03 6:51 ` Nick Terrell
2023-03-03 14:27 ` Jonathan Neuschäfer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=C1912105-5951-4627-83B6-BA84420FED0D@meta.com \
--to=terrelln@meta.com \
--cc=j.neuschaefer@gmx.net \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®