Received-SPF: pass (google.com: domain of linux-kernel+bounces-77334-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Precedence: bulk
MIME-Version: 1.0
References: <20240221-hid-bpf-sleepable-v3-0-1fb378ca6301@kernel.org> <20240221-hid-bpf-sleepable-v3-4-1fb378ca6301@kernel.org>
In-Reply-To: <20240221-hid-bpf-sleepable-v3-4-1fb378ca6301@kernel.org>
From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Date: Thu, 22 Feb 2024 12:47:37 -0800
Message-ID: <CAADnVQJ=a2BnOwcs5uNqnyHfbS=gv=X4Z8eaGU-Tx1o8LwyJdQ@mail.gmail.com>
Subject: Re: [PATCH RFC bpf-next v3 04/16] bpf/helpers: introduce sleepable bpf_timers
To: Benjamin Tissoires <bentiss@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, 
	John Fastabend <john.fastabend@gmail.com>, Andrii Nakryiko <andrii@kernel.org>, 
	Martin KaFai Lau <martin.lau@linux.dev>, Eduard Zingerman <eddyz87@gmail.com>, Song Liu <song@kernel.org>, 
	Yonghong Song <yonghong.song@linux.dev>, KP Singh <kpsingh@kernel.org>, 
	Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>, Jiri Olsa <jolsa@kernel.org>, 
	Jiri Kosina <jikos@kernel.org>, Benjamin Tissoires <benjamin.tissoires@redhat.com>, 
	Jonathan Corbet <corbet@lwn.net>, Shuah Khan <shuah@kernel.org>, bpf <bpf@vger.kernel.org>, 
	LKML <linux-kernel@vger.kernel.org>, 
	"open list:HID CORE LAYER" <linux-input@vger.kernel.org>, 
	"open list:DOCUMENTATION" <linux-doc@vger.kernel.org>, 
	"open list:KERNEL SELFTEST FRAMEWORK" <linux-kselftest@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Wed, Feb 21, 2024 at 8:25=E2=80=AFAM Benjamin Tissoires <bentiss@kernel.=
org> wrote:
>  /* the actual struct hidden inside uapi struct bpf_timer */
> @@ -1113,6 +1120,55 @@ struct bpf_timer_kern {
>         struct bpf_spin_lock lock;
>  } __attribute__((aligned(8)));
>
> +static u32 __bpf_timer_compute_key(struct bpf_hrtimer *timer)
> +{
> +       struct bpf_map *map =3D timer->map;
> +       void *value =3D timer->value;
> +
> +       if (map->map_type =3D=3D BPF_MAP_TYPE_ARRAY) {
> +               struct bpf_array *array =3D container_of(map, struct bpf_=
array, map);
> +
> +               /* compute the key */
> +               return ((char *)value - array->value) / array->elem_size;
> +       }
> +
> +       /* hash or lru */
> +       return *(u32 *)(value - round_up(map->key_size, 8));
> +}
> +
> +static void bpf_timer_work_cb(struct work_struct *work)
> +{
> +       struct bpf_hrtimer *t =3D container_of(work, struct bpf_hrtimer, =
work);
> +       struct bpf_map *map =3D t->map;
> +       void *value =3D t->value;
> +       bpf_callback_t callback_fn;
> +       u32 key;
> +
> +       BTF_TYPE_EMIT(struct bpf_timer);
> +
> +       down(&t->sleepable_lock);
> +
> +       callback_fn =3D READ_ONCE(t->callback_fn);
> +       if (!callback_fn) {
> +               up(&t->sleepable_lock);
> +               return;
> +       }
> +
> +       key =3D __bpf_timer_compute_key(t);
> +
> +
> +       callback_fn((u64)(long)map, (u64)(long)&key, (u64)(long)value, 0,=
 0);
> +       /* The verifier checked that return value is zero. */
> +
> +       bpf_prog_put(t->prog);
> +}
> +
>  static DEFINE_PER_CPU(struct bpf_hrtimer *, hrtimer_running);
>
>  static enum hrtimer_restart bpf_timer_cb(struct hrtimer *hrtimer)
> @@ -1121,8 +1177,7 @@ static enum hrtimer_restart bpf_timer_cb(struct hrt=
imer *hrtimer)
>         struct bpf_map *map =3D t->map;
>         void *value =3D t->value;
>         bpf_callback_t callback_fn;
> -       void *key;
> -       u32 idx;
> +       u32 key;
>
>         BTF_TYPE_EMIT(struct bpf_timer);
>         callback_fn =3D rcu_dereference_check(t->callback_fn, rcu_read_lo=
ck_bh_held());
> @@ -1136,17 +1191,9 @@ static enum hrtimer_restart bpf_timer_cb(struct hr=
timer *hrtimer)
>          * bpf_map_delete_elem() on the same timer.
>          */
>         this_cpu_write(hrtimer_running, t);
> -       if (map->map_type =3D=3D BPF_MAP_TYPE_ARRAY) {
> -               struct bpf_array *array =3D container_of(map, struct bpf_=
array, map);
> -
> -               /* compute the key */
> -               idx =3D ((char *)value - array->value) / array->elem_size=
;
> -               key =3D &idx;
> -       } else { /* hash or lru */
> -               key =3D value - round_up(map->key_size, 8);
> -       }
> +       key =3D __bpf_timer_compute_key(t);

Please don't mix such "cleanup" with main changes.
It's buggy for a hash map.
Instead of passing a pointer to the real key into bpf prog
you're reading the first 4 bytes from the key. Copying it into a temp var
and passing an address to that.
It would have been very painful to debug such a bug if it slipped through,
since bpf prog would sort-of work for 4-byte keys.