From patchwork Sun May 12 05:35:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoav Winstein X-Patchwork-Id: 140024 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 EF75C44008; Sun, 12 May 2024 07:35:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BEDC740268; Sun, 12 May 2024 07:35:59 +0200 (CEST) Received: from mail-wr1-f100.google.com (mail-wr1-f100.google.com [209.85.221.100]) by mails.dpdk.org (Postfix) with ESMTP id 1CBDA4003C for ; Sun, 12 May 2024 07:35:58 +0200 (CEST) Received: by mail-wr1-f100.google.com with SMTP id ffacd0b85a97d-34d7d04808bso2470287f8f.0 for ; Sat, 11 May 2024 22:35:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715492158; x=1716096958; 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=udrcx59JibXtnJYVjBJNtFyWrohRxgXcPmfkuMvwNlI=; b=AO2PYWEY+adjyfERTUuJvBzspYxROI9cGiCMILh2MtMo+f5Z1mc98myPn80cH6jLq7 tOGslTYGxjNq+0DntBqiCIRY+0BtZXOX65Jq1cAnjciE28/Blq/7KWr9oIknkzuOtu1O Qah2HBNfMDMbQGyWSS+HLFsfSFXimaxlZgn4mJk+IZGr1jDOHircDVcarPCBd3OWK0Tn hiGsgmeT43cCj4Ph8X2VEhrM0z3ms5YYx0vyZizUMDY4FSyZWfAzSv8Vuhb9HOwB6ZvE 8KBD9C/mwxzi8jypMDwodGxtAT5YR5V/fgKjB8P+RaBo6tmb3LVGaBz/agNNfx8qOdoL XnUw== X-Gm-Message-State: AOJu0Yw2PNWyiGQXXrRshmb2VzbjjFxj9UtXxSdXhbHr+V1yqYve0c0G 9u6Lq41EcCAakY2k2uDW0MD7m/n0U/HHzbH8SAKTSbZEWRMTp5T465a8P7Olsox4y3wGrU1elg0 eoFEGg+MJLkTvRhv7Acbr4UEOcM8RwQQDsGTXsRQU X-Google-Smtp-Source: AGHT+IG4gd3RSxT9e7apBQez1rRmP7tLTTu5mfZJ2LEKDorXD73ZXVpUfTbTExNIutNPGfnK3l2iYYX5oTCr X-Received: by 2002:a5d:488a:0:b0:34c:f30f:d7a1 with SMTP id ffacd0b85a97d-3504a96ab69mr7133445f8f.61.1715492157703; Sat, 11 May 2024 22:35:57 -0700 (PDT) Received: from claroty.com (relay.goskope.com. [8.39.144.169]) by smtp-relay.gmail.com with ESMTPS id ffacd0b85a97d-351b7c2929bsm7192f8f.54.2024.05.11.22.35.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 22:35:57 -0700 (PDT) X-Relaying-Domain: claroty.com Received: by mail-lj1-f198.google.com with SMTP id 38308e7fff4ca-2e345cdb52bso32858741fa.3 for ; Sat, 11 May 2024 22:35:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=claroty.com; s=google; t=1715492156; x=1716096956; 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=udrcx59JibXtnJYVjBJNtFyWrohRxgXcPmfkuMvwNlI=; b=cUnakfA2SdlsJDBiC6Ik47f4hFBsRVbNKYGH1vtYETaLyFc9XeYwqhDisUMSG0Of6P +lRWLgS6vwXVnsxgH1bwRWtmqOrgno8m+zozbVYCbn7+UnDTuoCaTrjVtx+c/511Ymfr 80fpbjDHOv05ryF8uCm6lKBsBNmLnxHCZCWBHM8cRox3g06wOrb6kKnzFI5gPlRtJ3Kq E+4Jh0f17wovSgeNaAxm9265RpUF4oeo/akTc+3LCfaf4qG+6Kck/5/+7Jmf9gmGhL1u Z6brEvbaB+xh5X+ixXozJ4rhfy9rDW+N/3Y9lvW/p/Agfm3nYDBsyoZOZiQka8kRkWRJ PvUw== X-Received: by 2002:a2e:9e97:0:b0:2df:dea1:5378 with SMTP id 38308e7fff4ca-2e51fe53141mr51648811fa.16.1715492156105; Sat, 11 May 2024 22:35:56 -0700 (PDT) X-Received: by 2002:a2e:9e97:0:b0:2df:dea1:5378 with SMTP id 38308e7fff4ca-2e51fe53141mr51648661fa.16.1715492155469; Sat, 11 May 2024 22:35:55 -0700 (PDT) Received: from localhost.localdomain ([94.188.185.10]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41fccce9426sm115631065e9.25.2024.05.11.22.35.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 22:35:55 -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:35:42 +0300 Message-Id: <20240512053542.88416-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 Signed-off-by: Yoav Winstein --- app/test/test_bpf.c | 2 ++ lib/bpf/bpf_convert.c | 1 + lib/bpf/bpf_load.c | 7 +++++-- lib/bpf/rte_bpf.h | 1 + 4 files changed, 9 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..9d42c862aa 100644 --- a/lib/bpf/bpf_load.c +++ b/lib/bpf/bpf_load.c @@ -108,13 +108,16 @@ 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 */ }; /**