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 C2DB1A04DD for ; Wed, 28 Oct 2020 11:49:44 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B3E124C90; Wed, 28 Oct 2020 11:49:43 +0100 (CET) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 2CAA12C2A for ; Wed, 28 Oct 2020 11:49:43 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id w14so1132296wrs.9 for ; Wed, 28 Oct 2020 03:49:43 -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=MscKXNUxPJ9v76NRKbbaIFeLilKc3Nr5806eGS8ZCwI=; b=hpqhi04hyQ4w0gXQLiV5vB92oq/Yew4Y4f16dWbQjHVWQRgrbSFX7gZiofQtAdiEmO hXXiLU9k4X7FMt15I7csTGFB2MT1DOkMmHHBfAz1cic6Nz+FWikwBNRcSC32tnP/KsHk p0Bejj/oopJjrxnSPyHVWtTMTEi08JMsKmOgbVtUGLpd58UZwvoUQhign0OGG0cJKKrY QtNCQuqc23/fBgXpTg4T/ZL/yEtQXOs/rTGywQ2BW27gGm89rrP3DcUyDdbA9yOJyork 9ykKhr5WSX8XCWxEH7xmE3aSpA/Whot9oryQr/PoY3xvcFPqy7l5GMId3uxxndtn24Cs vCyw== 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=MscKXNUxPJ9v76NRKbbaIFeLilKc3Nr5806eGS8ZCwI=; b=c39rLN8APELA6TDA34/aieL98T0TFGJFExdQb/sNAirRDkQeHvZOzMLnsw6F2GcOs/ FF3XI3vYMjAh6t28v+BN3AE65mgWPL/2mtTpbOq8rUiaqDeeO1zXCZHqrHtRdZAjI1Gs NVkNk5z8RwmEH8rGdu9jqyaoFHbMTrn1xjEKmQIM9l/AJe2lBwMgssg0sjVKmr8Sg9yA gREHgVVR6f5mFwQtLQE58QoO58NNXgxMpMcKUGWzRtTCKW85qYvelFc112dEWqiS/nFp f1aqiLptoxrBpbeL/PYyNXFwOqP4pI0r3L0pLmShIYIYdC4O3Jis/CwHH5e2mcgfXCBR yqgg== X-Gm-Message-State: AOAM531E0YPrhJcCxfDdIC3TWzeTsyenDiVfxQfDgw9DgXWMNj3qC8Tz BnmdEPbtZ9mYCoBMzSgb2P57iE5W59v32d6u X-Google-Smtp-Source: ABdhPJyeU5qx/8wfTwUIp3nwDgWGwMLd0980u8FecmkSCD09GvmaDI8AG+QVOK6grKFzgaeCt7CUIg== X-Received: by 2002:adf:b19c:: with SMTP id q28mr7930812wra.119.1603882181939; Wed, 28 Oct 2020 03:49:41 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id g17sm6592383wrw.37.2020.10.28.03.49.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:49:41 -0700 (PDT) From: luca.boccassi@gmail.com To: Michal Krawczyk Cc: Igor Chauskin , Guy Tzalik , Stephen Hemminger , dpdk stable Date: Wed, 28 Oct 2020 10:43:46 +0000 Message-Id: <20201028104606.3504127-67-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ena/base: fix release of wait event' has been queued to stable release 19.11.6 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.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 10/30/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 8b077cd951f41ec92402de0ca33a3d4ffcd45761 Mon Sep 17 00:00:00 2001 From: Michal Krawczyk Date: Thu, 17 Sep 2020 07:30:20 +0200 Subject: [PATCH] net/ena/base: fix release of wait event [ upstream commit f034d4bb973a23e6dd2af8acdc3829b013962e47 ] The wait event is being accessed without making sure it the completion context exists. The check for that is just below, so it could be used for releasing wait even safely. Fixes: 3adcba9a8987 ("net/ena: update HAL to the newer version") Signed-off-by: Michal Krawczyk Reviewed-by: Igor Chauskin Reviewed-by: Guy Tzalik Reviewed-by: Stephen Hemminger --- drivers/net/ena/base/ena_com.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c index 147c039124..592909c1be 100644 --- a/drivers/net/ena/base/ena_com.c +++ b/drivers/net/ena/base/ena_com.c @@ -1634,9 +1634,11 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev) struct ena_com_aenq *aenq = &ena_dev->aenq; u16 size; - ENA_WAIT_EVENT_DESTROY(admin_queue->comp_ctx->wait_event); - if (admin_queue->comp_ctx) + if (admin_queue->comp_ctx) { + ENA_WAIT_EVENT_DESTROY(admin_queue->comp_ctx->wait_event); ENA_MEM_FREE(ena_dev->dmadev, admin_queue->comp_ctx); + } + admin_queue->comp_ctx = NULL; size = ADMIN_SQ_SIZE(admin_queue->q_depth); if (sq->entries) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:13.845732197 +0000 +++ 0067-net-ena-base-fix-release-of-wait-event.patch 2020-10-28 10:35:11.536830495 +0000 @@ -1,14 +1,15 @@ -From f034d4bb973a23e6dd2af8acdc3829b013962e47 Mon Sep 17 00:00:00 2001 +From 8b077cd951f41ec92402de0ca33a3d4ffcd45761 Mon Sep 17 00:00:00 2001 From: Michal Krawczyk Date: Thu, 17 Sep 2020 07:30:20 +0200 Subject: [PATCH] net/ena/base: fix release of wait event +[ upstream commit f034d4bb973a23e6dd2af8acdc3829b013962e47 ] + The wait event is being accessed without making sure it the completion context exists. The check for that is just below, so it could be used for releasing wait even safely. Fixes: 3adcba9a8987 ("net/ena: update HAL to the newer version") -Cc: stable@dpdk.org Signed-off-by: Michal Krawczyk Reviewed-by: Igor Chauskin @@ -19,10 +20,10 @@ 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c -index b4e54318c6..ce239ab164 100644 +index 147c039124..592909c1be 100644 --- a/drivers/net/ena/base/ena_com.c +++ b/drivers/net/ena/base/ena_com.c -@@ -1655,11 +1655,13 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev) +@@ -1634,9 +1634,11 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev) struct ena_com_aenq *aenq = &ena_dev->aenq; u16 size; @@ -30,9 +31,7 @@ - if (admin_queue->comp_ctx) + if (admin_queue->comp_ctx) { + ENA_WAIT_EVENT_DESTROY(admin_queue->comp_ctx->wait_event); - ENA_MEM_FREE(ena_dev->dmadev, - admin_queue->comp_ctx, - (admin_queue->q_depth * sizeof(struct ena_comp_ctx))); + ENA_MEM_FREE(ena_dev->dmadev, admin_queue->comp_ctx); + } + admin_queue->comp_ctx = NULL;