From patchwork Sun May 12 05:51:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoav Winstein X-Patchwork-Id: 140025 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E0B1B44008; Sun, 12 May 2024 07:51:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AC39940268; Sun, 12 May 2024 07:51:19 +0200 (CEST) Received: from mail-wm1-f97.google.com (mail-wm1-f97.google.com [209.85.128.97]) by mails.dpdk.org (Postfix) with ESMTP id 55E684003C for ; Sun, 12 May 2024 07:51:18 +0200 (CEST) Received: by mail-wm1-f97.google.com with SMTP id 5b1f17b1804b1-41fc2f7fbb5so17147605e9.1 for ; Sat, 11 May 2024 22:51:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715493078; x=1716097878; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=BjmABP97bv1QBl9qGQ1USnTz0HSunGzny0EmK3+xyvA=; b=SvltGAq6UsPfCCRGjJAG/CB/kVJJKGsVWSwyjNlnPHjg72aFhJfX6b1h7X/AzrUN+G f5HloSpUvg6KyHUw5JgY2qgWsf95R68fXGWu9V2apt30ME/qPfSxLYWZ3gQ5g+tioqNG ExbWxoFfCZnNoOT4paOXmN/ObDGnk7QpPkxrxQA7kwz69fqFF+MnnjNRDwn4F6u00liV 6lY3HQI52imuFe4fjFyUJqM4f0xpVcfhUFED79z279BSTAZs/vCSZhJHK80vE+Ts+R22 4/cTMrxwclJ34fQzROgNdaQ7X06uNcsy6nN+VCPSOLxvAQU/Op2TalvaVlC6/ZD4sLr4 Dxsw== X-Gm-Message-State: AOJu0YzEUbWncPYK7aFsquAdmqW8TZyxUnSp5nqlEcpUNqnOu6IZsC4u Ti3xHAS2QpBQuQtdwUzcTQNzjiTV+imSwMrOhRQnZtGVUBaFJE7kqShD1Q2SdCF2Kr2RsPYJ6HP easfReJ7WL4Ka4qOmCd1y/1XFo0Zwee7zS88MbzHv X-Google-Smtp-Source: AGHT+IGI2EPzwk1L3aqdXZbi6QTDSntwjftGwZid75qyDcrWJX7A4Jd4TFHuFBt5trSNmlusbcXNUSiOMIs2 X-Received: by 2002:adf:e58e:0:b0:34d:8206:e76b with SMTP id ffacd0b85a97d-35018117631mr8643078f8f.9.1715493077944; Sat, 11 May 2024 22:51:17 -0700 (PDT) Received: from claroty.com ([31.186.239.8]) by smtp-relay.gmail.com with ESMTPS id 5b1f17b1804b1-41f882100ffsm9047575e9.43.2024.05.11.22.51.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 22:51:17 -0700 (PDT) X-Relaying-Domain: claroty.com Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-346c08df987so1771905f8f.0 for ; Sat, 11 May 2024 22:51:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=claroty.com; s=google; t=1715493077; x=1716097877; darn=dpdk.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=BjmABP97bv1QBl9qGQ1USnTz0HSunGzny0EmK3+xyvA=; b=Qj8hJ5RfHGB3R0gQVccGYp28hFtfhTVJZFFq+DWQWKFd2isT8DdghMrEoH/fqaK2Mq yaXyaO6YMf1hmh66gZh7kcGyNpGdXgD5Ib1EuoJcq8bQJVVT4W6Efu/R6rF0Sj09dKsb JI5NuQW+hWTysq9W6VB+6rRlGFltmvWtngS/eYPdRfCVl0zkilubPSosrIrnDllACpGs SfGUH4LKURttwBS+72SeZ1QbPwtxSqM4QSdWhyeRkwLLrTkwK3XzXV1579+kEnTzou6q xys1nzsbOYG59zEcdNhVeSkcV0OSolLCsSJYIAWBrrZvJVgZTIDEQai/d0vn9BVDJEVu 5Iag== X-Received: by 2002:a5d:4311:0:b0:34d:ab1a:6384 with SMTP id ffacd0b85a97d-3504989eb09mr5628443f8f.13.1715493076757; Sat, 11 May 2024 22:51:16 -0700 (PDT) X-Received: by 2002:a5d:4311:0:b0:34d:ab1a:6384 with SMTP id ffacd0b85a97d-3504989eb09mr5628433f8f.13.1715493076425; Sat, 11 May 2024 22:51:16 -0700 (PDT) Received: from localhost.localdomain ([94.188.185.10]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502bbbbfecsm8159446f8f.105.2024.05.11.22.51.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 22:51:16 -0700 (PDT) From: Yoav Winstein To: dev@dpdk.org Cc: Yoav Winstein , Konstantin Ananyev Subject: [PATCH] bpf: don't verify classic bpfs Date: Sun, 12 May 2024 08:51:09 +0300 Message-Id: <20240512055109.96609-1-yoav.w@claroty.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 x-netskope-inspected: true X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org I noticed that when classic BPFs with lots of branching instructions are compiled, __rte_bpf_bpf_validate runs way too slow. A simple bpf such as: 'ether host a0:38:6d:af:17:eb or b3:a3:ff:b6:c1:ef or ...' 12 times results in ~1 minute of bpf validation. This patch makes __rte_bpf_bpf_validate be aware of bpf_prm originating from classic BPF, allowing to safely skip over the validation. Signed-off-by: Yoav Winstein --- app/test/test_bpf.c | 2 ++ lib/bpf/bpf_convert.c | 1 + lib/bpf/bpf_load.c | 6 ++++-- lib/bpf/rte_bpf.h | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c index 53e3a31123..7aae290c1a 100644 --- a/app/test/test_bpf.c +++ b/app/test/test_bpf.c @@ -3407,6 +3407,8 @@ static const char * const sample_filters[] = { " and (tcp[((tcp[12] & 0xF0) >> 4 ) * 4 + 1] = 0x03)" " and (tcp[((tcp[12] & 0xF0) >> 4 ) * 4 + 2] < 0x04)" " and ((ip[2:2] - 4 * (ip[0] & 0x0F) - 4 * ((tcp[12] & 0xF0) >> 4) > 69))", + /* Performance */ + "ether host a0:38:6d:af:17:eb or b3:a3:ff:b6:c1:ef or 4a:e8:e7:5b:76:ce or 0d:87:fa:7a:a6:6d or bb:fd:c6:4b:bc:ae or 4e:28:dc:f1:1c:f6 or 3d:f2:b7:99:54:55 or 1c:5a:90:4b:82:ce or a7:28:08:ea:c9:84 or 1f:c0:2f:2f:0a:01 or c6:64:91:e9:78:f2 or 5b:cc:3f:90:39:ae or 4c:38:8f:ed:16:5c or cb:89:cb:54:0f:4f or 1e:0d:d7:b2:21:84 or 91:07:2b:88:e0:96 or 6c:ca:cf:bf:cf:3e or b9:df:f1:d6:dd:11 or ea:34:0b:b3:96:9e or 70:e5:18:9f:22:93", /* Other */ "len = 128", }; diff --git a/lib/bpf/bpf_convert.c b/lib/bpf/bpf_convert.c index d7ff2b4325..bc3c9a5d8e 100644 --- a/lib/bpf/bpf_convert.c +++ b/lib/bpf/bpf_convert.c @@ -567,6 +567,7 @@ rte_bpf_convert(const struct bpf_program *prog) /* Classic BPF programs use mbufs */ prm->prog_arg.type = RTE_BPF_ARG_PTR_MBUF; prm->prog_arg.size = sizeof(struct rte_mbuf); + prm->skip_verification = true; return prm; } diff --git a/lib/bpf/bpf_load.c b/lib/bpf/bpf_load.c index de43347405..e30797cb49 100644 --- a/lib/bpf/bpf_load.c +++ b/lib/bpf/bpf_load.c @@ -108,13 +108,15 @@ rte_bpf_load(const struct rte_bpf_prm *prm) return NULL; } - rc = __rte_bpf_validate(bpf); + if (!prm->skip_verification) + rc = __rte_bpf_validate(bpf); + if (rc == 0) { __rte_bpf_jit(bpf); if (mprotect(bpf, bpf->sz, PROT_READ) != 0) rc = -ENOMEM; } - + if (rc != 0) { rte_bpf_destroy(bpf); rte_errno = -rc; diff --git a/lib/bpf/rte_bpf.h b/lib/bpf/rte_bpf.h index 80ebb0210f..6f3b4e3c31 100644 --- a/lib/bpf/rte_bpf.h +++ b/lib/bpf/rte_bpf.h @@ -94,6 +94,7 @@ struct rte_bpf_prm { /**< array of external symbols that eBPF code is allowed to reference */ uint32_t nb_xsym; /**< number of elements in xsym */ struct rte_bpf_arg prog_arg; /**< eBPF program input arg description */ + bool skip_verification; /**< should skip eBPF verification before load */ }; /**