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 16A3D4326F for ; Thu, 2 Nov 2023 14:13:27 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 105F240A76; Thu, 2 Nov 2023 14:13:27 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id BD502402D5 for ; Thu, 2 Nov 2023 14:13:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930805; 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=0CZPTMLa8QBPBNVrL59hJfg9Jp0wVInjRhzKvH1maFw=; b=QdelZZ8rMlVMixn4X3Le6cU6hOj7eGEdCfH3lclph5mqfqyhZ9dMxfB0kGiEnZmQemRKs3 Z8DmK0Bnw1UP98h4PfAdkLejoTPC+wjyTLfJCw1UiKJzMNMl0+Dd0tv/6eVxgpuR8Trs4B HSGSGcm1kIqfqTDvvUIiIi8NHlEy/uc= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-108-wJFn0h75PfihLoHSObboAw-1; Thu, 02 Nov 2023 09:13:22 -0400 X-MC-Unique: wJFn0h75PfihLoHSObboAw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BB7981C04327; Thu, 2 Nov 2023 13:13:21 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4DA39492BFA; Thu, 2 Nov 2023 13:13:20 +0000 (UTC) From: Kevin Traynor To: Viacheslav Galaktionov Cc: Ivan Malov , Andy Moreton , Andrew Rybchenko , dpdk stable Subject: patch 'net/sfc: account for data offset on Tx' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:11:12 +0000 Message-ID: <20231102131254.315947-6-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 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.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 11/08/23. 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/0ea692c019ba9271499d658bae1cee724a849a20 Thanks. Kevin --- >From 0ea692c019ba9271499d658bae1cee724a849a20 Mon Sep 17 00:00:00 2001 From: Viacheslav Galaktionov Date: Mon, 11 Sep 2023 14:47:41 +0400 Subject: [PATCH] net/sfc: account for data offset on Tx [ upstream commit e7694b080de025fbc4bb31fbe7eb149f20a10373 ] Memory buffers passed by the application may contain private data, which must not be sent to the NIC. Omit this private data by using the actual data address instead of the default one. Fixes: 3037e6cf3dde ("net/sfc: support regioned NIC DMA memory mapping type") Signed-off-by: Viacheslav Galaktionov Reviewed-by: Ivan Malov Reviewed-by: Andy Moreton Acked-by: Andrew Rybchenko --- drivers/net/sfc/sfc_ef100_tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/sfc/sfc_ef100_tx.c b/drivers/net/sfc/sfc_ef100_tx.c index 4c2205f7a4..1b6374775f 100644 --- a/drivers/net/sfc/sfc_ef100_tx.c +++ b/drivers/net/sfc/sfc_ef100_tx.c @@ -406,5 +406,5 @@ sfc_ef100_tx_qdesc_send_create(const struct sfc_ef100_txq *txq, } - rc = sfc_ef100_tx_map(txq, rte_mbuf_data_iova_default(m), + rc = sfc_ef100_tx_map(txq, rte_mbuf_data_iova(m), rte_pktmbuf_data_len(m), &dma_addr); if (unlikely(rc != 0)) -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:41.054123499 +0000 +++ 0006-net-sfc-account-for-data-offset-on-Tx.patch 2023-11-02 13:09:40.769163194 +0000 @@ -1 +1 @@ -From e7694b080de025fbc4bb31fbe7eb149f20a10373 Mon Sep 17 00:00:00 2001 +From 0ea692c019ba9271499d658bae1cee724a849a20 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e7694b080de025fbc4bb31fbe7eb149f20a10373 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org