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 C3E034569C for ; Wed, 24 Jul 2024 13:33:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BEA5042F01; Wed, 24 Jul 2024 13:33:59 +0200 (CEST) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id 82D3942EFD for ; Wed, 24 Jul 2024 13:33:58 +0200 (CEST) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-4266edee10cso44940945e9.2 for ; Wed, 24 Jul 2024 04:33:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721820838; x=1722425638; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AIxebhhDRINnY1VeZjZDoTz9o5Y0aUkhYY9xYbXrIhA=; b=AegKlQZp+fbKCOzBiIeFv0OTuLzi5nlvS963ARoXkY+WGkLHthXiE8NaXuI3QxC3TX 3w8649lZOOn+K7qymH8kRM7NQoTYGTSOvTmandGpArCsstujsbX9eW5VhudHh3fJ6c2s YeFDBPu7gb/8i4PfNXhHpbptTrY/RFd47OuXs2j/eXkUsM/zS9cRTKcgUcvxo6Tm9Agx FV8QCsg2aayvdT+HS7aAJ0122hNYrjmGktVt3PShe6xuiKBD7K6jG7q6hxjbir+I2H8h ZC5qIEZjnHGaPjFOwepvSyvER9ofZn39p+y8g7D+YFBI6OJXHgEEH6NU54BeT+Bw5Z28 a3VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721820838; x=1722425638; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AIxebhhDRINnY1VeZjZDoTz9o5Y0aUkhYY9xYbXrIhA=; b=LQL1yyHg5+IlK7gpHDIZyA11fGbtW1njGdE6q+nxNjx4Cim00/7sIB7fxYv8alHS1O cDgFM1q1ALylcyDHmHmZeshbZULKDoMfYz8SfW0YOXQP4N3iddR30wOB+EddBXi0FOTc U8uHisDdN5OjNILeS3Hc3PgmYw1yzUlzC81CW7f6uAuq7gElN6OB/t77Pxp24lntKYmI jmKGlVBeCBVnzPjsab9dDJ1vzTo+7EEfCTwXIo8G9/kgp1C1EIRIm2MOvlOB4DbBio6E f+jA+ofXxOHfItThouJFERiImX0RvKvan37QWDl0tAfTh2SeWDVisSIH3btzb8aWqGr4 tBVA== X-Forwarded-Encrypted: i=1; AJvYcCUCVDyymX5lU7Ip4kzFLBdlXDv4+QTchpR30O9kVaeACYHnYrXyKdaPsctwMMKnHeUTuiQtyOeZGpM3I4YzWrs= X-Gm-Message-State: AOJu0YyfvZmtRHjCM6c6cREe5QUSrF5veHw1siQDtN0u0gpNoMiSa0dk k+qmXENlePitl4xKUqVlsd/wVvnusdozwWqs+s3K91L39TJwVQ96ktEgpptk X-Google-Smtp-Source: AGHT+IEW0Rf0mk5rV+vknENmVre2CDGz6Lehid96+hG2zwEm6QJALWpqtsCYWjGL11DARfHf/Oy9Ug== X-Received: by 2002:a05:600c:a07:b0:426:6220:cb57 with SMTP id 5b1f17b1804b1-427f95ad891mr11256855e9.25.1721820838054; Wed, 24 Jul 2024 04:33:58 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427f935dd55sm25843895e9.8.2024.07.24.04.33.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jul 2024 04:33:57 -0700 (PDT) From: luca.boccassi@gmail.com To: Gregory Etelson Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix Arm build with GCC 9.1' has been queued to stable release 22.11.6 Date: Wed, 24 Jul 2024 12:32:49 +0100 Message-Id: <20240724113318.616754-11-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240724113318.616754-1-luca.boccassi@gmail.com> References: <20240715152704.2229503-86-luca.boccassi@gmail.com> <20240724113318.616754-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 22.11.6 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/24. 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/48bfee9777abf382ea28a470fa2591de7096d5da Thanks. Luca Boccassi --- >From 48bfee9777abf382ea28a470fa2591de7096d5da Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Sun, 7 Jul 2024 12:57:23 +0300 Subject: [PATCH] net/mlx5: fix Arm build with GCC 9.1 [ upstream commit 42d6a9084f55281a70bece647803cddbeb8aaec8 ] GCC has introduced a bugfix in 9.1 that changed GCC ABI in ARM setups https://gcc.gnu.org/gcc-9/changes.html ``` On Arm targets (arm*-*-*), a bug in the implementation of the procedure call standard (AAPCS) in the GCC 6, 7 and 8 releases has been fixed a structure containing a bit-field based on a 64-bit integral type and where no other element in a structure required 64-bit alignment could be passed incorrectly to functions. This is an ABI change. If the option -Wpsabi is enabled (on by default) the compiler will emit a diagnostic note for code that might be affected. ``` This fixes the PMD compilation in the INTEGRITY flow item. Fixes: 23b0a8b298b1 ("net/mlx5: fix integrity item validation and translation") Signed-off-by: Gregory Etelson Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_dv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 2bdca754bc..6521b5b230 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -6798,11 +6798,13 @@ flow_dv_validate_attributes(struct rte_eth_dev *dev, } static int -validate_integrity_bits(const struct rte_flow_item_integrity *mask, +validate_integrity_bits(const void *arg, int64_t pattern_flags, uint64_t l3_flags, uint64_t l4_flags, uint64_t ip4_flag, struct rte_flow_error *error) { + const struct rte_flow_item_integrity *mask = arg; + if (mask->l3_ok && !(pattern_flags & l3_flags)) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-24 12:29:21.632613162 +0100 +++ 0011-net-mlx5-fix-Arm-build-with-GCC-9.1.patch 2024-07-24 12:29:20.711024924 +0100 @@ -1 +1 @@ -From 42d6a9084f55281a70bece647803cddbeb8aaec8 Mon Sep 17 00:00:00 2001 +From 48bfee9777abf382ea28a470fa2591de7096d5da Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 42d6a9084f55281a70bece647803cddbeb8aaec8 ] + @@ -22 +23,0 @@ -Cc: stable@dpdk.org @@ -31 +32 @@ -index 8a0d58cb05..89057edbcf 100644 +index 2bdca754bc..6521b5b230 100644 @@ -34 +35 @@ -@@ -7396,11 +7396,13 @@ flow_dv_validate_attributes(struct rte_eth_dev *dev, +@@ -6798,11 +6798,13 @@ flow_dv_validate_attributes(struct rte_eth_dev *dev,