From patchwork Tue Oct 25 09:34:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 10656 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp903403wru; Tue, 25 Oct 2022 02:38:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6xXchFYTozT/PG2vxs/InpJrF2afmi6ciwklABKEPNMPYWzJd8tVcwbrKsfeS18IsxP6pn X-Received: by 2002:a17:907:3e01:b0:730:a690:a211 with SMTP id hp1-20020a1709073e0100b00730a690a211mr31263499ejc.596.1666690733575; Tue, 25 Oct 2022 02:38:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666690733; cv=none; d=google.com; s=arc-20160816; b=zKWFtY4AWg7FHftzxuFHBl6a52GIZsOXj1QuWHhIwpSFAA5PM/MoLCUpNwI4hpDZGp pxO2zZwuFmhLUCEPbgF1cOYzBhStXLTsZzY1baahPaehvAi4gyzwghT1/YhqG8l4gytx MW/7GGenM5K4BdTLuE2YP96+hf+J/t1qPvabexMp8Ldr/enwtxIoAhMgUfg9VM0aiOcb ayYkU1LhstcISCiSjWcWtHamt162PRkoJCVnRAoX1Y+BPReoJHY+rF0+3io7FHv0tyy2 wbpGYl0poEdExQ9Nm+Tl/I0jpPv/s/hz66YqZwgCIEhSSmom2gupNlyZKnr24C1UxJwj glYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Zgxd3vBpCtaC6tleAUuCeo/bn9Mm2LTa+TkrsbZCnaw=; b=xEt66vc4JwJD66keeYbwelumKiwtX/Tqt4tEFmbM/9frnbLfPeodi0RqPtdgjg1OpK wrWioCItpgK3/9AbLanaS3Z+12BcbeJZmRIYxK4JsVFQtf7/sZg3qWqn9z7v6NfeHXyA K/AcqzKwJ5fbzF48QtsFhID2XGR8EWMc+/bW36+GY6hmWXsL4qUojPpLhOoo1aPTvo9J 6uxNxdIJz9JSdthee73NWX0U4q0k2rNXRELBOtK+5vKLkOVDZ5fEjlb1Obzzm8opYPTC ByScK7BPyeaSHNyklF0SxzDf+/n84hQXfn78UabI6XHc5xihSkJceVVBkMezolZxT9c5 HLIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UmU3OZ2X; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hs33-20020a1709073ea100b0078d8c03a5a6si2719780ejc.759.2022.10.25.02.38.29; Tue, 25 Oct 2022 02:38:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UmU3OZ2X; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231951AbiJYJhW (ORCPT + 99 others); Tue, 25 Oct 2022 05:37:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231982AbiJYJga (ORCPT ); Tue, 25 Oct 2022 05:36:30 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8CA6100BC5 for ; Tue, 25 Oct 2022 02:35:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666690532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Zgxd3vBpCtaC6tleAUuCeo/bn9Mm2LTa+TkrsbZCnaw=; b=UmU3OZ2XmGpmUAKfhVxKY3pLFqvIBNtXmyfewQA5SP7IjHM+rIKsdovh89CevvWPEEJQZs 0dIJ+bHnXLCp7hXUh1H9Fyi0Bulq2CvDEYtA/avUvqFjMZ8/CqfaqdsKgT2ChyfW9BJHjf 4eHUp//Tm8ePzrZgCm3DDtkuoR/mpIA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-317-s8u4YDW6P62EGgXO_2T5ww-1; Tue, 25 Oct 2022 05:35:27 -0400 X-MC-Unique: s8u4YDW6P62EGgXO_2T5ww-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F248A8582B9; Tue, 25 Oct 2022 09:35:26 +0000 (UTC) Received: from plouf.redhat.com (unknown [10.39.195.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 49AA4492CA2; Tue, 25 Oct 2022 09:35:25 +0000 (UTC) From: Benjamin Tissoires To: Greg KH , Jiri Kosina , Jonathan Corbet , Shuah Khan Cc: Tero Kristo , linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, Benjamin Tissoires Subject: [PATCH hid v11 11/14] selftests/hid: Add a test for BPF_F_INSERT_HEAD Date: Tue, 25 Oct 2022 11:34:55 +0200 Message-Id: <20221025093458.457089-12-benjamin.tissoires@redhat.com> In-Reply-To: <20221025093458.457089-1-benjamin.tissoires@redhat.com> References: <20221025093458.457089-1-benjamin.tissoires@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747651902232706128?= X-GMAIL-MSGID: =?utf-8?q?1747651902232706128?= Insert 3 programs to check that we are doing the correct thing: '2', '1', '3' are inserted, but '1' is supposed to be executed first. Signed-off-by: Benjamin Tissoires --- changes in v11: - use the new facility from selftests/hid no changes in v10 no changes in v9 no changes in v8 no changes in v7 changes in v6: - fixed copy/paste in ASSERT_OK and test execution order changes in v5: - use the new API not in v4 changes in v3: - use the new hid_get_data API new in v2 --- tools/testing/selftests/hid/hid_bpf.c | 43 ++++++++++++++++++++ tools/testing/selftests/hid/progs/hid.c | 54 ++++++++++++++++++++++++- 2 files changed, 96 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/hid/hid_bpf.c b/tools/testing/selftests/hid/hid_bpf.c index fc2ad0443803..14548a558d9e 100644 --- a/tools/testing/selftests/hid/hid_bpf.c +++ b/tools/testing/selftests/hid/hid_bpf.c @@ -88,6 +88,7 @@ static u8 feature_data[] = { 1, 2 }; struct attach_prog_args { int prog_fd; unsigned int hid; + unsigned int flags; int retval; }; @@ -491,6 +492,7 @@ FIXTURE_SETUP(hid_bpf) struct test_program { const char *name; + unsigned int flags; }; #define LOAD_PROGRAMS(progs) \ load_programs(progs, ARRAY_SIZE(progs), _metadata, self, variant) @@ -540,6 +542,7 @@ static void load_programs(const struct test_program programs[], args.prog_fd = bpf_program__fd(prog); args.hid = self->hid_id; + args.flags = programs[i].flags; err = bpf_prog_test_run_opts(attach_fd, &tattr); ASSERT_OK(args.retval) TH_LOG("attach_hid(%s): %d", programs[i].name, args.retval); } @@ -741,6 +744,46 @@ TEST_F(hid_bpf, test_hid_user_raw_request_call) ASSERT_EQ(args.data[1], 2); } +/* + * Attach hid_insert{0,1,2} to the given uhid device, + * retrieve and open the matching hidraw node, + * inject one event in the uhid device, + * check that the programs have been inserted in the correct order. + */ +TEST_F(hid_bpf, test_hid_attach_flags) +{ + const struct test_program progs[] = { + { + .name = "hid_test_insert2", + .flags = HID_BPF_FLAG_NONE, + }, + { + .name = "hid_test_insert1", + .flags = HID_BPF_FLAG_INSERT_HEAD, + }, + { + .name = "hid_test_insert3", + .flags = HID_BPF_FLAG_NONE, + }, + }; + u8 buf[10] = {0}; + int err; + + LOAD_PROGRAMS(progs); + + /* inject one event */ + buf[0] = 1; + uhid_send_event(_metadata, self->uhid_fd, buf, 6); + + /* read the data from hidraw */ + memset(buf, 0, sizeof(buf)); + err = read(self->hidraw_fd, buf, sizeof(buf)); + ASSERT_EQ(err, 6) TH_LOG("read_hidraw"); + ASSERT_EQ(buf[1], 1); + ASSERT_EQ(buf[2], 2); + ASSERT_EQ(buf[3], 3); +} + /* * Attach hid_rdesc_fixup to the given uhid device, * retrieve and open the matching hidraw node, diff --git a/tools/testing/selftests/hid/progs/hid.c b/tools/testing/selftests/hid/progs/hid.c index 815ff94321c9..eb869a80c254 100644 --- a/tools/testing/selftests/hid/progs/hid.c +++ b/tools/testing/selftests/hid/progs/hid.c @@ -21,6 +21,7 @@ extern int hid_bpf_hw_request(struct hid_bpf_ctx *ctx, struct attach_prog_args { int prog_fd; unsigned int hid; + unsigned int flags; int retval; }; @@ -60,7 +61,7 @@ int attach_prog(struct attach_prog_args *ctx) { ctx->retval = hid_bpf_attach_prog(ctx->hid, ctx->prog_fd, - 0); + ctx->flags); return 0; } @@ -152,3 +153,54 @@ int BPF_PROG(hid_rdesc_fixup, struct hid_bpf_ctx *hid_ctx) return sizeof(rdesc) + 73; } + +SEC("?fmod_ret/hid_bpf_device_event") +int BPF_PROG(hid_test_insert1, struct hid_bpf_ctx *hid_ctx) +{ + __u8 *data = hid_bpf_get_data(hid_ctx, 0 /* offset */, 4 /* size */); + + if (!data) + return 0; /* EPERM check */ + + /* we need to be run first */ + if (data[2] || data[3]) + return -1; + + data[1] = 1; + + return 0; +} + +SEC("?fmod_ret/hid_bpf_device_event") +int BPF_PROG(hid_test_insert2, struct hid_bpf_ctx *hid_ctx) +{ + __u8 *data = hid_bpf_get_data(hid_ctx, 0 /* offset */, 4 /* size */); + + if (!data) + return 0; /* EPERM check */ + + /* after insert0 and before insert2 */ + if (!data[1] || data[3]) + return -1; + + data[2] = 2; + + return 0; +} + +SEC("?fmod_ret/hid_bpf_device_event") +int BPF_PROG(hid_test_insert3, struct hid_bpf_ctx *hid_ctx) +{ + __u8 *data = hid_bpf_get_data(hid_ctx, 0 /* offset */, 4 /* size */); + + if (!data) + return 0; /* EPERM check */ + + /* at the end */ + if (!data[1] || !data[2]) + return -1; + + data[3] = 3; + + return 0; +}