From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 683642745E; Fri, 21 Nov 2025 13:31:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763731895; cv=none; b=KjgHD5xWzoFxN8iZ8IpzeN0EGxpsGBrb7YLSDtiyzGBZfeMQi7qeSpdYbZB+oJDjOKOke2y83DgellMgqW14b60KuARBZuDLA5aUBFhX6f/uAafWtyfGZZbLcYpW+ptUBLGcr1QngRzdCdbxm7JAiKIJ2GG8iQM+3CGlmhydSJA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763731895; c=relaxed/simple; bh=0XEoadYu6Uo+vcfirYs32ApXcOqLOiT5hLG2wZ4Tx1E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J8BlloVyQvcPqWlmHR5/A6q91Wox+a9JPufplVsbtg1uuJ2+xjrbpLC8tDBX/WMV4+NTP+2ZPRwaNMnyZ8f7D9LZeQv6WqGarWbQo5tx2UzV8NsNX1heTyYCtjuLRYdHoyRkm70vBWgdIiygXYA04pir9JY5QXukbsDwzMtIvEw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LZ6fe0q9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="LZ6fe0q9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C346C4CEF1; Fri, 21 Nov 2025 13:31:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1763731895; bh=0XEoadYu6Uo+vcfirYs32ApXcOqLOiT5hLG2wZ4Tx1E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LZ6fe0q9HQ+qM7g5ribxe7KYa4fN4RwvMrCAsqh5vXNIbtrwxZzva3Ot+hSvr3g9T T+xPsFKVGfmaP1QGM35BTXQf0dLiBRsS0qZ3NlAUGkzdRz8XdwaQCh/0Jn4nB9NP3B Agm2GShJE7ZL+TIpp9px0SgzL36FLkKJteviIi8w= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Barry Song , Qinxin Xia , Jonathan Cameron , Marek Szyprowski Subject: [PATCH 6.12 117/185] dma-mapping: benchmark: Restore padding to ensure uABI remained consistent Date: Fri, 21 Nov 2025 14:12:24 +0100 Message-ID: <20251121130148.097221871@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251121130143.857798067@linuxfoundation.org> References: <20251121130143.857798067@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Qinxin Xia commit 23ee8a2563a0f24cf4964685ced23c32be444ab8 upstream. The padding field in the structure was previously reserved to maintain a stable interface for potential new fields, ensuring compatibility with user-space shared data structures. However,it was accidentally removed by tiantao in a prior commit, which may lead to incompatibility between user space and the kernel. This patch reinstates the padding to restore the original structure layout and preserve compatibility. Fixes: 8ddde07a3d28 ("dma-mapping: benchmark: extract a common header file for map_benchmark definition") Cc: stable@vger.kernel.org Acked-by: Barry Song Signed-off-by: Qinxin Xia Reported-by: Barry Song Closes: https://lore.kernel.org/lkml/CAGsJ_4waiZ2+NBJG+SCnbNk+nQ_ZF13_Q5FHJqZyxyJTcEop2A@mail.gmail.com/ Reviewed-by: Jonathan Cameron Signed-off-by: Marek Szyprowski Link: https://lore.kernel.org/r/20251028120900.2265511-2-xiaqinxin@huawei.com Signed-off-by: Greg Kroah-Hartman --- include/linux/map_benchmark.h | 1 + 1 file changed, 1 insertion(+) --- a/include/linux/map_benchmark.h +++ b/include/linux/map_benchmark.h @@ -27,5 +27,6 @@ struct map_benchmark { __u32 dma_dir; /* DMA data direction */ __u32 dma_trans_ns; /* time for DMA transmission in ns */ __u32 granule; /* how many PAGE_SIZE will do map/unmap once a time */ + __u8 expansion[76]; /* For future use */ }; #endif /* _KERNEL_DMA_BENCHMARK_H */