From patchwork Wed Aug 11 18:16:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 495605 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18EE8C4338F for ; Wed, 11 Aug 2021 18:18:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ED0FB60FC0 for ; Wed, 11 Aug 2021 18:18:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230329AbhHKSSl (ORCPT ); Wed, 11 Aug 2021 14:18:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:52156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229802AbhHKSSi (ORCPT ); Wed, 11 Aug 2021 14:18:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6DB216108C; Wed, 11 Aug 2021 18:18:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1628705893; bh=SASyCz5oOjrzGahpVoJzbFyGP3nFJg1LNkcyfYhDoz8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=su8j8Wll8QViMzj89lvgSWT2Wo+VdTVS6XXopLUkmaSallLbzM84PBBsyCrDM150e SZaWPgHfwazlpbMa7n5CE4VLDapmTKgaJXz6jPtEfO4tG2HQMKv8AkMlHkJHAQEYIq X0r7k1B0SG3KJ4yXDRW0LLsmrbNkVL59PrP8VHRFKTNUn63SMg39L2GdKvvyUQ3CSq QjRjWOcQaZWcvkVEIzisOSh5eAe0Ao0EfN4B+O+zm2KnY4gHhwKUp/pFkqw9+vI8uw AhjnDXiFNxyGCQeDaR4pDbfGEza0pzVs2Q9Rpi65bs8A2JGxqhrbMqvr73IYAEXbPu jEPhZDOXWotDA== From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Tariq Toukan , Leon Romanovsky , Shay Drory , Parav Pandit , Saeed Mahameed Subject: [net-next 04/12] net/mlx5: Align mlx5_irq structure Date: Wed, 11 Aug 2021 11:16:50 -0700 Message-Id: <20210811181658.492548-5-saeed@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210811181658.492548-1-saeed@kernel.org> References: <20210811181658.492548-1-saeed@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Shay Drory mlx5_irq structure have holes due to incorrect position of fields in it. Make them naturally align. pahole output after alignment: struct mlx5_irq { struct atomic_notifier_head nh; /* 0 72 */ /* --- cacheline 1 boundary (64 bytes) was 8 bytes ago --- */ cpumask_var_t mask; /* 72 8 */ char name[32]; /* 80 32 */ struct mlx5_irq_pool * pool; /* 112 8 */ struct kref kref; /* 120 4 */ u32 index; /* 124 4 */ /* --- cacheline 2 boundary (128 bytes) --- */ int irqn; /* 128 4 */ /* size: 136, cachelines: 3, members: 7 */ /* padding: 4 */ /* last cacheline: 8 bytes */ }; Signed-off-by: Shay Drory Reviewed-by: Parav Pandit Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c index 9fb75d79bf08..a4f6ba0c91da 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c @@ -28,13 +28,13 @@ #define MLX5_EQ_REFS_PER_IRQ (2) struct mlx5_irq { - u32 index; struct atomic_notifier_head nh; cpumask_var_t mask; char name[MLX5_MAX_IRQ_NAME]; + struct mlx5_irq_pool *pool; struct kref kref; + u32 index; int irqn; - struct mlx5_irq_pool *pool; }; struct mlx5_irq_pool {