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 B801BA054A for ; Tue, 25 Oct 2022 17:10:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B002542C3C; Tue, 25 Oct 2022 17:10:18 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 49E5242C34 for ; Tue, 25 Oct 2022 17:10:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EIzY2qiLcjgSYieBtUvsaq2EVkwglaKOlID08hvy7x8=; b=OgJLjhbjeNCKxWDmLcgIXehNMqzHIEhl0IpE5LGIkVsAjuDBfGSsHfzbWoxvcgegQ8xVst VE9EaE5ItBq5/jSAVY3K64fW1z1Yt8U7sg7gGLVjCu4ClyJYxIy2tAW80fQ1NvmtYjBpZT RPi4lxYPtmuuQC8Kg8pupvxk2Tp7X1A= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-665-eC_wDjweNXyS_DflPBB-tA-1; Tue, 25 Oct 2022 11:10:11 -0400 X-MC-Unique: eC_wDjweNXyS_DflPBB-tA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F1974185A7AB; Tue, 25 Oct 2022 15:10:10 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 300DA4A9254; Tue, 25 Oct 2022 15:10:09 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix crash in SVE Tx' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:07:31 +0100 Message-Id: <20221025150734.142189-96-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.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 11/01/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/2197709643a6bb8beb1b31e241cecd0e8c125622 Thanks. Kevin --- >From 2197709643a6bb8beb1b31e241cecd0e8c125622 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Mon, 5 Sep 2022 16:59:32 +0800 Subject: [PATCH] net/hns3: fix crash in SVE Tx [ upstream commit 905487d35fb3d2481cb46ad9bd0e348e9c188911 ] Currently, the number of Tx send bytes is obtained by accumulating the length of the batch 'mbuf' packets of the current loop cycle. Unfortunately, it uses svcntd (which means all lane, regardless of whether the corresponding lane is valid) which may lead to overflow, and thus refers to an invalid mbuf. Because the SVE xmit algorithm applies only to a single mbuf, the mbuf's data_len is equal pkt_len, so this patch fixes it by using svaddv_u64(svbool_t pg, svuint64_t data_len) which only adds valid lanes. Fixes: fdcd6a3e0246 ("net/hns3: add bytes stats") Signed-off-by: Chengwen Feng Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_rxtx_vec_sve.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/hns3/hns3_rxtx_vec_sve.c b/drivers/net/hns3/hns3_rxtx_vec_sve.c index be1fdbcdf0..b0dfb052bb 100644 --- a/drivers/net/hns3/hns3_rxtx_vec_sve.c +++ b/drivers/net/hns3/hns3_rxtx_vec_sve.c @@ -436,7 +436,6 @@ hns3_tx_fill_hw_ring_sve(struct hns3_tx_queue *txq, /* Increment bytes counter */ - uint32_t idx; - for (idx = 0; idx < svcntd(); idx++) - txq->basic_stats.bytes += pkts[idx]->pkt_len; + txq->basic_stats.bytes += + (svaddv_u64(pg, data_len) >> HNS3_UINT16_BIT); /* update index for next loop */ -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:19:00.709366359 +0100 +++ 0096-net-hns3-fix-crash-in-SVE-Tx.patch 2022-10-25 14:18:58.537798542 +0100 @@ -1 +1 @@ -From 905487d35fb3d2481cb46ad9bd0e348e9c188911 Mon Sep 17 00:00:00 2001 +From 2197709643a6bb8beb1b31e241cecd0e8c125622 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 905487d35fb3d2481cb46ad9bd0e348e9c188911 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org