From patchwork Sun Jun 18 10:16:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 109598 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2398180vqr; Sun, 18 Jun 2023 04:00:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5/jmQDYSli/r3biUj+giI9Qg/s5h9LJblhAaSAVrIHCrShhD1Fcnrww2MevzzpMGQH6dLP X-Received: by 2002:a17:902:d507:b0:1b1:82a6:7c84 with SMTP id b7-20020a170902d50700b001b182a67c84mr9107853plg.62.1687086058638; Sun, 18 Jun 2023 04:00:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687086058; cv=none; d=google.com; s=arc-20160816; b=xaKoz16vQ/LaewOCa2ZqHv49WiX6/J1G78G6E81vkhNXoEkH2yzIUPIYh2kFCFamvR L2nLjfv1Kv4m41jYu2BqoqucYzD4o43jfFdnRl9BPSGoXm0s0Kneo5ZSfafi7Yakf+RL OLeXr30XHGlEE60CclyVwS+cHkFUVsp5v7JXnVae2BTVEbeDyQ2GyNbfakvP6nEbBbGN vw51Fr6ECP4GlhvRZplyER/9BcWCsHmdqrHaW90pC07AyqRnXwYRkAHK7qvb9Ss+ABs9 ogFZsborgXC/qMcd+5BCsAAFHzKtWIwkXeWiyjcWrGwRO+RWEKbLoUAxtdQl53bY4bN2 Imvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=DSknnbdi6ETR4gXl9xkSuTonkqso7NbmO9NcHs49YUM=; b=IBJbm6M2TSFAmyTyWzt5Is7Yj/m1BHApBjdD+PNHqBLnZNNDPh4zl6vOAg9kE2jeaB I774kO0FMr4+gzaOhPvXhCCzI8hYEayt12HBNBsNDt3ihoWr/JBcjr7BcGk9lzt1nG5b pLYG4xgpzBJ6W9UL9AHqLuTk6Y05hShh2I1y3F8luD6irmNXVcW7IvEROIi0WznMSOvi DLB7CYWszC7ZjfS9IjDYjI5t5kbHEQF1nLasaZz2TcK6IxzQNedY6GSoRLdS9vwnFVyN ZGJ4sDu0tth2pgiDDtvVZUKKMr3Btq+KairCRbSRxpQlOCDqGZIvwz/USHKSkHmWFR/U okKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=oUN9wnGr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i1-20020a170902c94100b001b3c7d38cd6si14629565pla.274.2023.06.18.04.00.34; Sun, 18 Jun 2023 04:00:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=oUN9wnGr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229529AbjFRKQu (ORCPT + 99 others); Sun, 18 Jun 2023 06:16:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229489AbjFRKQt (ORCPT ); Sun, 18 Jun 2023 06:16:49 -0400 Received: from smtp.smtpout.orange.fr (smtp-29.smtpout.orange.fr [80.12.242.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F2348F for ; Sun, 18 Jun 2023 03:16:47 -0700 (PDT) Received: from pop-os.home ([86.243.2.178]) by smtp.orange.fr with ESMTPA id ApScqyYPQhQKVApScqcNqL; Sun, 18 Jun 2023 12:16:44 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1687083404; bh=DSknnbdi6ETR4gXl9xkSuTonkqso7NbmO9NcHs49YUM=; h=From:To:Cc:Subject:Date; b=oUN9wnGrAcXdub/3VYK2AdRcF/0yznYc5OEJ/3kjtVQlGrOA/H1dqj7zFj7ehR5RK 5bg6ZqB62JhYgTEVsuSv4iUSpSD3znp7a3L8BAFHhfZ/Gai78XX4LklQRZ15pBmYct XLupCOx4xWMyzxqosNKnPHmZ+bDtMtOt4+wqG3k109/31LmqYoioF+d+oRZBLULoMp jD3FbBVm6WuT6zL2Mn9B1/f7rAO6vt27wMSaVc8d39w9sw4REIyiB0zFnE9UrfB2ey Dx09kEEC4DeLn9MUTX2NX1gb5+o5JYLh8xo8814zzjl8qKlMJ/IFh2PUkuCjOcl2zc nhfjEZYWhhXFg== X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sun, 18 Jun 2023 12:16:44 +0200 X-ME-IP: 86.243.2.178 From: Christophe JAILLET To: Paul Moore , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , netdev@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH net-next] netlabel: Reorder fields in 'struct netlbl_domaddr6_map' Date: Sun, 18 Jun 2023 12:16:41 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769037951176981827?= X-GMAIL-MSGID: =?utf-8?q?1769037951176981827?= Group some variables based on their sizes to reduce hole and avoid padding. On x86_64, this shrinks the size of 'struct netlbl_domaddr6_map' from 72 to 64 bytes. It saves a few bytes of memory and is more cache-line friendly. Signed-off-by: Christophe JAILLET Reviewed-by: Simon Horman Reviewed-by: Jiri Pirko Acked-by: Paul Moore --- Using pahole Before: ====== struct netlbl_dom_map { char * domain; /* 0 8 */ u16 family; /* 8 2 */ /* XXX 6 bytes hole, try to pack */ struct netlbl_dommap_def def; /* 16 16 */ u32 valid; /* 32 4 */ /* XXX 4 bytes hole, try to pack */ struct list_head list; /* 40 16 */ struct callback_head rcu __attribute__((__aligned__(8))); /* 56 16 */ /* size: 72, cachelines: 2, members: 6 */ /* sum members: 62, holes: 2, sum holes: 10 */ /* forced alignments: 1 */ /* last cacheline: 8 bytes */ } __attribute__((__aligned__(8))); After: ===== struct netlbl_dom_map { char * domain; /* 0 8 */ struct netlbl_dommap_def def; /* 8 16 */ u16 family; /* 24 2 */ /* XXX 2 bytes hole, try to pack */ u32 valid; /* 28 4 */ struct list_head list; /* 32 16 */ struct callback_head rcu __attribute__((__aligned__(8))); /* 48 16 */ /* size: 64, cachelines: 1, members: 6 */ /* sum members: 62, holes: 1, sum holes: 2 */ /* forced alignments: 1 */ } __attribute__((__aligned__(8))); --- net/netlabel/netlabel_domainhash.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netlabel/netlabel_domainhash.h b/net/netlabel/netlabel_domainhash.h index 9f80972ae39b..7eaa35fdd9bd 100644 --- a/net/netlabel/netlabel_domainhash.h +++ b/net/netlabel/netlabel_domainhash.h @@ -57,8 +57,8 @@ struct netlbl_domaddr6_map { struct netlbl_dom_map { char *domain; - u16 family; struct netlbl_dommap_def def; + u16 family; u32 valid; struct list_head list;