From patchwork Sun May 29 20:15:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Xu X-Patchwork-Id: 12864237 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD902C433F5 for ; Sun, 29 May 2022 20:16:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230217AbiE2UQE (ORCPT ); Sun, 29 May 2022 16:16:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229515AbiE2UQE (ORCPT ); Sun, 29 May 2022 16:16:04 -0400 Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88D6854BD7; Sun, 29 May 2022 13:16:02 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id C61105C0097; Sun, 29 May 2022 16:15:59 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 29 May 2022 16:15:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dxuuu.xyz; h=cc :cc:content-transfer-encoding:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to; s=fm3; t=1653855359; x=1653941759; bh=4yxj77r4xtmn7VVg4M5Kx65OM Vx5pZUm+BegY1jUTqs=; b=qFVVB8EdYI/9IgSbYsKayEAOkKTcupcNibIro0Pal g7jYea+fwsEFrbRG0ohFwgecGlaDmIy/v62MH/qHJlTITYpMRNnzXtHCT3ygObbQ uR2vFjbUpSB7Nbs+kbbLR2kNTQyj2VXK4yPyRdwT4/zjTztVHoof3Fgh6s5IuuCV Aig+8kVMX+/UA7emAZQeTHlJJgf3KTxLnTJtn1ex/sXPt1JabvoXF6AA63Wqf8Uf f39+cvq9craC6HTwYCJQqm/M7GyGQOYbr6oW0jJ+UKWFVbEI0LvyFs9sd6yhdfym NxBEYL6guLuwxZqlS8yU0i8ZgCwCuT170POLZT63pon0g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1653855359; x=1653941759; bh=4yxj77r4xtmn7VVg4M5Kx65OMVx5pZUm+Be gY1jUTqs=; b=x65kk18DVeSJm9vKbbAAYk+W6Ho3liePfwKiHAZBH6nWyDk8Jvw 4TO5VHYi1lijUQD5RjcjMpdFXS6cG6gme/vvK2eyNEC3uUP/3nqLBVqLJy0/jUpF dN8TSdoC1bTfHF/LrdxFFUIbOwMBqFBTe4NBnREucKTNTt1AAMEPI6ueVaWkJJ8O wZNhCbUczxExfq4BmovbpU6qfNEygM/+Ji17y6LAv9cnm4yXmmYqQheLxAgsFDZ0 2Zib/oT5CuKdYoYPxvLAH36DJywIvkDPRvI0dTrDPUcirfWQunI8enQC0kdYcVqm cRW3AcYo3VKyO2oDRtmWXDRONESTOdXt2mA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrkeeggddugeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucgfrhhlucfvnfffucdljedtmdenucfjughrpefhvf evufffkffoggfgsedtkeertdertddtnecuhfhrohhmpeffrghnihgvlhcuighuuceougig uhesugiguhhuuhdrgiihiieqnecuggftrfgrthhtvghrnhepvdeggfetgfelhefhueefke duvdfguedvhfegleejudduffffgfetueduieeikeejnecuvehluhhsthgvrhfuihiivgep tdenucfrrghrrghmpehmrghilhhfrhhomhepugiguhesugiguhhuuhdrgiihii X-ME-Proxy: Feedback-ID: i6a694271:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 29 May 2022 16:15:58 -0400 (EDT) From: Daniel Xu To: bpf@vger.kernel.org, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org Cc: Daniel Xu , linux-kernel@vger.kernel.org Subject: [PATCH bpf-next] bpf, test_run: Remove unnecessary prog type checks Date: Sun, 29 May 2022 15:15:41 -0500 Message-Id: <0a9aaac329f76ddb17df1786b001117823ffefa5.1653855302.git.dxu@dxuuu.xyz> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net These checks were effectively noops b/c there's only one way these functions get called: through prog_ops dispatching. And since there's no other callers, we can be sure that `prog` is always the correct type. Signed-off-by: Daniel Xu Acked-by: Song Liu --- net/bpf/test_run.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c index 56f059b3c242..2ca96acbc50a 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c @@ -1420,9 +1420,6 @@ int bpf_prog_test_run_flow_dissector(struct bpf_prog *prog, void *data; int ret; - if (prog->type != BPF_PROG_TYPE_FLOW_DISSECTOR) - return -EINVAL; - if (kattr->test.flags || kattr->test.cpu || kattr->test.batch_size) return -EINVAL; @@ -1487,9 +1484,6 @@ int bpf_prog_test_run_sk_lookup(struct bpf_prog *prog, const union bpf_attr *kat u32 retval, duration; int ret = -EINVAL; - if (prog->type != BPF_PROG_TYPE_SK_LOOKUP) - return -EINVAL; - if (kattr->test.flags || kattr->test.cpu || kattr->test.batch_size) return -EINVAL;