Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp566564ybz; Wed, 22 Apr 2020 03:52:30 -0700 (PDT) X-Google-Smtp-Source: APiQypLRfbiM63yYJG+3h1KGF8XXMUiw5gNmxWKiZHDie8f3O1Rp65O5jJuHF2hybw+udnd48cbd X-Received: by 2002:a17:906:d143:: with SMTP id br3mr26114110ejb.348.1587552750596; Wed, 22 Apr 2020 03:52:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587552750; cv=none; d=google.com; s=arc-20160816; b=iFE+mDsM3ZmnfrTLwQo62doHG03MSxi86A2itfPfrDLTWtgEiiR7W6s6f+d9j2f5nM MFSrX4RnDqyphELmZCCT1qJTg+PJWJ+r+oLEuRGt3LGTvZia6hvBdxoV2mxSKEvfdqJs MYfFtUh7KFMNs818St7edeifVXTzmXlEYiIKMtFGXIerTmO0CQRspkeOSYbNx7hJi4it BZ8q/SEinq5WYu65Dz3K/TJNlQSB0duzG0aNYg9QH3Wkh85hdXH6o08llB8NUGOwsGQm JB08/xxFUyZP1cDnsspzOvh5L2PFxU6IKgjpTF7E/seiCNk+SHQFWtwAH6EI3I53LQg2 vFYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rlt7tLO3Ib9xEyhFiEAkAtOx7KiQKqBsCyo7AZlVDDw=; b=ZfCgUfmUdK/1/dYAmlbYAQ1akDyjxCdc8UHemlXBdadShAmgbYTkB8rfxafK6Ml256 Imtp5qcwnvPjqcqYp6Tzl877fZfTwMEiGY0hlJcnzSsLjThvj/GNv6mSx77XhzqpbVuA yL+0bHaXIZD41fzs/Hi9N42p6ek0/r+V/wPZlV5+XEbi/t+CZfE66jKg+22+7KXsnpWk vlZ0PiDuHeYIqJmR1eCooMe3oVQPFFnJ47G7w+m7HZEETlTPMmTQRfYgnI8t/wqwWRg0 9/3gCaHB2NmzyLbRI5vb5Z1+zrIbnalDDvMzTCKBJiyXrIqABlwRU6DpyLaBCK2XDNzJ Bidg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SydP2LD5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w21si2967340edt.595.2020.04.22.03.52.07; Wed, 22 Apr 2020 03:52:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SydP2LD5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728708AbgDVKMo (ORCPT + 99 others); Wed, 22 Apr 2020 06:12:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:45570 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729340AbgDVKM3 (ORCPT ); Wed, 22 Apr 2020 06:12:29 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C0AD620575; Wed, 22 Apr 2020 10:12:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587550349; bh=1247amiGWYj46GQXVS7haaALg3Qs/29K8ODPpL1H2dI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SydP2LD5GweYO0582ewFHQqD2n2U0ImlKOZjjPnEkQOzixB41g2/FLK+tOIogKXXP YZN7zeKsQcZiKi7KUHsioFYpw8TX56yvwDbf4jtkJwMF/ZoixIbfYyg5Vk6i83A3QU 6sR7TN+pZ3el9rW1IRs6EMa2/BDdxq7h2Sr0u9iA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Yakunin , Konstantin Khlebnikov , "David S. Miller" Subject: [PATCH 4.14 111/199] net: revert default NAPI poll timeout to 2 jiffies Date: Wed, 22 Apr 2020 11:57:17 +0200 Message-Id: <20200422095108.781018091@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200422095057.806111593@linuxfoundation.org> References: <20200422095057.806111593@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Konstantin Khlebnikov [ Upstream commit a4837980fd9fa4c70a821d11831698901baef56b ] For HZ < 1000 timeout 2000us rounds up to 1 jiffy but expires randomly because next timer interrupt could come shortly after starting softirq. For commonly used CONFIG_HZ=1000 nothing changes. Fixes: 7acf8a1e8a28 ("Replace 2 jiffies with sysctl netdev_budget_usecs to enable softirq tuning") Reported-by: Dmitry Yakunin Signed-off-by: Konstantin Khlebnikov Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/core/dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3575,7 +3575,8 @@ EXPORT_SYMBOL(netdev_max_backlog); int netdev_tstamp_prequeue __read_mostly = 1; int netdev_budget __read_mostly = 300; -unsigned int __read_mostly netdev_budget_usecs = 2000; +/* Must be at least 2 jiffes to guarantee 1 jiffy timeout */ +unsigned int __read_mostly netdev_budget_usecs = 2 * USEC_PER_SEC / HZ; int weight_p __read_mostly = 64; /* old backlog weight */ int dev_weight_rx_bias __read_mostly = 1; /* bias for backlog weight */ int dev_weight_tx_bias __read_mostly = 1; /* bias for output_queue quota */