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 4B7C2A0524 for ; Fri, 5 Feb 2021 12:29:45 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4280740682; Fri, 5 Feb 2021 12:29:45 +0100 (CET) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mails.dpdk.org (Postfix) with ESMTP id 1C6D4188742 for ; Fri, 5 Feb 2021 12:29:44 +0100 (CET) Received: by mail-wr1-f53.google.com with SMTP id v15so7310212wrx.4 for ; Fri, 05 Feb 2021 03:29:44 -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=gvLxv88gaOLXY4OX89piuabPBfcomOw02Jcn2hxEHdI=; b=uyOUQjmnssVeTZESuFF9PRQqpqpj6fDkD8amoPuuW5ULsp5zwUMXZfUd2i2z8L8E7o CmmFe+1dZShO5hGjMMelhBUWEvlgooXZVc5cDw9yUOH35ZVp1EIae5Z6IgPRsfJHOYJn +EY2cs2qh3ImDqJgdKfAIrFP8osqMhRtTLYcQJWkWxPYYYYR2p0PxPNFnandp83ksCRI ho6SBUlnWEWMwfgM0XM9JzAFo4fiAPFMgzgD4ntPQKXme7uCi+TIR0x343aYdW4woW/z be1dYfHSoNxCGU3wHGlWlMcPaelxEEt7UXwgjSY+/vDm3KYdnnRgDdz22sWB1RAPAdAo ufsg== 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=gvLxv88gaOLXY4OX89piuabPBfcomOw02Jcn2hxEHdI=; b=MQpkmu/XMP42Xk/ws9Idwggcrg6cL83xzQqH7XL6B1DGBP3aTHi1y98kAaPGsWWqhT /ninTI0jXTfyb45bUMsu0dd+bFRaqfSVm882JSA4sxzrwTjEHhVS2h11fCTQ0CdS63nB fgQ56A7ZcU7Qbv1H01lMcaBP4XQ5fOdkDl8s1k1b5tRJPXpSbgklEBaPHZFelNeO6U+/ rrPbEwlVdcyntLLqn6aiz+xLPChbJvwcSjTid3CCE/zyHUMcibA7uzAHO8H5T4JrvxaT HdooBfIe/H24B3af4xNROe0gGsq9VjR4uvYgvnzhKqnkS+JWAMxCeUTIk34R4Cfc9hvo PM0Q== X-Gm-Message-State: AOAM531DCf28FJGsFUGF2CXzUYf9gpNyfWcfXfhCLxJPp0zKYNKchMnb ullZPQyLvLbhuSHQAYzICdqWych+dnLMmTP+ X-Google-Smtp-Source: ABdhPJxrlM+hhef7VccbmtuEpFetd8MtFsWUoOsgZPvCxFL036U0d18rAbfVopQwEz79FzksBi2wHQ== X-Received: by 2002:a05:6000:cd:: with SMTP id q13mr4511827wrx.138.1612524583918; Fri, 05 Feb 2021 03:29:43 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id o83sm2943336wme.37.2021.02.05.03.29.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:29:42 -0800 (PST) From: luca.boccassi@gmail.com To: Qi Zhang Cc: Andrii Pypchenko , dpdk stable Date: Fri, 5 Feb 2021 11:16:15 +0000 Message-Id: <20210205111920.1272063-89-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 'net/ice/base: fix memory handling' 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/56997e8283ff16fc9104047a9c8f275020e25d90 Thanks. Luca Boccassi --- >From 56997e8283ff16fc9104047a9c8f275020e25d90 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Fri, 8 Jan 2021 12:03:52 +0800 Subject: [PATCH] net/ice/base: fix memory handling [ upstream commit 964bafcf5e75cddfbd8bc49485922b01fc491182 ] Fixed memory handling when memory allocated in user space was handled as memory allocated in kernel space within QV os_dep implementation of the ice_memdup function. Fixes: 93e84b1bfc92 ("net/ice/base: add basic Tx scheduler") Signed-off-by: Andrii Pypchenko Signed-off-by: Qi Zhang --- drivers/net/ice/base/ice_sched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_sched.c b/drivers/net/ice/base/ice_sched.c index ac48bbe279..882448671e 100644 --- a/drivers/net/ice/base/ice_sched.c +++ b/drivers/net/ice/base/ice_sched.c @@ -1345,7 +1345,7 @@ enum ice_status ice_sched_query_res_alloc(struct ice_hw *hw) ice_memdup(hw, buf->layer_props, (hw->num_tx_sched_layers * sizeof(*hw->layer_info)), - ICE_DMA_TO_DMA); + ICE_NONDMA_TO_NONDMA); if (!hw->layer_info) { status = ICE_ERR_NO_MEMORY; goto sched_query_out; -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:33.267187742 +0000 +++ 0089-net-ice-base-fix-memory-handling.patch 2021-02-05 11:18:28.938693625 +0000 @@ -1 +1 @@ -From 964bafcf5e75cddfbd8bc49485922b01fc491182 Mon Sep 17 00:00:00 2001 +From 56997e8283ff16fc9104047a9c8f275020e25d90 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 964bafcf5e75cddfbd8bc49485922b01fc491182 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index b75a44f54c..1cce8eaff1 100644 +index ac48bbe279..882448671e 100644 @@ -23 +24 @@ -@@ -1361,7 +1361,7 @@ enum ice_status ice_sched_query_res_alloc(struct ice_hw *hw) +@@ -1345,7 +1345,7 @@ enum ice_status ice_sched_query_res_alloc(struct ice_hw *hw)