Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp589582rwb; Fri, 13 Jan 2023 01:29:32 -0800 (PST) X-Google-Smtp-Source: AMrXdXudUEgHhIQYUdmOCLbhInk51In4HZX0d4C8O9/auad54fggWgqS0dqLaPS4hFsXDo/7fK1z X-Received: by 2002:a17:907:8c0c:b0:7c0:ad62:a25f with SMTP id ta12-20020a1709078c0c00b007c0ad62a25fmr70710695ejc.51.1673602171959; Fri, 13 Jan 2023 01:29:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673602171; cv=none; d=google.com; s=arc-20160816; b=H4xD2A87fRg2i8JRVtWPQ+UlfWE7QlH3t2KEiiV7XC88T6Pv260QMLB7SmA5cVLNb4 8shbYEoWIx+F5hZb/NS9Bg7VDtEwcHpMfQ1iVqWuHc6x6dLe3br1HHLjVj017VkGJFej kxd9hCx7Q/MlexDQCx6sk7DcKojtca3H67Se7esnPj+cs1DoqCCmOm0WuFDT57C9Tg0Q 0YqfoJBAgf6iAKFzVjksZJ5/+0skoTRTnsA3o6kq99bZD+PJOXCiiDBviZbC2LnEfjof jamHZbmM8YMkMGO60K2opzz0BnSfpXTvL9iwoLGhqiQr535K0U7K9hwdvs68aSRRM4DB tF5w== 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=zSBi9fEVjxMCBgiA3KVP8rZ11VOYsIr1qRPkJekyhzo=; b=xxkaorG6tkehiK0mM9ijZLvloiKawxgHgSlv/VDnWJjyVj43NFOCHPvspZ+MVYLPpx rtpSE4qt5v3VVmoUH2evj+XyFYc4P1CUWiNNsKNyoywK4mLbGeg/wLRki1rL+dsYJZBZ J6fCWWjrsbadNHq9e/juLJe0pm5TioeDeRSU+ULmZk4TZO1q1AzOM2OygI62raMPhJYI zNt/+bkCTqxDZb8RhQqwBPObGtTRNuhNQ/Z/wzcv+82QFBSdTwhRS4+WCYBuEWwJoNc4 3oD5dV4ErZllcI0UqrXri/jEp8eFS4lxQj2xRc/nz8ZiYtkVTX2ZAjv8QHGOJ0caEdqK OvRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KTHI36SQ; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nd15-20020a170907628f00b007da4fe085desi22052495ejc.157.2023.01.13.01.29.18; Fri, 13 Jan 2023 01:29:31 -0800 (PST) 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=KTHI36SQ; 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 S241295AbjAMJNe (ORCPT + 53 others); Fri, 13 Jan 2023 04:13:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241130AbjAMJMW (ORCPT ); Fri, 13 Jan 2023 04:12:22 -0500 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 D304FF00E for ; Fri, 13 Jan 2023 01:10:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673601003; 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=zSBi9fEVjxMCBgiA3KVP8rZ11VOYsIr1qRPkJekyhzo=; b=KTHI36SQNcuSlPKQrwiL3wLhjkKg6ACK316ByHRgScm89G3nDD+xXueofY59YGH62nmYKX ne7by3J29BkHhTM97iAWwSXmn6t2HZji2hUZSoW0z3v1d+105bsbB4sl/v3ZG2ytPEsWV1 KRm+bJvLfV4i8NpHBwFfVEPE+HjumgQ= 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-357-sAL87FzoO2mhn9iSm-k3qw-1; Fri, 13 Jan 2023 04:09:57 -0500 X-MC-Unique: sAL87FzoO2mhn9iSm-k3qw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 24862858F09; Fri, 13 Jan 2023 09:09:57 +0000 (UTC) Received: from plouf.redhat.com (ovpn-193-50.brq.redhat.com [10.40.193.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id E530D1121314; Fri, 13 Jan 2023 09:09:54 +0000 (UTC) From: Benjamin Tissoires To: Greg KH , Jiri Kosina , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Dmitry Torokhov Cc: Tero Kristo , linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, Benjamin Tissoires Subject: [PATCH HID for-next v2 7/9] selftests: hid: enforce new attach API Date: Fri, 13 Jan 2023 10:09:33 +0100 Message-Id: <20230113090935.1763477-8-benjamin.tissoires@redhat.com> In-Reply-To: <20230113090935.1763477-1-benjamin.tissoires@redhat.com> References: <20230113090935.1763477-1-benjamin.tissoires@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Spam-Status: No, score=-2.1 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 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 Now that the new API for hid_bpf_attach_prog() is in place, ensure we get an fd when calling this function. And remove the fallback code. Signed-off-by: Benjamin Tissoires --- no changes in v2 --- tools/testing/selftests/hid/hid_bpf.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/testing/selftests/hid/hid_bpf.c b/tools/testing/selftests/hid/hid_bpf.c index 9a262fe99b32..2cf96f818f25 100644 --- a/tools/testing/selftests/hid/hid_bpf.c +++ b/tools/testing/selftests/hid/hid_bpf.c @@ -638,11 +638,7 @@ TEST_F(hid_bpf, test_attach_detach) LOAD_PROGRAMS(progs); link = self->hid_links[0]; - /* we might not be using the new code path where hid_bpf_attach_prog() - * returns a link. - */ - if (!link) - link = bpf_program__fd(self->skel->progs.hid_first_event); + ASSERT_GT(link, 0) TH_LOG("HID-BPF link not created"); /* inject one event */ buf[0] = 1; -- 2.38.1