From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2D5EEA0524 for ; Fri, 5 Feb 2021 12:31:42 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 27DB640682; Fri, 5 Feb 2021 12:31:42 +0100 (CET) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id 98F9C188949 for ; Fri, 5 Feb 2021 12:31:39 +0100 (CET) Received: by mail-wm1-f53.google.com with SMTP id y187so5644754wmd.3 for ; Fri, 05 Feb 2021 03:31:39 -0800 (PST) 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=yNMitp7IRZzBuFI3gm3HkaH9uiR95jgOa+maZR9eloc=; b=eXkBWKv4O9SxEX1y5DSQ/HKGM9oY+Mn7Q2h8O8mSLGOmGrpbGmi7Br70NsJNPLJq7r GC/lDYBRIwOh/poJ5QJarklMq6595/qxe07FzUl9mXuc3s+6yZYvmyUEyMW6klwBmC8i SnhjlvkE7YupGRK/8OaImOdo/ktsSZnZr5hF0IjLlbd3Xl7Z5QXrpkPXEPLXCTe7fL3/ Q+q//nmhRuKmBmHAOFLvJ9LDk2UdH+1k0kaj1sZiBlyygAKxwFs8/wmtpJkm2wk3cFGU Fp9mWhtGLB/bWpbX45wGVzcjOdVPnlh9IAnk3Eg/4TMnIitMVeubmp0+BKtPnS18hKTC iTMw== 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=yNMitp7IRZzBuFI3gm3HkaH9uiR95jgOa+maZR9eloc=; b=VxMjyip4n2h7MTS0+Gn7T0EZLeAG2EDU9vAK21PspTLMmlsod+vJd1DlJsiVCQ2wRI 7X4hlpedkudjRoVlGfSF7YCet72TkYgkHVqyThvNaQD6g97+4/JzXrUCin6S0l1L87AH LgB/sGJJag++5BFfh1Ba1fVR6nRzxjvLdqcy6sWZjZK2B801PssEsPR49jO/WEoO5P6y s8/eTO3ZGo82TQQebFRJOvnw8sWZ4UACbTQnfQvrbJ2LLfXLfcS5OrHsb6qhT3FRmh4M dC8aKbWk3Ba/OLuQzJXN+CEpKHF7C+L2HastjZTlxskNmjbVSyLE0SsefAq9jv8AxmE9 OHpg== X-Gm-Message-State: AOAM531y63lmtyEHyQVArmrET2LCsOgOZFcf0jlJCymDgaLf7Oz6o46A FgcVxWnU/fDwZHt5x1tgbPs= X-Google-Smtp-Source: ABdhPJyT7PqouDWH//Gvn+DU/IIM8v+eAnWfohFbrBYfOXWmHppW1/zmUI2IBNVRzipyuwcuy/QIMg== X-Received: by 2002:a1c:9e4d:: with SMTP id h74mr3190752wme.103.1612524699417; Fri, 05 Feb 2021 03:31:39 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id d3sm12320001wrp.79.2021.02.05.03.31.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:31:38 -0800 (PST) From: luca.boccassi@gmail.com To: Anatoly Burakov Cc: Zhihong Peng , dpdk stable Date: Fri, 5 Feb 2021 11:16:50 +0000 Message-Id: <20210205111920.1272063-124-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'fbarray: fix overlap check' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. 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. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/5a949c60c8694f5fd80d3dea2cf5f68aa0d8b728 Thanks. Luca Boccassi --- >From 5a949c60c8694f5fd80d3dea2cf5f68aa0d8b728 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Thu, 14 Jan 2021 15:02:45 +0000 Subject: [PATCH] fbarray: fix overlap check [ upstream commit 27ff8384deaca2f7727d0cedf2053aa13fbae1e2 ] When we're attaching fbarrays in secondary processes, we check for whether the intended memory address for the fbarray is already in use by some other, local fbarray. However, the check for end-overlap (i.e. to see if our memory area's end overlaps with some other fbarray) is incorrectly counting end offset as part of the overlap. Fix the check. Fixes: 5b61c62cfd76 ("fbarray: add internal tailq for mapped areas") Signed-off-by: Anatoly Burakov Tested-by: Zhihong Peng --- lib/librte_eal/common/eal_common_fbarray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_eal/common/eal_common_fbarray.c b/lib/librte_eal/common/eal_common_fbarray.c index 1220e2bae9..d974f3dab7 100644 --- a/lib/librte_eal/common/eal_common_fbarray.c +++ b/lib/librte_eal/common/eal_common_fbarray.c @@ -110,7 +110,7 @@ overlap(const struct mem_area *ma, const void *start, size_t len) if (start >= ma_start && start < ma_end) return 1; /* end overlap? */ - if (end >= ma_start && end < ma_end) + if (end > ma_start && end < ma_end) return 1; return 0; } -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:34.750184566 +0000 +++ 0124-fbarray-fix-overlap-check.patch 2021-02-05 11:18:28.998694767 +0000 @@ -1 +1 @@ -From 27ff8384deaca2f7727d0cedf2053aa13fbae1e2 Mon Sep 17 00:00:00 2001 +From 5a949c60c8694f5fd80d3dea2cf5f68aa0d8b728 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 27ff8384deaca2f7727d0cedf2053aa13fbae1e2 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org