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 91223A0093 for ; Tue, 19 May 2020 15:14:10 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 882401D8F6; Tue, 19 May 2020 15:14:10 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 8032E1D8F6 for ; Tue, 19 May 2020 15:14:09 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id e1so15874014wrt.5 for ; Tue, 19 May 2020 06:14:09 -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=pNhqDIplzB7VWiQnuhkMn1e4vWZ3QV8XO16ugcsAIlc=; b=iZseSE2zhslv2tMCfjqI2LUK9RHzZypGxG48iXv9sfVswDBCMNOF/IWTyXkCuijs+k ZLnmSqEfxRYp1bXEWzvKWQSmp0zl6ueKgXoaJyLiq9gmzrSY/MnjEiejvD0oxpX7fgjM bc0tWaEC81v79c0lejqP8ZDZfWCfCddbK8HiYAHzNC4JK3NaXXbEmSEsDMfqbDnmdrLe MCsi4P6lE553+hMvMOcZAHxlOZk8acWR6XBNG5K72vjDKR3WSSxfBS+ZSmcr2dXWq0Rw 9bE38qOh8OX+EsSkx+cWhgC3149b7R/V36X0vgYD4/vRh/F9MSbx1ZhPcEmpCIwqRlBV DjKQ== 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=pNhqDIplzB7VWiQnuhkMn1e4vWZ3QV8XO16ugcsAIlc=; b=UffFjQJWlX1hkWNkue2eEfypn2vtawkuieYRUJ3hEBGsSeWmexY6YUiEtZdZ7jz31i IAym3NK0+83MCMi3nSBLDl0YA06NJP55NGGflusWS3RG9CNC6cs82X43mhUUJorewRSt 5OJXMqMwL9kjS0emL1lWz37Nd+bYrYvhTCM27uIWZXL68vqYlRFadk3B3ad/CMFkI/zr zcTwGc77VBV6ZnuwMoBBvz+YNB9h9IAoRD2cDAf4MeUXhM+1Rb7xDAp1mwq4NfOXRDDF Oa47iCYeRa4pf8guBm6KGMuMOUHqtZZErsWbu0Q5bYMn4Ko41igAW3ry8gLIU0B7EPiI zrig== X-Gm-Message-State: AOAM5318Go6ns3JuNXl0jDE+Qskjr9HJZRXuFi/NU+CGsHnX4V/8RzVt W6nNEab0TEPtPLWs89nLY84= X-Google-Smtp-Source: ABdhPJyrjkf51eJofkkWfD1VFAfFu3DPrIJsABSlCdg7me66KHVYZWL9lhzWFoyu/Bwsb/0NHrfLPw== X-Received: by 2002:adf:e5c8:: with SMTP id a8mr24907584wrn.335.1589894049259; Tue, 19 May 2020 06:14:09 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id c16sm20568274wrv.62.2020.05.19.06.14.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:14:08 -0700 (PDT) From: luca.boccassi@gmail.com To: Lukasz Bartosik Cc: Pavan Nikhilesh , dpdk stable Date: Tue, 19 May 2020 14:04:52 +0100 Message-Id: <20200519130549.112823-157-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'event/octeontx2: fix queue removal from Rx adapter' 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/21/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 a309eafc8902de65a2caf0e64a4c5c0303fbc27b Mon Sep 17 00:00:00 2001 From: Lukasz Bartosik Date: Thu, 16 Apr 2020 17:47:40 +0200 Subject: [PATCH] event/octeontx2: fix queue removal from Rx adapter [ upstream commit 534d1d4b65468deed18723fb45818275887c8ecd ] When eth port queue is removed from Rx adapter using rte_event_eth_rx_adapter_queue_del() it incorrectly initializes CQ context instead of modifying it. This might lead to a crash when CQ context is modified as a part of rte_eth_dev_stop() sequence as CQ will hold invalid entries. This is responsibility of an application to call rte_event_eth_rx_adapter_queue_del() to remove eth port queue from Rx adapter in tear down sequence. Fixes: 37720fc1fba8 ("event/octeontx2: add Rx adapter") Signed-off-by: Lukasz Bartosik Acked-by: Pavan Nikhilesh --- drivers/event/octeontx2/otx2_evdev_adptr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/event/octeontx2/otx2_evdev_adptr.c b/drivers/event/octeontx2/otx2_evdev_adptr.c index 233cba2aa3..8bdcfa3ea5 100644 --- a/drivers/event/octeontx2/otx2_evdev_adptr.c +++ b/drivers/event/octeontx2/otx2_evdev_adptr.c @@ -133,7 +133,7 @@ sso_rxq_disable(struct otx2_eth_dev *dev, uint16_t qid) aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox); aq->qidx = qid; aq->ctype = NIX_AQ_CTYPE_CQ; - aq->op = NIX_AQ_INSTOP_INIT; + aq->op = NIX_AQ_INSTOP_WRITE; aq->cq.ena = 1; aq->cq.caching = 1; @@ -144,7 +144,7 @@ sso_rxq_disable(struct otx2_eth_dev *dev, uint16_t qid) rc = otx2_mbox_process(mbox); if (rc < 0) { - otx2_err("Failed to init cq context"); + otx2_err("Failed to enable cq context"); goto fail; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:50.881850262 +0100 +++ 0157-event-octeontx2-fix-queue-removal-from-Rx-adapter.patch 2020-05-19 14:04:44.496653448 +0100 @@ -1,8 +1,10 @@ -From 534d1d4b65468deed18723fb45818275887c8ecd Mon Sep 17 00:00:00 2001 +From a309eafc8902de65a2caf0e64a4c5c0303fbc27b Mon Sep 17 00:00:00 2001 From: Lukasz Bartosik Date: Thu, 16 Apr 2020 17:47:40 +0200 Subject: [PATCH] event/octeontx2: fix queue removal from Rx adapter +[ upstream commit 534d1d4b65468deed18723fb45818275887c8ecd ] + When eth port queue is removed from Rx adapter using rte_event_eth_rx_adapter_queue_del() it incorrectly initializes CQ context instead of modifying it. This @@ -14,7 +16,6 @@ sequence. Fixes: 37720fc1fba8 ("event/octeontx2: add Rx adapter") -Cc: stable@dpdk.org Signed-off-by: Lukasz Bartosik Acked-by: Pavan Nikhilesh