From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 627A41E87B; Sun, 1 Sep 2024 16:35:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725208535; cv=none; b=Rvc0ggKVp7qS/j3EKmXCnVVmC6jx18nroFCDQMjw+HFNzr3BGCoGQqvFEs+EDrje+DY4QAhRs+vHjCCE54+dyO3EmMwVc65+1NQ/q241gBrtt/xP6APwovyWCvEkUGTuEwVqN3PcEZ2HS0aW0fi9l/9EGZE2OYNcIzd+yQaOkzg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725208535; c=relaxed/simple; bh=4QNcIgrlTdrKUK6qyQT6CMPWWdXD2HI/yJa+MRGL/Jk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LTCkDg/QbGAG7PC3sQl3fIk7AmM7UQ4ZE9yFC26mOPe7CNJg8jW+BJUQclw3tmeTLRMUJtETXDpWtOnKAnq8cK+aSOaKbKFrznCWmoJ2N19c71KH/nzNNChCieqiFn51hA+2YonQq0V4I2sfVkazNj5vKCMbXa+k+8O0r8RQASU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=yJDosJTv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="yJDosJTv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D87D8C4CEC8; Sun, 1 Sep 2024 16:35:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725208535; bh=4QNcIgrlTdrKUK6qyQT6CMPWWdXD2HI/yJa+MRGL/Jk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yJDosJTvDjLzisGeiNpRuYS5YvK6NIa1M8LEecWgMqfdokbZp8ECY1hMl03V4wlPV V9/SE0qbmc6gAKjfvFOCQqQEqRP349P5u5nenBgUsdEl10SsPv58WN7h44x0Mvi8k7 kCW1f1cJj92rypHAjESbDEOefE9f85claSJQdC1Y= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Dumazet , Mina Almasry , Willem de Bruijn , Joe Damato , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.10 111/149] net: busy-poll: use ktime_get_ns() instead of local_clock() Date: Sun, 1 Sep 2024 18:17:02 +0200 Message-ID: <20240901160821.629468196@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240901160817.461957599@linuxfoundation.org> References: <20240901160817.461957599@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet [ Upstream commit 0870b0d8b393dde53106678a1e2cec9dfa52f9b7 ] Typically, busy-polling durations are below 100 usec. When/if the busy-poller thread migrates to another cpu, local_clock() can be off by +/-2msec or more for small values of HZ, depending on the platform. Use ktimer_get_ns() to ensure deterministic behavior, which is the whole point of busy-polling. Fixes: 060212928670 ("net: add low latency socket poll") Fixes: 9a3c71aa8024 ("net: convert low latency sockets to sched_clock()") Fixes: 37089834528b ("sched, net: Fixup busy_loop_us_clock()") Signed-off-by: Eric Dumazet Cc: Mina Almasry Cc: Willem de Bruijn Reviewed-by: Joe Damato Link: https://patch.msgid.link/20240827114916.223377-1-edumazet@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- include/net/busy_poll.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h index 9b09acac538ee..522f1da8b747a 100644 --- a/include/net/busy_poll.h +++ b/include/net/busy_poll.h @@ -68,7 +68,7 @@ static inline bool sk_can_busy_loop(struct sock *sk) static inline unsigned long busy_loop_current_time(void) { #ifdef CONFIG_NET_RX_BUSY_POLL - return (unsigned long)(local_clock() >> 10); + return (unsigned long)(ktime_get_ns() >> 10); #else return 0; #endif -- 2.43.0