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 2D4EC45804 for ; Fri, 23 Aug 2024 18:21:43 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 274D8402BE; Fri, 23 Aug 2024 18:21:43 +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 60D4640295 for ; Fri, 23 Aug 2024 18:21:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430101; 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=0t35Bx5RrrUk7BQZiBQav0e4HpJ7O5aydyP9lJaXk+s=; b=YgvFHOdS45+QCtao/EdO/ZhDP7pTss8b77HC499LEjVIeYJb3jT0ZHzRCFzGexN0a2ufMr VLuW87QlZrzKqCyoyPM4BqDdquyqI/8z3fcjejlgkzIHxU9uzV63/baoOl6Cst5DF6AMec n/F9f/w8R2QXx731zOaMNTC5fZT03Jo= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-263-0IZ1lbssNPWG7GhnBj3qkQ-1; Fri, 23 Aug 2024 12:21:37 -0400 X-MC-Unique: 0IZ1lbssNPWG7GhnBj3qkQ-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DD6231956048; Fri, 23 Aug 2024 16:21:36 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5676F1956053; Fri, 23 Aug 2024 16:21:35 +0000 (UTC) From: Kevin Traynor To: Wenwu Ma Cc: Chengwen Feng , dpdk stable Subject: patch 'dmadev: fix structure alignment' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:18:03 +0100 Message-ID: <20240823161929.1004778-55-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/24. 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/2c3f6129d9d7aea65dc0c0e0c24cf3436af0abf3 Thanks. Kevin --- >From 2c3f6129d9d7aea65dc0c0e0c24cf3436af0abf3 Mon Sep 17 00:00:00 2001 From: Wenwu Ma Date: Wed, 20 Mar 2024 15:23:32 +0800 Subject: [PATCH] dmadev: fix structure alignment [ upstream commit c15902587b538ff02cfb0fbb4dd481f1503d936b ] The structure rte_dma_dev needs to be aligned to the cache line, but the return value of malloc may not be aligned to the cache line. When we use memset to clear the rte_dma_dev object, it may cause a segmentation fault in clang-x86-platform. This is because clang uses the "vmovaps" assembly instruction for memset, which requires that the operands (rte_dma_dev objects) must aligned on a 16-byte boundary or a general-protection exception (#GP) is generated. Therefore, either additional memory is applied for re-alignment, or the rte_dma_dev object does not require cache line alignment. The patch chooses the former option to fix the issue. Fixes: b36970f2e13e ("dmadev: introduce DMA device library") Signed-off-by: Wenwu Ma Reviewed-by: Chengwen Feng --- lib/dmadev/rte_dmadev.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c index d4b32b2971..4e2057d301 100644 --- a/lib/dmadev/rte_dmadev.c +++ b/lib/dmadev/rte_dmadev.c @@ -155,13 +155,22 @@ dma_dev_data_prepare(void) { size_t size; + void *ptr; if (rte_dma_devices != NULL) return 0; - size = dma_devices_max * sizeof(struct rte_dma_dev); - rte_dma_devices = malloc(size); - if (rte_dma_devices == NULL) + /* The DMA device object is expected to align cacheline, + * but the return value of malloc may not be aligned to the cache line. + * Therefore, extra memory is applied for realignment. + * Note: posix_memalign/aligned_alloc are not used + * because not always available, depending on libc. + */ + size = dma_devices_max * sizeof(struct rte_dma_dev) + RTE_CACHE_LINE_SIZE; + ptr = malloc(size); + if (ptr == NULL) return -ENOMEM; - memset(rte_dma_devices, 0, size); + memset(ptr, 0, size); + + rte_dma_devices = RTE_PTR_ALIGN(ptr, RTE_CACHE_LINE_SIZE); return 0; -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:11.532781881 +0100 +++ 0055-dmadev-fix-structure-alignment.patch 2024-08-23 17:18:09.719430102 +0100 @@ -1 +1 @@ -From c15902587b538ff02cfb0fbb4dd481f1503d936b Mon Sep 17 00:00:00 2001 +From 2c3f6129d9d7aea65dc0c0e0c24cf3436af0abf3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c15902587b538ff02cfb0fbb4dd481f1503d936b ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index e64b279bac..845727210f 100644 +index d4b32b2971..4e2057d301 100644 @@ -33 +34 @@ -@@ -160,13 +160,22 @@ dma_dev_data_prepare(void) +@@ -155,13 +155,22 @@ dma_dev_data_prepare(void)