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 93E79A0524 for ; Fri, 5 Feb 2021 12:31:53 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 82FAD40682; Fri, 5 Feb 2021 12:31:53 +0100 (CET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id 1585F40682 for ; Fri, 5 Feb 2021 12:31:52 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id j21so2934261wmj.0 for ; Fri, 05 Feb 2021 03:31:52 -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=u3an7de4xT6TclWuYwiyu47RR+R1Xr5PU8+iXY92HTs=; b=D8NVplKs2o7vyZq02snnOxI6XyMrOtzneg4QcB/4XZvf7QTSO+TNxX+FPJVxEJoovF QboENXfztALS1U3+p3oFYHh+Ixc9sAlMDzorJ8FjEvE9yH+wKcmNem+nMjx0s4cOlsLF Qd2rni9qrDXprWEm/1BuSjFQ9LKO4dRWiP+zE+KXjEaGmzXoZ/6dUwQ71nezIalbVr6w Hm7Q60LmMWrEnSdOIllq6rgwk3Tyx9HPpeKneThWOubmMm9mESZADOvFABp2RcLwhiUA E7KyVF+IHSUuzFwag17lw42y3qKL1SVEeIykRZ5B29XHXFSDHjwy6fiXh8Ovh1EQi9u5 xoag== 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=u3an7de4xT6TclWuYwiyu47RR+R1Xr5PU8+iXY92HTs=; b=nVTScooQcCUSMJaYRHH5jVSe77aYHqZMOJObEg8YgZXNkK7c0MRLGn+8gIU2xLkc+s IB5l4CYEOuoJ1OXAbuG+0gFVFbX6D+poBEKspYyT4+SjlRLmEJMjpZf/UTejD8oiWQco iT+5CO4A4YHg1yxQPadidZNQSgx2OZFNUpg9bVe8E3hfB7GyshXQ1xC3iZZ7CK0MYBZ+ r7y7R/TgNclr9xRkXo/dbf5lZVN+n4fM6VwMVmyapVKXm5fBzX6XUbqN7FbhbUJABdsF niwSvc4F69xvcwa+TozUeIOaqgpWRMRDRwsZWcDV51GxxMt6NzIQ1NLsHb7rTjS/S0yp KpCA== X-Gm-Message-State: AOAM5308Sxl8TrIj6yRcBgbz7ArfT3sP9oEf9X6WCAeXQhDoyVoirqOo I8hPlC0edQ4W5I/2fhZtKEo= X-Google-Smtp-Source: ABdhPJys61BI4ZAAFe2JFKS8yQ0LsKmEH9ZZVwfQZ071n8e0F+PY45DOKJvf7tT2ecaTQM6XSAANRA== X-Received: by 2002:a1c:8002:: with SMTP id b2mr3292585wmd.94.1612524711831; Fri, 05 Feb 2021 03:31:51 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id b4sm11386530wrn.12.2021.02.05.03.31.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:31:51 -0800 (PST) From: luca.boccassi@gmail.com To: Ori Kam Cc: dpdk stable Date: Fri, 5 Feb 2021 11:16:52 +0000 Message-Id: <20210205111920.1272063-126-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 'regex/mlx5: fix memory rule alignment' 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/dfbcce979787a17d93f05c45308804796c754a4b Thanks. Luca Boccassi --- >From dfbcce979787a17d93f05c45308804796c754a4b Mon Sep 17 00:00:00 2001 From: Ori Kam Date: Thu, 7 Jan 2021 18:57:07 +0200 Subject: [PATCH] regex/mlx5: fix memory rule alignment [ upstream commit 7e8b42e89aaa9217472fc2a3aa37718391ae08a5 ] Due to Kernel requirement the memory allocated must be aligned to 2M. Fixes: b34d816363b5 ("regex/mlx5: support rules import") Signed-off-by: Ori Kam --- drivers/regex/mlx5/mlx5_rxp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/regex/mlx5/mlx5_rxp.c b/drivers/regex/mlx5/mlx5_rxp.c index fcbc766441..bd721f0b11 100644 --- a/drivers/regex/mlx5/mlx5_rxp.c +++ b/drivers/regex/mlx5/mlx5_rxp.c @@ -892,7 +892,7 @@ rxp_db_setup(struct mlx5_regex_priv *priv) /* Setup database memories for both RXP engines + reprogram memory. */ for (i = 0; i < (priv->nb_engines + MLX5_RXP_EM_COUNT); i++) { - priv->db[i].ptr = rte_malloc("", MLX5_MAX_DB_SIZE, 0); + priv->db[i].ptr = rte_malloc("", MLX5_MAX_DB_SIZE, 1 << 21); if (!priv->db[i].ptr) { DRV_LOG(ERR, "Failed to alloc db memory!"); ret = ENODEV; -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:34.833450377 +0000 +++ 0126-regex-mlx5-fix-memory-rule-alignment.patch 2021-02-05 11:18:28.998694767 +0000 @@ -1 +1 @@ -From 7e8b42e89aaa9217472fc2a3aa37718391ae08a5 Mon Sep 17 00:00:00 2001 +From dfbcce979787a17d93f05c45308804796c754a4b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7e8b42e89aaa9217472fc2a3aa37718391ae08a5 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org