From: Erez Geva <erez.geva.ext@siemens.com>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arch@vger.kernel.org,
Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>,
Arnd Bergmann <arnd@arndb.de>,
Cong Wang <xiyou.wangcong@gmail.com>,
"David S . Miller" <davem@davemloft.net>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
Jakub Kicinski <kuba@kernel.org>,
Jamal Hadi Salim <jhs@mojatatu.com>,
Jiri Pirko <jiri@resnulli.us>,
Alexei Starovoitov <ast@kernel.org>,
Colin Ian King <colin.king@canonical.com>,
Daniel Borkmann <daniel@iogearbox.net>,
Eric Dumazet <edumazet@google.com>,
Eyal Birger <eyal.birger@gmail.com>,
"Gustavo A . R . Silva" <gustavoars@kernel.org>,
Jakub Sitnicki <jakub@cloudflare.com>,
John Ogness <john.ogness@linutronix.de>,
Jon Rosen <jrosen@cisco.com>, Kees Cook <keescook@chromium.org>,
Mao Wenan <maowenan@huawei.com>,
Marc Kleine-Budde <mkl@pengutronix.de>,
Martin KaFai Lau <kafai@fb.com>,
Matthieu Baerts <matthieu.baerts@tessares.net>,
Andrei Vagin <avagin@gmail.com>,
Dmitry Safonov <0x7f454c46@gmail.com>,
"Eric W . Biederman" <ebiederm@xmission.com>,
Ingo Molnar <mingo@kernel.org>,
John Stultz <john.stultz@linaro.org>,
Miaohe Lin <linmiaohe@huawei.com>,
Michal Kubecek <mkubecek@suse.cz>,
Or Cohen <orcohen@paloaltonetworks.com>,
Oleg Nesterov <oleg@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Richard Cochran <richardcochran@gmail.com>,
Stefan Schmidt <stefan@datenfreihafen.org>,
Willem de Bruijn <willemb@google.com>,
Xie He <xie.he.0141@gmail.com>, Stephen Boyd <sboyd@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Vladis Dronov <vdronov@redhat.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Frederic Weisbecker <frederic@kernel.org>
Cc: Vinicius Costa Gomes <vinicius.gomes@intel.com>,
Vedang Patel <vedang.patel@intel.com>,
Ines Molzahn <ines.molzahn@siemens.com>,
Simon Sudler <simon.sudler@siemens.com>,
Andreas Meisinger <andreas.meisinger@siemens.com>,
Andreas Bucher <andreas.bucher@siemens.com>,
Henning Schild <henning.schild@siemens.com>,
Jan Kiszka <jan.kiszka@siemens.com>,
Andreas Zirkler <andreas.zirkler@siemens.com>,
Ermin Sakic <ermin.sakic@siemens.com>,
An Ninh Nguyen <anninh.nguyen@siemens.com>,
Michael Saenger <michael.saenger@siemens.com>,
Bernd Maehringer <bernd.maehringer@siemens.com>,
Gisela Greinert <gisela.greinert@siemens.com>,
Erez Geva <erez.geva.ext@siemens.com>,
Erez Geva <ErezGeva2@gmail.com>
Subject: [PATCH 3/3] The TC ETF Qdisc pass the hardware timestamp to the interface driver.
Date: Wed, 9 Dec 2020 15:37:06 +0100 [thread overview]
Message-ID: <20201209143707.13503-4-erez.geva.ext@siemens.com> (raw)
In-Reply-To: <20201209143707.13503-1-erez.geva.ext@siemens.com>
The ETF pass the TX sending hardware timestamp to
the network interface driver.
- Add new flag to the ETF Qdisc setting that mandate
the use of the hardware timestamp in a socket's buffer.
- The ETF Qdisc pass the TX sending hardware timestamp to the
network interface driver.
Signed-off-by: Erez Geva <erez.geva.ext@siemens.com>
---
include/uapi/linux/pkt_sched.h | 1 +
net/sched/sch_etf.c | 59 +++++++++++++++++++++++++++-------
2 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
index 9e7c2c607845..51e2b57bfa81 100644
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -1056,6 +1056,7 @@ struct tc_etf_qopt {
#define TC_ETF_DEADLINE_MODE_ON _BITUL(0)
#define TC_ETF_OFFLOAD_ON _BITUL(1)
#define TC_ETF_SKIP_SOCK_CHECK _BITUL(2)
+#define TC_ETF_USE_HW_TIMESTAMP _BITUL(3)
};
enum {
diff --git a/net/sched/sch_etf.c b/net/sched/sch_etf.c
index c48f91075b5c..67eace3e180f 100644
--- a/net/sched/sch_etf.c
+++ b/net/sched/sch_etf.c
@@ -23,11 +23,13 @@
#define DEADLINE_MODE_IS_ON(x) ((x)->flags & TC_ETF_DEADLINE_MODE_ON)
#define OFFLOAD_IS_ON(x) ((x)->flags & TC_ETF_OFFLOAD_ON)
#define SKIP_SOCK_CHECK_IS_SET(x) ((x)->flags & TC_ETF_SKIP_SOCK_CHECK)
+#define USE_HW_TIMESTAMP(x) ((x)->flags & TC_ETF_USE_HW_TIMESTAMP)
struct etf_sched_data {
bool offload;
bool deadline_mode;
bool skip_sock_check;
+ bool use_hw_timestamp;
int clockid;
int queue;
s32 delta; /* in ns */
@@ -75,7 +77,7 @@ static inline int validate_input_params(struct tc_etf_qopt *qopt,
static bool is_packet_valid(struct Qdisc *sch, struct sk_buff *nskb)
{
struct etf_sched_data *q = qdisc_priv(sch);
- ktime_t txtime = nskb->tstamp;
+ ktime_t hwtxtime, txtime = nskb->tstamp;
struct sock *sk = nskb->sk;
ktime_t now;
@@ -88,6 +90,9 @@ static bool is_packet_valid(struct Qdisc *sch, struct sk_buff *nskb)
if (!sock_flag(sk, SOCK_TXTIME))
return false;
+ if (!q->use_hw_timestamp != !sock_flag(sk, SOCK_HW_TXTIME))
+ return false;
+
/* We don't perform crosstimestamping.
* Drop if packet's clockid differs from qdisc's.
*/
@@ -99,7 +104,11 @@ static bool is_packet_valid(struct Qdisc *sch, struct sk_buff *nskb)
skip:
now = q->get_time();
- if (ktime_before(txtime, now) || ktime_before(txtime, q->last))
+ if (q->use_hw_timestamp)
+ hwtxtime = skb_hwtstamps(nskb)->hwtstamp;
+ else
+ hwtxtime = txtime;
+ if (ktime_before(txtime, now) || ktime_before(hwtxtime, q->last))
return false;
return true;
@@ -173,16 +182,33 @@ static int etf_enqueue_timesortedlist(struct sk_buff *nskb, struct Qdisc *sch,
return qdisc_drop(nskb, sch, to_free);
}
- while (*p) {
- struct sk_buff *skb;
+ if (q->use_hw_timestamp) {
+ ktime_t hwtxtime = skb_hwtstamps(nskb)->hwtstamp;
+
+ while (*p) {
+ struct sk_buff *skb;
- parent = *p;
- skb = rb_to_skb(parent);
- if (ktime_compare(txtime, skb->tstamp) >= 0) {
- p = &parent->rb_right;
- leftmost = false;
- } else {
- p = &parent->rb_left;
+ parent = *p;
+ skb = rb_to_skb(parent);
+ if (ktime_compare(hwtxtime, skb_hwtstamps(skb)->hwtstamp) >= 0) {
+ p = &parent->rb_right;
+ leftmost = false;
+ } else {
+ p = &parent->rb_left;
+ }
+ }
+ } else {
+ while (*p) {
+ struct sk_buff *skb;
+
+ parent = *p;
+ skb = rb_to_skb(parent);
+ if (ktime_compare(txtime, skb->tstamp) >= 0) {
+ p = &parent->rb_right;
+ leftmost = false;
+ } else {
+ p = &parent->rb_left;
+ }
}
}
rb_link_node(&nskb->rbnode, parent, p);
@@ -245,6 +271,10 @@ static void timesortedlist_remove(struct Qdisc *sch, struct sk_buff *skb)
qdisc_bstats_update(sch, skb);
+ /* Pass hardware time to driver and to last */
+ if (q->use_hw_timestamp)
+ skb->tstamp = skb_hwtstamps(skb)->hwtstamp;
+
q->last = skb->tstamp;
sch->q.qlen--;
@@ -393,6 +423,10 @@ static int etf_init(struct Qdisc *sch, struct nlattr *opt,
q->offload = OFFLOAD_IS_ON(qopt);
q->deadline_mode = DEADLINE_MODE_IS_ON(qopt);
q->skip_sock_check = SKIP_SOCK_CHECK_IS_SET(qopt);
+ q->use_hw_timestamp = USE_HW_TIMESTAMP(qopt);
+ /* deadline mode can not coexist with using hardware time */
+ if (q->use_hw_timestamp && q->deadline_mode)
+ return -EOPNOTSUPP;
switch (q->clockid) {
case CLOCK_REALTIME:
@@ -484,6 +518,9 @@ static int etf_dump(struct Qdisc *sch, struct sk_buff *skb)
if (q->skip_sock_check)
opt.flags |= TC_ETF_SKIP_SOCK_CHECK;
+ if (q->use_hw_timestamp)
+ opt.flags |= TC_ETF_USE_HW_TIMESTAMP;
+
if (nla_put(skb, TCA_ETF_PARMS, sizeof(opt), &opt))
goto nla_put_failure;
--
2.20.1
prev parent reply other threads:[~2020-12-09 15:55 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-09 14:37 [PATCH 0/3] Add sending TX hardware timestamp for TC ETF Qdisc Erez Geva
2020-12-09 14:37 ` [PATCH 1/3] Add TX sending hardware timestamp Erez Geva
2020-12-09 14:48 ` Willem de Bruijn
2020-12-09 15:21 ` Geva, Erez
2020-12-09 17:37 ` Willem de Bruijn
2020-12-09 20:18 ` Geva, Erez
2020-12-10 19:11 ` Willem de Bruijn
2020-12-10 22:37 ` Geva, Erez
2020-12-10 23:30 ` Willem de Bruijn
2020-12-11 0:27 ` Vinicius Costa Gomes
2020-12-11 14:44 ` Geva, Erez
2020-12-11 15:15 ` Willem de Bruijn
2020-12-11 14:22 ` Geva, Erez
2020-12-10 3:11 ` kernel test robot
2020-12-10 12:41 ` Geva, Erez
2020-12-10 18:17 ` Geva, Erez
2020-12-12 8:47 ` [kbuild-all] " Philip Li
2020-12-16 2:01 ` Rong Chen
2020-12-09 14:37 ` [PATCH 2/3] Pass TX sending hardware timestamp to a socket's buffer Erez Geva
2020-12-09 14:37 ` Erez Geva [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=20201209143707.13503-4-erez.geva.ext@siemens.com \
--to=erez.geva.ext@siemens.com \
--cc=0x7f454c46@gmail.com \
--cc=ErezGeva2@gmail.com \
--cc=andreas.bucher@siemens.com \
--cc=andreas.meisinger@siemens.com \
--cc=andreas.zirkler@siemens.com \
--cc=anninh.nguyen@siemens.com \
--cc=arnd@arndb.de \
--cc=ast@kernel.org \
--cc=avagin@gmail.com \
--cc=bernd.maehringer@siemens.com \
--cc=bigeasy@linutronix.de \
--cc=colin.king@canonical.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=ebiederm@xmission.com \
--cc=edumazet@google.com \
--cc=ermin.sakic@siemens.com \
--cc=eyal.birger@gmail.com \
--cc=frederic@kernel.org \
--cc=gisela.greinert@siemens.com \
--cc=gustavoars@kernel.org \
--cc=henning.schild@siemens.com \
--cc=ines.molzahn@siemens.com \
--cc=jakub@cloudflare.com \
--cc=jan.kiszka@siemens.com \
--cc=jhs@mojatatu.com \
--cc=jiri@resnulli.us \
--cc=john.ogness@linutronix.de \
--cc=john.stultz@linaro.org \
--cc=jrosen@cisco.com \
--cc=kafai@fb.com \
--cc=keescook@chromium.org \
--cc=kuba@kernel.org \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linmiaohe@huawei.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maowenan@huawei.com \
--cc=matthieu.baerts@tessares.net \
--cc=michael.saenger@siemens.com \
--cc=mingo@kernel.org \
--cc=mkl@pengutronix.de \
--cc=mkubecek@suse.cz \
--cc=netdev@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=orcohen@paloaltonetworks.com \
--cc=peterz@infradead.org \
--cc=richardcochran@gmail.com \
--cc=sboyd@kernel.org \
--cc=simon.sudler@siemens.com \
--cc=stefan@datenfreihafen.org \
--cc=tglx@linutronix.de \
--cc=vdronov@redhat.com \
--cc=vedang.patel@intel.com \
--cc=vinicius.gomes@intel.com \
--cc=willemb@google.com \
--cc=xie.he.0141@gmail.com \
--cc=xiyou.wangcong@gmail.com \
--cc=yoshfuji@linux-ipv6.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).