From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.2]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8E84821B91D; Fri, 15 Aug 2025 04:43:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.2 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755232994; cv=none; b=BNB7xG4Et6bU15LwQAwb4++HBvGTse/iNYdlUfLV2nHdkJb9dsgQjsxtZTO5S4IZorxpw+5bBE91gfBZICVmR8Up9LQTJVaqNwcUb3Rz7Fgg3MIDCRK+VxW8gip8wr3SV3r8p3zt/fDUkg9zVLwsan9yHVxaCd62CeUQiHy9KkY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755232994; c=relaxed/simple; bh=CNLehYffetwfAhVYqFYU+9/qdglwThwBw3mEsQNXh4I=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=IYEFibZ0RlBT98NIHERMxWJ5uHwrTUJIPGzn5VvTRnPNG6IbjoYGNUBkzTx57qKu4hbBnSqUjj5d8WKleF3inJRACbNb2Soz28Y9o0etlyBCFMMaHPFIIjYJL9Rgm4m2gmHZLhqYtWuPMVIxN3VbMfgv8ioNOWljCpJ835kypTE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=Y9LJVJaR; arc=none smtp.client-ip=220.197.31.2 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="Y9LJVJaR" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=Nf LdtcsJQQfUXvmEfG45iV24vdgcD/QbKrMo7rLtfSc=; b=Y9LJVJaR0CIobFYYM9 53fQ7i9ayPzbBehpUoAqANWDEWxgM0ld6tEtC45Lx/8jE0BpnjE22xJYzIS7J1g+ CqyP+rus4ErB8eZOsEW8pehbzpYBL/ZlsRFcBummb9yNgaLofozWkPp+xGCA+mFq he9An3aI6SHWc7SlfrVTnw9to= Received: from zhaoxin-MS-7E12.. (unknown []) by gzsmtp1 (Coremail) with SMTP id PCgvCgDH6q6Gup5ojrf7AA--.36995S2; Fri, 15 Aug 2025 12:41:43 +0800 (CST) From: Xin Zhao To: willemdebruijn.kernel@gmail.com, edumazet@google.com, ferenc@fejes.dev Cc: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Xin Zhao Subject: [PATCH v2] net: af_packet: Use hrtimer to do the retire operation Date: Fri, 15 Aug 2025 12:41:41 +0800 Message-Id: <20250815044141.1374446-1-jackzxcui1989@163.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:PCgvCgDH6q6Gup5ojrf7AA--.36995S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxXw1rAr1kWF4UJr1kuF1DAwb_yoWruw4xpa y5W34xGw47Za1agw48Xrs7ZFyYgw1UAryUG393Xwsayas3try5ta1j9Fyq9FWftFZ2kw47 Ar4ktFs8Cw1kXrDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zEfMaUUUUUU= X-CM-SenderInfo: pmdfy650fxxiqzyzqiywtou0bp/1tbibgiqCmietc9i2QAAsx In a system with high real-time requirements, the timeout mechanism of ordinary timers with jiffies granularity is insufficient to meet the demands for real-time performance. Meanwhile, the optimization of CPU usage with af_packet is quite significant. Use hrtimer instead of timer to help compensate for the shortcomings in real-time performance. In HZ=100 or HZ=250 system, the update of TP_STATUS_USER is not real-time enough, with fluctuations reaching over 8ms (on a system with HZ=250). This is unacceptable in some high real-time systems that require timely processing of network packets. By replacing it with hrtimer, if a timeout of 2ms is set, the update of TP_STATUS_USER can be stabilized to within 3 ms. Signed-off-by: Xin Zhao --- net/packet/af_packet.c | 19 ++++++++++--------- net/packet/internal.h | 3 +-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index bc438d0d9..c4746a9cb 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -203,7 +203,7 @@ static void prb_retire_current_block(struct tpacket_kbdq_core *, static int prb_queue_frozen(struct tpacket_kbdq_core *); static void prb_open_block(struct tpacket_kbdq_core *, struct tpacket_block_desc *); -static void prb_retire_rx_blk_timer_expired(struct timer_list *); +static enum hrtimer_restart prb_retire_rx_blk_timer_expired(struct hrtimer *); static void _prb_refresh_rx_retire_blk_timer(struct tpacket_kbdq_core *); static void prb_fill_rxhash(struct tpacket_kbdq_core *, struct tpacket3_hdr *); static void prb_clear_rxhash(struct tpacket_kbdq_core *, @@ -581,7 +581,7 @@ static __be16 vlan_get_protocol_dgram(const struct sk_buff *skb) static void prb_del_retire_blk_timer(struct tpacket_kbdq_core *pkc) { - timer_delete_sync(&pkc->retire_blk_timer); + hrtimer_cancel(&pkc->retire_blk_timer); } static void prb_shutdown_retire_blk_timer(struct packet_sock *po, @@ -603,9 +603,10 @@ static void prb_setup_retire_blk_timer(struct packet_sock *po) struct tpacket_kbdq_core *pkc; pkc = GET_PBDQC_FROM_RB(&po->rx_ring); - timer_setup(&pkc->retire_blk_timer, prb_retire_rx_blk_timer_expired, - 0); - pkc->retire_blk_timer.expires = jiffies; + hrtimer_setup(&pkc->retire_blk_timer, prb_retire_rx_blk_timer_expired, + CLOCK_MONOTONIC, HRTIMER_MODE_REL_SOFT); + hrtimer_start(&pkc->retire_blk_timer, ms_to_ktime(pkc->retire_blk_tov), + HRTIMER_MODE_REL_SOFT); } static int prb_calc_retire_blk_tmo(struct packet_sock *po, @@ -676,7 +677,6 @@ static void init_prb_bdqc(struct packet_sock *po, else p1->retire_blk_tov = prb_calc_retire_blk_tmo(po, req_u->req3.tp_block_size); - p1->tov_in_jiffies = msecs_to_jiffies(p1->retire_blk_tov); p1->blk_sizeof_priv = req_u->req3.tp_sizeof_priv; rwlock_init(&p1->blk_fill_in_prog_lock); @@ -691,8 +691,8 @@ static void init_prb_bdqc(struct packet_sock *po, */ static void _prb_refresh_rx_retire_blk_timer(struct tpacket_kbdq_core *pkc) { - mod_timer(&pkc->retire_blk_timer, - jiffies + pkc->tov_in_jiffies); + hrtimer_set_expires(&pkc->retire_blk_timer, + ktime_add(ktime_get(), ms_to_ktime(pkc->retire_blk_tov))); pkc->last_kactive_blk_num = pkc->kactive_blk_num; } @@ -719,7 +719,7 @@ static void _prb_refresh_rx_retire_blk_timer(struct tpacket_kbdq_core *pkc) * prb_calc_retire_blk_tmo() calculates the tmo. * */ -static void prb_retire_rx_blk_timer_expired(struct timer_list *t) +static enum hrtimer_restart prb_retire_rx_blk_timer_expired(struct hrtimer *t) { struct packet_sock *po = timer_container_of(po, t, rx_ring.prb_bdqc.retire_blk_timer); @@ -790,6 +790,7 @@ static void prb_retire_rx_blk_timer_expired(struct timer_list *t) out: spin_unlock(&po->sk.sk_receive_queue.lock); + return HRTIMER_RESTART; } static void prb_flush_block(struct tpacket_kbdq_core *pkc1, diff --git a/net/packet/internal.h b/net/packet/internal.h index 1e743d031..9812feb3d 100644 --- a/net/packet/internal.h +++ b/net/packet/internal.h @@ -47,10 +47,9 @@ struct tpacket_kbdq_core { unsigned short retire_blk_tov; unsigned short version; - unsigned long tov_in_jiffies; /* timer to retire an outstanding block */ - struct timer_list retire_blk_timer; + struct hrtimer retire_blk_timer; }; struct pgv { -- 2.34.1