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 D259FA0093 for ; Fri, 22 May 2020 11:41:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CA87A1D966; Fri, 22 May 2020 11:41:05 +0200 (CEST) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by dpdk.org (Postfix) with ESMTP id E08B41D96A for ; Fri, 22 May 2020 11:41:02 +0200 (CEST) Received: by mail-wm1-f48.google.com with SMTP id f13so8046465wmc.5 for ; Fri, 22 May 2020 02:41:02 -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=eupYL8b48m5ocrrO9Mx0zOZLyGjJnYp2PaSpLOMOTTE=; b=uM4S3IAEWfbJIm2ZN3WWE2sjkc3fOQBAnYnjB69Oq1jY7tjeeJChSesy91Tgq604DE LDXmZ+j4lh2NbOb5oNsnpEQxIUuY3oF8oyD7TlAA8PTqVQoAWsRYM1G/mzQSY8ZYz2Ic F2Ka+q5E0D+w8fKbxP7mrmeE8LIattTYWw130fKmU65a5f2NV9fGgcAnBsDGEZM1mmmW KULxWPV+bX8N92VJpT/oL9fKFssgBQpRFI44vkAuXRJV/IKVpmk6nwd1d6UZPSWxkbpD laGXTrTkbo/OaTK1PhV1k83Nen3pH9ysay0TL/BXf+2NzKP5ZhGVB1S2QRmdWz9ZcrSc FnjA== 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=eupYL8b48m5ocrrO9Mx0zOZLyGjJnYp2PaSpLOMOTTE=; b=SgLaiduzT5RJjARTG6zzSFeafiMPTorjaigQAV8NB4Q+P9ISfc2RjPcS2llyF3kDf3 H3/qoWzmaanETBOvWvMcospnOJXxidC2ZLVetR/ckGtooTZ68S3gpVyDfZH6ofZj4VNe 3idnRuY6Miwzbb+cbt7EN1+Z6E8FTjpKf0mavxpZ3UOz/psTzrrZ+8jhQ3WOQqF4JF90 yR4Jn0XGhwOoFtUA3DHenc5WDyEsu+ARhafv7FmmWMfANzO1Jpt3MnefgNW4y9L6XUAC iZAZprZ5CmD0rGTqsg2J3taduK5rBqts2VulxF6Zz4sIVmhJ8zbezlRZe1kOAkQiG5pR 6t8A== X-Gm-Message-State: AOAM531AGHp+PrbdNlMpL5SIgBYu/u0HaG4CPwGYzf32XY9MH88li4O0 RXpnCRyodB7IYjGGY+UontAvHbso6gQ= X-Google-Smtp-Source: ABdhPJxK/YnjmdjbwOgI3EwNlVxYE1Zx7WS42CiJ+2B59Ws1fzr7zOFIzSJ9g+BZ1B0jjJVbOlWhQQ== X-Received: by 2002:a05:600c:2614:: with SMTP id h20mr13302464wma.155.1590140462644; Fri, 22 May 2020 02:41:02 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id s67sm9250469wmf.3.2020.05.22.02.41.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 02:41:02 -0700 (PDT) From: luca.boccassi@gmail.com To: Dekel Peled Cc: Matan Azrad , dpdk stable Date: Fri, 22 May 2020 10:39:51 +0100 Message-Id: <20200522094022.1025696-12-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200522094022.1025696-1-luca.boccassi@gmail.com> References: <20200519130549.112823-214-luca.boccassi@gmail.com> <20200522094022.1025696-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'common/mlx5: fix umem buffer alignment' has been queued to stable release 19.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/24/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 22f701a5d4ce1a8f97695545818f1ac140ff91b3 Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Mon, 11 May 2020 13:02:45 +0300 Subject: [PATCH] common/mlx5: fix umem buffer alignment [ upstream commit 4240b11e7b32e5b5ca23eb81fbcd6ac5c967248c ] The value MLX5_WQE_BUF_ALIGNMENT is defined as 512. In some cases this alignment size is not adequate, which results in memory registration that is not accepted by FW. The result error can be "page_offset is not aligned to page_size/64, bad umem_offset" (syndrome 0x357275). This patch updates the definition to match the running system. Fixes: 18a68e046b51 ("net/mlx5: fix DevX Rx queue memory alignment") Signed-off-by: Dekel Peled Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_prm.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_prm.h b/drivers/net/mlx5/mlx5_prm.h index bdbfe56a13..4c86719769 100644 --- a/drivers/net/mlx5/mlx5_prm.h +++ b/drivers/net/mlx5/mlx5_prm.h @@ -18,6 +18,8 @@ #pragma GCC diagnostic error "-Wpedantic" #endif +#include + #include #include "mlx5_autoconf.h" @@ -251,7 +253,7 @@ #define MLX5_MAX_LOG_RQ_SEGS 5u /* The alignment needed for WQ buffer. */ -#define MLX5_WQE_BUF_ALIGNMENT 512 +#define MLX5_WQE_BUF_ALIGNMENT sysconf(_SC_PAGESIZE) /* Completion mode. */ enum mlx5_completion_mode { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-22 10:37:39.684834095 +0100 +++ 0012-common-mlx5-fix-umem-buffer-alignment.patch 2020-05-22 10:37:39.076411781 +0100 @@ -1,8 +1,10 @@ -From 4240b11e7b32e5b5ca23eb81fbcd6ac5c967248c Mon Sep 17 00:00:00 2001 +From 22f701a5d4ce1a8f97695545818f1ac140ff91b3 Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Mon, 11 May 2020 13:02:45 +0300 Subject: [PATCH] common/mlx5: fix umem buffer alignment +[ upstream commit 4240b11e7b32e5b5ca23eb81fbcd6ac5c967248c ] + The value MLX5_WQE_BUF_ALIGNMENT is defined as 512. In some cases this alignment size is not adequate, which results in memory registration that is not accepted by FW. @@ -12,26 +14,25 @@ This patch updates the definition to match the running system. Fixes: 18a68e046b51 ("net/mlx5: fix DevX Rx queue memory alignment") -Cc: stable@dpdk.org Signed-off-by: Dekel Peled Acked-by: Matan Azrad --- - drivers/common/mlx5/mlx5_prm.h | 4 +++- + drivers/net/mlx5/mlx5_prm.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h -index 4ab1c75930..b39a141d74 100644 ---- a/drivers/common/mlx5/mlx5_prm.h -+++ b/drivers/common/mlx5/mlx5_prm.h -@@ -16,6 +16,8 @@ +diff --git a/drivers/net/mlx5/mlx5_prm.h b/drivers/net/mlx5/mlx5_prm.h +index bdbfe56a13..4c86719769 100644 +--- a/drivers/net/mlx5/mlx5_prm.h ++++ b/drivers/net/mlx5/mlx5_prm.h +@@ -18,6 +18,8 @@ #pragma GCC diagnostic error "-Wpedantic" #endif +#include + #include - #include + #include "mlx5_autoconf.h" @@ -251,7 +253,7 @@ #define MLX5_MAX_LOG_RQ_SEGS 5u