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 1599B489EF for ; Mon, 27 Oct 2025 17:22:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E49240671; Mon, 27 Oct 2025 17:22:23 +0100 (CET) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id 0034A4028B for ; Mon, 27 Oct 2025 17:22:21 +0100 (CET) Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-429a0d1c31aso731592f8f.1 for ; Mon, 27 Oct 2025 09:22:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761582141; x=1762186941; 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=rdFSDOCFR80DJIVysyGgKRCYwM4D7VGZF0oXEAU7LPs=; b=A8Q1YX0mVDYzV3rXPFvHgMuAMJUTXXkVgql0pOx9fZWp2bIUGr50GP/mgekNiZlQTQ GmqLHw1WGZig4CJ0JXuI39MkVOp3j0Wviz/PL5iko6KeSa6kiozR91dl5NgyOTE0b8En yVSYJJZO8dbtfhuin2Dh8dGybW3GKYZuBPtvmhN7BXkXr9jDwhByYmROtZgtqyusjGE3 F93wvaZOAHOPU8xlfm/WpcPo4uRrUAxFgd9+LYXpCJSvOQ7gLpUZpdfpBvS1QELMZlnk YVEgLM36GNoKStgJHkBZLnf451tANb2O1hVJwsCKdFlwOag6CyIKWfWYCoYstA0B/4wh iNMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761582141; x=1762186941; 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=rdFSDOCFR80DJIVysyGgKRCYwM4D7VGZF0oXEAU7LPs=; b=vcHDB6QD9SLu2upUMZMPmBFktRKt1iRtzwm22eQPckH5yll9i7tsbe0+gjzi1tkWgD ou/l4/AlBsX6LYeS0L7GrmRsMUBbURSeZf9mp1kVTzOw07Ajwz1bds0vTS0pvyCl1DeO UhpJ5xF3k+E26Uij3GRSpm6coXNpVylRDox9iV3XC+pct/b3FQ7WO8HMfzuPTfPt9xkC pJHS6oNyGmIQrpl8VmWhKd6yUc0yLswiovFgbfoM6NDQKXcV+CE9Ay1uJh3inuoAsI+d YK/JU8NT1AnHKRCqlafu+W7UNKZAfWzErT0srcos76KwYXFqRynkGjhzqHdsvgxprR40 idYA== X-Gm-Message-State: AOJu0Yx3v5BsSNejXwiDlfkq2Hqwrkt25cHS4O1EdGrdsBP5Jq5gQHOK M7lAAVNmaYhEKKE12BVf8Bda60gcN48GuFqKRB/7pmxsQY3NzfzzT+uC X-Gm-Gg: ASbGncv63KhqAv/wlP8THfk1InIw9e50soI+Ds3abxlmFKxuHtB+S3PEhSmaT3rIhtS xqfuib2kbBelf5iy5hPJRJXJt1xe74pTqmPYhbIPSNJRqWzxheUbhd8K8PSIWuo1GIj1s8knq6i pVkBjj4U3FX6kj4hvO+wIJPpj6sy02h6ODIvBjt0i+pL0lk+b0+nulqhAeUl6UCXPofS3RMIBYh ttXf6LR1n4AsuH+Vgi/CLpJ+qloRbkNi9zmga17Ijlo7igXElsG5bE0p3El89kJC3NacVzXjxxH R0AyCODr9pas746wN6Pgk6FNvP2mKo7Onxw7Juqp680JunND5/ZXYC3VZwIHFD9qCbey7eRNBeO Io6dqnx2eRceYnTIfdzYV8BTLK15PBfim57Vfc1D3f1VCizx4wqrMk/P2TIsuFQLxkX5T0WNBP0 GPOA1acfxujA7T+JZj X-Google-Smtp-Source: AGHT+IGYLBcNtZMoFXaN3xpm9F/J5OIMCBI8K7LY5yeMBOsuiF0ckOiolR1yFW3l10axMa930fX/Ag== X-Received: by 2002:a5d:64e8:0:b0:401:c55d:2d20 with SMTP id ffacd0b85a97d-429a83e5037mr14515f8f.26.1761582141338; Mon, 27 Oct 2025 09:22:21 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:6fc5:c3bc:147e:832c]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-429952df62dsm16365853f8f.45.2025.10.27.09.22.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Oct 2025 09:22:20 -0700 (PDT) From: luca.boccassi@gmail.com To: Chengwen Feng Cc: dpdk stable Subject: patch 'dma/hisilicon: fix stop with pending transfers' has been queued to stable release 22.11.11 Date: Mon, 27 Oct 2025 16:19:19 +0000 Message-ID: <20251027162001.3710450-41-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251027162001.3710450-1-luca.boccassi@gmail.com> References: <20251027162001.3710450-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.11 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/29/25. 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/ff8d762481472039fe6f3001c83468f7c97bf9e9 Thanks. Luca Boccassi --- >From ff8d762481472039fe6f3001c83468f7c97bf9e9 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Mon, 13 Oct 2025 17:22:11 +0800 Subject: [PATCH] dma/hisilicon: fix stop with pending transfers [ upstream commit 8aa458f1c44b9f6e73f75047aca77191dc79746f ] Stop dmadev may fail if there are pending DMA transfers, we need make sure there are no pending DMA transfers when stop. This commit uses following scheme: 1. flag stop proc so that new request will not process. 2. setting drop flag for all descriptor to quick complete. 3. waiting dmadev to complete. Fixes: 3c5f5f03a047 ("dma/hisilicon: add control path") Signed-off-by: Chengwen Feng --- drivers/dma/hisilicon/hisi_dmadev.c | 45 ++++++++++++++++++++++++----- drivers/dma/hisilicon/hisi_dmadev.h | 2 ++ 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/drivers/dma/hisilicon/hisi_dmadev.c b/drivers/dma/hisilicon/hisi_dmadev.c index 4db3b0554c..29aed3e156 100644 --- a/drivers/dma/hisilicon/hisi_dmadev.c +++ b/drivers/dma/hisilicon/hisi_dmadev.c @@ -378,6 +378,7 @@ hisi_dma_start(struct rte_dma_dev *dev) hw->cq_head = 0; hw->cqs_completed = 0; hw->cqe_vld = 1; + hw->stop_proc = 0; hw->submitted = 0; hw->completed = 0; hw->errors = 0; @@ -389,12 +390,6 @@ hisi_dma_start(struct rte_dma_dev *dev) return 0; } -static int -hisi_dma_stop(struct rte_dma_dev *dev) -{ - return hisi_dma_reset_hw(dev->data->dev_private); -} - static int hisi_dma_close(struct rte_dma_dev *dev) { @@ -456,6 +451,37 @@ hisi_dma_vchan_status(const struct rte_dma_dev *dev, uint16_t vchan, return 0; } +static int +hisi_dma_stop(struct rte_dma_dev *dev) +{ +#define MAX_WAIT_MSEC 10 + struct hisi_dma_dev *hw = dev->data->dev_private; + enum rte_dma_vchan_status status; + uint32_t i; + + /* Flag stop processing new requests. */ + hw->stop_proc = 1; + rte_delay_ms(1); + + /* Force set drop flag so that the hardware can quickly complete. */ + for (i = 0; i <= hw->sq_depth_mask; i++) + hw->sqe[i].dw0 |= SQE_DROP_FLAG; + + i = 0; + do { + hisi_dma_vchan_status(dev, 0, &status); + if (status != RTE_DMA_VCHAN_ACTIVE) + break; + rte_delay_ms(1); + } while (i++ < MAX_WAIT_MSEC); + if (status == RTE_DMA_VCHAN_ACTIVE) { + HISI_DMA_ERR(hw, "dev is still active!"); + return -EBUSY; + } + + return hisi_dma_reset_hw(dev->data->dev_private); +} + static void hisi_dma_dump_range(struct hisi_dma_dev *hw, FILE *f, uint32_t start, uint32_t end) @@ -550,14 +576,14 @@ hisi_dma_dump(const struct rte_dma_dev *dev, FILE *f) " revision: 0x%x queue_id: %u ring_size: %u\n" " ridx: %u cridx: %u\n" " sq_head: %u sq_tail: %u cq_sq_head: %u\n" - " cq_head: %u cqs_completed: %u cqe_vld: %u\n" + " cq_head: %u cqs_completed: %u cqe_vld: %u stop_proc: %u\n" " submitted: %" PRIu64 " completed: %" PRIu64 " errors: %" PRIu64 " qfulls: %" PRIu64 "\n", hw->revision, hw->queue_id, hw->sq_depth_mask > 0 ? hw->sq_depth_mask + 1 : 0, hw->ridx, hw->cridx, hw->sq_head, hw->sq_tail, hw->cq_sq_head, - hw->cq_head, hw->cqs_completed, hw->cqe_vld, + hw->cq_head, hw->cqs_completed, hw->cqe_vld, hw->stop_proc, hw->submitted, hw->completed, hw->errors, hw->qfulls); hisi_dma_dump_queue(hw, f); hisi_dma_dump_common(hw, f); @@ -575,6 +601,9 @@ hisi_dma_copy(void *dev_private, uint16_t vchan, RTE_SET_USED(vchan); + if (unlikely(hw->stop_proc > 0)) + return -EPERM; + if (((hw->sq_tail + 1) & hw->sq_depth_mask) == hw->sq_head) { hw->qfulls++; return -ENOSPC; diff --git a/drivers/dma/hisilicon/hisi_dmadev.h b/drivers/dma/hisilicon/hisi_dmadev.h index a57b5c759a..b9dd172c31 100644 --- a/drivers/dma/hisilicon/hisi_dmadev.h +++ b/drivers/dma/hisilicon/hisi_dmadev.h @@ -141,6 +141,7 @@ enum { struct hisi_dma_sqe { uint32_t dw0; +#define SQE_DROP_FLAG BIT(4) #define SQE_FENCE_FLAG BIT(10) #define SQE_OPCODE_M2M 0x4 uint32_t dw1; @@ -211,6 +212,7 @@ struct hisi_dma_dev { */ uint16_t cqs_completed; uint8_t cqe_vld; /**< valid bit for CQE, will change for every round. */ + volatile uint8_t stop_proc; /**< whether stop processing new requests. */ uint64_t submitted; uint64_t completed; -- 2.47.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-10-27 15:54:36.342690329 +0000 +++ 0041-dma-hisilicon-fix-stop-with-pending-transfers.patch 2025-10-27 15:54:34.811949950 +0000 @@ -1 +1 @@ -From 8aa458f1c44b9f6e73f75047aca77191dc79746f Mon Sep 17 00:00:00 2001 +From ff8d762481472039fe6f3001c83468f7c97bf9e9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8aa458f1c44b9f6e73f75047aca77191dc79746f ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 019c4a8189..7575fb12d9 100644 +index 4db3b0554c..29aed3e156 100644 @@ -27 +28 @@ -@@ -376,6 +376,7 @@ hisi_dma_start(struct rte_dma_dev *dev) +@@ -378,6 +378,7 @@ hisi_dma_start(struct rte_dma_dev *dev) @@ -35 +36 @@ -@@ -387,12 +388,6 @@ hisi_dma_start(struct rte_dma_dev *dev) +@@ -389,12 +390,6 @@ hisi_dma_start(struct rte_dma_dev *dev) @@ -48 +49 @@ -@@ -454,6 +449,37 @@ hisi_dma_vchan_status(const struct rte_dma_dev *dev, uint16_t vchan, +@@ -456,6 +451,37 @@ hisi_dma_vchan_status(const struct rte_dma_dev *dev, uint16_t vchan, @@ -86 +87 @@ -@@ -548,14 +574,14 @@ hisi_dma_dump(const struct rte_dma_dev *dev, FILE *f) +@@ -550,14 +576,14 @@ hisi_dma_dump(const struct rte_dma_dev *dev, FILE *f) @@ -103 +104 @@ -@@ -573,6 +599,9 @@ hisi_dma_copy(void *dev_private, uint16_t vchan, +@@ -575,6 +601,9 @@ hisi_dma_copy(void *dev_private, uint16_t vchan, @@ -114 +115 @@ -index 90301e6b00..aab87c40be 100644 +index a57b5c759a..b9dd172c31 100644