From: Florian Kauer <florian.kauer@linutronix.de>
To: Jesse Brandeburg <jesse.brandeburg@intel.com>,
Tony Nguyen <anthony.l.nguyen@intel.com>,
Vinicius Costa Gomes <vinicius.gomes@intel.com>,
"David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Tan Tee Min <tee.min.tan@linux.intel.com>,
Muhammad Husaini Zulkifli <muhammad.husaini.zulkifli@intel.com>,
Aravindhan Gunasekaran <aravindhan.gunasekaran@intel.com>,
Malli C <mallikarjuna.chilakala@intel.com>
Cc: netdev@vger.kernel.org, kurt@linutronix.de,
intel-wired-lan@lists.osuosl.org, linux-kernel@vger.kernel.org
Subject: [Intel-wired-lan] [PATCH net v2 5/6] igc: Fix launchtime before start of cycle
Date: Mon, 19 Jun 2023 12:08:57 +0200 [thread overview]
Message-ID: <20230619100858.116286-6-florian.kauer@linutronix.de> (raw)
In-Reply-To: <20230619100858.116286-1-florian.kauer@linutronix.de>
It is possible (verified on a running system) that frames are processed
by igc_tx_launchtime with a txtime before the start of the cycle
(baset_est).
However, the result of txtime - baset_est is written into a u32,
leading to a wrap around to a positive number. The following
launchtime > 0 check will only branch to executing launchtime = 0
if launchtime is already 0.
Fix it by using a s32 before checking launchtime > 0.
Fixes: db0b124f02ba ("igc: Enhance Qbv scheduling by using first flag bit")
Signed-off-by: Florian Kauer <florian.kauer@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
drivers/net/ethernet/intel/igc/igc_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index 9c04df900b59..565c72bd737d 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -1017,7 +1017,7 @@ static __le32 igc_tx_launchtime(struct igc_ring *ring, ktime_t txtime,
ktime_t base_time = adapter->base_time;
ktime_t now = ktime_get_clocktai();
ktime_t baset_est, end_of_cycle;
- u32 launchtime;
+ s32 launchtime;
s64 n;
n = div64_s64(ktime_sub_ns(now, base_time), cycle_time);
--
2.39.2
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
next prev parent reply other threads:[~2023-06-19 10:09 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-19 10:08 [Intel-wired-lan] [PATCH net v2 0/6] igc: Fix corner cases for TSN offload Florian Kauer
2023-06-19 10:08 ` [Intel-wired-lan] [PATCH net v2 1/6] igc: Rename qbv_enable to taprio_offload_enable Florian Kauer
2023-07-02 13:42 ` naamax.meir
2023-07-02 16:55 ` Markus Elfring
2023-07-02 19:17 ` Florian Kauer
2023-06-19 10:08 ` [Intel-wired-lan] [PATCH net v2 2/6] igc: Do not enable taprio offload for invalid arguments Florian Kauer
2023-07-03 8:34 ` naamax.meir
2023-06-19 10:08 ` [Intel-wired-lan] [PATCH net v2 3/6] igc: Handle already enabled taprio offload for basetime 0 Florian Kauer
2023-07-04 5:28 ` naamax.meir
2023-06-19 10:08 ` [Intel-wired-lan] [PATCH net v2 4/6] igc: No strict mode in pure launchtime/CBS offload Florian Kauer
2023-07-04 9:34 ` naamax.meir
2023-07-04 9:39 ` Paul Menzel
2023-06-19 10:08 ` Florian Kauer [this message]
2023-07-05 11:06 ` [Intel-wired-lan] [PATCH net v2 5/6] igc: Fix launchtime before start of cycle naamax.meir
2023-06-19 10:08 ` [Intel-wired-lan] [PATCH net v2 6/6] igc: Fix inserting of empty frame for launchtime Florian Kauer
2023-07-02 17:24 ` Markus Elfring
2023-07-06 11:36 ` naamax.meir
2023-06-20 22:57 ` [Intel-wired-lan] [PATCH net v2 0/6] igc: Fix corner cases for TSN offload Vinicius Costa Gomes
2023-06-21 0:17 ` Zulkifli, Muhammad Husaini
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=20230619100858.116286-6-florian.kauer@linutronix.de \
--to=florian.kauer@linutronix.de \
--cc=anthony.l.nguyen@intel.com \
--cc=aravindhan.gunasekaran@intel.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jesse.brandeburg@intel.com \
--cc=kuba@kernel.org \
--cc=kurt@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mallikarjuna.chilakala@intel.com \
--cc=muhammad.husaini.zulkifli@intel.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=tee.min.tan@linux.intel.com \
--cc=vinicius.gomes@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox