From: David Marchand <david.marchand@redhat.com>
To: Thomas Monjalon <thomas@monjalon.net>
Cc: dev <dev@dpdk.org>, dpdk stable <stable@dpdk.org>
Subject: Re: [dpdk-stable] [PATCH] eal/linux: fix return after alarm registration failure
Date: Wed, 26 Jun 2019 13:20:17 +0200 [thread overview]
Message-ID: <CAJFAV8wpFONbSCQzusaZvABv8B+CJuO_BXE00m35d63Gx6-+xw@mail.gmail.com> (raw)
In-Reply-To: <20190626104056.26829-1-thomas@monjalon.net>
On Wed, Jun 26, 2019 at 12:41 PM Thomas Monjalon <thomas@monjalon.net>
wrote:
> When adding an alarm, if an error happen when registering
> the common alarm callback, it is not considered as a major failure.
> The alarm is then inserted in the list.
> However it was returning an error code after inserting the alarm.
>
> The error code is reset to 0 so the behaviour and the return code
> are consistent.
> Other return code related lines are cleaned up for easier understanding.
>
> Fixes: af75078fece3 ("first public release")
> Cc: stable@dpdk.org
>
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---
> lib/librte_eal/linux/eal/eal_alarm.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/lib/librte_eal/linux/eal/eal_alarm.c
> b/lib/librte_eal/linux/eal/eal_alarm.c
> index 840ede780..d6d70e8c3 100644
> --- a/lib/librte_eal/linux/eal/eal_alarm.c
> +++ b/lib/librte_eal/linux/eal/eal_alarm.c
> @@ -137,9 +137,13 @@ rte_eal_alarm_set(uint64_t us, rte_eal_alarm_callback
> cb_fn, void *cb_arg)
>
> rte_spinlock_lock(&alarm_list_lk);
> if (!handler_registered) {
> - ret |= rte_intr_callback_register(&intr_handle,
> + ret = rte_intr_callback_register(&intr_handle,
> eal_alarm_callback, NULL);
> - handler_registered = (ret == 0) ? 1 : 0;
> + if (ret == 0)
> + handler_registered = 1;
> + else
> + /* not fatal, callback can be registered later */
> + ret = 0;
> }
>
> if (LIST_EMPTY(&alarm_list))
>
Well, then it means that you don't want to touch ret at all.
How about:
if (rte_intr_callback_register(&intr_handle,
eal_alarm_callback, NULL) == 0)
handler_registered = 1;
?
--
David Marchand
next prev parent reply other threads:[~2019-06-26 11:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-26 10:40 Thomas Monjalon
2019-06-26 11:20 ` David Marchand [this message]
2019-06-26 14:02 ` [dpdk-stable] [PATCH v2] " Thomas Monjalon
2019-06-26 23:09 ` [dpdk-stable] [dpdk-dev] " Stephen Hemminger
2019-06-27 15:25 ` Thomas Monjalon
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=CAJFAV8wpFONbSCQzusaZvABv8B+CJuO_BXE00m35d63Gx6-+xw@mail.gmail.com \
--to=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
--cc=thomas@monjalon.net \
/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;
as well as URLs for NNTP newsgroup(s).