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 6F724A0032 for ; Fri, 18 Feb 2022 13:43:39 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5C73640150; Fri, 18 Feb 2022 13:43:38 +0100 (CET) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id 1990440141 for ; Fri, 18 Feb 2022 13:43:34 +0100 (CET) Received: by mail-wr1-f44.google.com with SMTP id i14so14359525wrc.10 for ; Fri, 18 Feb 2022 04:43:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=q1GladkdoxwsUpT1qqeQUDAm7IwFf7Fw0xER7SkL/dw=; b=GoS+5vRyA6sQB5r2tk2cPeRpZpy6Z3hQWhPWYKPZRcid0NRv+uuVW/dsXx6BUe0+Cr 9J4ZuVVMLdHWqso2Xlf8ulgef/vb2JvB5U6hm4goRWIEQfOf7rp91FdjBGfwtoRS6rxs 4sm1/ADw5zdX2bsQio8LyDqpB6MPjWGjENlwKyB7DpAxyckCqnlzFQ2xERgTe5+0mEMO QpslgMxlXtbcN0ReVAytCUvlBekvBJxcIuL+qagrlgl36yfOI5lR+fGPLJIsPWhnuF8e w1REZaTyTRh8ndNYISy+v7CcGCMFAoP6HTJJ2Re2pKjZWVRMCtmPpgzZFjU+ERa4+q68 FUJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=q1GladkdoxwsUpT1qqeQUDAm7IwFf7Fw0xER7SkL/dw=; b=iL8tUfxs/TyXEVySBKC78Z5d0n8Amg8vCdUxrDHqkheDNAGBhF/RZoPOVoLDqdAvYx Lm6KXbLYhIGhJdVHp/2T2anR2lgao0bya5kIW5SGGXCoq1DKIPLZW0WwMbEe0uNRdFRq L08LdtUKWe7EVt+C3jG7Y99/AsqSZWUyDk7pC9ttOZ7CeIt/acH8TWXB0hvV5E60ABZB ep5XfquFEHWie9ogQ3s+W1DFWrwZPsvL7FwBF5bcr0oe1K8EgoJbWU6imF8pVb5KI46R /AtknW6MJJcxBkc/zCWQBrbPie8GlE1XBPvMh0gP102KC8vBRQmmyZXcPMrecV9H39H2 5Pfg== X-Gm-Message-State: AOAM532RLY3ebAQYJATXAvjHyD4bftvWsHlo/jSKzGp8/ZiPF+MCCkMo AhJv8M3XMhmMNDLZgYsdNKaNr1gYflKlh31I X-Google-Smtp-Source: ABdhPJwmXBz5LpvDkmByzLW/hqHTdhxefI4C9I3qGDq24Nz0gC7XTRkw6CAcHtRD/3+ZLbjNsqkcYw== X-Received: by 2002:a5d:59a6:0:b0:1e8:580f:9f5b with SMTP id p6-20020a5d59a6000000b001e8580f9f5bmr5908974wrr.64.1645188213761; Fri, 18 Feb 2022 04:43:33 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id n20sm4421898wmq.42.2022.02.18.04.43.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:43:33 -0800 (PST) From: luca.boccassi@gmail.com To: Jie Zhou Cc: Dmitry Kozlyuk , dpdk stable Subject: patch 'eal/windows: fix error code for not supported API' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:38:45 +0000 Message-Id: <20220218123931.1749595-76-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-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 20.11.5 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/20/22. 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/2da6c3024762d5b8ef308aaac5ae11a50fe03969 Thanks. Luca Boccassi --- >From 2da6c3024762d5b8ef308aaac5ae11a50fe03969 Mon Sep 17 00:00:00 2001 From: Jie Zhou Date: Tue, 25 Jan 2022 21:10:34 -0800 Subject: [PATCH] eal/windows: fix error code for not supported API [ upstream commit 7e71c4dce375b8aa575dbdcda97936199a4136f3 ] UT memory_autotest on Windows has 2 failed cases on EAL APIs eal_memalloc_get_seg_fd and eal_memalloc_get_seg_fd_offset. These 2 APIs are not supported on Windows yet. Should return ENOTSUP such that in test_memory.c these 2 ENOTSUP cases will not be marked as failures, same as other ENOTSUP cases. Fixes: 2a5d547a4a9b ("eal/windows: implement basic memory management") Signed-off-by: Jie Zhou Acked-by: Dmitry Kozlyuk --- lib/librte_eal/windows/eal_memalloc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/librte_eal/windows/eal_memalloc.c b/lib/librte_eal/windows/eal_memalloc.c index d1e49f0be8..690a8d8243 100644 --- a/lib/librte_eal/windows/eal_memalloc.c +++ b/lib/librte_eal/windows/eal_memalloc.c @@ -18,7 +18,7 @@ eal_memalloc_get_seg_fd(int list_idx, int seg_idx) RTE_SET_USED(list_idx); RTE_SET_USED(seg_idx); EAL_LOG_NOT_IMPLEMENTED(); - return -1; + return -ENOTSUP; } int @@ -29,7 +29,7 @@ eal_memalloc_get_seg_fd_offset(int list_idx, int seg_idx, size_t *offset) RTE_SET_USED(seg_idx); RTE_SET_USED(offset); EAL_LOG_NOT_IMPLEMENTED(); - return -1; + return -ENOTSUP; } static int @@ -429,7 +429,7 @@ eal_memalloc_sync_with_primary(void) { /* No multi-process support. */ EAL_LOG_NOT_IMPLEMENTED(); - return -1; + return -ENOTSUP; } int -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:40.859533442 +0000 +++ 0076-eal-windows-fix-error-code-for-not-supported-API.patch 2022-02-18 12:37:37.754793350 +0000 @@ -1 +1 @@ -From 7e71c4dce375b8aa575dbdcda97936199a4136f3 Mon Sep 17 00:00:00 2001 +From 2da6c3024762d5b8ef308aaac5ae11a50fe03969 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7e71c4dce375b8aa575dbdcda97936199a4136f3 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ - lib/eal/windows/eal_memalloc.c | 6 +++--- + lib/librte_eal/windows/eal_memalloc.c | 6 +++--- @@ -21,5 +22,5 @@ -diff --git a/lib/eal/windows/eal_memalloc.c b/lib/eal/windows/eal_memalloc.c -index 55d6dcc71c..aa7589b81d 100644 ---- a/lib/eal/windows/eal_memalloc.c -+++ b/lib/eal/windows/eal_memalloc.c -@@ -17,7 +17,7 @@ eal_memalloc_get_seg_fd(int list_idx, int seg_idx) +diff --git a/lib/librte_eal/windows/eal_memalloc.c b/lib/librte_eal/windows/eal_memalloc.c +index d1e49f0be8..690a8d8243 100644 +--- a/lib/librte_eal/windows/eal_memalloc.c ++++ b/lib/librte_eal/windows/eal_memalloc.c +@@ -18,7 +18,7 @@ eal_memalloc_get_seg_fd(int list_idx, int seg_idx) @@ -34 +35 @@ -@@ -28,7 +28,7 @@ eal_memalloc_get_seg_fd_offset(int list_idx, int seg_idx, size_t *offset) +@@ -29,7 +29,7 @@ eal_memalloc_get_seg_fd_offset(int list_idx, int seg_idx, size_t *offset) @@ -43 +44 @@ -@@ -428,7 +428,7 @@ eal_memalloc_sync_with_primary(void) +@@ -429,7 +429,7 @@ eal_memalloc_sync_with_primary(void)