From nobody Mon Feb 9 03:17:23 2026 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (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 24EC83B28F for ; Sat, 6 Apr 2024 09:20:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.122 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712395222; cv=none; b=TX/BJhxLDHOAEnjLHtkxF+4CIU+9ZBmCaQowCAYYozZR2oiKCpvACHfPVVJjE9NWer+Ldf/hPsgkRMWxG5hboZhqIWkjWlqRrZ5NOTintjBPaiNxcULk13OnwxV8D4CafSgxTlz7ma7125KORfIj1/Mcqiq5lnq31lhCZZGM7e0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712395222; c=relaxed/simple; bh=yt9tmTIBJzVdCFZ4PnU57SVH6MzeinR1L4YoDUXNjsE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gd4/YBWKOE0tn9KWR1+wqueKRDEfs5Wx5pKaYs3DofkDaYaHdgEmNKA40uMfAsn+LS1dZCJVaMBBCxJvRzIXJNkF/Ud1EdqHD7RjLv8vnITSN7T6mr0vScmnPFYwSSO4VAoZKyPSb3+R4TLfEKzPWzvjFQqFcde4YKmL61tgl4A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=dOmJwRE8; arc=none smtp.client-ip=185.125.188.122 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="dOmJwRE8" Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 61BB24249A for ; Sat, 6 Apr 2024 09:20:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1712395216; bh=G6LgQlJD57yHhfXydvKzs8A9bUpRZ0ooDJmyE1zvH0s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dOmJwRE8oTUeXFiopPdOZhTIHljrEg1oNa6fQNSMzZh6tAzjyoAozBGY9xAPb1ZVs WdSHX3/8v9LKdS8sY05r+nyM4A4/cdYp4/30cmpsCgueAeY6vt5GKx8A/vplF3yxGs KbTV/CNFegIF5LT9jhQgEyFOdElabj2P+LUJgIUrRC64AFuTmzgtrQDqqOhbxdb/XI kTc5qrLPqjF38jkMXhWpv66GfIkwQc1/cAM5rWfPMGdOqYMfvygsu1Ocmg8UXQ1p22 hkrhRMW2Pl5IWtj0oCxxIvxexWuoTIv0WXUzFDVofbSX6qhB3W51RyfNFpn6uea0R4 QC8nFzUYu4MUA== Received: by mail-lj1-f198.google.com with SMTP id 38308e7fff4ca-2d6c94d98afso26915141fa.3 for ; Sat, 06 Apr 2024 02:20:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712395214; x=1713000014; 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=G6LgQlJD57yHhfXydvKzs8A9bUpRZ0ooDJmyE1zvH0s=; b=mHr3CDaE5xMnbVv0NZm9ruBHPnA4BHe9HOA7823OoYevgQ1tO/C4qwhkKBDohefwxu 1vEwS6OKqSecg46IUebyNEfDpHqgj0kDs7E9cYIp7ePPJgdzLyhfUx98xNDpz0pVQtqO QGhaE4UVlMHZFGji9EqGkWPYfPAsv53yiM/9HxT8BjCvefnt4kR9XdkAkUkMzx9sv508 1f9Al1WLUcNZh9e0YKEiRmPNHTooZeeNoYNClRMCvE5FA/DzsFinS86STrg1L2IcqKjo mU3pR3SFpyMv4kbhxQb0uDoFUaxKwF/efHnGPjps0Z37Af5kT/qvTk9tOdJEEN1ZKgCZ eL4w== X-Forwarded-Encrypted: i=1; AJvYcCXbcdPSV3c8an4az3V0K4+hZHyjqqR+0xRHJr37F6+2YRc1lbUDchlnQ1Rt+n/0IutRxw1dvMSViOaPa9LI3ZeX/SvUTcSUSjdzXy7q X-Gm-Message-State: AOJu0YztLZ9cKCfVKyKkPJiMcMqwRP8DbjDcN1r9Dn/GGNNCMLbN0gvQ k1DUzTST3yJ1Mz08S7LVDb96U0rqQ7jBIoWOtcb/aVfYBVMtEVoLOgezQnJkjbiJQDvThr5FoZx ckLAXGgG5ANuEz+KUAcsgZXQr7Zaxuba7NZz0Agb+cz/Si2hZuCBQcsw2/kGrXHJSYtqmNZmJPX 2P/Q== X-Received: by 2002:a2e:98d9:0:b0:2d6:d351:78ae with SMTP id s25-20020a2e98d9000000b002d6d35178aemr3079659ljj.29.1712395214346; Sat, 06 Apr 2024 02:20:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEC5CR3YqSgu+J4/e2RoJd1lpNEBaMZEgCrY3TxjTsm1+4G8Z80bdHexcZXeNzlB0Tjro1Qiw== X-Received: by 2002:a2e:98d9:0:b0:2d6:d351:78ae with SMTP id s25-20020a2e98d9000000b002d6d35178aemr3079628ljj.29.1712395213639; Sat, 06 Apr 2024 02:20:13 -0700 (PDT) Received: from gpd.station (net-2-39-142-110.cust.vodafonedsl.it. [2.39.142.110]) by smtp.gmail.com with ESMTPSA id l23-20020a7bc457000000b00414924f307csm5779993wmi.26.2024.04.06.02.20.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Apr 2024 02:20:13 -0700 (PDT) From: Andrea Righi To: Andrii Nakryiko , Eduard Zingerman Cc: Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , David Vernet , Tejun Heo , bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 1/4] libbpf: Start v1.5 development cycle Date: Sat, 6 Apr 2024 11:15:41 +0200 Message-ID: <20240406092005.92399-2-andrea.righi@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240406092005.92399-1-andrea.righi@canonical.com> References: <20240406092005.92399-1-andrea.righi@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Bump libbpf.map to v1.5.0 to start a new libbpf version cycle. Signed-off-by: Andrea Righi --- tools/lib/bpf/libbpf.map | 3 +++ tools/lib/bpf/libbpf_version.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map index 51732ecb1385..5dd81a7b96b5 100644 --- a/tools/lib/bpf/libbpf.map +++ b/tools/lib/bpf/libbpf.map @@ -416,3 +416,6 @@ LIBBPF_1.4.0 { btf__new_split; btf_ext__raw_data; } LIBBPF_1.3.0; + +LIBBPF_1.5.0 { +} LIBBPF_1.4.0; diff --git a/tools/lib/bpf/libbpf_version.h b/tools/lib/bpf/libbpf_version.h index e783a47da815..d6e5eff967cb 100644 --- a/tools/lib/bpf/libbpf_version.h +++ b/tools/lib/bpf/libbpf_version.h @@ -4,6 +4,6 @@ #define __LIBBPF_VERSION_H =20 #define LIBBPF_MAJOR_VERSION 1 -#define LIBBPF_MINOR_VERSION 4 +#define LIBBPF_MINOR_VERSION 5 =20 #endif /* __LIBBPF_VERSION_H */ --=20 2.43.0 From nobody Mon Feb 9 03:17:23 2026 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (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 F22663B18D for ; Sat, 6 Apr 2024 09:20:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.122 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712395224; cv=none; b=dMIo78MOkZO/niLdD8zQfWY3nEKw/Ap0fglzlYrN7wtV4nzmFDsS41/kI/pOtOjiqTdUFSZkGgrdyiH6uQStdVlp6+qBLbQqij8p6D0XAfVxddW2H3gtTLv9y9tdKHE3mI1z720uv9lTq4pmaAlRT87iXeclm9kmKy3D6Ezy3Fg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712395224; c=relaxed/simple; bh=a78vMWglkqZNxVpizm3bz2mABJk4IrXHntVwOv9hkR0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MYl1zgBCc4/b+6x6eCUtx0CpsPlLRCOQtpfkQII+z1bMpDfGatyQ8q/VM6BgI9OEfxojCOIrG1ErLCePuRTU7b25Akg5DkY97TrAupE01fPU3Dw2Vb3IqjMQkyVr1tgsInKDHWL7vPavm3Dicz6ME4c3rGMKJxAKyzkUN8VymSU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=gFrTYqbP; arc=none smtp.client-ip=185.125.188.122 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="gFrTYqbP" Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 00BE7424A5 for ; Sat, 6 Apr 2024 09:20:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1712395218; bh=U9JiGxHu1Zu7lOUTn6nQmFFrRqhFXaTmBwUIearvaJY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gFrTYqbPR572IK0B/W7HVVRJ/NcPKS8ke+uoR1TW0dviOaQxlT9VtQdDeShH5mIvL 1WCRak/kefII4Kz6xCI/Ji7N+pDw9ihewWaHGZu2LCly/xnVNgeyf30p7SsA6tXy0Z QZbXc2Ayx4BW9kQ6mJOFUd5DG3qoZgQ4nxVkDAjGxwmXcqT7uANLn9ByLTi6N3ozY0 fgYBKYjne4yQjr3MCGZAb1XfVRH+jsxxu5W6do4zfEa6dN4itGb/1NtC/hj96lczRV xOpogtjNQGPJukFCFvholqM3hiahVbqe5wRtVUO5Im+X50cQBa9JcdBeXMX13DtcN0 CCnNFu+ngrdVw== Received: by mail-lf1-f69.google.com with SMTP id 2adb3069b0e04-516be44ea1dso2472118e87.1 for ; Sat, 06 Apr 2024 02:20:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712395216; x=1713000016; 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=U9JiGxHu1Zu7lOUTn6nQmFFrRqhFXaTmBwUIearvaJY=; b=SGRe1dJGD5oi0ER15R2tuE8mRPj4etvb1UbyspX0xRaBckcxwFZFdA9tB5QaYjKtYZ ut7QWXrGB/pE7ZGwCZiU3gmcmbnMCAkprNcsR/g0rLPf3fnvjr/ywwcGdMiIIimiyrUf 8vG+ualLtOs0HIvDvmKG5E5UKnkr78XZXa623bJnY0GhpT8qGB9fzxw2BnGU0LeSi9Ul 5mctt21v3cE8acIPxEXrxE1y4CRF7wu9Q2W/dg5BO6YQtE64OrGMF4TaeDNSRJ67OhM4 YODcFF5S+LNkjMZCIPW3nZVoTBIYQDTaB4hFhODl2uTHr4bNIxjcb3ad/u6j0L7F0fSM tjog== X-Forwarded-Encrypted: i=1; AJvYcCUXXE/LwTPtGRrFXqBr1MvbdYGwPzqC6rJfRu9oIKT0XrpW8tQtdWPS1fy4SBNIYfcB0+nzWUG1WkOSZHWrTUdMJe0mWdi8FNhKcvGS X-Gm-Message-State: AOJu0Yx9R7v/N7/CMVG5QwDNMPsSWrcEny3i0jy7Pq8YM5y/wM7+chys V9fHwV2hooRr7eYi37z/BrU1GYZ8HFoVKYpgHsYwYnXxmYEfeAftZLMuMqHNlUaFouJMEq2VbWw OIGdSiBJPMsDZBLNiOIFcD1BPYwxpk/H5onxVQpgQuxxM8g2erHovp0O/fjIm77+swgtyRHSL0e 4tAg== X-Received: by 2002:ac2:5df9:0:b0:515:d50f:c6cc with SMTP id z25-20020ac25df9000000b00515d50fc6ccmr2674253lfq.63.1712395215920; Sat, 06 Apr 2024 02:20:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHS/Wj4fTtj4EhH4SwuK4rc7frejoX2SMVVjV8lwzSRp5JOOCrfUKz3Ui9mytME96ZdhQmWHg== X-Received: by 2002:ac2:5df9:0:b0:515:d50f:c6cc with SMTP id z25-20020ac25df9000000b00515d50fc6ccmr2674231lfq.63.1712395215460; Sat, 06 Apr 2024 02:20:15 -0700 (PDT) Received: from gpd.station (net-2-39-142-110.cust.vodafonedsl.it. [2.39.142.110]) by smtp.gmail.com with ESMTPSA id l23-20020a7bc457000000b00414924f307csm5779993wmi.26.2024.04.06.02.20.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Apr 2024 02:20:14 -0700 (PDT) From: Andrea Righi To: Andrii Nakryiko , Eduard Zingerman Cc: Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , David Vernet , Tejun Heo , bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/4] libbpf: ringbuf: allow to consume up to a certain amount of items Date: Sat, 6 Apr 2024 11:15:42 +0200 Message-ID: <20240406092005.92399-3-andrea.righi@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240406092005.92399-1-andrea.righi@canonical.com> References: <20240406092005.92399-1-andrea.righi@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In some cases, instead of always consuming all items from ring buffers in a greedy way, we may want to consume up to a certain amount of items, for example when we need to copy items from the BPF ring buffer to a limited user buffer. This change allows to set an upper limit to the amount of items consumed from one or more ring buffers. Signed-off-by: Andrea Righi --- tools/lib/bpf/ringbuf.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/tools/lib/bpf/ringbuf.c b/tools/lib/bpf/ringbuf.c index aacb64278a01..2c4031168413 100644 --- a/tools/lib/bpf/ringbuf.c +++ b/tools/lib/bpf/ringbuf.c @@ -231,7 +231,7 @@ static inline int roundup_len(__u32 len) return (len + 7) / 8 * 8; } =20 -static int64_t ringbuf_process_ring(struct ring *r) +static int64_t ringbuf_process_ring(struct ring *r, size_t n) { int *len_ptr, len, err; /* 64-bit to avoid overflow in case of extreme application behavior */ @@ -268,6 +268,9 @@ static int64_t ringbuf_process_ring(struct ring *r) } =20 smp_store_release(r->consumer_pos, cons_pos); + + if (cnt >=3D n) + goto done; } } while (got_new_data); done: @@ -287,13 +290,15 @@ int ring_buffer__consume(struct ring_buffer *rb) for (i =3D 0; i < rb->ring_cnt; i++) { struct ring *ring =3D rb->rings[i]; =20 - err =3D ringbuf_process_ring(ring); + err =3D ringbuf_process_ring(ring, INT_MAX); if (err < 0) return libbpf_err(err); res +=3D err; + if (res > INT_MAX) { + res =3D INT_MAX; + break; + } } - if (res > INT_MAX) - return INT_MAX; return res; } =20 @@ -314,13 +319,15 @@ int ring_buffer__poll(struct ring_buffer *rb, int tim= eout_ms) __u32 ring_id =3D rb->events[i].data.fd; struct ring *ring =3D rb->rings[ring_id]; =20 - err =3D ringbuf_process_ring(ring); + err =3D ringbuf_process_ring(ring, INT_MAX); if (err < 0) return libbpf_err(err); res +=3D err; + if (res > INT_MAX) { + res =3D INT_MAX; + break; + } } - if (res > INT_MAX) - return INT_MAX; return res; } =20 @@ -375,7 +382,7 @@ int ring__consume(struct ring *r) { int64_t res; =20 - res =3D ringbuf_process_ring(r); + res =3D ringbuf_process_ring(r, INT_MAX); if (res < 0) return libbpf_err(res); =20 --=20 2.43.0 From nobody Mon Feb 9 03:17:23 2026 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) (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 CE3DF3FBA7 for ; Sat, 6 Apr 2024 09:20:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.123 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712395238; cv=none; b=nGgMTJkrUlHY6ge3AuWet/yU1xQHobiFxRJlABe+o5FdobU0M4bLtWjgsxRMku7gO2psbUJmKSjWtI1Tuz1O6FAMpn8yNbVqY9oq/rtUGx1sbPxOcX56Lh8CprycOAFqFEdSba105Mfmi8LXM4LJa2Ua+gwxh3eVuSjQuEx03cE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712395238; c=relaxed/simple; bh=WxyORd5UGrvrhH3ovdgj29XhigFycIY9JFgRu0PCY/A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=euU0/XDUC154CLEZ1NCKG6FZbHQn/nT/DagKp6vnx0UCJ9xwW+gzBlxSnA9rfiAdead5XWWesyF630VcbyQPUUFkm7BKMy8x2a4UNSS1/hWcFnF4NVIjA5haKeszhlYslZMpU+V/EaMm3Y2WFfINC66+s6XehiKnybO7CqNymDg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=FKZhXKdn; arc=none smtp.client-ip=185.125.188.123 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="FKZhXKdn" Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id A280E3FE67 for ; Sat, 6 Apr 2024 09:20:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1712395224; bh=OGumsLBWYsNiBqaQkxgfB4Yj3V+oiBGI9bnDO7L7IE8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FKZhXKdnqeowQv0waOcRef6TIIWf8DZwwosHupqS/iFa0vVTAGbEHCWCBtimSKvST LBPjTWRoyQY2QzJTLSn7yJBpJN3DhtxLk55ZGLwkJwyReZyeTNp75LjFMcbtX/GX9t yR6GkLOcv/IzneyAGtsEj0QERz1OqLqGNiHTRjwi7ie+H+Kl5hk2bNc8bz3YQ1dlzt kYC7fTsAtQ9c4/gm5G3506V0n0Qmw+ecMFxCUsIzAqlqi2xdshQ4fhh9GU9cC6TmTk ZBRnppVTi/dXkPvzH6/4fgvKYmADevchJc3XjNlbkpqQyl28pNA4voUUP+arFiZ/mA yTm7FRUygKDkQ== Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-41645ed539eso17365e9.3 for ; Sat, 06 Apr 2024 02:20:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712395218; x=1713000018; 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=OGumsLBWYsNiBqaQkxgfB4Yj3V+oiBGI9bnDO7L7IE8=; b=JkIn0YovjCFS6M2D8xuire09WPoQ06/blfINzCUlbZUjQsh2U4CsmS/qX6V+FpqXYh rOV/tQn0nup7lmJGqAbt6B1FrDHdEb8S3u5ShHggZXigT60g15g5Y3jt1p5X6ajLXD4N vKtuvAcRhk9bzOxUFCXxLlckx+pj3aLMY413oqHVS2lJ4nZ3BRHArqwZ+L71Qwru+SZl kIuO1goAkoCSEc9bTKJWAL0sUlSAUK4rMon0IMPIuHiv45LPYYlclDY0VA9bZ4KLIZkQ bW2ILtJQXFdDmwE0PbqHcJyV1nf7GcxwzEeqjJsEkNnsWCjgqQhkFrEjtuqrx4YZIefi HiWA== X-Forwarded-Encrypted: i=1; AJvYcCVpsZM5TOzHbQg67opfkcnL6zxQl503iMexwGZ0JDMFeUTDEd5swy9Vw7Ko4EG4ztThZ9M7VzN06v+rLWYvjxDNVWO7VZkFpHj0YjIb X-Gm-Message-State: AOJu0YzWCTTKPj8Tj6nXHVzIaIsJ7JO0AXxPjfc+aTYVZFdJQxk74/8+ ZaxTnqpNymzSFNRP0e9nzaPQ0erGgSzGSiXHe/DvC2PDoXuvXQoWJscqfeTNDHG/XYR3znwJjZN CNC+8wBsYUh/TR2j0tAI1K2+HcQaVcHJ1aGvTJrrSW0PW61BxIMqiklr2Uytpy9a38MLv5MikP8 7EuA== X-Received: by 2002:a05:600c:4e8c:b0:415:6728:a584 with SMTP id f12-20020a05600c4e8c00b004156728a584mr2494541wmq.25.1712395217760; Sat, 06 Apr 2024 02:20:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGNXztDhLsiKAKWeuFLp95WeOaSFimKeT6ittgqyCRbNIAyGvgIZJkAN7068+uWqmdKvBO5fg== X-Received: by 2002:a05:600c:4e8c:b0:415:6728:a584 with SMTP id f12-20020a05600c4e8c00b004156728a584mr2494512wmq.25.1712395217054; Sat, 06 Apr 2024 02:20:17 -0700 (PDT) Received: from gpd.station (net-2-39-142-110.cust.vodafonedsl.it. [2.39.142.110]) by smtp.gmail.com with ESMTPSA id l23-20020a7bc457000000b00414924f307csm5779993wmi.26.2024.04.06.02.20.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Apr 2024 02:20:16 -0700 (PDT) From: Andrea Righi To: Andrii Nakryiko , Eduard Zingerman Cc: Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , David Vernet , Tejun Heo , bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 3/4] libbpf: Add ring__consume_n / ring_buffer__consume_n Date: Sat, 6 Apr 2024 11:15:43 +0200 Message-ID: <20240406092005.92399-4-andrea.righi@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240406092005.92399-1-andrea.righi@canonical.com> References: <20240406092005.92399-1-andrea.righi@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce a new API to consume items from a ring buffer, limited to a specified amount, and return to the caller the actual number of items consumed. Link: https://lore.kernel.org/lkml/20240310154726.734289-1-andrea.righi@can= onical.com/T Signed-off-by: Andrea Righi --- tools/lib/bpf/libbpf.h | 12 ++++++++++++ tools/lib/bpf/libbpf.map | 3 +++ tools/lib/bpf/ringbuf.c | 38 +++++++++++++++++++++++++++++++++++--- 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index f88ab50c0229..4f775a6dcaa0 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -1293,6 +1293,7 @@ LIBBPF_API int ring_buffer__add(struct ring_buffer *r= b, int map_fd, ring_buffer_sample_fn sample_cb, void *ctx); LIBBPF_API int ring_buffer__poll(struct ring_buffer *rb, int timeout_ms); LIBBPF_API int ring_buffer__consume(struct ring_buffer *rb); +LIBBPF_API int ring_buffer__consume_n(struct ring_buffer *rb, size_t n); LIBBPF_API int ring_buffer__epoll_fd(const struct ring_buffer *rb); =20 /** @@ -1367,6 +1368,17 @@ LIBBPF_API int ring__map_fd(const struct ring *r); */ LIBBPF_API int ring__consume(struct ring *r); =20 +/** + * @brief **ring__consume_n()** consumes up to a requested amount of items= from + * a ringbuffer without event polling. + * + * @param r A ringbuffer object. + * @param n Maximum amount of items to consume. + * @return The number of items consumed, or a negative number if any of the + * callbacks return an error. + */ +LIBBPF_API int ring__consume_n(struct ring *r, size_t n); + struct user_ring_buffer_opts { size_t sz; /* size of this struct, for forward/backward compatibility */ }; diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map index 5dd81a7b96b5..23d82bba021a 100644 --- a/tools/lib/bpf/libbpf.map +++ b/tools/lib/bpf/libbpf.map @@ -418,4 +418,7 @@ LIBBPF_1.4.0 { } LIBBPF_1.3.0; =20 LIBBPF_1.5.0 { + global: + ring__consume_n; + ring_buffer__consume_n; } LIBBPF_1.4.0; diff --git a/tools/lib/bpf/ringbuf.c b/tools/lib/bpf/ringbuf.c index 2c4031168413..19cd34883011 100644 --- a/tools/lib/bpf/ringbuf.c +++ b/tools/lib/bpf/ringbuf.c @@ -277,6 +277,33 @@ static int64_t ringbuf_process_ring(struct ring *r, si= ze_t n) return cnt; } =20 +/* Consume available ring buffer(s) data without event polling, up to n + * records. + * + * Returns number of records consumed across all registered ring buffers (= or + * n, whichever is less), or negative number if any of the callbacks return + * error. + */ +int ring_buffer__consume_n(struct ring_buffer *rb, size_t n) +{ + int64_t err, res =3D 0; + int i; + + for (i =3D 0; i < rb->ring_cnt; i++) { + struct ring *ring =3D rb->rings[i]; + + err =3D ringbuf_process_ring(ring, n); + if (err < 0) + return libbpf_err(err); + res +=3D err; + n -=3D err; + + if (n =3D=3D 0) + break; + } + return res; +} + /* Consume available ring buffer(s) data without event polling. * Returns number of records consumed across all registered ring buffers (= or * INT_MAX, whichever is less), or negative number if any of the callbacks @@ -378,17 +405,22 @@ int ring__map_fd(const struct ring *r) return r->map_fd; } =20 -int ring__consume(struct ring *r) +int ring__consume_n(struct ring *r, size_t n) { - int64_t res; + int res; =20 - res =3D ringbuf_process_ring(r, INT_MAX); + res =3D ringbuf_process_ring(r, n); if (res < 0) return libbpf_err(res); =20 return res > INT_MAX ? INT_MAX : res; } =20 +int ring__consume(struct ring *r) +{ + return ring__consume_n(r, INT_MAX); +} + static void user_ringbuf_unmap_ring(struct user_ring_buffer *rb) { if (rb->consumer_pos) { --=20 2.43.0 From nobody Mon Feb 9 03:17:23 2026 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) (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 B502D3FBA5 for ; Sat, 6 Apr 2024 09:20:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.123 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712395238; cv=none; b=X6flFC5WAr9i3OswDgzdKK4TNM5bvU462MNd0//ibKsvfiuWVoeMbWJVqeCSg/UC1SHUgN9EdF+vH5Wcg4ucTVKlMAPrmuXm4yx1eZbzf7A3qy276BcqCZkPqc0woqjoWYnRKzRovwFwN72NhAHUrKq/2R0y0SDAfFAbEIRgUcE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712395238; c=relaxed/simple; bh=V866d7v0EUjhFe+hV0qrTNaTJ3Gb92BOJZHI+Gz3L24=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OPM8zzPQj0i4bpguCtlbpeYlCQDT/S8I5ON4/hXPhJm33BqXxBjSoVHHY4GpSBmRh1G1RcBOl/xM8ENcKmmnjjmWXnMI+rPNXhaQ8BhqKrYzwwRUnGrdUxzVdxo2z20NovUlovz6FKvYl9UIcX3jKktrmDp3skBbSoLLGTH6kJg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=lB2l4Ywu; arc=none smtp.client-ip=185.125.188.123 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="lB2l4Ywu" Received: from mail-lf1-f70.google.com (mail-lf1-f70.google.com [209.85.167.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id E20F73FB79 for ; Sat, 6 Apr 2024 09:20:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1712395225; bh=qzaONF2ufkMLEwxVO924M3LwWzApnPaibbBgBkLZGxs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lB2l4YwunUmf2+jdL5QZxL41cjtSDwXWT5tyAkjETaS2mqoFUw64VqBO38dZlClyM 3qTgiQkszAevQm6LYhm/Xt/oWFxGhj0slblNBezlrx+jOBXquWkY9hQ2KYYLGYjz0p wFPzndEPnlNINkfaIEuOR/nRjOQNKRYysVgpJo4EdiQgub9ET8NEVnSI6JiI8a74oP xx6ESaa3TmLuwMoPDiiQQFDxVQWn20fAs/y6csbQt+eTAa9IFOU6O6Hheza4DUJahT VVnLmJiNGvh+mnrq8C8Jy18XK8/cGu0JPi9XITL4rwOLdWB8coHbMEQC48cYLJbcfN yGB3h7ZJVz1hg== Received: by mail-lf1-f70.google.com with SMTP id 2adb3069b0e04-516ddd6d66fso140389e87.1 for ; Sat, 06 Apr 2024 02:20:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712395219; x=1713000019; 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=qzaONF2ufkMLEwxVO924M3LwWzApnPaibbBgBkLZGxs=; b=IJMcSpm9AxLBLXTVOOiynHaFlHdLh2d2H+r5GKSfsiXqOc2DD/M/xmwQYmWinuCHii fHizmEjCUJwhXGCqGaSxSFgRuOESoVPB4EFrOiuHJaGSCFkZhhD/QzF5iqaqtbV98Zy0 6nYRQ+h4RzroOsTVaiPr2jnhVrhZONULJEN/w+A+61kyJTccIuMd3Optfy+RzW4r0sVX wF7D0KDzNNvubMNE/6XxIE4Ei8Iysjjag3MKTKrQX2RCete0WVplVS0zl3aSg9RL//n7 BDydtssSoVR17Uy2/N6FZRXEUPwA4MNsunUps9ztBiXTnsg3cTqKV0FNM9VUzekA8+77 NACg== X-Forwarded-Encrypted: i=1; AJvYcCXsuNO3MN4fT0jCtK7GbfWvxKEm5MyQ9mi9AkY6DBSqoPuFPofv9Z+eWP8etWEsmNo04QnuvrsfZJ4xqiGLhfJCllBjj8KQ2ysviKKz X-Gm-Message-State: AOJu0YxeWz1+z5n53AS5otUnuICZfthxcTFkkPpBniTa/LCkYOAQ4Fxn FU3u52e0gITEFWGUVuSU5XQ3HG6FIy5DBpy/W2ZVwH3EeArVkBPEiT7wM5/wRjupYuSHx035LPM /U66ipn/gx/3Yz/D18cPR2Rgv7ewMksiyGtYhDvEuEvEU5iKC8malxnI6HEAeIbIL0P9du4JKFI tRWg== X-Received: by 2002:ac2:528f:0:b0:516:ace0:9a75 with SMTP id q15-20020ac2528f000000b00516ace09a75mr2341483lfm.23.1712395219275; Sat, 06 Apr 2024 02:20:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHZAyOXnlJzHnF6UAxzVX17DxYL4mhxCDf8C91bLhJCKP1I0WnSc9EcZ/D+EvzXCHwk6NrkuA== X-Received: by 2002:ac2:528f:0:b0:516:ace0:9a75 with SMTP id q15-20020ac2528f000000b00516ace09a75mr2341471lfm.23.1712395218819; Sat, 06 Apr 2024 02:20:18 -0700 (PDT) Received: from gpd.station (net-2-39-142-110.cust.vodafonedsl.it. [2.39.142.110]) by smtp.gmail.com with ESMTPSA id l23-20020a7bc457000000b00414924f307csm5779993wmi.26.2024.04.06.02.20.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Apr 2024 02:20:18 -0700 (PDT) From: Andrea Righi To: Andrii Nakryiko , Eduard Zingerman Cc: Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , David Vernet , Tejun Heo , bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 4/4] selftests/bpf: Add tests for ring__consume_n and ring_buffer__consume_n Date: Sat, 6 Apr 2024 11:15:44 +0200 Message-ID: <20240406092005.92399-5-andrea.righi@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240406092005.92399-1-andrea.righi@canonical.com> References: <20240406092005.92399-1-andrea.righi@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add tests for new API ring__consume_n() and ring_buffer__consume_n(). Signed-off-by: Andrea Righi --- tools/testing/selftests/bpf/prog_tests/ringbuf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/ringbuf.c b/tools/testi= ng/selftests/bpf/prog_tests/ringbuf.c index 48c5695b7abf..33aba7684ab9 100644 --- a/tools/testing/selftests/bpf/prog_tests/ringbuf.c +++ b/tools/testing/selftests/bpf/prog_tests/ringbuf.c @@ -304,10 +304,18 @@ static void ringbuf_subtest(void) err =3D ring_buffer__consume(ringbuf); CHECK(err < 0, "rb_consume", "failed: %d\b", err); =20 + /* try to consume up to one item */ + err =3D ring_buffer__consume_n(ringbuf, 1); + CHECK(err < 0 || err > 1, "rb_consume_n", "failed: %d\b", err); + /* also consume using ring__consume to make sure it works the same */ err =3D ring__consume(ring); ASSERT_GE(err, 0, "ring_consume"); =20 + /* try to consume up to one item */ + err =3D ring__consume_n(ring, 1); + CHECK(err < 0 || err > 1, "ring_consume_n", "failed: %d\b", err); + /* 3 rounds, 2 samples each */ cnt =3D atomic_xchg(&sample_cnt, 0); CHECK(cnt !=3D 6, "cnt", "exp %d samples, got %d\n", 6, cnt); --=20 2.43.0