From cf9a46253142e091416fcf2041a71ddab4425aa7 Mon Sep 17 00:00:00 2001 From: ruppala Date: Tue, 2 Jul 2024 12:10:55 +0000 Subject: [PATCH] nvethernet: Modify Wframe-larger-than flag for KASAN KASAN increases the stack usage and that causes a build error for crossing the stack-frame limits. Increase the frame-larger-than limit for KASAN from 2048 to 4096 bytes. Bug 4625047 Change-Id: I77550e524722af377745d47c6a0255e9341f8414 Signed-off-by: ruppala Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3166783 GVS: buildbot_gerritrpt Reviewed-by: Bibek Basu --- drivers/net/ethernet/nvidia/nvethernet/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/nvidia/nvethernet/Makefile b/drivers/net/ethernet/nvidia/nvethernet/Makefile index 085a6c1a..feafd8a0 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/Makefile +++ b/drivers/net/ethernet/nvidia/nvethernet/Makefile @@ -15,13 +15,19 @@ endif ifndef CONFIG_TEGRA_SYSTEM_TYPE_ACK # These CFLAGS must not be shared/used in OSI. These are local to Linux -ccflags-y += -DLINUX_OS -DNET30 -DNVPKCS_MACSEC -DLINUX_IVC -mno-outline-atomics -Werror=frame-larger-than=2048 \ +ccflags-y += -DLINUX_OS -DNET30 -DNVPKCS_MACSEC -DLINUX_IVC -mno-outline-atomics -Werror \ -I$(srctree.nvidia-oot)/drivers/net/ethernet/nvidia/nvethernet/nvethernetrm/include else ccflags-y += -DLINUX_OS -DNET30 -DNVPKCS_MACSEC -DLINUX_IVC \ -I$(srctree.nvidia-oot)/drivers/net/ethernet/nvidia/nvethernet/nvethernetrm/include endif +ifdef CONFIG_KASAN +ccflags-y += -Wframe-larger-than=4096 +else +ccflags-y += -Wframe-larger-than=2048 +endif + #ccflags-y += -DOSI_DEBUG -DMACSEC_SUPPORT -DDEBUG_MACSEC -DMACSEC_KEY_PROGRAM ccflags-y += -DMACSEC_SUPPORT