From: "Jiang, Dave" <dave.jiang@intel.com>
To: "Allen.Hubbe@emc.com" <Allen.Hubbe@emc.com>,
"logang@deltatee.com" <logang@deltatee.com>,
"jdmason@kudzu.us" <jdmason@kudzu.us>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"shuahkh@osg.samsung.com" <shuahkh@osg.samsung.com>,
"sudipm.mukherjee@gmail.com" <sudipm.mukherjee@gmail.com>,
"linux-kselftest@vger.kernel.org"
<linux-kselftest@vger.kernel.org>,
"arnd@arndb.de" <arnd@arndb.de>,
"linux-ntb@googlegroups.com" <linux-ntb@googlegroups.com>
Subject: Re: [PATCH v4 10/10] ntb_perf: clear link_is_up flag when the link goes down.
Date: Thu, 16 Jun 2016 20:57:20 +0000 [thread overview]
Message-ID: <1466110623.16234.279.camel@intel.com> (raw)
In-Reply-To: <53d495a5f97211289302ddb60d8508edeaab20ed.1466098407.git.logang@deltatee.com>
On Thu, 2016-06-16 at 14:17 -0600, Logan Gunthorpe wrote:
> When the link goes down, the link_is_up flag did not return to
> false. This could have caused some subtle corner case bugs
> when the link goes up and down quickly.
>
> Once that was fixed, there was found to be a race if the link was
> brought down then immediately up. The link_cleanup work would
> occasionally be scheduled after the next link up event. This would
> cancel the link_work that was supposed to occur and leave ntb_perf
> in an unusable state.
>
> To fix this we get rid of the link_cleanup work and put the actions
> directly in the link_down event.
>
> Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Acked-by: Dave Jiang <dave.jiang@intel.com>
Also patches 1-3 Acked.
> ---
> drivers/ntb/test/ntb_perf.c | 28 +++++++++-------------------
> 1 file changed, 9 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/ntb/test/ntb_perf.c
> b/drivers/ntb/test/ntb_perf.c
> index f0784e5..6a50f20 100644
> --- a/drivers/ntb/test/ntb_perf.c
> +++ b/drivers/ntb/test/ntb_perf.c
> @@ -133,7 +133,6 @@ struct perf_ctx {
> spinlock_t db_lock;
> struct perf_mw mw;
> bool link_is_up;
> - struct work_struct link_cleanup;
> struct delayed_work link_work;
> wait_queue_head_t link_wq;
> struct dentry *debugfs_node_dir;
> @@ -158,10 +157,16 @@ static void perf_link_event(void *ctx)
> {
> struct perf_ctx *perf = ctx;
>
> - if (ntb_link_is_up(perf->ntb, NULL, NULL) == 1)
> + if (ntb_link_is_up(perf->ntb, NULL, NULL) == 1) {
> schedule_delayed_work(&perf->link_work, 2*HZ);
> - else
> - schedule_work(&perf->link_cleanup);
> + } else {
> + dev_dbg(&perf->ntb->pdev->dev, "link down\n");
> +
> + if (!perf->link_is_up)
> + cancel_delayed_work_sync(&perf->link_work);
> +
> + perf->link_is_up = false;
> + }
> }
>
> static void perf_db_event(void *ctx, int vec)
> @@ -547,18 +552,6 @@ out:
> msecs_to_jiffies(PERF_LINK_DOW
> N_TIMEOUT));
> }
>
> -static void perf_link_cleanup(struct work_struct *work)
> -{
> - struct perf_ctx *perf = container_of(work,
> - struct perf_ctx,
> - link_cleanup);
> -
> - dev_dbg(&perf->ntb->pdev->dev, "%s called\n", __func__);
> -
> - if (!perf->link_is_up)
> - cancel_delayed_work_sync(&perf->link_work);
> -}
> -
> static int perf_setup_mw(struct ntb_dev *ntb, struct perf_ctx *perf)
> {
> struct perf_mw *mw;
> @@ -787,7 +780,6 @@ static int perf_probe(struct ntb_client *client,
> struct ntb_dev *ntb)
> perf_setup_mw(ntb, perf);
> init_waitqueue_head(&perf->link_wq);
> INIT_DELAYED_WORK(&perf->link_work, perf_link_work);
> - INIT_WORK(&perf->link_cleanup, perf_link_cleanup);
>
> rc = ntb_set_ctx(ntb, perf, &perf_ops);
> if (rc)
> @@ -807,7 +799,6 @@ static int perf_probe(struct ntb_client *client,
> struct ntb_dev *ntb)
>
> err_ctx:
> cancel_delayed_work_sync(&perf->link_work);
> - cancel_work_sync(&perf->link_cleanup);
> kfree(perf);
> err_perf:
> return rc;
> @@ -823,7 +814,6 @@ static void perf_remove(struct ntb_client
> *client, struct ntb_dev *ntb)
> mutex_lock(&perf->run_mutex);
>
> cancel_delayed_work_sync(&perf->link_work);
> - cancel_work_sync(&perf->link_cleanup);
>
> ntb_clear_ctx(ntb);
> ntb_link_disable(ntb);
> --
> 2.1.4
>
prev parent reply other threads:[~2016-06-16 20:57 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-16 20:17 [PATCH v4 00/10] NTB Selftest Script Logan Gunthorpe
2016-06-16 20:17 ` [PATCH v4 01/10] ntb_perf: Schedule based on time not on performance Logan Gunthorpe
2016-06-16 20:17 ` [PATCH v4 02/10] ntb_perf: Improve thread handling to increase robustness Logan Gunthorpe
2016-06-16 20:17 ` [PATCH v4 03/10] ntb_perf: Return results by reading the run file Logan Gunthorpe
2016-06-16 20:17 ` [PATCH v4 04/10] ntb_perf: Wait for link before running test Logan Gunthorpe
2016-06-16 20:17 ` [PATCH v4 05/10] ntb_tool: BUG: Ensure the buffer size is large enough to return all spads Logan Gunthorpe
2016-06-16 20:17 ` [PATCH v4 06/10] ntb_tool: Postpone memory window initialization for the user Logan Gunthorpe
2016-06-16 20:17 ` [PATCH v4 07/10] ntb_tool: Add link status and files to debugfs Logan Gunthorpe
2016-06-16 20:45 ` Allen Hubbe
2016-06-16 20:45 ` Allen Hubbe
2016-06-16 20:17 ` [PATCH v4 08/10] ntb_pingpong: Add a debugfs file to get the ping count Logan Gunthorpe
2016-06-16 20:17 ` [PATCH v4 09/10] ntb_test: Add a selftest script for the NTB subsystem Logan Gunthorpe
2016-06-16 20:46 ` Allen Hubbe
2016-06-16 20:46 ` Allen Hubbe
2016-06-16 20:17 ` [PATCH v4 10/10] ntb_perf: clear link_is_up flag when the link goes down Logan Gunthorpe
2016-06-16 20:57 ` Jiang, Dave [this message]
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=1466110623.16234.279.camel@intel.com \
--to=dave.jiang@intel.com \
--cc=Allen.Hubbe@emc.com \
--cc=arnd@arndb.de \
--cc=jdmason@kudzu.us \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-ntb@googlegroups.com \
--cc=logang@deltatee.com \
--cc=shuahkh@osg.samsung.com \
--cc=sudipm.mukherjee@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.