Commit 01d3240a authored by Sean Young's avatar Sean Young Committed by Alexei Starovoitov

media: bpf: add bpf function to report mouse movement

Some IR remotes have a directional pad or other pointer-like thing that
can be used as a mouse. Make it possible to decode these types of IR
protocols in BPF.

Cc: netdev@vger.kernel.org
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent ca5d1a7f
...@@ -59,6 +59,28 @@ static const struct bpf_func_proto rc_keydown_proto = { ...@@ -59,6 +59,28 @@ static const struct bpf_func_proto rc_keydown_proto = {
.arg4_type = ARG_ANYTHING, .arg4_type = ARG_ANYTHING,
}; };
BPF_CALL_3(bpf_rc_pointer_rel, u32*, sample, s32, rel_x, s32, rel_y)
{
struct ir_raw_event_ctrl *ctrl;
ctrl = container_of(sample, struct ir_raw_event_ctrl, bpf_sample);
input_report_rel(ctrl->dev->input_dev, REL_X, rel_x);
input_report_rel(ctrl->dev->input_dev, REL_Y, rel_y);
input_sync(ctrl->dev->input_dev);
return 0;
}
static const struct bpf_func_proto rc_pointer_rel_proto = {
.func = bpf_rc_pointer_rel,
.gpl_only = true,
.ret_type = RET_INTEGER,
.arg1_type = ARG_PTR_TO_CTX,
.arg2_type = ARG_ANYTHING,
.arg3_type = ARG_ANYTHING,
};
static const struct bpf_func_proto * static const struct bpf_func_proto *
lirc_mode2_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) lirc_mode2_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
{ {
...@@ -67,6 +89,8 @@ lirc_mode2_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) ...@@ -67,6 +89,8 @@ lirc_mode2_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
return &rc_repeat_proto; return &rc_repeat_proto;
case BPF_FUNC_rc_keydown: case BPF_FUNC_rc_keydown:
return &rc_keydown_proto; return &rc_keydown_proto;
case BPF_FUNC_rc_pointer_rel:
return &rc_pointer_rel_proto;
case BPF_FUNC_map_lookup_elem: case BPF_FUNC_map_lookup_elem:
return &bpf_map_lookup_elem_proto; return &bpf_map_lookup_elem_proto;
case BPF_FUNC_map_update_elem: case BPF_FUNC_map_update_elem:
......
...@@ -2301,6 +2301,20 @@ union bpf_attr { ...@@ -2301,6 +2301,20 @@ union bpf_attr {
* payload and/or *pop* value being to large. * payload and/or *pop* value being to large.
* Return * Return
* 0 on success, or a negative error in case of failure. * 0 on success, or a negative error in case of failure.
*
* int bpf_rc_pointer_rel(void *ctx, s32 rel_x, s32 rel_y)
* Description
* This helper is used in programs implementing IR decoding, to
* report a successfully decoded pointer movement.
*
* The *ctx* should point to the lirc sample as passed into
* the program.
*
* This helper is only available is the kernel was compiled with
* the **CONFIG_BPF_LIRC_MODE2** configuration option set to
* "**y**".
* Return
* 0
*/ */
#define __BPF_FUNC_MAPPER(FN) \ #define __BPF_FUNC_MAPPER(FN) \
FN(unspec), \ FN(unspec), \
...@@ -2394,7 +2408,8 @@ union bpf_attr { ...@@ -2394,7 +2408,8 @@ union bpf_attr {
FN(map_pop_elem), \ FN(map_pop_elem), \
FN(map_peek_elem), \ FN(map_peek_elem), \
FN(msg_push_data), \ FN(msg_push_data), \
FN(msg_pop_data), FN(msg_pop_data), \
FN(rc_pointer_rel),
/* integer value in 'imm' field of BPF_CALL instruction selects which helper /* integer value in 'imm' field of BPF_CALL instruction selects which helper
* function eBPF program intends to call * function eBPF program intends to call
......
...@@ -2298,9 +2298,22 @@ union bpf_attr { ...@@ -2298,9 +2298,22 @@ union bpf_attr {
* if possible. Other errors can occur if input parameters are * if possible. Other errors can occur if input parameters are
* invalid either due to *start* byte not being valid part of msg * invalid either due to *start* byte not being valid part of msg
* payload and/or *pop* value being to large. * payload and/or *pop* value being to large.
* Return
* 0 on success, or a negative error in case of failure.
*
* int bpf_rc_pointer_rel(void *ctx, s32 rel_x, s32 rel_y)
* Description
* This helper is used in programs implementing IR decoding, to
* report a successfully decoded pointer movement.
*
* The *ctx* should point to the lirc sample as passed into
* the program.
* *
* This helper is only available is the kernel was compiled with
* the **CONFIG_BPF_LIRC_MODE2** configuration option set to
* "**y**".
* Return * Return
* 0 on success, or a negative erro in case of failure. * 0
*/ */
#define __BPF_FUNC_MAPPER(FN) \ #define __BPF_FUNC_MAPPER(FN) \
FN(unspec), \ FN(unspec), \
...@@ -2394,7 +2407,8 @@ union bpf_attr { ...@@ -2394,7 +2407,8 @@ union bpf_attr {
FN(map_pop_elem), \ FN(map_pop_elem), \
FN(map_peek_elem), \ FN(map_peek_elem), \
FN(msg_push_data), \ FN(msg_push_data), \
FN(msg_pop_data), FN(msg_pop_data), \
FN(rc_pointer_rel),
/* integer value in 'imm' field of BPF_CALL instruction selects which helper /* integer value in 'imm' field of BPF_CALL instruction selects which helper
* function eBPF program intends to call * function eBPF program intends to call
......
...@@ -170,6 +170,8 @@ static int (*bpf_skb_vlan_push)(void *ctx, __be16 vlan_proto, __u16 vlan_tci) = ...@@ -170,6 +170,8 @@ static int (*bpf_skb_vlan_push)(void *ctx, __be16 vlan_proto, __u16 vlan_tci) =
(void *) BPF_FUNC_skb_vlan_push; (void *) BPF_FUNC_skb_vlan_push;
static int (*bpf_skb_vlan_pop)(void *ctx) = static int (*bpf_skb_vlan_pop)(void *ctx) =
(void *) BPF_FUNC_skb_vlan_pop; (void *) BPF_FUNC_skb_vlan_pop;
static int (*bpf_rc_pointer_rel)(void *ctx, int rel_x, int rel_y) =
(void *) BPF_FUNC_rc_pointer_rel;
/* llvm builtin functions that eBPF C program may use to /* llvm builtin functions that eBPF C program may use to
* emit BPF_LD_ABS and BPF_LD_IND instructions * emit BPF_LD_ABS and BPF_LD_IND instructions
......
...@@ -21,13 +21,14 @@ do ...@@ -21,13 +21,14 @@ do
if grep -q DRV_NAME=rc-loopback $i/uevent if grep -q DRV_NAME=rc-loopback $i/uevent
then then
LIRCDEV=$(grep DEVNAME= $i/lirc*/uevent | sed sQDEVNAME=Q/dev/Q) LIRCDEV=$(grep DEVNAME= $i/lirc*/uevent | sed sQDEVNAME=Q/dev/Q)
INPUTDEV=$(grep DEVNAME= $i/input*/event*/uevent | sed sQDEVNAME=Q/dev/Q)
fi fi
done done
if [ -n $LIRCDEV ]; if [ -n $LIRCDEV ];
then then
TYPE=lirc_mode2 TYPE=lirc_mode2
./test_lirc_mode2_user $LIRCDEV ./test_lirc_mode2_user $LIRCDEV $INPUTDEV
ret=$? ret=$?
if [ $ret -ne 0 ]; then if [ $ret -ne 0 ]; then
echo -e ${RED}"FAIL: $TYPE"${NC} echo -e ${RED}"FAIL: $TYPE"${NC}
......
...@@ -15,6 +15,9 @@ int bpf_decoder(unsigned int *sample) ...@@ -15,6 +15,9 @@ int bpf_decoder(unsigned int *sample)
if (duration & 0x10000) if (duration & 0x10000)
bpf_rc_keydown(sample, 0x40, duration & 0xffff, 0); bpf_rc_keydown(sample, 0x40, duration & 0xffff, 0);
if (duration & 0x20000)
bpf_rc_pointer_rel(sample, (duration >> 8) & 0xff,
duration & 0xff);
} }
return 0; return 0;
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <linux/bpf.h> #include <linux/bpf.h>
#include <linux/lirc.h> #include <linux/lirc.h>
#include <linux/input.h>
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
...@@ -47,12 +48,13 @@ ...@@ -47,12 +48,13 @@
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
struct bpf_object *obj; struct bpf_object *obj;
int ret, lircfd, progfd, mode; int ret, lircfd, progfd, inputfd;
int testir = 0x1dead; int testir1 = 0x1dead;
int testir2 = 0x20101;
u32 prog_ids[10], prog_flags[10], prog_cnt; u32 prog_ids[10], prog_flags[10], prog_cnt;
if (argc != 2) { if (argc != 3) {
printf("Usage: %s /dev/lircN\n", argv[0]); printf("Usage: %s /dev/lircN /dev/input/eventM\n", argv[0]);
return 2; return 2;
} }
...@@ -76,9 +78,9 @@ int main(int argc, char **argv) ...@@ -76,9 +78,9 @@ int main(int argc, char **argv)
return 1; return 1;
} }
mode = LIRC_MODE_SCANCODE; inputfd = open(argv[2], O_RDONLY | O_NONBLOCK);
if (ioctl(lircfd, LIRC_SET_REC_MODE, &mode)) { if (inputfd == -1) {
printf("failed to set rec mode: %m\n"); printf("failed to open input device %s: %m\n", argv[1]);
return 1; return 1;
} }
...@@ -102,29 +104,54 @@ int main(int argc, char **argv) ...@@ -102,29 +104,54 @@ int main(int argc, char **argv)
} }
/* Write raw IR */ /* Write raw IR */
ret = write(lircfd, &testir, sizeof(testir)); ret = write(lircfd, &testir1, sizeof(testir1));
if (ret != sizeof(testir)) { if (ret != sizeof(testir1)) {
printf("Failed to send test IR message: %m\n"); printf("Failed to send test IR message: %m\n");
return 1; return 1;
} }
struct pollfd pfd = { .fd = lircfd, .events = POLLIN }; struct pollfd pfd = { .fd = inputfd, .events = POLLIN };
struct lirc_scancode lsc; struct input_event event;
poll(&pfd, 1, 100); for (;;) {
poll(&pfd, 1, 100);
/* Read decoded IR */ /* Read decoded IR */
ret = read(lircfd, &lsc, sizeof(lsc)); ret = read(inputfd, &event, sizeof(event));
if (ret != sizeof(lsc)) { if (ret != sizeof(event)) {
printf("Failed to read decoded IR: %m\n"); printf("Failed to read decoded IR: %m\n");
return 1; return 1;
}
if (event.type == EV_MSC && event.code == MSC_SCAN &&
event.value == 0xdead) {
break;
}
} }
if (lsc.scancode != 0xdead || lsc.rc_proto != 64) { /* Write raw IR */
printf("Incorrect scancode decoded\n"); ret = write(lircfd, &testir2, sizeof(testir2));
if (ret != sizeof(testir2)) {
printf("Failed to send test IR message: %m\n");
return 1; return 1;
} }
for (;;) {
poll(&pfd, 1, 100);
/* Read decoded IR */
ret = read(inputfd, &event, sizeof(event));
if (ret != sizeof(event)) {
printf("Failed to read decoded IR: %m\n");
return 1;
}
if (event.type == EV_REL && event.code == REL_Y &&
event.value == 1 ) {
break;
}
}
prog_cnt = 10; prog_cnt = 10;
ret = bpf_prog_query(lircfd, BPF_LIRC_MODE2, 0, prog_flags, prog_ids, ret = bpf_prog_query(lircfd, BPF_LIRC_MODE2, 0, prog_flags, prog_ids,
&prog_cnt); &prog_cnt);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment