From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 401A21474D3 for ; Sun, 3 Nov 2024 05:24:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730611498; cv=none; b=l776uw8CpXf21PC4bUBm8P42ct8TmjHbY+/jtDsZI3W/1WVKYLMhcodCRvU/Skt0RxjpK5TpLoHBTS3OS2OcTrtF7mb/nMSGvwERgw1yUX2Yqyp8HHYs/e5EsYyk0CGli6Y6D+Hn8cfCH339aUtOxWq7U+TDoriMppOHuGU+PHc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730611498; c=relaxed/simple; bh=tXmbRF7JGULYsZzWA5kM9IZCbzo0EHRzhvKrW+Ho9eI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eZJMTsAl0fH47bOjVwmusM3soTBTTgCYIHR8tuXn5bBxGERqChrzchmsflz69TjiliQe2t12qZ8MRdRBfefFSQ/UIQW0o/T0lK0v/feBD5HwChXrFqrwvpthqmBobzI3+5Vuu7trd7IieLh3mMoU/uIk9hNJaEnZQhATpkl7Uac= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com; spf=pass smtp.mailfrom=fastly.com; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b=LemAMPKM; arc=none smtp.client-ip=209.85.215.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastly.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b="LemAMPKM" Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-7ea7e250c54so2368250a12.0 for ; Sat, 02 Nov 2024 22:24:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1730611496; x=1731216296; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fHqyHgTj8Yctl5o5QmypsxoBptb79nPdd8vssXFP5EA=; b=LemAMPKMUO4qryatbqHCvNJTGiA0qu0B/jNGwTuDnyrbseJpL06Bv8qv9qBLZg2FZE ESRGk6eUkv5ePgIbZwyXYqfw5D74TWLWqYJ+HiGi15C6JP4w6NZ2yhDl138Rx8U2xvrZ yCKZQVC2z9c8gBOUtcyMWKukYK+sbBBX+S0po= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730611496; x=1731216296; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fHqyHgTj8Yctl5o5QmypsxoBptb79nPdd8vssXFP5EA=; b=PyETMADZNMSO9za+HZkfJoUpem0PZlsQI/mcCsgBqsMjOWIYb1fmdjCd0a8mJY9o2z acBG5Btdtb0keAw3NDpCMw6Frg5XkjRDOCAZntdbzZH+B9iuKMOwaNb/0ra5jYgPFwsX p0a2KNaRWk3ImMp9Lc+H/fFuERtpTMo9x2DbTZzuTfSgLiwRD0yBMq/zs7w6UfHXw/jC JTQ4w7/G8ZByeKdvrp32X++5jcp0zRtQyfc7OMfBopU8xxxQ/CmYLHQ3acat6++6dKtA AxOeGZDhdBb5nXTLSFbqiH5pon8kzudO/Scs0nFhivbyY2hYl5pA77fqK5S33uoXTOQS G6GQ== X-Gm-Message-State: AOJu0Yw1TuCeYkcMfufbOz4HGVVVceL0yC2n8dY1OnhizCzV8Bkc4Vor cGEOf1IOjg4YfUrgADEXr1UzNtBLfCLgmK6UOg3GpEOm69tGdxaO9i+3BPoj7UHPSsNxmlM0d9P lx1KC+moJ/JyorSELEEfJVC2JV1p41S1YBtdsqqgqOF626MEwh0wRAub65GWLJAMznfqYM1uZSs 8zfF4/byA/DvpQYK4oo2oIkHWsii4I2DqDnWc= X-Google-Smtp-Source: AGHT+IENywKvSiRm28xhWkoUEQdXaHm5KvA0KAcLepS71pu5DTuKIQu1baYegwQ40lDLoZPMPv7fvQ== X-Received: by 2002:a17:90b:1f86:b0:2e2:d1c9:95c with SMTP id 98e67ed59e1d1-2e94c2b035bmr12820182a91.16.1730611494985; Sat, 02 Nov 2024 22:24:54 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e93dac02acsm5896036a91.27.2024.11.02.22.24.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Nov 2024 22:24:54 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org Cc: hdanton@sina.com, bagasdotme@gmail.com, pabeni@redhat.com, namangulati@google.com, edumazet@google.com, amritha.nambiar@intel.com, sridhar.samudrala@intel.com, sdf@fomichev.me, peter@typeblog.net, m2shafiei@uwaterloo.ca, bjorn@rivosinc.com, hch@infradead.org, willy@infradead.org, willemdebruijn.kernel@gmail.com, skhawaja@google.com, kuba@kernel.org, Martin Karsten , Joe Damato , "David S. Miller" , Simon Horman , David Ahern , Sebastian Andrzej Siewior , Lorenzo Bianconi , Alexander Lobakin , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next v5 3/7] net: Add control functions for irq suspension Date: Sun, 3 Nov 2024 05:24:05 +0000 Message-Id: <20241103052421.518856-4-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241103052421.518856-1-jdamato@fastly.com> References: <20241103052421.518856-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Martin Karsten The napi_suspend_irqs routine bootstraps irq suspension by elongating the defer timeout to irq_suspend_timeout. The napi_resume_irqs routine effectively cancels irq suspension by forcing the napi to be scheduled immediately. Signed-off-by: Martin Karsten Co-developed-by: Joe Damato Signed-off-by: Joe Damato Tested-by: Joe Damato Tested-by: Martin Karsten Acked-by: Stanislav Fomichev Reviewed-by: Sridhar Samudrala --- v1 -> v2: - Added a comment to napi_resume_irqs. include/net/busy_poll.h | 3 +++ net/core/dev.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h index f03040baaefd..c858270141bc 100644 --- a/include/net/busy_poll.h +++ b/include/net/busy_poll.h @@ -52,6 +52,9 @@ void napi_busy_loop_rcu(unsigned int napi_id, bool (*loop_end)(void *, unsigned long), void *loop_end_arg, bool prefer_busy_poll, u16 budget); +void napi_suspend_irqs(unsigned int napi_id); +void napi_resume_irqs(unsigned int napi_id); + #else /* CONFIG_NET_RX_BUSY_POLL */ static inline unsigned long net_busy_loop_on(void) { diff --git a/net/core/dev.c b/net/core/dev.c index 51d88f758e2e..9d903ce0c2b0 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -6516,6 +6516,45 @@ void napi_busy_loop(unsigned int napi_id, } EXPORT_SYMBOL(napi_busy_loop); +void napi_suspend_irqs(unsigned int napi_id) +{ + struct napi_struct *napi; + + rcu_read_lock(); + napi = napi_by_id(napi_id); + if (napi) { + unsigned long timeout = napi_get_irq_suspend_timeout(napi); + + if (timeout) + hrtimer_start(&napi->timer, ns_to_ktime(timeout), + HRTIMER_MODE_REL_PINNED); + } + rcu_read_unlock(); +} +EXPORT_SYMBOL(napi_suspend_irqs); + +void napi_resume_irqs(unsigned int napi_id) +{ + struct napi_struct *napi; + + rcu_read_lock(); + napi = napi_by_id(napi_id); + if (napi) { + /* If irq_suspend_timeout is set to 0 between the call to + * napi_suspend_irqs and now, the original value still + * determines the safety timeout as intended and napi_watchdog + * will resume irq processing. + */ + if (napi_get_irq_suspend_timeout(napi)) { + local_bh_disable(); + napi_schedule(napi); + local_bh_enable(); + } + } + rcu_read_unlock(); +} +EXPORT_SYMBOL(napi_resume_irqs); + #endif /* CONFIG_NET_RX_BUSY_POLL */ static void __napi_hash_add_with_id(struct napi_struct *napi, -- 2.25.1