From patchwork Tue Feb 6 16:30:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 13547598 Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) (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 E70D6139D for ; Tue, 6 Feb 2024 16:34:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707237270; cv=none; b=X8MLtuxVXfH4xv7fxmOhD55/8rpXqPbHqClH69eNngv6FeGigFoud8GJazd+clRF3Jf8Wn/egP0zq2owL7X2AMz0W560e/0PSTQ/B35T6q0SwgTI2uDjov4AUK+x/NujOr4Jst1yBPH3NJyBZXlt1bqWlHbFr73dfpmh7QCPZQI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707237270; c=relaxed/simple; bh=5KFgeQ6e+GH7Q24OQeSwNCVYVJdZ6g3TXCXyGyBVLYg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tMGYt8IsYUKrEyc7cfaNxPv91g5xK6WBF0//xsIuXAQjbJG5HzOiQuzqw9jiVC3xQMh9BD5reNhH7ZBbF/B8YvZALxVnC6dpnl/7byzAopBk9D6ei7rM/qAEd7jTO0Co0hUaqMqj4uzNEby4MbKAau9N6eenw+B4czdWZaOpVdQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=fSagLxsh; arc=none smtp.client-ip=209.85.166.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="fSagLxsh" Received: by mail-io1-f42.google.com with SMTP id ca18e2360f4ac-7c3e06c8608so30351939f.1 for ; Tue, 06 Feb 2024 08:34:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1707237267; x=1707842067; 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=B0353+KBVocmpwKcAzO+oB9LTsTL8XRLqxQjtjBy7bs=; b=fSagLxshIyGqzyDUgX9AxyqedKyuzAPmCBcGHpQbuV39OiQkUo6yDFLAXItWtPdRy0 SJDyJvQi95y5jtjXP5JMPFx5lkKZeYROV+fEIznyQrMw1PDQrFjtuKYchIXkzvfvPuyF O2gNk6WQm8oV9M1VhjcTPg4gH099BCEffI3lVnpW6nQWhw5jDReIulx5O/vDrrdx87P+ sktvFSDY0rqB+YTwyrgeTrL0SOCGlYMQSV5CeTbTLEoMlX66I0TU/OYsYDJJF5PoRklc vdJaHjtq2D+L7x3tFR+WsX0IHC0g808gWyZjnOR9T1DkpqTWmrZC11h3AeNR8afX07eK p76w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707237267; x=1707842067; 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=B0353+KBVocmpwKcAzO+oB9LTsTL8XRLqxQjtjBy7bs=; b=gSgvQ1WZOLzuUd16a08KJ9qoCOyOjhe7U+jYcAMdeQvekDGcugB7baYx56tZd9loMJ pl5voxkPya7JizzHyGERbw8niwK5ldkS43GGzN44J3a1EEGiSsQbulBZrYXH+UpAfDz8 HrGXvRalvzBcjv76ScX6MhS4eIdvMcRa7fwqeaacZnvJdHdsmzDSY+//pSZoqeReupEM 9ON6y8Dp9oSyv/tv84ndmLOrby69m5o/MTcpyhEs9RtQpA3aRUGq67bFdN0XkP84sLCS lUDZDzf/X0qqZLA2HTk1qi6uKk8Qqx5b26oRwN5BnZ5kP/iSkskELWK63/JF4YC2cHTU ITRA== X-Gm-Message-State: AOJu0YxAKymemJ9QeVS+uHUcOwZUAjO/egoVnkCkafRz9pxUt1V/XrYp ukgjcCtNhiGWPV8Y53hELCnKNNKRMHP7sCIWIyvH0Kg8IrjmwADBzz8MbXzyDrOcEJVzQqX0OyW hj+E= X-Google-Smtp-Source: AGHT+IF/n2KlENyGG3ALXOXFV+e79eF9Gqsg0GmWLEX7EhXQSiDddLnvyXLjHknyagAhuVi06/MP9w== X-Received: by 2002:a6b:db13:0:b0:7c3:edbb:1816 with SMTP id t19-20020a6bdb13000000b007c3edbb1816mr2814224ioc.2.1707237267608; Tue, 06 Feb 2024 08:34:27 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCUyZK1/82Kc/YPV5epMBRym5L6ZevyHgFMilH16dIqUcUTIYFlDhIc41WQ9jYWqKcDmW3GWFpFVyKHlzCLk/MGchldJIJA40J0thaG50aWEGpYRg6IRumt2U6w7u/MptjuxjFkk9TwyOxdyn+Wdh5N40iKEgjRMrmVaQ/D5pn05nsI= Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id u8-20020a02aa88000000b00471337ff774sm573316jai.113.2024.02.06.08.34.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 08:34:26 -0800 (PST) From: Jens Axboe To: io-uring@vger.kernel.org, netdev@vger.kernel.org Cc: kuba@kernel.org, olivier@trillion01.com, Stefan Roesch , Jens Axboe Subject: [PATCH 1/7] net: split off __napi_busy_poll from napi_busy_poll Date: Tue, 6 Feb 2024 09:30:03 -0700 Message-ID: <20240206163422.646218-2-axboe@kernel.dk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240206163422.646218-1-axboe@kernel.dk> References: <20240206163422.646218-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Stefan Roesch This splits off the key part of the napi_busy_poll function into its own function, __napi_busy_poll, and changes the prefer_busy_poll bool to be flag based to allow passing in more flags in the future. This is done in preparation for an additional napi_busy_poll() function, that doesn't take the rcu_read_lock(). The new function is introduced in the next patch. Signed-off-by: Stefan Roesch Link: https://lore.kernel.org/r/20230608163839.2891748-2-shr@devkernel.io Signed-off-by: Jens Axboe --- net/core/dev.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index cb2dab0feee0..1eaed657f2c2 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -6177,8 +6177,12 @@ static void __busy_poll_stop(struct napi_struct *napi, bool skip_schedule) clear_bit(NAPI_STATE_SCHED, &napi->state); } -static void busy_poll_stop(struct napi_struct *napi, void *have_poll_lock, bool prefer_busy_poll, - u16 budget) +enum { + NAPI_F_PREFER_BUSY_POLL = 1, +}; + +static void busy_poll_stop(struct napi_struct *napi, void *have_poll_lock, + unsigned flags, u16 budget) { bool skip_schedule = false; unsigned long timeout; @@ -6198,7 +6202,7 @@ static void busy_poll_stop(struct napi_struct *napi, void *have_poll_lock, bool local_bh_disable(); - if (prefer_busy_poll) { + if (flags & NAPI_F_PREFER_BUSY_POLL) { napi->defer_hard_irqs_count = READ_ONCE(napi->dev->napi_defer_hard_irqs); timeout = READ_ONCE(napi->dev->gro_flush_timeout); if (napi->defer_hard_irqs_count && timeout) { @@ -6222,23 +6226,23 @@ static void busy_poll_stop(struct napi_struct *napi, void *have_poll_lock, bool local_bh_enable(); } -void napi_busy_loop(unsigned int napi_id, - bool (*loop_end)(void *, unsigned long), - void *loop_end_arg, bool prefer_busy_poll, u16 budget) +static void __napi_busy_loop(unsigned int napi_id, + bool (*loop_end)(void *, unsigned long), + void *loop_end_arg, unsigned flags, u16 budget) { unsigned long start_time = loop_end ? busy_loop_current_time() : 0; int (*napi_poll)(struct napi_struct *napi, int budget); void *have_poll_lock = NULL; struct napi_struct *napi; + WARN_ON_ONCE(!rcu_read_lock_held()); + restart: napi_poll = NULL; - rcu_read_lock(); - napi = napi_by_id(napi_id); if (!napi) - goto out; + return; if (!IS_ENABLED(CONFIG_PREEMPT_RT)) preempt_disable(); @@ -6254,14 +6258,14 @@ void napi_busy_loop(unsigned int napi_id, */ if (val & (NAPIF_STATE_DISABLE | NAPIF_STATE_SCHED | NAPIF_STATE_IN_BUSY_POLL)) { - if (prefer_busy_poll) + if (flags & NAPI_F_PREFER_BUSY_POLL) set_bit(NAPI_STATE_PREFER_BUSY_POLL, &napi->state); goto count; } if (cmpxchg(&napi->state, val, val | NAPIF_STATE_IN_BUSY_POLL | NAPIF_STATE_SCHED) != val) { - if (prefer_busy_poll) + if (flags & NAPI_F_PREFER_BUSY_POLL) set_bit(NAPI_STATE_PREFER_BUSY_POLL, &napi->state); goto count; } @@ -6282,11 +6286,12 @@ void napi_busy_loop(unsigned int napi_id, if (unlikely(need_resched())) { if (napi_poll) - busy_poll_stop(napi, have_poll_lock, prefer_busy_poll, budget); + busy_poll_stop(napi, have_poll_lock, flags, budget); if (!IS_ENABLED(CONFIG_PREEMPT_RT)) preempt_enable(); rcu_read_unlock(); cond_resched(); + rcu_read_lock(); if (loop_end(loop_end_arg, start_time)) return; goto restart; @@ -6294,10 +6299,19 @@ void napi_busy_loop(unsigned int napi_id, cpu_relax(); } if (napi_poll) - busy_poll_stop(napi, have_poll_lock, prefer_busy_poll, budget); + busy_poll_stop(napi, have_poll_lock, flags, budget); if (!IS_ENABLED(CONFIG_PREEMPT_RT)) preempt_enable(); -out: +} + +void napi_busy_loop(unsigned int napi_id, + bool (*loop_end)(void *, unsigned long), + void *loop_end_arg, bool prefer_busy_poll, u16 budget) +{ + unsigned flags = prefer_busy_poll ? NAPI_F_PREFER_BUSY_POLL : 0; + + rcu_read_lock(); + __napi_busy_loop(napi_id, loop_end, loop_end_arg, flags, budget); rcu_read_unlock(); } EXPORT_SYMBOL(napi_busy_loop); From patchwork Tue Feb 6 16:30:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 13547599 Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) (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 D0D9D4A34 for ; Tue, 6 Feb 2024 16:34:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707237272; cv=none; b=ZnYUVDS+I2qLVRZ+hQkHC/DaFTAYfi3pY4ccSyP+zrMaeD5ymO+W5z8stQH2OLGJz7aC9rxajBs/ujNOI7p+IoENENPgmEdqMGnbh0IKTUMnj+CBMp6EQDdPCaryYO7eMagyAdlVjixqW+FV+IivoVKQwx1qnRqo2xNpLXfeIcc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707237272; c=relaxed/simple; bh=SuaQlgcVOVlC7zlMPU+x6rEsJ0Zjx6NMLKM8YlnWwBg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Gdd9wKb8IGQh+CDx1vpdrKT0wLxd2xdIpFYOX9kSnGPspVfxslM/SG5Etbb7zjCDPMrsF3PrrBvGHMTbxBJRVpQFlXds2NZGmR4rinRmin83yspczAxlzZrP4q60i/cA9Lgm5PNrJMfFzM71Y8WzIdWvTq95Y0jR7hwhXdP7EjY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=Bj37fNCh; arc=none smtp.client-ip=209.85.166.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="Bj37fNCh" Received: by mail-io1-f49.google.com with SMTP id ca18e2360f4ac-7bff2f6080aso40928439f.1 for ; Tue, 06 Feb 2024 08:34:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1707237269; x=1707842069; 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=8qELm2FpXv5k6BPFGObM3NIMiZQejvBKMhHMcJLLsQA=; b=Bj37fNChJoyhttk0r27Mmiotyd4c8iU0/qml6rgmt2csSQVev4PzvV32PyeIS+oPdo bPJVsHvclJP77BE7Qqip1YBjBO/WQjdVXLP7cAW9v2HO+dyco3DlRwFpfVnjdpv18oZL uWBhdPZ4UgkFz8ojtwitEVPyUOn5YEwRBIFS+vmr3+KNEVpb1oB6MEI9elSa35NbHGT2 uoLHU0Pbc4Ha63wALonjbkiDQHTUDX8uZlmAbov2/Lg6ZQZnNKOI2zlXB410q99n//Lc UorsYYE5gK2wvr02398vswe73aZ1VIkeV4a4nq6VPIv8b6SlAdOWj1JPzUwVc08Ux9SY MfeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707237269; x=1707842069; 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=8qELm2FpXv5k6BPFGObM3NIMiZQejvBKMhHMcJLLsQA=; b=hAIsLopbTzV79DdA/3CCdLPC8Dnl6cI/QIcdUxksjV6Nx3yKxIJwyY1RrE1i4PhTpB kCLA2ESv2N1kMLj11/L5zXes9JhCN3baibYWNJFgIXnqns/ewY0dgYOGnpemmE2KJzTn HIqtl1Gg8nznQEUJPGjWVZdp9Oa+4G7dMgo52AEceYjUKj+WiLCURi2ul4RR2fET8wwH IwR/iD6TbSt3NnVfBu/oBAktg5rjnV9I6cNQH5bx/t63DkfifV/1ZgBM+XG/XhtUzBZV +ismnokn87o0fWiocZpRMpw6dVSjF5rai7NJbmdubS7mIUWjkAdN1QUO52Wx1Zzo9m19 41uQ== X-Gm-Message-State: AOJu0YzpKlnsCmmNT+trFcQ2bn34/uJlONw9gui4C7aS8QMceww9WQFb nwmbp7ripfzQG/0RaMuboDXhJ4JbDlISVrZiybbtVXI+BQ6u+nnOVlxSFugBamNJpawCcg2eVoI lARc= X-Google-Smtp-Source: AGHT+IFw+i3L56sDBdDa7canvbqgNWiUREG82CvFI7cQ4FKKEQj1Wc7uJgRU4m/58cqRPC+ml+LhLQ== X-Received: by 2002:a5d:938a:0:b0:7c3:f631:a18f with SMTP id c10-20020a5d938a000000b007c3f631a18fmr1226623iol.1.1707237269512; Tue, 06 Feb 2024 08:34:29 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCVeXh9bAilBBSoN28EwjapOXRkmP+0S2LSrQY35G8X3K9DLc+7enLS6UHcbEftaqmL4akS6hgNiJ9SuMQ3jRzRoRz9wNv39aV/xWOxWYq69FLq8lTdf84Zm+mizD5HEWmAoY+4vOPg081uuWkIxsSBZypW05txqeCgdKZcfeMOym/Q= Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id u8-20020a02aa88000000b00471337ff774sm573316jai.113.2024.02.06.08.34.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 08:34:27 -0800 (PST) From: Jens Axboe To: io-uring@vger.kernel.org, netdev@vger.kernel.org Cc: kuba@kernel.org, olivier@trillion01.com, Stefan Roesch , Jens Axboe Subject: [PATCH 2/7] net: add napi_busy_loop_rcu() Date: Tue, 6 Feb 2024 09:30:04 -0700 Message-ID: <20240206163422.646218-3-axboe@kernel.dk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240206163422.646218-1-axboe@kernel.dk> References: <20240206163422.646218-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Stefan Roesch This adds the napi_busy_loop_rcu() function. This function assumes that the calling function is already holding the rcu read lock and napi_busy_loop() does not need to take the rcu read lock. Add a NAPI_F_NO_SCHED flag, which tells __napi_busy_loop() to abort if we need to reschedule rather than drop the RCU read lock and reschedule. Signed-off-by: Stefan Roesch Link: https://lore.kernel.org/r/20230608163839.2891748-3-shr@devkernel.io Signed-off-by: Jens Axboe --- include/net/busy_poll.h | 4 ++++ net/core/dev.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h index 4dabeb6c76d3..9b09acac538e 100644 --- a/include/net/busy_poll.h +++ b/include/net/busy_poll.h @@ -48,6 +48,10 @@ void napi_busy_loop(unsigned int napi_id, bool (*loop_end)(void *, unsigned long), void *loop_end_arg, bool prefer_busy_poll, u16 budget); +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); + #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 1eaed657f2c2..ffa394f3e796 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -6179,6 +6179,7 @@ static void __busy_poll_stop(struct napi_struct *napi, bool skip_schedule) enum { NAPI_F_PREFER_BUSY_POLL = 1, + NAPI_F_END_ON_RESCHED = 2, }; static void busy_poll_stop(struct napi_struct *napi, void *have_poll_lock, @@ -6285,6 +6286,8 @@ static void __napi_busy_loop(unsigned int napi_id, break; if (unlikely(need_resched())) { + if (flags & NAPI_F_END_ON_RESCHED) + break; if (napi_poll) busy_poll_stop(napi, have_poll_lock, flags, budget); if (!IS_ENABLED(CONFIG_PREEMPT_RT)) @@ -6304,6 +6307,18 @@ static void __napi_busy_loop(unsigned int napi_id, preempt_enable(); } +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) +{ + unsigned flags = NAPI_F_END_ON_RESCHED; + + if (prefer_busy_poll) + flags |= NAPI_F_PREFER_BUSY_POLL; + + __napi_busy_loop(napi_id, loop_end, loop_end_arg, flags, budget); +} + void napi_busy_loop(unsigned int napi_id, bool (*loop_end)(void *, unsigned long), void *loop_end_arg, bool prefer_busy_poll, u16 budget) From patchwork Tue Feb 6 16:30:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 13547600 Received: from mail-io1-f48.google.com (mail-io1-f48.google.com [209.85.166.48]) (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 D3783611B for ; Tue, 6 Feb 2024 16:34:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707237274; cv=none; b=foqX8q4J6/ukg2u+3h7sQzYin6GZn2pfXmv1mUUUqXGyJro+ObJLT3vZj2jMhzT/pgJpDSYbWTxJGtV/PXGQ81beeMRybFZZWCx3Pdrn7rNZtTO8wc7ckbCbXfBKZgfcx3haoOdBnoXlzZ9/k+8hWXu6m+loFWSsuuCnqXp5R24= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707237274; c=relaxed/simple; bh=qFrLfnZUqnxpf9kZjxPOH7hXkYHaofqwbA2Dey+GNqQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sra7ukkMR3vnEtNdt9NFkAJQAoeHFXMIIwPqDBbtCqnv0zoFrBAxhoWFDSbt29NjfxlsZf4+rwLxRJYLiyvi7CJcd4uzNZCbJ4unH1zts0LXmXJ8jW5saX1W8LHV+xJavFjXKVhu/95Qrrq0LwSP1XQTIn+pJdkKqAFbWda62mc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=v/joypFv; arc=none smtp.client-ip=209.85.166.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="v/joypFv" Received: by mail-io1-f48.google.com with SMTP id ca18e2360f4ac-7bbdd28a52aso98779739f.1 for ; Tue, 06 Feb 2024 08:34:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1707237271; x=1707842071; 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=N2f7mblEBC6gILdcCaQ7zTCfyhJUPrlWxzcU1XfF6vs=; b=v/joypFvE741RtF+1oGU3hPX0xq2skhyBFvPiHzNxt8cRKjyVQNQS+ApRdFQVwS3WY OgQ+zNQjpolipizHc3gDjfnAFzf4l/kQl/xYej/FVw5ChshgHKpoJHVQcgCUejo3Ra9p Uj9wIuFlYCvJuaIdqbuNLfo/t1oprmB/73K/OQhulFjkE0oKwDk1zo0uAST3DdBG64ar ZFbkOqL0hy0S6cFWPvj6a+cWWer8CdtLzTvtXEmawgWY812JyzWLDqLDDiqJKdj78exB k1nIKHSyHS4E+prPjv2pAW1Nk2DkTs4frRag2giXw+udehibdd0r+H4ll/GSslcOxzXk g2FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707237271; x=1707842071; 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=N2f7mblEBC6gILdcCaQ7zTCfyhJUPrlWxzcU1XfF6vs=; b=l3FBueMhOf3wXQ8v/rv0zMKiu/20TUBjLRfMRYrSed9jFUF+FNStY4KzmtK6kcvKOO yQgWMOVtIw7qN8pTeUFkfgfWcEilgSsBJqjtODjRVI6WJbPIF1WqXsbyZOET2Ve3VhMy 4elsbkpsoYIGMyIYARXYKx4NshB8jmRXJ7eoy3sA/fgdOGgrO39uy+kwKtNgTXZt4ssT 7hAxdpzP18EexVB6e25kvpqXm1ZT0ix2M+1Zhf90dhN6Nt3Vu7geEkwdd6P/s2CVkUoy 6MnafwdBmyusmomYkERTv1wbIHn+AVJxEyyiefkB/iNZaxAlXDua77YShNfKGJSVF+yi IVWg== X-Gm-Message-State: AOJu0YzEaK2ai88907dM5Rt1dpsnkOPloRaijbxqloIm9NRJQ5F3FHBg tuMFngpeqAx40hdrV0osTrj42KAbIVn1w4uSP4cbGLXlvrEeuEIZ7V3jHFJBv0G4D/EWbv/wieW pv2A= X-Google-Smtp-Source: AGHT+IGiNAJxWmLVVliV4s3lCMHniDuSEsp/FWRaG+qQ/jxQx6rRqR8ocSXystJKlPiDsnFN/Q2UDw== X-Received: by 2002:a6b:f308:0:b0:7c3:f836:aed with SMTP id m8-20020a6bf308000000b007c3f8360aedmr465487ioh.0.1707237271462; Tue, 06 Feb 2024 08:34:31 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCVafBau/mNjUZi+BUFYhR5vMCBIJteOSb0oVEqYyc4vOHHFUjQsDP795cU8ds5OuMVrh+SSibTXxljcONOdoR1LQjxwO9YxA4Q156iJQncFbLfoXDwFzeNAGeFKmicZS3uiNWIz5XmX05lCksLqqXQ7Y7jHci7e6yOMPgeMR91hBXI= Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id u8-20020a02aa88000000b00471337ff774sm573316jai.113.2024.02.06.08.34.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 08:34:29 -0800 (PST) From: Jens Axboe To: io-uring@vger.kernel.org, netdev@vger.kernel.org Cc: kuba@kernel.org, olivier@trillion01.com, Stefan Roesch , Jens Axboe Subject: [PATCH 3/7] io-uring: move io_wait_queue definition to header file Date: Tue, 6 Feb 2024 09:30:05 -0700 Message-ID: <20240206163422.646218-4-axboe@kernel.dk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240206163422.646218-1-axboe@kernel.dk> References: <20240206163422.646218-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Stefan Roesch This moves the definition of the io_wait_queue structure to the header file so it can be also used from other files. Signed-off-by: Stefan Roesch Link: https://lore.kernel.org/r/20230608163839.2891748-4-shr@devkernel.io Signed-off-by: Jens Axboe --- io_uring/io_uring.c | 21 --------------------- io_uring/io_uring.h | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 9ba2244c624e..76762371eba3 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -2477,33 +2477,12 @@ int io_submit_sqes(struct io_ring_ctx *ctx, unsigned int nr) return ret; } -struct io_wait_queue { - struct wait_queue_entry wq; - struct io_ring_ctx *ctx; - unsigned cq_tail; - unsigned nr_timeouts; - ktime_t timeout; -}; - static inline bool io_has_work(struct io_ring_ctx *ctx) { return test_bit(IO_CHECK_CQ_OVERFLOW_BIT, &ctx->check_cq) || !llist_empty(&ctx->work_llist); } -static inline bool io_should_wake(struct io_wait_queue *iowq) -{ - struct io_ring_ctx *ctx = iowq->ctx; - int dist = READ_ONCE(ctx->rings->cq.tail) - (int) iowq->cq_tail; - - /* - * Wake up if we have enough events, or if a timeout occurred since we - * started waiting. For timeouts, we always want to return to userspace, - * regardless of event count. - */ - return dist >= 0 || atomic_read(&ctx->cq_timeouts) != iowq->nr_timeouts; -} - static int io_wake_function(struct wait_queue_entry *curr, unsigned int mode, int wake_flags, void *key) { diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h index 38af82788786..859f6e0580e3 100644 --- a/io_uring/io_uring.h +++ b/io_uring/io_uring.h @@ -35,6 +35,28 @@ enum { IOU_STOP_MULTISHOT = -ECANCELED, }; +struct io_wait_queue { + struct wait_queue_entry wq; + struct io_ring_ctx *ctx; + unsigned cq_tail; + unsigned nr_timeouts; + ktime_t timeout; + +}; + +static inline bool io_should_wake(struct io_wait_queue *iowq) +{ + struct io_ring_ctx *ctx = iowq->ctx; + int dist = READ_ONCE(ctx->rings->cq.tail) - (int) iowq->cq_tail; + + /* + * Wake up if we have enough events, or if a timeout occurred since we + * started waiting. For timeouts, we always want to return to userspace, + * regardless of event count. + */ + return dist >= 0 || atomic_read(&ctx->cq_timeouts) != iowq->nr_timeouts; +} + bool io_cqe_cache_refill(struct io_ring_ctx *ctx, bool overflow); void io_req_cqe_overflow(struct io_kiocb *req); int io_run_task_work_sig(struct io_ring_ctx *ctx); From patchwork Tue Feb 6 16:30:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 13547601 Received: from mail-io1-f53.google.com (mail-io1-f53.google.com [209.85.166.53]) (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 D24DD79C4 for ; Tue, 6 Feb 2024 16:34:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707237276; cv=none; b=q/6r6RK7vB3kbkxar8JOvYIzI+V1nP5k/SiER2aB7g5oiR2gBHtcJK2DS+oLYkzjn6z3MIO/jWVlm4eQmFg5T0zTIw3wy+TZSDjab0pIrpbZgj643bmBXv9Gv5gKNv0c+8hroNTB17/RATIlZHxpatKXdqTVbhf9Qom6vW/QhHY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707237276; c=relaxed/simple; bh=eLksyQ0MtfFvoJZdFb1LhkLzmmNUkNkVgRHd9DLyh2o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DVMdVHishWDTtFuwCuEkixiwUQeuOpfcUPPBJEFhfJtAL1nq/CqS/PB5tjrbJ43j9dIPOaXzgUvNPWjz2ugKS0l83xUgtm8ph0j9xyU5cq1sDBMdaFra3BM1J+a6hEpQDlLfJy4FEsOYHJvPwXWTimSxUzSOAXK/8asZyUvcj0k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=uMPoPCHc; arc=none smtp.client-ip=209.85.166.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="uMPoPCHc" Received: by mail-io1-f53.google.com with SMTP id ca18e2360f4ac-7bf3283c18dso74302739f.0 for ; Tue, 06 Feb 2024 08:34:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1707237273; x=1707842073; 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=Y5X5AUjZNYYEuUj8am5fmQz51tbMel9yIWnPqzHKSl4=; b=uMPoPCHc97BLc+kQYVmZZXy9Pk6faCA8KUS2foAOU9suVJY/XHNAS0eUt7ZKREZoNO m21Z4b2+xNDE11b0Bxg2YwdMPQz96hcb2Fklsr+9/aWGxo62X8kvoP2vhOvvTFB0wm+o Xma84CC12p7K0Xs+HqsuazzFjW1x3uX2QIHCakveLyFYzTIFUGNiD5WZzM9yTVm48ZIE WjCebTEnGV6pP7twpm+aMZ1lqRjLtWRg+jEmarwwUR7CF784ynENImRHKYj3DI9mEjjS BDfYv4szItqXNxhkw9OHw629+BbvSyKuPQ1Q6gBr1FuvTfzU2TFNV94MijZObiwpvOFq nUww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707237273; x=1707842073; 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=Y5X5AUjZNYYEuUj8am5fmQz51tbMel9yIWnPqzHKSl4=; b=Ywhelqg5jlBT9gJGrgQ4EOZIiSq0ZEMSHXsvLSxYUc2Fpy7sFNpingQxIOc+sX22m7 ALqxNskZJKfNC6Wk9mSc02MtNOhl+2D310+ZHFteumeUJCYGIrKIZCHLfN50ETNvnay5 NXKVeKBPfETiauWM7HBOFSbX6fP7fhKCc/VfHpD6MjfTI1Qd5ubgGptzui3HFfqxIq// F4YDsYeq08xt6Yryti71Rrdcq5aklWJ6B55MTL1Uov1ro5zcjVS7Vngu5xXTMTdKhK/V qutB+o7b4fOzFj0YpxznY8a7XkHQDKyLu8w6aILtuIoq6DFhksJBwYjfOsAikBx0ys7g Qs2A== X-Gm-Message-State: AOJu0YxiLf8cKtUe6CJk//vR4RcidVmLM5t7I0LG2ValKhZtqUiPoHuo k0ZIDMknbzbBUpw9mcjWxAoETQ0JKQgJ+s/Eag3g0QIWz03zPTDNSadyxvur4pJh6+OOBPkTxD0 PaNU= X-Google-Smtp-Source: AGHT+IF2LDeLQj6zm+K/0hF+quUUwt/9QrU8jUx29xqHZGRzmKptXB3qk+lXT6VsnecHrMTxoz6sRA== X-Received: by 2002:a6b:670e:0:b0:7c3:eda5:f41a with SMTP id b14-20020a6b670e000000b007c3eda5f41amr2957784ioc.1.1707237273423; Tue, 06 Feb 2024 08:34:33 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCWvQ63hNe4QbSfaQbvWOvEL5ANMhqoxizDdUu4Ymil+6K4ujTh2yIfz/rW3qcYrwCgCUAWnaTWyWDCMCyCK7E1udKzmFmcbnijh7PrXINxoQ3KnBnURRYsa9uJonwp8B16cESQUEtoBy0qZqvspxvZWN2kZTwu5hFT9H69xMMz4B0w= Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id u8-20020a02aa88000000b00471337ff774sm573316jai.113.2024.02.06.08.34.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 08:34:32 -0800 (PST) From: Jens Axboe To: io-uring@vger.kernel.org, netdev@vger.kernel.org Cc: kuba@kernel.org, olivier@trillion01.com, Stefan Roesch , Jens Axboe Subject: [PATCH 4/7] io-uring: add napi busy poll support Date: Tue, 6 Feb 2024 09:30:06 -0700 Message-ID: <20240206163422.646218-5-axboe@kernel.dk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240206163422.646218-1-axboe@kernel.dk> References: <20240206163422.646218-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Stefan Roesch This adds the napi busy polling support in io_uring.c. It adds a new napi_list to the io_ring_ctx structure. This list contains the list of napi_id's that are currently enabled for busy polling. The list is synchronized by the new napi_lock spin lock. The current default napi busy polling time is stored in napi_busy_poll_to. If napi busy polling is not enabled, the value is 0. In addition there is also a hash table. The hash table store the napi id and the pointer to the above list nodes. The hash table is used to speed up the lookup to the list elements. The hash table is synchronized with rcu. The NAPI_TIMEOUT is stored as a timeout to make sure that the time a napi entry is stored in the napi list is limited. The busy poll timeout is also stored as part of the io_wait_queue. This is necessary as for sq polling the poll interval needs to be adjusted and the napi callback allows only to pass in one value. This has been tested with two simple programs from the liburing library repository: the napi client and the napi server program. The client sends a request, which has a timestamp in its payload and the server replies with the same payload. The client calculates the roundtrip time and stores it to calculate the results. The client is running on host1 and the server is running on host 2 (in the same rack). The measured times below are roundtrip times. They are average times over 5 runs each. Each run measures 1 million roundtrips. no rx coal rx coal: frames=88,usecs=33 Default 57us 56us client_poll=100us 47us 46us server_poll=100us 51us 46us client_poll=100us+ 40us 40us server_poll=100us client_poll=100us+ 41us 39us server_poll=100us+ prefer napi busy poll on client client_poll=100us+ 41us 39us server_poll=100us+ prefer napi busy poll on server client_poll=100us+ 41us 39us server_poll=100us+ prefer napi busy poll on client + server Signed-off-by: Stefan Roesch Suggested-by: Olivier Langlois Acked-by: Jakub Kicinski Link: https://lore.kernel.org/r/20230608163839.2891748-5-shr@devkernel.io Signed-off-by: Jens Axboe --- include/linux/io_uring_types.h | 11 ++ io_uring/Makefile | 1 + io_uring/io_uring.c | 8 ++ io_uring/io_uring.h | 4 + io_uring/napi.c | 255 +++++++++++++++++++++++++++++++++ io_uring/napi.h | 89 ++++++++++++ io_uring/poll.c | 2 + 7 files changed, 370 insertions(+) create mode 100644 io_uring/napi.c create mode 100644 io_uring/napi.h diff --git a/include/linux/io_uring_types.h b/include/linux/io_uring_types.h index 8c0742f5b57e..1fabbcda38a6 100644 --- a/include/linux/io_uring_types.h +++ b/include/linux/io_uring_types.h @@ -2,6 +2,7 @@ #define IO_URING_TYPES_H #include +#include #include #include #include @@ -374,6 +375,16 @@ struct io_ring_ctx { /* deferred free list, protected by ->uring_lock */ struct hlist_head io_buf_list; +#ifdef CONFIG_NET_RX_BUSY_POLL + struct list_head napi_list; /* track busy poll napi_id */ + spinlock_t napi_lock; /* napi_list lock */ + + DECLARE_HASHTABLE(napi_ht, 4); + /* napi busy poll default timeout */ + unsigned int napi_busy_poll_to; + bool napi_prefer_busy_poll; +#endif + /* Keep this last, we don't need it for the fast path */ struct wait_queue_head poll_wq; struct io_restriction restrictions; diff --git a/io_uring/Makefile b/io_uring/Makefile index 2cdc51825405..0e2d4e94855d 100644 --- a/io_uring/Makefile +++ b/io_uring/Makefile @@ -11,3 +11,4 @@ obj-$(CONFIG_IO_URING) += io_uring.o xattr.o nop.o fs.o splice.o \ notif.o waitid.o register.o obj-$(CONFIG_IO_WQ) += io-wq.o obj-$(CONFIG_FUTEX) += futex.o +obj-$(CONFIG_NET_RX_BUSY_POLL) += napi.o diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 76762371eba3..1a9d176bb7f7 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -95,6 +95,7 @@ #include "notif.h" #include "waitid.h" #include "futex.h" +#include "napi.h" #include "timeout.h" #include "poll.h" @@ -349,6 +350,8 @@ static __cold struct io_ring_ctx *io_ring_ctx_alloc(struct io_uring_params *p) INIT_DELAYED_WORK(&ctx->fallback_work, io_fallback_req_func); INIT_WQ_LIST(&ctx->submit_state.compl_reqs); INIT_HLIST_HEAD(&ctx->cancelable_uring_cmd); + io_napi_init(ctx); + return ctx; err: kfree(ctx->cancel_table.hbs); @@ -2602,9 +2605,13 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, if (get_timespec64(&ts, uts)) return -EFAULT; + iowq.timeout = ktime_add_ns(timespec64_to_ktime(ts), ktime_get_ns()); + io_napi_adjust_timeout(ctx, &iowq, &ts); } + io_napi_busy_loop(ctx, &iowq); + trace_io_uring_cqring_wait(ctx, min_events); do { int nr_wait = (int) iowq.cq_tail - READ_ONCE(ctx->rings->cq.tail); @@ -2897,6 +2904,7 @@ static __cold void io_ring_ctx_free(struct io_ring_ctx *ctx) io_req_caches_free(ctx); if (ctx->hash_map) io_wq_put_hash(ctx->hash_map); + io_napi_free(ctx); kfree(ctx->cancel_table.hbs); kfree(ctx->cancel_table_locked.hbs); kfree(ctx->io_bl); diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h index 859f6e0580e3..1ca99522811b 100644 --- a/io_uring/io_uring.h +++ b/io_uring/io_uring.h @@ -42,6 +42,10 @@ struct io_wait_queue { unsigned nr_timeouts; ktime_t timeout; +#ifdef CONFIG_NET_RX_BUSY_POLL + unsigned int napi_busy_poll_to; + bool napi_prefer_busy_poll; +#endif }; static inline bool io_should_wake(struct io_wait_queue *iowq) diff --git a/io_uring/napi.c b/io_uring/napi.c new file mode 100644 index 000000000000..1112cc39153c --- /dev/null +++ b/io_uring/napi.c @@ -0,0 +1,255 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include "io_uring.h" +#include "napi.h" + +#ifdef CONFIG_NET_RX_BUSY_POLL + +/* Timeout for cleanout of stale entries. */ +#define NAPI_TIMEOUT (60 * SEC_CONVERSION) + +struct io_napi_entry { + unsigned int napi_id; + struct list_head list; + + unsigned long timeout; + struct hlist_node node; + + struct rcu_head rcu; +}; + +static struct io_napi_entry *io_napi_hash_find(struct hlist_head *hash_list, + unsigned int napi_id) +{ + struct io_napi_entry *e; + + hlist_for_each_entry_rcu(e, hash_list, node) { + if (e->napi_id != napi_id) + continue; + e->timeout = jiffies + NAPI_TIMEOUT; + return e; + } + + return NULL; +} + +void __io_napi_add(struct io_ring_ctx *ctx, struct socket *sock) +{ + struct hlist_head *hash_list; + unsigned int napi_id; + struct sock *sk; + struct io_napi_entry *e; + + sk = sock->sk; + if (!sk) + return; + + napi_id = READ_ONCE(sk->sk_napi_id); + + /* Non-NAPI IDs can be rejected. */ + if (napi_id < MIN_NAPI_ID) + return; + + hash_list = &ctx->napi_ht[hash_min(napi_id, HASH_BITS(ctx->napi_ht))]; + + rcu_read_lock(); + e = io_napi_hash_find(hash_list, napi_id); + if (e) { + e->timeout = jiffies + NAPI_TIMEOUT; + rcu_read_unlock(); + return; + } + rcu_read_unlock(); + + e = kmalloc(sizeof(*e), GFP_NOWAIT); + if (!e) + return; + + e->napi_id = napi_id; + e->timeout = jiffies + NAPI_TIMEOUT; + + spin_lock(&ctx->napi_lock); + if (unlikely(io_napi_hash_find(hash_list, napi_id))) { + spin_unlock(&ctx->napi_lock); + kfree(e); + return; + } + + hlist_add_tail_rcu(&e->node, hash_list); + list_add_tail(&e->list, &ctx->napi_list); + spin_unlock(&ctx->napi_lock); +} + +static void __io_napi_remove_stale(struct io_ring_ctx *ctx) +{ + struct io_napi_entry *e; + unsigned int i; + + spin_lock(&ctx->napi_lock); + hash_for_each(ctx->napi_ht, i, e, node) { + if (time_after(jiffies, e->timeout)) { + list_del(&e->list); + hash_del_rcu(&e->node); + kfree_rcu(e, rcu); + } + } + spin_unlock(&ctx->napi_lock); +} + +static inline void io_napi_remove_stale(struct io_ring_ctx *ctx, bool is_stale) +{ + if (is_stale) + __io_napi_remove_stale(ctx); +} + +static inline bool io_napi_busy_loop_timeout(unsigned long start_time, + unsigned long bp_usec) +{ + if (bp_usec) { + unsigned long end_time = start_time + bp_usec; + unsigned long now = busy_loop_current_time(); + + return time_after(now, end_time); + } + + return true; +} + +static bool io_napi_busy_loop_should_end(void *data, + unsigned long start_time) +{ + struct io_wait_queue *iowq = data; + + if (signal_pending(current)) + return true; + if (io_should_wake(iowq)) + return true; + if (io_napi_busy_loop_timeout(start_time, iowq->napi_busy_poll_to)) + return true; + + return false; +} + +static bool __io_napi_do_busy_loop(struct io_ring_ctx *ctx, + void *loop_end_arg) +{ + struct io_napi_entry *e; + bool (*loop_end)(void *, unsigned long) = NULL; + bool is_stale = false; + + if (loop_end_arg) + loop_end = io_napi_busy_loop_should_end; + + list_for_each_entry_rcu(e, &ctx->napi_list, list) { + napi_busy_loop_rcu(e->napi_id, loop_end, loop_end_arg, + ctx->napi_prefer_busy_poll, BUSY_POLL_BUDGET); + + if (time_after(jiffies, e->timeout)) + is_stale = true; + } + + return is_stale; +} + +static void io_napi_blocking_busy_loop(struct io_ring_ctx *ctx, + struct io_wait_queue *iowq) +{ + unsigned long start_time = busy_loop_current_time(); + void *loop_end_arg = NULL; + bool is_stale = false; + + /* Singular lists use a different napi loop end check function and are + * only executed once. + */ + if (list_is_singular(&ctx->napi_list)) + loop_end_arg = iowq; + + rcu_read_lock(); + do { + is_stale = __io_napi_do_busy_loop(ctx, loop_end_arg); + } while (!io_napi_busy_loop_should_end(iowq, start_time) && !loop_end_arg); + rcu_read_unlock(); + + io_napi_remove_stale(ctx, is_stale); +} + +/* + * io_napi_init() - Init napi settings + * @ctx: pointer to io-uring context structure + * + * Init napi settings in the io-uring context. + */ +void io_napi_init(struct io_ring_ctx *ctx) +{ + INIT_LIST_HEAD(&ctx->napi_list); + spin_lock_init(&ctx->napi_lock); + ctx->napi_prefer_busy_poll = false; + ctx->napi_busy_poll_to = READ_ONCE(sysctl_net_busy_poll); +} + +/* + * io_napi_free() - Deallocate napi + * @ctx: pointer to io-uring context structure + * + * Free the napi list and the hash table in the io-uring context. + */ +void io_napi_free(struct io_ring_ctx *ctx) +{ + struct io_napi_entry *e; + LIST_HEAD(napi_list); + unsigned int i; + + spin_lock(&ctx->napi_lock); + hash_for_each(ctx->napi_ht, i, e, node) { + hash_del_rcu(&e->node); + kfree_rcu(e, rcu); + } + spin_unlock(&ctx->napi_lock); +} + +/* + * __io_napi_adjust_timeout() - Add napi id to the busy poll list + * @ctx: pointer to io-uring context structure + * @iowq: pointer to io wait queue + * @ts: pointer to timespec or NULL + * + * Adjust the busy loop timeout according to timespec and busy poll timeout. + */ +void __io_napi_adjust_timeout(struct io_ring_ctx *ctx, struct io_wait_queue *iowq, + struct timespec64 *ts) +{ + unsigned int poll_to = READ_ONCE(ctx->napi_busy_poll_to); + + if (ts) { + struct timespec64 poll_to_ts = ns_to_timespec64(1000 * (s64)poll_to); + + if (timespec64_compare(ts, &poll_to_ts) > 0) { + *ts = timespec64_sub(*ts, poll_to_ts); + } else { + u64 to = timespec64_to_ns(ts); + + do_div(to, 1000); + ts->tv_sec = 0; + ts->tv_nsec = 0; + } + } + + iowq->napi_busy_poll_to = poll_to; +} + +/* + * __io_napi_busy_loop() - execute busy poll loop + * @ctx: pointer to io-uring context structure + * @iowq: pointer to io wait queue + * + * Execute the busy poll loop and merge the spliced off list. + */ +void __io_napi_busy_loop(struct io_ring_ctx *ctx, struct io_wait_queue *iowq) +{ + iowq->napi_prefer_busy_poll = READ_ONCE(ctx->napi_prefer_busy_poll); + + if (!(ctx->flags & IORING_SETUP_SQPOLL) && iowq->napi_busy_poll_to) + io_napi_blocking_busy_loop(ctx, iowq); +} + +#endif diff --git a/io_uring/napi.h b/io_uring/napi.h new file mode 100644 index 000000000000..be8aa8ee32d9 --- /dev/null +++ b/io_uring/napi.h @@ -0,0 +1,89 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef IOU_NAPI_H +#define IOU_NAPI_H + +#include +#include +#include + +#ifdef CONFIG_NET_RX_BUSY_POLL + +void io_napi_init(struct io_ring_ctx *ctx); +void io_napi_free(struct io_ring_ctx *ctx); + +void __io_napi_add(struct io_ring_ctx *ctx, struct socket *sock); + +void __io_napi_adjust_timeout(struct io_ring_ctx *ctx, + struct io_wait_queue *iowq, struct timespec64 *ts); +void __io_napi_busy_loop(struct io_ring_ctx *ctx, struct io_wait_queue *iowq); + +static inline bool io_napi(struct io_ring_ctx *ctx) +{ + return !list_empty(&ctx->napi_list); +} + +static inline void io_napi_adjust_timeout(struct io_ring_ctx *ctx, + struct io_wait_queue *iowq, + struct timespec64 *ts) +{ + if (!io_napi(ctx)) + return; + __io_napi_adjust_timeout(ctx, iowq, ts); +} + +static inline void io_napi_busy_loop(struct io_ring_ctx *ctx, + struct io_wait_queue *iowq) +{ + if (!io_napi(ctx)) + return; + __io_napi_busy_loop(ctx, iowq); +} + +/* + * io_napi_add() - Add napi id to the busy poll list + * @req: pointer to io_kiocb request + * + * Add the napi id of the socket to the napi busy poll list and hash table. + */ +static inline void io_napi_add(struct io_kiocb *req) +{ + struct io_ring_ctx *ctx = req->ctx; + struct socket *sock; + + if (!READ_ONCE(ctx->napi_busy_poll_to)) + return; + + sock = sock_from_file(req->file); + if (sock) + __io_napi_add(ctx, sock); +} + +#else + +static inline void io_napi_init(struct io_ring_ctx *ctx) +{ +} +static inline void io_napi_free(struct io_ring_ctx *ctx) +{ +} +static inline bool io_napi(struct io_ring_ctx *ctx) +{ + return false; +} +static inline void io_napi_add(struct io_kiocb *req) +{ +} +static inline void io_napi_adjust_timeout(struct io_ring_ctx *ctx, + struct io_wait_queue *iowq, + struct timespec64 *ts) +{ +} +static inline void io_napi_busy_loop(struct io_ring_ctx *ctx, + struct io_wait_queue *iowq) +{ +} + +#endif /* CONFIG_NET_RX_BUSY_POLL */ + +#endif diff --git a/io_uring/poll.c b/io_uring/poll.c index 8e01c2672df4..053d738c330c 100644 --- a/io_uring/poll.c +++ b/io_uring/poll.c @@ -15,6 +15,7 @@ #include "io_uring.h" #include "refs.h" +#include "napi.h" #include "opdef.h" #include "kbuf.h" #include "poll.h" @@ -649,6 +650,7 @@ static int __io_arm_poll_handler(struct io_kiocb *req, __io_poll_execute(req, mask); return 0; } + io_napi_add(req); if (ipt->owning) { /* From patchwork Tue Feb 6 16:30:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 13547602 Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) (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 A9B844C85 for ; Tue, 6 Feb 2024 16:34:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707237278; cv=none; b=grgnVDhee1tZqXV9fA5cME9rnpHySqrS9FwyLykrcijcUEWMZ3eV0bqX70O3Ad0LbcqMWl3+Zt5e+2cXgE30Q9pWTS2w4m9BCZgu7sQWSrdZ9Jqnfd2HDkD7C1T+ovXcVYzk8a1gpCYqm5Z2kRg0iSlm6v+yMaWFHLdvxz/rHfA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707237278; c=relaxed/simple; bh=HGkg8jn+1tiQhhHkeDvYdLT6P19EyKlQEBs4srDnGLE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GSZG/bieYIez5L3CvdMKcyUW4FF5UTuIpkGeyMPGHxEt9ILTmSThjPITWCe0hl8cprA7v3tYsEzBbv9KZodaDa6fGR6HmS0aSml+3OmcbVYoxEjjlizOJPejGD1kmKMG3tY2avfaIpxo0AGiFIv7n2IIJtuA9DkWB2yyApxVUL8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=cgW4cvSY; arc=none smtp.client-ip=209.85.166.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="cgW4cvSY" Received: by mail-io1-f51.google.com with SMTP id ca18e2360f4ac-7c3d923f7cbso16745339f.0 for ; Tue, 06 Feb 2024 08:34:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1707237275; x=1707842075; 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=HKc3IuqsYtihfLzHWvhn751k2a+IQ40XzH/g9DCcLM8=; b=cgW4cvSYo1OgOCkhvzk4UPBGVR0AKOLSpnpi3B1J2qQ4oS1DkBcwBXdjStnc4TJX0p W019zozBIuhzRwyB7+xSXVyXtY6d/e9Z6oicoa0ts+UxiwyiRLDZSPerTcxa6y0nLSjS Zvo+OzfDkTJFWP1rSWZVVnUKxWOAamid1tDtcF6oW1BOf/oLjLNGG1NJR5p5xjoP98ty LqcOKFXD+P6+dBajeZGs7BPMccNuNhhb36NgmYtuUcIRpVbkDlcsEnqMIZXhnAjobT+7 iyDk5jtviGv8Ol1bdUfqDqvtIfp2ijHHdLyXmaaUh0VYtFiNkBm0ItveZzzZyktDS6tK T+lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707237275; x=1707842075; 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=HKc3IuqsYtihfLzHWvhn751k2a+IQ40XzH/g9DCcLM8=; b=w45VhlgkCQumbVAgE41KITq9/+NDbUW6SPpVZjrpQw7AT4HteMstrqxd1Om+vY2Ob1 aasTfbtrM125QXCFBlu1ycBmXzLYnnE2VOmjGkbKbzWsrPycm00W2U3NOF2mhBpX7tYV e3aqsvkhxqS94AXB/gHu2VKw5uW1JHi1fPHbhpgixHitth7ClLyis4LNyHqDBAuCExqB 6SiN2C7Pcdnw91fcKWEUKLkUYi1i/93KpoSUXsVkTL426Unvb+EKJbSrAVthcdGG+9F0 j0ACyFsayN7v4ctdhHsOKmGYMpKwCqeeeHONZKSp6ZSy+NqwWgJ8A4ejmlW+5XsjK4In dd7g== X-Gm-Message-State: AOJu0YxhLghWelMd76BhsiGQr7uLqHFOmD05W9boIy0E8C4uAeTXDF4i tknFShULIaQmg2shLiuLxfdr2aXKRgDhe2n0/yAIdDj/XGDnceVNmdUtVZDzozfRzQzIeeYZK/C 9gLw= X-Google-Smtp-Source: AGHT+IHGX09ZwU0r9KtnFAfB9k518CqpJMG77lsRWA/Zoc7I2VmqCxChPBvPfqhFxSQM6IDD6iliCw== X-Received: by 2002:a6b:ef07:0:b0:7bf:cc4d:ea53 with SMTP id k7-20020a6bef07000000b007bfcc4dea53mr3488843ioh.0.1707237275253; Tue, 06 Feb 2024 08:34:35 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCUqycd8BVtvgYWdnuco6aREtlfEnNV8TP4RSynXRhuhT7NfjrRUgjr9FS48gPpdoaMHD/gmK8t3gBL2JgW5PgTExD3T2L3F4ZBCvj/liG8kyZN+XFdsI81Y0vgKjeSAciH8d6+HsqINiz4AY/nZEZBqJTMMp5lxpH+CBkCJSY7kvcI= Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id u8-20020a02aa88000000b00471337ff774sm573316jai.113.2024.02.06.08.34.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 08:34:33 -0800 (PST) From: Jens Axboe To: io-uring@vger.kernel.org, netdev@vger.kernel.org Cc: kuba@kernel.org, olivier@trillion01.com, Stefan Roesch , Jens Axboe Subject: [PATCH 5/7] io-uring: add sqpoll support for napi busy poll Date: Tue, 6 Feb 2024 09:30:07 -0700 Message-ID: <20240206163422.646218-6-axboe@kernel.dk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240206163422.646218-1-axboe@kernel.dk> References: <20240206163422.646218-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Stefan Roesch This adds the sqpoll support to the io-uring napi. Signed-off-by: Stefan Roesch Suggested-by: Olivier Langlois Link: https://lore.kernel.org/r/20230608163839.2891748-6-shr@devkernel.io Signed-off-by: Jens Axboe --- io_uring/napi.c | 24 ++++++++++++++++++++++++ io_uring/napi.h | 6 +++++- io_uring/sqpoll.c | 4 ++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/io_uring/napi.c b/io_uring/napi.c index 1112cc39153c..3e578df36cc5 100644 --- a/io_uring/napi.c +++ b/io_uring/napi.c @@ -252,4 +252,28 @@ void __io_napi_busy_loop(struct io_ring_ctx *ctx, struct io_wait_queue *iowq) io_napi_blocking_busy_loop(ctx, iowq); } +/* + * io_napi_sqpoll_busy_poll() - busy poll loop for sqpoll + * @ctx: pointer to io-uring context structure + * + * Splice of the napi list and execute the napi busy poll loop. + */ +int io_napi_sqpoll_busy_poll(struct io_ring_ctx *ctx) +{ + LIST_HEAD(napi_list); + bool is_stale = false; + + if (!READ_ONCE(ctx->napi_busy_poll_to)) + return 0; + if (list_empty_careful(&ctx->napi_list)) + return 0; + + rcu_read_lock(); + is_stale = __io_napi_do_busy_loop(ctx, NULL); + rcu_read_unlock(); + + io_napi_remove_stale(ctx, is_stale); + return 1; +} + #endif diff --git a/io_uring/napi.h b/io_uring/napi.h index be8aa8ee32d9..b6d6243fc7fe 100644 --- a/io_uring/napi.h +++ b/io_uring/napi.h @@ -17,6 +17,7 @@ void __io_napi_add(struct io_ring_ctx *ctx, struct socket *sock); void __io_napi_adjust_timeout(struct io_ring_ctx *ctx, struct io_wait_queue *iowq, struct timespec64 *ts); void __io_napi_busy_loop(struct io_ring_ctx *ctx, struct io_wait_queue *iowq); +int io_napi_sqpoll_busy_poll(struct io_ring_ctx *ctx); static inline bool io_napi(struct io_ring_ctx *ctx) { @@ -83,7 +84,10 @@ static inline void io_napi_busy_loop(struct io_ring_ctx *ctx, struct io_wait_queue *iowq) { } - +static inline int io_napi_sqpoll_busy_poll(struct io_ring_ctx *ctx) +{ + return 0; +} #endif /* CONFIG_NET_RX_BUSY_POLL */ #endif diff --git a/io_uring/sqpoll.c b/io_uring/sqpoll.c index 28bf0e085d31..f3979cacda13 100644 --- a/io_uring/sqpoll.c +++ b/io_uring/sqpoll.c @@ -15,6 +15,7 @@ #include #include "io_uring.h" +#include "napi.h" #include "sqpoll.h" #define IORING_SQPOLL_CAP_ENTRIES_VALUE 8 @@ -194,6 +195,9 @@ static int __io_sq_thread(struct io_ring_ctx *ctx, bool cap_entries) ret = io_submit_sqes(ctx, to_submit); mutex_unlock(&ctx->uring_lock); + if (io_napi(ctx)) + ret += io_napi_sqpoll_busy_poll(ctx); + if (to_submit && wq_has_sleeper(&ctx->sqo_sq_wait)) wake_up(&ctx->sqo_sq_wait); if (creds) From patchwork Tue Feb 6 16:30:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 13547603 Received: from mail-io1-f48.google.com (mail-io1-f48.google.com [209.85.166.48]) (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 8B4C7AD5D for ; Tue, 6 Feb 2024 16:34:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707237280; cv=none; b=T+oMZ7Ix2iayokmb/h7XxyOpGQPxNBEHHpmaMcHd9XDpTYRvsUa/s1u26AvwnZAIkCifvvJGRm+ocBVPcANKXulI6MP02SxnhOuc9B9tI7pKHd/wsYFHT4R4ZYsBJoEr/ddfX75XNLisQp/LYh+kadYXh5M4G4HgL/+XxtNW8Nw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707237280; c=relaxed/simple; bh=Ehe8wkbySYlqi06F4nKKmVja3qQsGAVpDppEmrigw4w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hd00UYVv3UwTrpO0J7wO0O7b6fPN5UqdTqClCircVMntKTatpvK4PD/GQNT0XSIrGu5xP+tWVOVMn/CxIzWFxH30WLnbnaqzz8J+/gFRHcqOQNhjjJicYisHoVRUP246r3yVHbFvXv/jzsOj87GrF2pxtp/I8BbgPflFIYBYPpI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=VK4aDJ2o; arc=none smtp.client-ip=209.85.166.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="VK4aDJ2o" Received: by mail-io1-f48.google.com with SMTP id ca18e2360f4ac-7bff2f6080aso40930339f.1 for ; Tue, 06 Feb 2024 08:34:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1707237277; x=1707842077; 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=hIRoOUxRSdp9f2nKlutUNq13IaJ20RhqPUvflOfDWuQ=; b=VK4aDJ2oXKzeYrQ+PIke05zBu20u8MFSJsifrQMZVVmGVZb3GhRxpDFTuNuHEb0IEh yxFIhcc9WzxgfIHbWp/2tVtb8FQSIxnDXPgS39MQFDKvPRkPPnmS4pAsTSNRLjMysTJg 3k94XZN79uggmUfcKDbN6lVG3dDOmIumAclGayeQrNUZB8jfJ0++VYSxnOQDyQl08FtJ N3szvrfYashKR+YGmoPnqcPyHiaa8AfEZjQQd12pUPzHg2TdVP7/i4cJUph0lpEFLAwr F6lddVA19IFto05gkN00ksFmtB3ZK00wTnis5J8+Ymnucey9IrbjsXe3oVxABosAQPAL DV7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707237277; x=1707842077; 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=hIRoOUxRSdp9f2nKlutUNq13IaJ20RhqPUvflOfDWuQ=; b=SguFHFzyrlvJWXXf4upD0KfNh2wkVtQQhuYoc9d9wyaDC8MbL48kUhk9IV3bVa+SgE UyP2aOo/acmvNRMS4zQE4d9mpSoKSfk331OuB2qfiD0fvdzHUwsYmg1CWFTLGfKT+z0w J1STeH3unhcAby48qtM+z632CCnaV47ncblSFUv/0d0ogOxZkmzjLQ3O2C1ONrEhWv3C lZW0e89Zn3HAHHDElo1z/NZVOl5fkIoHzWEZgWLActo5ea0erivQeifB+KKOY4TpL9C7 eP1mi4+zBOwpRAo9HamskoGZwckCUKgNcBVq6hYF73Mus9tVTc6uzoR+r6ktCx39WEpT f25w== X-Gm-Message-State: AOJu0YwExUVe1STEWrttoyO7Ibb8ryWGmxl8m+1EmaC1ICWjSDYll3O8 VH9ws23EBTB2+mqHq4H1Zg783rjEDTOJte71xo3gqKS8Pb0y6wrdlNYZQqfSJuMn95ZJg1knDpd +BH4= X-Google-Smtp-Source: AGHT+IF/6TnH2bylCGTwaThiNlvRFifzCvkGJTzJ0EuV0obgLqxihsVNQSVCwhkqCApF/0IlLFteRA== X-Received: by 2002:a5d:938a:0:b0:7c3:f631:a18f with SMTP id c10-20020a5d938a000000b007c3f631a18fmr1227061iol.1.1707237277271; Tue, 06 Feb 2024 08:34:37 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCUyOOAYxTdAgI9WE+gCd+hE2ciJ3STwUQgRrT6ixCRxIqIBb9B797dhAYT4nZOa6rGGXa7ko/l7JHrF2ifMh3cSY5ixBA2VMVie6sUEntft3V/NJcDJ5IcqE1RWWdtGSptSNrlv38Nri3kOIY1rJ+xJbnZX7wEryySpSLUx7WCvRKk= Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id u8-20020a02aa88000000b00471337ff774sm573316jai.113.2024.02.06.08.34.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 08:34:35 -0800 (PST) From: Jens Axboe To: io-uring@vger.kernel.org, netdev@vger.kernel.org Cc: kuba@kernel.org, olivier@trillion01.com, Stefan Roesch , Jens Axboe Subject: [PATCH 6/7] io_uring: add register/unregister napi function Date: Tue, 6 Feb 2024 09:30:08 -0700 Message-ID: <20240206163422.646218-7-axboe@kernel.dk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240206163422.646218-1-axboe@kernel.dk> References: <20240206163422.646218-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Stefan Roesch This adds an api to register and unregister the napi for io-uring. If the arg value is specified when unregistering, the current napi setting for the busy poll timeout is copied into the user structure. If this is not required, NULL can be passed as the arg value. Signed-off-by: Stefan Roesch Acked-by: Jakub Kicinski Link: https://lore.kernel.org/r/20230608163839.2891748-7-shr@devkernel.io Signed-off-by: Jens Axboe --- include/uapi/linux/io_uring.h | 11 ++++++++ io_uring/napi.c | 48 +++++++++++++++++++++++++++++++++++ io_uring/napi.h | 11 ++++++++ io_uring/register.c | 13 ++++++++++ 4 files changed, 83 insertions(+) diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 7a673b52827b..26f78eb85934 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -570,6 +570,10 @@ enum { /* return status information for a buffer group */ IORING_REGISTER_PBUF_STATUS = 26, + /* set/clear busy poll settings */ + IORING_REGISTER_NAPI = 27, + IORING_UNREGISTER_NAPI = 28, + /* this goes last */ IORING_REGISTER_LAST, @@ -703,6 +707,13 @@ struct io_uring_buf_status { __u32 resv[8]; }; +/* argument for IORING_(UN)REGISTER_NAPI */ +struct io_uring_napi { + __u32 busy_poll_to; + __u32 pad; + __u64 resv; +}; + /* * io_uring_restriction->opcode values */ diff --git a/io_uring/napi.c b/io_uring/napi.c index 3e578df36cc5..b1a3ed9d1c2e 100644 --- a/io_uring/napi.c +++ b/io_uring/napi.c @@ -207,6 +207,54 @@ void io_napi_free(struct io_ring_ctx *ctx) spin_unlock(&ctx->napi_lock); } +/* + * io_napi_register() - Register napi with io-uring + * @ctx: pointer to io-uring context structure + * @arg: pointer to io_uring_napi structure + * + * Register napi in the io-uring context. + */ +int io_register_napi(struct io_ring_ctx *ctx, void __user *arg) +{ + const struct io_uring_napi curr = { + .busy_poll_to = ctx->napi_busy_poll_to, + }; + struct io_uring_napi napi; + + if (copy_from_user(&napi, arg, sizeof(napi))) + return -EFAULT; + if (napi.pad || napi.resv) + return -EINVAL; + + WRITE_ONCE(ctx->napi_busy_poll_to, napi.busy_poll_to); + + if (copy_to_user(arg, &curr, sizeof(curr))) + return -EFAULT; + + return 0; +} + +/* + * io_napi_unregister() - Unregister napi with io-uring + * @ctx: pointer to io-uring context structure + * @arg: pointer to io_uring_napi structure + * + * Unregister napi. If arg has been specified copy the busy poll timeout and + * prefer busy poll setting to the passed in structure. + */ +int io_unregister_napi(struct io_ring_ctx *ctx, void __user *arg) +{ + const struct io_uring_napi curr = { + .busy_poll_to = ctx->napi_busy_poll_to, + }; + + if (arg && copy_to_user(arg, &curr, sizeof(curr))) + return -EFAULT; + + WRITE_ONCE(ctx->napi_busy_poll_to, 0); + return 0; +} + /* * __io_napi_adjust_timeout() - Add napi id to the busy poll list * @ctx: pointer to io-uring context structure diff --git a/io_uring/napi.h b/io_uring/napi.h index b6d6243fc7fe..6fc0393d0dbe 100644 --- a/io_uring/napi.h +++ b/io_uring/napi.h @@ -12,6 +12,9 @@ void io_napi_init(struct io_ring_ctx *ctx); void io_napi_free(struct io_ring_ctx *ctx); +int io_register_napi(struct io_ring_ctx *ctx, void __user *arg); +int io_unregister_napi(struct io_ring_ctx *ctx, void __user *arg); + void __io_napi_add(struct io_ring_ctx *ctx, struct socket *sock); void __io_napi_adjust_timeout(struct io_ring_ctx *ctx, @@ -68,6 +71,14 @@ static inline void io_napi_init(struct io_ring_ctx *ctx) static inline void io_napi_free(struct io_ring_ctx *ctx) { } +static inline int io_register_napi(struct io_ring_ctx *ctx, void __user *arg) +{ + return -EOPNOTSUPP; +} +static inline int io_unregister_napi(struct io_ring_ctx *ctx, void __user *arg) +{ + return -EOPNOTSUPP; +} static inline bool io_napi(struct io_ring_ctx *ctx) { return false; diff --git a/io_uring/register.c b/io_uring/register.c index 5e62c1208996..99c37775f974 100644 --- a/io_uring/register.c +++ b/io_uring/register.c @@ -26,6 +26,7 @@ #include "register.h" #include "cancel.h" #include "kbuf.h" +#include "napi.h" #define IORING_MAX_RESTRICTIONS (IORING_RESTRICTION_LAST + \ IORING_REGISTER_LAST + IORING_OP_LAST) @@ -550,6 +551,18 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode, break; ret = io_register_pbuf_status(ctx, arg); break; + case IORING_REGISTER_NAPI: + ret = -EINVAL; + if (!arg || nr_args != 1) + break; + ret = io_register_napi(ctx, arg); + break; + case IORING_UNREGISTER_NAPI: + ret = -EINVAL; + if (nr_args != 1) + break; + ret = io_unregister_napi(ctx, arg); + break; default: ret = -EINVAL; break; From patchwork Tue Feb 6 16:30:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 13547604 Received: from mail-io1-f50.google.com (mail-io1-f50.google.com [209.85.166.50]) (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 56C4AB675 for ; Tue, 6 Feb 2024 16:34:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707237281; cv=none; b=bms2Q0yv8SCOx6h9tMc4A/1bE+OE8LP5syf93nq7mhS9JmGELt+3VlHyta1+/QqU3ALVUNm4eqFfz7NssiGAb45pmNVeIH2U2NlrNDRdYuFLjPWcZHeVlJHDtnONuiK8iJS+XHr9wwbWPQm1/D1uNWFcMqkhuWCF8Xe9zTil2+w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707237281; c=relaxed/simple; bh=bKldgRH+jmoYG2UwNAWyPrn7nn5FOsDfMF3ysm38zmo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IMWVwXC9KUdkFZzHSFXVfFjDqdOcW+BcFg3W0C1+n2xgRZSn54v3vXIK6xkE1K3+gK6s60tGWhyDYtbXcyAQ12e1WL9nrCOGx3cuIq+c1QahP9YKZ49g7c/Rr9vvAQ95kextTYusiRYvrFN8kDrpiPE0kXwELxjRNBHhuihDLP4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=3XNTmKRn; arc=none smtp.client-ip=209.85.166.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="3XNTmKRn" Received: by mail-io1-f50.google.com with SMTP id ca18e2360f4ac-7c3d923f7cbso16747739f.0 for ; Tue, 06 Feb 2024 08:34:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1707237279; x=1707842079; 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=SmXm6XjQKipONkpkmvyaJr75SDlHSLzJzAOD7SY3R9Q=; b=3XNTmKRn0FiIRnTJVelM9k1FZeHv+FR7MSJ6xzBHC3NdUafD+VwMMcbwzSmnO2DMV9 YcYBPQawc7QBgZxtCgUNOlR/w9L4EF3j6IdORqkfjW4Lq14qNiM86GhmHQlElKGMBxTk 3nnEOn0aqTi+ZJpgXSJfsifib5bhah8xdxGxhWODa24o2BN2q4nePEqS3dVBzkDEX1oF g96zZbnbNFTPAfOpsG22vOkknmHguJqi7tUiIeZyKlaTLuRJXr+L1FsYtV2L3+a7yojJ njuPsodgZOLc+Zndty+JlmwybMI+XcHkUPk43akAzIdkeCSdaoQKhqVipmtMbEcLbz4f xqRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707237279; x=1707842079; 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=SmXm6XjQKipONkpkmvyaJr75SDlHSLzJzAOD7SY3R9Q=; b=aqplByFdpgnpkdUcH+cvmaAC6viEsQ/6p9Abj5Ea7d/bF6HqPWbaNO0ylt+D6i8P8O 9BLTcuzYWqsK2Qa+MWetTOU9IEd5qGF+dUeoLtQoGvV5gpjhsrTcPTzOMjh9lJoC/GdC SQa0oc79YcNoPHlQw6DCO1mR55HoIkWeJZ3hrf8SFVJ0IpLdxFk0z5ob1ZZfOA/Tb6jy iwCjXBJGrrHr0NFN+0I/B0FEAUQSrYc6dVT3U7i56hhVIqsdLvA38YUItAWahScrdazo UoYHSCALQgIGIoAOZekX4W+T1P8tW9/7H22Y1D8RczVC8y2DOH9Lul0JiU3vwwbgUeA4 VEUw== X-Gm-Message-State: AOJu0Yzq1nD64MO4J5bkmBij1HWJMg2Kf66GfyKL5hCT37AYo7GbhSZ1 dSJfww+lKwmrZ3LxPOcH8drv9MbR06zGeYRRwQ//ig2vlRO/KbiuPhP0iyx5Gzrq7+fsq/upxZ+ zte0= X-Google-Smtp-Source: AGHT+IHKGGkvqPFOBW68s7G9dDl3gUexZCFm1JpOStska+Y0ajDj6Lj6nbokX0LXKobNRGJKpn5fzA== X-Received: by 2002:a05:6602:2bcf:b0:7c3:eaf9:2cd with SMTP id s15-20020a0566022bcf00b007c3eaf902cdmr3534308iov.2.1707237279096; Tue, 06 Feb 2024 08:34:39 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCXzfA2NZOInnA0ehp3R5lXv0P2AZBbkhTAWPV7VmfmxMMcmWIUKZIfSyOKSCmzaZ6LPg3zw0PFr9YbJ0MBvKzB1BZmejtQWlXFHlBkRKozV+cDYMfWzY1ia3o5e71GkZQIXOX6caDMvKjSGbt6tKAY4qD4OQEff11BJg4L1vf4K0sU= Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id u8-20020a02aa88000000b00471337ff774sm573316jai.113.2024.02.06.08.34.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 08:34:37 -0800 (PST) From: Jens Axboe To: io-uring@vger.kernel.org, netdev@vger.kernel.org Cc: kuba@kernel.org, olivier@trillion01.com, Stefan Roesch , Jens Axboe Subject: [PATCH 7/7] io_uring: add prefer busy poll to register and unregister napi api Date: Tue, 6 Feb 2024 09:30:09 -0700 Message-ID: <20240206163422.646218-8-axboe@kernel.dk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240206163422.646218-1-axboe@kernel.dk> References: <20240206163422.646218-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Stefan Roesch This adds the napi prefer busy poll setting to the register and unregister napi api. When napi is unregistered and arg is specified, both napi settings: busy poll timeout and the prefer busy poll setting are copied into the user structure. Signed-off-by: Stefan Roesch Acked-by: Jakub Kicinski Link: https://lore.kernel.org/r/20230608163839.2891748-8-shr@devkernel.io Signed-off-by: Jens Axboe --- include/uapi/linux/io_uring.h | 3 ++- io_uring/napi.c | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 26f78eb85934..4f41097a54b9 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -710,7 +710,8 @@ struct io_uring_buf_status { /* argument for IORING_(UN)REGISTER_NAPI */ struct io_uring_napi { __u32 busy_poll_to; - __u32 pad; + __u8 prefer_busy_poll; + __u8 pad[3]; __u64 resv; }; diff --git a/io_uring/napi.c b/io_uring/napi.c index b1a3ed9d1c2e..8ec016899539 100644 --- a/io_uring/napi.c +++ b/io_uring/napi.c @@ -217,16 +217,18 @@ void io_napi_free(struct io_ring_ctx *ctx) int io_register_napi(struct io_ring_ctx *ctx, void __user *arg) { const struct io_uring_napi curr = { - .busy_poll_to = ctx->napi_busy_poll_to, + .busy_poll_to = ctx->napi_busy_poll_to, + .prefer_busy_poll = ctx->napi_prefer_busy_poll }; struct io_uring_napi napi; if (copy_from_user(&napi, arg, sizeof(napi))) return -EFAULT; - if (napi.pad || napi.resv) + if (napi.pad[0] || napi.pad[1] || napi.pad[2] || napi.resv) return -EINVAL; WRITE_ONCE(ctx->napi_busy_poll_to, napi.busy_poll_to); + WRITE_ONCE(ctx->napi_prefer_busy_poll, !!napi.prefer_busy_poll); if (copy_to_user(arg, &curr, sizeof(curr))) return -EFAULT; @@ -245,13 +247,15 @@ int io_register_napi(struct io_ring_ctx *ctx, void __user *arg) int io_unregister_napi(struct io_ring_ctx *ctx, void __user *arg) { const struct io_uring_napi curr = { - .busy_poll_to = ctx->napi_busy_poll_to, + .busy_poll_to = ctx->napi_busy_poll_to, + .prefer_busy_poll = ctx->napi_prefer_busy_poll }; if (arg && copy_to_user(arg, &curr, sizeof(curr))) return -EFAULT; WRITE_ONCE(ctx->napi_busy_poll_to, 0); + WRITE_ONCE(ctx->napi_prefer_busy_poll, false); return 0; }