From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id EB6EFA0518 for ; Fri, 24 Jul 2020 14:03:24 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E45621BFE3; Fri, 24 Jul 2020 14:03:24 +0200 (CEST) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by dpdk.org (Postfix) with ESMTP id D92F01C025 for ; Fri, 24 Jul 2020 14:03:23 +0200 (CEST) Received: by mail-wm1-f43.google.com with SMTP id c80so7744550wme.0 for ; Fri, 24 Jul 2020 05:03:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DQIzv72vob4pr6Q2zXmdgIvSrUDzrre/qGZs0RY5xqc=; b=rQU70UYx00lor9g0Ad0k1MwWf3mmgsy0FsHAAO0f+pdYlM5QYib6s2opN6lD5P5Mig 73rzlkzXYASjfSYLvxw8VGzLoK+i5epQpCY6NR9ec1mzPLEwD/X5pN/waXUlrce6HEpD V3o8j0nc5k5brT/l17sU6EFGTn1xjFmOP86IoZEite+xsFuCWe03fMiWA5eAVNaHF2xr QVVeQc6yrt2EPc5fVQKwmbdI3MWuQCjzCe5qvLbavGcUvI8MPtZaWqtuomMYwm5GPVys nJELOmJzxutMWhsQwkN1/q7d9FcEZt/kvlc9X9BiZ6jLOipY2rMiizTJmvnA6lO7E6Ho AHiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DQIzv72vob4pr6Q2zXmdgIvSrUDzrre/qGZs0RY5xqc=; b=VitaV+ztHYvY29X6FbbZ38RKMvhUQ6eQ0jUwySF+zQjlotESzvVJn1gj5CZByD87RL DcjExgMRvppIQ2Xf77GKEWlbQl8fKFxZkiIOonmnQRMMtT1j66BsMswRf53UOLp8Yyc7 zerQXuw5/FJzfS4/lMm7ZLTCfV9gE5S2cubhJO2PQbVYhnklUU/2m1aRCC7vAlEdlB3o wblNFjFtt+pjsuiYkFnQwLiWaLSbwZyBoE3Iwk0J11p9d7+XPPhiFwSTX7ObVGoj7S18 ygSydwAjv0eYwAvfrvua/gj9CISAe9/SvSKZWbzOrWExN+8IRLbPA18J9fS+ySIjudOn xriw== X-Gm-Message-State: AOAM532y1aTDPoV/a7EX+Fnkm0y8GTbSNa+isW6EvxGTD1OkKESt9buR G6KdXXzu1ZyT+0amTs2e++dkubRixZZzzQ== X-Google-Smtp-Source: ABdhPJysvk1pfIWAFNKYYkOjS0Pr22thT7H2PUoFd6jH8b6Gkm8zpKAREYMpKBRoZ624XX0yvIiTDw== X-Received: by 2002:a05:600c:2209:: with SMTP id z9mr8281302wml.70.1595592203603; Fri, 24 Jul 2020 05:03:23 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id c136sm7103262wmd.10.2020.07.24.05.03.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:03:22 -0700 (PDT) From: luca.boccassi@gmail.com To: Konstantin Ananyev Cc: dpdk stable Date: Fri, 24 Jul 2020 12:58:02 +0100 Message-Id: <20200724120030.1863487-44-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'bpf: fix add/sub min/max estimations' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 66d977367bc4645400785fca42128318d3dd773b Mon Sep 17 00:00:00 2001 From: Konstantin Ananyev Date: Wed, 27 May 2020 15:16:50 +0100 Subject: [PATCH] bpf: fix add/sub min/max estimations [ upstream commit 20c19d9df5f08840d96204dcc65437223c434325 ] eval_add()/eval_sub() not always correctly estimate minimum and maximum possible values of add/sub operations. Fixes: 8021917293d0 ("bpf: add extra validation for input BPF program") Signed-off-by: Konstantin Ananyev --- lib/librte_bpf/bpf_validate.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/librte_bpf/bpf_validate.c b/lib/librte_bpf/bpf_validate.c index 6bd6f78e9..80d21fabb 100644 --- a/lib/librte_bpf/bpf_validate.c +++ b/lib/librte_bpf/bpf_validate.c @@ -226,7 +226,7 @@ eval_add(struct bpf_reg_val *rd, const struct bpf_reg_val *rs, uint64_t msk) struct bpf_reg_val rv; rv.u.min = (rd->u.min + rs->u.min) & msk; - rv.u.max = (rd->u.min + rs->u.max) & msk; + rv.u.max = (rd->u.max + rs->u.max) & msk; rv.s.min = (rd->s.min + rs->s.min) & msk; rv.s.max = (rd->s.max + rs->s.max) & msk; @@ -254,10 +254,10 @@ eval_sub(struct bpf_reg_val *rd, const struct bpf_reg_val *rs, uint64_t msk) { struct bpf_reg_val rv; - rv.u.min = (rd->u.min - rs->u.min) & msk; - rv.u.max = (rd->u.min - rs->u.max) & msk; - rv.s.min = (rd->s.min - rs->s.min) & msk; - rv.s.max = (rd->s.max - rs->s.max) & msk; + rv.u.min = (rd->u.min - rs->u.max) & msk; + rv.u.max = (rd->u.max - rs->u.min) & msk; + rv.s.min = (rd->s.min - rs->s.max) & msk; + rv.s.max = (rd->s.max - rs->s.min) & msk; /* * if at least one of the operands is not constant, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:50.313085064 +0100 +++ 0044-bpf-fix-add-sub-min-max-estimations.patch 2020-07-24 12:53:48.259005938 +0100 @@ -1,13 +1,14 @@ -From 20c19d9df5f08840d96204dcc65437223c434325 Mon Sep 17 00:00:00 2001 +From 66d977367bc4645400785fca42128318d3dd773b Mon Sep 17 00:00:00 2001 From: Konstantin Ananyev Date: Wed, 27 May 2020 15:16:50 +0100 Subject: [PATCH] bpf: fix add/sub min/max estimations +[ upstream commit 20c19d9df5f08840d96204dcc65437223c434325 ] + eval_add()/eval_sub() not always correctly estimate minimum and maximum possible values of add/sub operations. Fixes: 8021917293d0 ("bpf: add extra validation for input BPF program") -Cc: stable@dpdk.org Signed-off-by: Konstantin Ananyev ---