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 45688175A6; Sat, 3 Feb 2024 04:19:34 +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=1706933974; cv=none; b=RnWPuiOqnKa9fXgjm5E5k/tVQxgtNxlNoKXrI9EjRQKemGkRaG5O3++Cxxiez1DG7Vsp9R5v0IjDlt7q2svtSdsy1GUbi65qRgpl8oM1ePr1kqHD7cLc1pkXWlS6HYDm5je7ksZUPXhHRFwRpqRrxH4GN6rUdvEWL7tZXhsLYcc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706933974; c=relaxed/simple; bh=TG4Of/o5PUDxzuAmRxdcf7NJiDgMB39ZF85nSlPnPI4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q8HcDh9rwbJrY9TcLgaxYP2tPretKg79KcB/cPXPb4tvAjXOrakxpCmk/B4b74o7LAteIIwo/XDKihdtGONpbUqksd2PWalGk+NbTTORty1LH8Y0TzLo/DBd+Ccu2n90t0SCXe6dNlGZ4UzcqGGO1d0NWO7kxovUXNwz4Qsb63c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XPET6DnR; 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="XPET6DnR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0D289C433F1; Sat, 3 Feb 2024 04:19:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706933974; bh=TG4Of/o5PUDxzuAmRxdcf7NJiDgMB39ZF85nSlPnPI4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XPET6DnRLSVxu7vhv5zgx5R+EscjNYdkWv9OpseSOqlY1oycShYtPaoms+OmLFWjq 2P3HMN1Ww28ZI+2iEZLJm7b9Qphus9b3x0jlTnRn6m1Tp+hKAJFVL/+h+Je/46gSD+ 4QAetiovnAqr86uSNiCy9rAuLCWC0gi5zNqXzVkc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, kernel test robot , Przemek Kitszel , Paul Menzel , Simon Horman , Pavan Kumar Linga , Krishneil Singh , Tony Nguyen , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.7 347/353] idpf: avoid compiler padding in virtchnl2_ptype struct Date: Fri, 2 Feb 2024 20:07:45 -0800 Message-ID: <20240203035414.730700077@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240203035403.657508530@linuxfoundation.org> References: <20240203035403.657508530@linuxfoundation.org> User-Agent: quilt/0.67 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.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pavan Kumar Linga [ Upstream commit f0588b157f48b9c6277a75c9f14650e86d969e03 ] In the arm random config file, kconfig option 'CONFIG_AEABI' is disabled which results in adding the compiler flag '-mabi=apcs-gnu'. This causes the compiler to add padding in virtchnl2_ptype structure to align it to 8 bytes, resulting in the following size check failure: include/linux/build_bug.h:78:41: error: static assertion failed: "(6) == sizeof(struct virtchnl2_ptype)" 78 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg) | ^~~~~~~~~~~~~~ include/linux/build_bug.h:77:34: note: in expansion of macro '__static_assert' 77 | #define static_assert(expr, ...) __static_assert(expr, ##__VA_ARGS__, #expr) | ^~~~~~~~~~~~~~~ drivers/net/ethernet/intel/idpf/virtchnl2.h:26:9: note: in expansion of macro 'static_assert' 26 | static_assert((n) == sizeof(struct X)) | ^~~~~~~~~~~~~ drivers/net/ethernet/intel/idpf/virtchnl2.h:982:1: note: in expansion of macro 'VIRTCHNL2_CHECK_STRUCT_LEN' 982 | VIRTCHNL2_CHECK_STRUCT_LEN(6, virtchnl2_ptype); | ^~~~~~~~~~~~~~~~~~~~~~~~~~ Avoid the compiler padding by using "__packed" structure attribute for the virtchnl2_ptype struct. Also align the structure by using "__aligned(2)" for better code optimization. Fixes: 0d7502a9b4a7 ("virtchnl: add virtchnl version 2 ops") Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202312220250.ufEm8doQ-lkp@intel.com Reviewed-by: Przemek Kitszel Reviewed-by: Paul Menzel Reviewed-by: Simon Horman Signed-off-by: Pavan Kumar Linga Tested-by: Krishneil Singh Signed-off-by: Tony Nguyen Link: https://lore.kernel.org/r/20240131222241.2087516-1-anthony.l.nguyen@intel.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/idpf/virtchnl2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/idpf/virtchnl2.h b/drivers/net/ethernet/intel/idpf/virtchnl2.h index 8dc837889723..4a3c4454d25a 100644 --- a/drivers/net/ethernet/intel/idpf/virtchnl2.h +++ b/drivers/net/ethernet/intel/idpf/virtchnl2.h @@ -978,7 +978,7 @@ struct virtchnl2_ptype { u8 proto_id_count; __le16 pad; __le16 proto_id[]; -}; +} __packed __aligned(2); VIRTCHNL2_CHECK_STRUCT_LEN(6, virtchnl2_ptype); /** -- 2.43.0