From: Yuval Basson <ybason@marvell.com>
To: <davem@davemloft.net>, <netdev@vger.kernel.org>
Cc: Yuval Basson <ybason@marvell.com>, Denis Bolotin <dbolotin@marvell.com>
Subject: [PATCH net-next 2/3] qed: Add a flag for rescheduling the slowpath task
Date: Tue, 24 Mar 2020 16:13:47 +0200 [thread overview]
Message-ID: <20200324141348.7897-3-ybason@marvell.com> (raw)
In-Reply-To: <20200324141348.7897-1-ybason@marvell.com>
Rechedule delayed work in case ptt_acquire failed.
Since it is the same task don't reset task's flags.
Signed-off-by: Yuval Basson <ybason@marvell.com>
Signed-off-by: Denis Bolotin <dbolotin@marvell.com>
---
drivers/net/ethernet/qlogic/qed/qed.h | 1 +
drivers/net/ethernet/qlogic/qed/qed_main.c | 15 +++++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qed/qed.h b/drivers/net/ethernet/qlogic/qed/qed.h
index ca866c2..e3b238e 100644
--- a/drivers/net/ethernet/qlogic/qed/qed.h
+++ b/drivers/net/ethernet/qlogic/qed/qed.h
@@ -566,6 +566,7 @@ enum qed_slowpath_wq_flag {
QED_SLOWPATH_MFW_TLV_REQ,
QED_SLOWPATH_PERIODIC_DB_REC,
QED_SLOWPATH_ACTIVE,
+ QED_SLOWPATH_RESCHEDULE,
};
struct qed_hwfn {
diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index 016d658..fb13863 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_main.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
@@ -1098,10 +1098,13 @@ static int qed_slowpath_delayed_work(struct qed_hwfn *hwfn,
if (!test_bit(QED_SLOWPATH_ACTIVE, &hwfn->slowpath_task_flags))
return -EINVAL;
- /* Memory barrier for setting atomic bit */
- smp_mb__before_atomic();
- set_bit(wq_flag, &hwfn->slowpath_task_flags);
- smp_mb__after_atomic();
+ if (wq_flag != QED_SLOWPATH_RESCHEDULE) {
+ /* Memory barrier for setting atomic bit */
+ smp_mb__before_atomic();
+ set_bit(wq_flag, &hwfn->slowpath_task_flags);
+ smp_mb__after_atomic();
+ }
+
queue_delayed_work(hwfn->slowpath_wq, &hwfn->slowpath_task, delay);
return 0;
@@ -1155,8 +1158,8 @@ static void qed_slowpath_task(struct work_struct *work)
if (!ptt) {
if (test_bit(QED_SLOWPATH_ACTIVE, &hwfn->slowpath_task_flags))
- queue_delayed_work(hwfn->slowpath_wq,
- &hwfn->slowpath_task, 0);
+ qed_slowpath_delayed_work(hwfn,
+ QED_SLOWPATH_RESCHEDULE, 0);
return;
}
--
1.8.3.1
next prev parent reply other threads:[~2020-03-24 14:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-24 14:13 [PATCH net-next 0/3] qed: Fix and enhance slowpath workqueue mechanism Yuval Basson
2020-03-24 14:13 ` [PATCH net-next 1/3] qed: Replace wq_active Boolean with an atomic QED_SLOWPATH_ACTIVE flag Yuval Basson
2020-03-24 23:36 ` David Miller
2020-03-25 20:35 ` [EXT] " Yuval Basson
2020-03-24 14:13 ` Yuval Basson [this message]
2020-03-24 14:13 ` [PATCH net-next 3/3] qed: Fix race condition between scheduling and destroying the slowpath workqueue Yuval Basson
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=20200324141348.7897-3-ybason@marvell.com \
--to=ybason@marvell.com \
--cc=davem@davemloft.net \
--cc=dbolotin@marvell.com \
--cc=netdev@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;
as well as URLs for NNTP newsgroup(s).