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 990454326F for ; Thu, 2 Nov 2023 14:14:16 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 934B642DED; Thu, 2 Nov 2023 14:14:16 +0100 (CET) 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 10C3D42D80 for ; Thu, 2 Nov 2023 14:14:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930854; 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=vDOJ/xCdjI2ZqX7GkAVDhQFtb+tFlz5mL2F8S6ib2qc=; b=bMUHMIk+8sbP1HoBjZupzBdd6a/FVJTX818xm5VlGP1SW8OY770RywYItTFzfvFPXKV29M LF7u5YFa3Z6PXOS7yVQAs9GC+PyoRRgS1SR3/JCsIhS8AhWvw8hHMzEZMaXKBPtMZHhUb1 SVZ6h6PsVThfxa+8/0GyfohCfUJ5bAk= 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-685-2oBJeqh4PLCVQ4XSYD4gtw-1; Thu, 02 Nov 2023 09:14:12 -0400 X-MC-Unique: 2oBJeqh4PLCVQ4XSYD4gtw-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 D9F703816D81; Thu, 2 Nov 2023 13:14:11 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A24F492BFA; Thu, 2 Nov 2023 13:14:11 +0000 (UTC) From: Kevin Traynor To: Amit Prakash Shukla Cc: Radha Mohan Chintakuntla , dpdk stable Subject: patch 'common/cnxk: fix DPI memzone name' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:11:52 +0000 Message-ID: <20231102131254.315947-46-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/7c35f7b1c549b8c3f5afef562917797caf079f61 Thanks. Kevin --- >From 7c35f7b1c549b8c3f5afef562917797caf079f61 Mon Sep 17 00:00:00 2001 From: Amit Prakash Shukla Date: Wed, 23 Aug 2023 16:45:14 +0530 Subject: [PATCH] common/cnxk: fix DPI memzone name [ upstream commit 7ca20b053cb739d021d2ff33a5ba75651048c322 ] roc_dpi was using vfid as part of name for memzone allocation. This led to memzone allocation failure in case of multiple physical functions. vfid is not unique by itself since multiple physical functions can have the same virtual function indices. So use complete DBDF as part of memzone name to make it unique. Fixes: b6e395692b6d ("common/cnxk: add DPI DMA support") Signed-off-by: Radha Mohan Chintakuntla Signed-off-by: Amit Prakash Shukla --- drivers/common/cnxk/roc_dpi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/common/cnxk/roc_dpi.c b/drivers/common/cnxk/roc_dpi.c index 23b2cc41a4..1666fe5fad 100644 --- a/drivers/common/cnxk/roc_dpi.c +++ b/drivers/common/cnxk/roc_dpi.c @@ -82,8 +82,8 @@ roc_dpi_configure(struct roc_dpi *roc_dpi) } - snprintf(name, sizeof(name), "dpimem%d", roc_dpi->vfid); + snprintf(name, sizeof(name), "dpimem%d:%d:%d:%d", pci_dev->addr.domain, pci_dev->addr.bus, + pci_dev->addr.devid, pci_dev->addr.function); buflen = DPI_CMD_QUEUE_SIZE * DPI_CMD_QUEUE_BUFS; - dpi_mz = plt_memzone_reserve_aligned(name, buflen, 0, - DPI_CMD_QUEUE_SIZE); + dpi_mz = plt_memzone_reserve_aligned(name, buflen, 0, DPI_CMD_QUEUE_SIZE); if (dpi_mz == NULL) { plt_err("dpi memzone reserve failed"); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:41.965471083 +0000 +++ 0046-common-cnxk-fix-DPI-memzone-name.patch 2023-11-02 13:09:40.847163445 +0000 @@ -1 +1 @@ -From 7ca20b053cb739d021d2ff33a5ba75651048c322 Mon Sep 17 00:00:00 2001 +From 7c35f7b1c549b8c3f5afef562917797caf079f61 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7ca20b053cb739d021d2ff33a5ba75651048c322 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 93c8318a3d..0e2f803077 100644 +index 23b2cc41a4..1666fe5fad 100644