From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f172.google.com (mail-dy1-f172.google.com [74.125.82.172]) (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 BD2DD36A375 for ; Thu, 11 Jun 2026 22:48:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781218099; cv=none; b=jHuUJ3kH+aAlDcWSCCxYpUE3IGdfoVdxtaYrFpsmoP2ueyE+9QCz/a/cL5ZhAjdfStZM9D4Ul2Dkq2PwTaW7HNmz4M193pATTQboFtOpk2FWr1C9mBhn/dXGazgvUCkiylCheqyiqd0uOssMgunZrkNrcJDID8uYsIkimNL7bJc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781218099; c=relaxed/simple; bh=SOurTV8MVSezXPtIqOaux2KDSaFDWyGI/YwP8/bMyS0=; h=Mime-Version:Content-Type:Date:Message-Id:Subject:From:To: References:In-Reply-To; b=FM5ibfWm+VibBgQTphB12FFY1tocjDM3yK5syUKENthkW/q4Ac62UscdDd+viZ0v8r6Zry6S/TlChlSquZCEIbwQWa6iKp38qXMWwrc7TET4rsNtoY/vQTneCjhfRpb8eIM8tC7SCGqozoOLoA/Y+TNNLuSAqES5i1AcOprH9To= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=etsalapatis.com; spf=pass smtp.mailfrom=etsalapatis.com; dkim=pass (2048-bit key) header.d=etsalapatis-com.20251104.gappssmtp.com header.i=@etsalapatis-com.20251104.gappssmtp.com header.b=GtbSd7T9; arc=none smtp.client-ip=74.125.82.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=etsalapatis.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=etsalapatis.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=etsalapatis-com.20251104.gappssmtp.com header.i=@etsalapatis-com.20251104.gappssmtp.com header.b="GtbSd7T9" Received: by mail-dy1-f172.google.com with SMTP id 5a478bee46e88-3074adb8fcaso1077801eec.0 for ; Thu, 11 Jun 2026 15:48:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=etsalapatis-com.20251104.gappssmtp.com; s=20251104; t=1781218097; x=1781822897; darn=vger.kernel.org; h=in-reply-to:references:to:from:subject:message-id:date :content-transfer-encoding:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=BxLD5BCySm0EUvi8VVSUy2Of5J/r9n7rRnE2RlT1lf0=; b=GtbSd7T9J9+hwiJaCzoYCNC9UeQ1Dwpc9l4v8z+bIdy4ZmoJ3SziT2jRs6s4zcPDol MuPMrV03r6LBrUdGEe00fib7aimRibDVwn4JJLrJ89f7TQSYiQEthdNjGaILXRT7NwM0 PFRNqB93v/jGvlgvrh7hFzr16kiWAizoaR4C1wMzBCKZFZq7USkFL9FzM5Bg0qDVJamk 0krhjmWcHjhmKeE2cKucBc63V88xLOc77pQ5YJukNwhlp1iAxBWylI2BUIBLZNSTDMo+ tk9n7Pfqg09h+j+DvcaQybisLMB4mFnN1l6Oi53ehRPj2x9Shq7n44map31qftrouOLk dulg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781218097; x=1781822897; h=in-reply-to:references:to:from:subject:message-id:date :content-transfer-encoding:mime-version:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=BxLD5BCySm0EUvi8VVSUy2Of5J/r9n7rRnE2RlT1lf0=; b=fZ5df8n1aJ17tj23JQdOuxrJSJjUzTQwK3zS7ciLVHS62HKrkW4mgvAHgIoCx/3Ul7 23gOQrVq5DVHLldiDthNw84dY2TDviUzO3DzKLKIkeWNPTfTViQKtqBeSw5e1bcl2xom 5wo1RX8aJ9BqT9SfKFnwQiU/GCKKys9Rd5EMWH3bWDAbDcyix7gekhsNgmdXuwMCN5YY AENRhOSV7cx4LZR9hmhJeC2yVEh1pN4jy2a1px7eDTFEgrHZONF3YRO5lkH9nFmW1Gjv jjsl1+FUPfl8S/QFaJ6jsOexEcwSUXB1bht6qgtkQvxEh+ucXI0I7CCePBbbfcTXNMj/ Z6xQ== X-Forwarded-Encrypted: i=1; AFNElJ9nyE+SaIhDhAhqMhWo+NjqrSbbJJ8AmiWDH6Ul2PdxP2gOX9wI+KKZJi4PxYMhycfUeqJtLlsbpPeBi3E=@vger.kernel.org X-Gm-Message-State: AOJu0YxMhF4bMOFgWW8uFHf4s9vEgZfDAYh9T8M0J2kCOamoz0KvWzuG +wDCWwHZN8JPgFbzt4+qknn4nOR4OUizguXDsOMHlVfBE6aFKR+PTgOJrvUFDlaDl/k= X-Gm-Gg: Acq92OHdj0NMR1F0OQ2U2nHWIZhkktiBct80ZZVa3n/2XNSgZYKnU2Yru3Cqik3FInz ChlyaCzi2Ar1c9s3l60oIIqR9yxOB/7pWCi8aO0temT1ppag7uty5FUjoDU7jkyKSVpKPnTnDj8 4Vtifrme/XLcOcF8zMw4bsny8LM5ZPmhV5Oz2b0c9tPhHCuYE+braUATdVb635kpoLLhOJcurto TuFFZISL9zEpEYJI9yqF9sY52O1EoZAaKIjwAt8NEFi4nDwlyDqKzOtY42egE/VQfuQAaRDewqx Nozrjzp8o5JGDl+JbTz7s/d73m6vC1qvwRrSf8wMm7668iAMrXmkQKgNgM+xCRWttDfV3X2RN/f 6rPG2BEcpWqQ/Tqo9up9qOA+3/7zfNj/KB1LMPL5UbaXDadu/0arlfhBsKPqHD2rLzzhgcyD6WI fHKD/4 X-Received: by 2002:a05:7300:578f:b0:2f2:6dde:df53 with SMTP id 5a478bee46e88-3082009bd41mr206505eec.17.1781218096849; Thu, 11 Jun 2026 15:48:16 -0700 (PDT) Received: from localhost ([2620:10d:c090:600::3c95]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081eb8f8b2sm670952eec.27.2026.06.11.15.48.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 11 Jun 2026 15:48:16 -0700 (PDT) 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 Date: Thu, 11 Jun 2026 18:48:14 -0400 Message-Id: Subject: Re: [PATCH bpf-next] selftsets/bpf: Retry map update on helper_fill_hashmap() From: "Emil Tsalapatis" To: "Gabriele Monaco" , "Alexei Starovoitov" , "Daniel Borkmann" , "Andrii Nakryiko" , "Eduard Zingerman" , "Kumar Kartikeya Dwivedi" , "Shuah Khan" , , , X-Mailer: aerc 0.21.0-0-g5549850facc2 References: <20260611150704.95133-1-gmonaco@redhat.com> In-Reply-To: <20260611150704.95133-1-gmonaco@redhat.com> On Thu Jun 11, 2026 at 11:07 AM EDT, Gabriele Monaco wrote: > helper_fill_hashmap() is used also on parallel and stress map tests. > Those are consistently failing with ENOMEM on kernels built with > PREEMPT_RT if preallocation is disabled. The failure is transient and > only called by the memory cache refill running in a preemptible > irq_work, which can easily stall in case of contention. > > Use a retriable update in those cases to handle transient ENOMEM and > make the test more stable also on PREEMPT_RT. > Also fix the sign of the value printed in case of error (strerror() > expects a positive errno while updates return it negative). > > Signed-off-by: Gabriele Monaco Reviewed-by: Emil Tsalapatis The bot has a point about changing the code to & BPF_F_PREALLOC, but we touch test_maps.c twice a year and that only for bugfixes. There will probably be no other consumer of this function in the foreseeable future. Similarly, the whole file uses CHECK() so imo it's fine to keep this as-is. > --- > tools/testing/selftests/bpf/test_maps.c | 23 +++++++++++++---------- > 1 file changed, 13 insertions(+), 10 deletions(-) > > diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/self= tests/bpf/test_maps.c > index ccc5acd55f..c32da7bd8b 100644 > --- a/tools/testing/selftests/bpf/test_maps.c > +++ b/tools/testing/selftests/bpf/test_maps.c > @@ -260,6 +260,16 @@ static void test_hashmap_percpu(unsigned int task, v= oid *data) > close(fd); > } > =20 > +#define MAP_RETRIES 20 > + > +static bool can_retry(int err) > +{ > + return (err =3D=3D EAGAIN || err =3D=3D EBUSY || > + ((err =3D=3D ENOMEM || err =3D=3D E2BIG) && > + map_opts.map_flags =3D=3D BPF_F_NO_PREALLOC)); > +} > + > + > #define VALUE_SIZE 3 > static int helper_fill_hashmap(int max_entries) > { > @@ -274,10 +284,11 @@ static int helper_fill_hashmap(int max_entries) > =20 > for (i =3D 0; i < max_entries; i++) { > key =3D i; value[0] =3D key; > - ret =3D bpf_map_update_elem(fd, &key, value, BPF_NOEXIST); > + ret =3D map_update_retriable(fd, &key, value, BPF_NOEXIST, > + MAP_RETRIES, can_retry); > CHECK(ret !=3D 0, > "can't update hashmap", > - "err: %s\n", strerror(ret)); > + "err: %s\n", strerror(-ret)); > } > =20 > return fd; > @@ -1392,17 +1403,9 @@ static void test_map_stress(void) > #define DO_UPDATE 1 > #define DO_DELETE 0 > =20 > -#define MAP_RETRIES 20 > #define MAX_DELAY_US 50000 > #define MIN_DELAY_RANGE_US 5000 > =20 > -static bool can_retry(int err) > -{ > - return (err =3D=3D EAGAIN || err =3D=3D EBUSY || > - ((err =3D=3D ENOMEM || err =3D=3D E2BIG) && > - map_opts.map_flags =3D=3D BPF_F_NO_PREALLOC)); > -} > - > int map_update_retriable(int map_fd, const void *key, const void *value,= int flags, int attempts, > retry_for_error_fn need_retry) > { > > base-commit: 2d3090a8aeb596a26935db0955d46c9a5db5c6ce