[PATCH net-next 1/4] net: rmnet: use fast monotonic time for tx aggregation
WARM3d
From: Koen Vandeputte <hidden>
Date: 2026-10-02 14:35:59
Also in:
lkml
Subsystem:
networking drivers, qualcomm rmnet driver, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Subash Abhinov Kasiviswanathan, Sean Tranchetti, Linus Torvalds
The rmnet egress aggregation logic currently relies on ktime_get_real_ts64() to determine if the aggregation bypass time threshold has been reached. Calling a wall-clock time function on the transmit hot path introduces significant performance bottlenecks, causing cacheline bouncing and pipeline stalls when processing high packet volumes. Furthermore, manipulating and comparing struct timespec64 fields adds unnecessary branching overhead. Since the driver only needs to measure elapsed time between consecutive packets to evaluate the aggregation bypass condition, absolute wall-clock time is not required. Replace ktime_get_real_ts64() with ktime_get_mono_fast_ns(). This reads a lockless, per-CPU timestamp directly in nanoseconds, returning a simple u64. Update the aggregation state variables (agg_time and agg_last) in struct rmnet_port to u64 accordingly. This optimization significantly reduces CPU overhead, eliminates struct timespec64 math, and provides a much faster, cache-friendly timekeeping mechanism for high-throughput egress traffic. Signed-off-by: Koen Vandeputte <redacted> --- .../ethernet/qualcomm/rmnet/rmnet_config.h | 4 ++-- .../ethernet/qualcomm/rmnet/rmnet_map_data.c | 22 ++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h
index 5adda0323dda..78c0289b6583 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h@@ -47,8 +47,8 @@ struct rmnet_port { struct sk_buff *skbagg_tail; int agg_state; u8 agg_count; - struct timespec64 agg_time; - struct timespec64 agg_last; + u64 agg_time; + u64 agg_last; struct hrtimer hrtimer; struct work_struct agg_wq; };
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c
index 39d6d084e73f..2eafb1d969c1 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c@@ -536,7 +536,7 @@ static void reset_aggr_params(struct rmnet_port *port) port->skbagg_head = NULL; port->agg_count = 0; port->agg_state = 0; - memset(&port->agg_time, 0, sizeof(struct timespec64)); + port->agg_time = 0; } static void rmnet_send_skb(struct rmnet_port *port, struct sk_buff *skb)
@@ -591,21 +591,23 @@ static enum hrtimer_restart rmnet_map_flush_tx_packet_queue(struct hrtimer *t) unsigned int rmnet_map_tx_aggregate(struct sk_buff *skb, struct rmnet_port *port, struct net_device *orig_dev) { - struct timespec64 diff, last; + u64 diff, last, now; unsigned int len = skb->len; struct sk_buff *agg_skb; int size; spin_lock_bh(&port->agg_lock); - memcpy(&last, &port->agg_last, sizeof(struct timespec64)); - ktime_get_real_ts64(&port->agg_last); + last = port->agg_last; + + now = ktime_get_mono_fast_ns(); + port->agg_last = now; if (!port->skbagg_head) { /* Check to see if we should agg first. If the traffic is very * sparse, don't aggregate. */ new_packet: - diff = timespec64_sub(port->agg_last, last); + diff = now - last; size = port->egress_agg_params.bytes - skb->len; if (size < 0) {
@@ -614,8 +616,7 @@ unsigned int rmnet_map_tx_aggregate(struct sk_buff *skb, struct rmnet_port *port return 0; } - if (diff.tv_sec > 0 || diff.tv_nsec > RMNET_AGG_BYPASS_TIME_NSEC || - size == 0) + if (diff > RMNET_AGG_BYPASS_TIME_NSEC || size == 0) goto no_aggr; port->skbagg_head = skb_copy_expand(skb, 0, size, GFP_ATOMIC);
@@ -625,11 +626,12 @@ unsigned int rmnet_map_tx_aggregate(struct sk_buff *skb, struct rmnet_port *port dev_kfree_skb_any(skb); port->skbagg_head->protocol = htons(ETH_P_MAP); port->agg_count = 1; - ktime_get_real_ts64(&port->agg_time); + port->agg_time = now; skb_frag_list_init(port->skbagg_head); goto schedule; } - diff = timespec64_sub(port->agg_last, port->agg_time); + + diff = now - port->agg_time; size = port->egress_agg_params.bytes - port->skbagg_head->len; if (skb->len > size) {
@@ -653,7 +655,7 @@ unsigned int rmnet_map_tx_aggregate(struct sk_buff *skb, struct rmnet_port *port port->skbagg_tail = skb; port->agg_count++; - if (diff.tv_sec > 0 || diff.tv_nsec > port->egress_agg_params.time_nsec || + if (diff > port->egress_agg_params.time_nsec || port->agg_count >= port->egress_agg_params.count || port->skbagg_head->len == port->egress_agg_params.bytes) { agg_skb = port->skbagg_head;
--
2.43.0