From mboxrd@z Thu Jan 1 00:00:00 1970 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=-3.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable 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 01DE4C31E46 for ; Tue, 11 Jun 2019 21:05:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BA479207E0 for ; Tue, 11 Jun 2019 21:05:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iJQMoCwY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407382AbfFKVFm (ORCPT ); Tue, 11 Jun 2019 17:05:42 -0400 Received: from mail-ot1-f65.google.com ([209.85.210.65]:37593 "EHLO mail-ot1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406793AbfFKVFl (ORCPT ); Tue, 11 Jun 2019 17:05:41 -0400 Received: by mail-ot1-f65.google.com with SMTP id r10so13329882otd.4; Tue, 11 Jun 2019 14:05:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=WcanZz+mptuiFO1FOrH8ws9AjJjCLr14oWUG5p6+Hks=; b=iJQMoCwYc23LAoq/nhxJ035CiFJQ2hxJn1BNye5jFP8Ck+CLav2jVQYv0vW++lqQhk FdQ5LuRoGMIXjLwW/r1NGjL8QX4oDOirRbw0KmEB01SaiIXj/GEGAGEPuQIMXxxQhWsG G/GDkauFLVXFhdh2Xxj+113U0mRxrwriwX4WmwN2pAkivZKtlFaybRhRo9Im6QP1wms2 Y8vJ9N68QW72MIZ3LPyv9vdww7ctB8Dg7ceszsxTwa/zVNKT02nv1FLKO+4ptGhfbC5k vR1P/C8PF6vQYDhXqJ6A+s2GAo1VxmU4pCtd+uBrP6F/KxkKh3I5wHNjT2cjou+ndLPS t/dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=WcanZz+mptuiFO1FOrH8ws9AjJjCLr14oWUG5p6+Hks=; b=K5p5+HprNs3VBki2XANJbT9iU2WRBxoiwGPRrUL6tpSAlZ3LrVO0UBrYiPh2gCJWys T9WzWBXTPt7gWnZogxaXbV/DhS3nhrZOaywOIBit0mWseJdgecrbEmDfQ1NHBYus1NvB dNc8vQZJVMTtxdGnFnRqi28T8eHc/9i0RGgstE3t0UIGF4cSKzIyUwIqlwHoi4pJbZ15 KFyu/ozIUY2bPj4nO3buyvyHX0SD40mL6AriPHOz7YaweafVKQG5jSM/lXeOWz3UosDC e0scnnJw1eOoHjKirAou334jwlxllj9USrRvDbXyCORjItfq8syt/Yd3OoJ+uRVqxmLG yCPQ== X-Gm-Message-State: APjAAAUS0CDpecoStJ8hmorbxx7/dNsVZuE8BryclfRaN4/4V4i2KjHv J/Nky06e+g8V5g9RCVn0MdMeBELkgU5CXHtS/ANoJ7jhdzUSRA== X-Google-Smtp-Source: APXvYqwCapXzUEU/OW0FgteBOI3Ru0UMCdmw4g13S/THGs3BP+sutXDmFQYqa8LgfH+7HTi5t3VxiZVUkypJLqgT5/o= X-Received: by 2002:a9d:3f62:: with SMTP id m89mr37392992otc.128.1560287139969; Tue, 11 Jun 2019 14:05:39 -0700 (PDT) MIME-Version: 1.0 References: <20190611193836.2772-1-shyam.saini@amarulasolutions.com> <201906111345.74AA9311F5@keescook> In-Reply-To: <201906111345.74AA9311F5@keescook> From: Shyam Saini Date: Wed, 12 Jun 2019 02:35:28 +0530 Message-ID: Subject: Re: [PATCH V2] include: linux: Regularise the use of FIELD_SIZEOF macro To: Kees Cook Cc: Shyam Saini , Kernel Hardening , linux-kernel , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, dri-devel , Network Development , linux-ext4@vger.kernel.org, devel@lists.orangefs.org, linux-mm , linux-sctp@vger.kernel.org, bpf , kvm@vger.kernel.org, William Kucharski Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Kees, Cc'ing William Kucharski, > On Wed, Jun 12, 2019 at 01:08:36AM +0530, Shyam Saini wrote: > > In favour of FIELD_SIZEOF, this patch also deprecates other two similar > > macros sizeof_field and SIZEOF_FIELD. > > > > For code compatibility reason, retain sizeof_field macro as a wrapper macro > > to FIELD_SIZEOF > > Can you explain this part? First sentence says you want to remove > sizeof_field, and the second says you're keeping it? I thought the point > was to switch all of these to FIELD_SIZEOF()? Previously, William [1] suggested to retain sizeof_field as macro to FIELD_SIZEOF for code compatibility reason. I have removed all the usage of sizeof_field apart from retained wrapper macro definition. [1] https://patchwork.ozlabs.org/patch/1085275/ Thanks, Shyam > > > > arch/arm64/include/asm/processor.h | 10 +++++----- > > arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 9 +-------- > > drivers/gpu/drm/i915/gvt/scheduler.c | 2 +- > > drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 4 ++-- > > fs/befs/linuxvfs.c | 2 +- > > fs/ext2/super.c | 2 +- > > fs/ext4/super.c | 2 +- > > fs/freevxfs/vxfs_super.c | 2 +- > > fs/orangefs/super.c | 2 +- > > fs/ufs/super.c | 2 +- > > include/linux/kernel.h | 9 --------- > > include/linux/slab.h | 2 +- > > include/linux/stddef.h | 17 ++++++++++++++--- > > kernel/fork.c | 2 +- > > kernel/utsname.c | 2 +- > > net/caif/caif_socket.c | 2 +- > > net/core/skbuff.c | 2 +- > > net/ipv4/raw.c | 2 +- > > net/ipv6/raw.c | 2 +- > > net/sctp/socket.c | 4 ++-- > > tools/testing/selftests/bpf/bpf_util.h | 22 +++++++++++++++++++--- > > virt/kvm/kvm_main.c | 2 +- > > 22 files changed, 58 insertions(+), 47 deletions(-) > > > > diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h > > index fcd0e691b1ea..ace906d887cc 100644 > > --- a/arch/arm64/include/asm/processor.h > > +++ b/arch/arm64/include/asm/processor.h > > @@ -164,13 +164,13 @@ static inline void arch_thread_struct_whitelist(unsigned long *offset, > > unsigned long *size) > > { > > /* Verify that there is no padding among the whitelisted fields: */ > > - BUILD_BUG_ON(sizeof_field(struct thread_struct, uw) != > > - sizeof_field(struct thread_struct, uw.tp_value) + > > - sizeof_field(struct thread_struct, uw.tp2_value) + > > - sizeof_field(struct thread_struct, uw.fpsimd_state)); > > + BUILD_BUG_ON(FIELD_SIZEOF(struct thread_struct, uw) != > > + FIELD_SIZEOF(struct thread_struct, uw.tp_value) + > > + FIELD_SIZEOF(struct thread_struct, uw.tp2_value) + > > + FIELD_SIZEOF(struct thread_struct, uw.fpsimd_state)); > > > > *offset = offsetof(struct thread_struct, uw); > > - *size = sizeof_field(struct thread_struct, uw); > > + *size = FIELD_SIZEOF(struct thread_struct, uw); > > } > > > > #ifdef CONFIG_COMPAT > > diff --git a/arch/mips/cavium-octeon/executive/cvmx-bootmem.c b/arch/mips/cavium-octeon/executive/cvmx-bootmem.c > > index ba8f82a29a81..44b506a14666 100644 > > --- a/arch/mips/cavium-octeon/executive/cvmx-bootmem.c > > +++ b/arch/mips/cavium-octeon/executive/cvmx-bootmem.c > > @@ -45,13 +45,6 @@ static struct cvmx_bootmem_desc *cvmx_bootmem_desc; > > /* See header file for descriptions of functions */ > > > > /** > > - * This macro returns the size of a member of a structure. > > - * Logically it is the same as "sizeof(s::field)" in C++, but > > - * C lacks the "::" operator. > > - */ > > -#define SIZEOF_FIELD(s, field) sizeof(((s *)NULL)->field) > > - > > -/** > > * This macro returns a member of the > > * cvmx_bootmem_named_block_desc_t structure. These members can't > > * be directly addressed as they might be in memory not directly > > @@ -65,7 +58,7 @@ static struct cvmx_bootmem_desc *cvmx_bootmem_desc; > > #define CVMX_BOOTMEM_NAMED_GET_FIELD(addr, field) \ > > __cvmx_bootmem_desc_get(addr, \ > > offsetof(struct cvmx_bootmem_named_block_desc, field), \ > > - SIZEOF_FIELD(struct cvmx_bootmem_named_block_desc, field)) > > + FIELD_SIZEOF(struct cvmx_bootmem_named_block_desc, field)) > > > > /** > > * This function is the implementation of the get macros defined > > diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c > > index 0f919f0a43d4..820f95a52542 100644 > > --- a/drivers/gpu/drm/i915/gvt/scheduler.c > > +++ b/drivers/gpu/drm/i915/gvt/scheduler.c > > @@ -1243,7 +1243,7 @@ int intel_vgpu_setup_submission(struct intel_vgpu *vgpu) > > sizeof(struct intel_vgpu_workload), 0, > > SLAB_HWCACHE_ALIGN, > > offsetof(struct intel_vgpu_workload, rb_tail), > > - sizeof_field(struct intel_vgpu_workload, rb_tail), > > + FIELD_SIZEOF(struct intel_vgpu_workload, rb_tail), > > NULL); > > > > if (!s->workloads) { > > diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c > > index 46baf3b44309..c0447bf07fbb 100644 > > --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c > > +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c > > @@ -49,13 +49,13 @@ struct mlxsw_sp_fid_8021d { > > }; > > > > static const struct rhashtable_params mlxsw_sp_fid_ht_params = { > > - .key_len = sizeof_field(struct mlxsw_sp_fid, fid_index), > > + .key_len = FIELD_SIZEOF(struct mlxsw_sp_fid, fid_index), > > .key_offset = offsetof(struct mlxsw_sp_fid, fid_index), > > .head_offset = offsetof(struct mlxsw_sp_fid, ht_node), > > }; > > > > static const struct rhashtable_params mlxsw_sp_fid_vni_ht_params = { > > - .key_len = sizeof_field(struct mlxsw_sp_fid, vni), > > + .key_len = FIELD_SIZEOF(struct mlxsw_sp_fid, vni), > > .key_offset = offsetof(struct mlxsw_sp_fid, vni), > > .head_offset = offsetof(struct mlxsw_sp_fid, vni_ht_node), > > }; > > diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c > > index 462d096ff3e9..06ffd4829e2e 100644 > > --- a/fs/befs/linuxvfs.c > > +++ b/fs/befs/linuxvfs.c > > @@ -438,7 +438,7 @@ befs_init_inodecache(void) > > SLAB_ACCOUNT), > > offsetof(struct befs_inode_info, > > i_data.symlink), > > - sizeof_field(struct befs_inode_info, > > + FIELD_SIZEOF(struct befs_inode_info, > > i_data.symlink), > > init_once); > > if (befs_inode_cachep == NULL) > > diff --git a/fs/ext2/super.c b/fs/ext2/super.c > > index 1d7ab73b1014..d9a6c81f4a47 100644 > > --- a/fs/ext2/super.c > > +++ b/fs/ext2/super.c > > @@ -220,7 +220,7 @@ static int __init init_inodecache(void) > > (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| > > SLAB_ACCOUNT), > > offsetof(struct ext2_inode_info, i_data), > > - sizeof_field(struct ext2_inode_info, i_data), > > + FIELD_SIZEOF(struct ext2_inode_info, i_data), > > init_once); > > if (ext2_inode_cachep == NULL) > > return -ENOMEM; > > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > > index 4079605d437a..b1b5856248bd 100644 > > --- a/fs/ext4/super.c > > +++ b/fs/ext4/super.c > > @@ -1148,7 +1148,7 @@ static int __init init_inodecache(void) > > (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| > > SLAB_ACCOUNT), > > offsetof(struct ext4_inode_info, i_data), > > - sizeof_field(struct ext4_inode_info, i_data), > > + FIELD_SIZEOF(struct ext4_inode_info, i_data), > > init_once); > > if (ext4_inode_cachep == NULL) > > return -ENOMEM; > > diff --git a/fs/freevxfs/vxfs_super.c b/fs/freevxfs/vxfs_super.c > > index a89f68c3cbed..ffd22f85bbe0 100644 > > --- a/fs/freevxfs/vxfs_super.c > > +++ b/fs/freevxfs/vxfs_super.c > > @@ -329,7 +329,7 @@ vxfs_init(void) > > sizeof(struct vxfs_inode_info), 0, > > SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, > > offsetof(struct vxfs_inode_info, vii_immed.vi_immed), > > - sizeof_field(struct vxfs_inode_info, > > + FIELD_SIZEOF(struct vxfs_inode_info, > > vii_immed.vi_immed), > > NULL); > > if (!vxfs_inode_cachep) > > diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c > > index ee5efdc35cc1..30f625059ad9 100644 > > --- a/fs/orangefs/super.c > > +++ b/fs/orangefs/super.c > > @@ -646,7 +646,7 @@ int orangefs_inode_cache_initialize(void) > > ORANGEFS_CACHE_CREATE_FLAGS, > > offsetof(struct orangefs_inode_s, > > link_target), > > - sizeof_field(struct orangefs_inode_s, > > + FIELD_SIZEOF(struct orangefs_inode_s, > > link_target), > > orangefs_inode_cache_ctor); > > > > diff --git a/fs/ufs/super.c b/fs/ufs/super.c > > index 3d247c0d92aa..1e8bcd950f6d 100644 > > --- a/fs/ufs/super.c > > +++ b/fs/ufs/super.c > > @@ -1469,7 +1469,7 @@ static int __init init_inodecache(void) > > (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| > > SLAB_ACCOUNT), > > offsetof(struct ufs_inode_info, i_u1.i_symlink), > > - sizeof_field(struct ufs_inode_info, > > + FIELD_SIZEOF(struct ufs_inode_info, > > i_u1.i_symlink), > > init_once); > > if (ufs_inode_cachep == NULL) > > diff --git a/include/linux/kernel.h b/include/linux/kernel.h > > index 74b1ee9027f5..4672391cdb5b 100644 > > --- a/include/linux/kernel.h > > +++ b/include/linux/kernel.h > > @@ -79,15 +79,6 @@ > > */ > > #define round_down(x, y) ((x) & ~__round_mask(x, y)) > > > > -/** > > - * FIELD_SIZEOF - get the size of a struct's field > > - * @t: the target struct > > - * @f: the target struct's field > > - * Return: the size of @f in the struct definition without having a > > - * declared instance of @t. > > - */ > > -#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f)) > > - > > #define DIV_ROUND_UP __KERNEL_DIV_ROUND_UP > > > > #define DIV_ROUND_DOWN_ULL(ll, d) \ > > diff --git a/include/linux/slab.h b/include/linux/slab.h > > index 9449b19c5f10..8bdfdd389b37 100644 > > --- a/include/linux/slab.h > > +++ b/include/linux/slab.h > > @@ -175,7 +175,7 @@ void memcg_destroy_kmem_caches(struct mem_cgroup *); > > sizeof(struct __struct), \ > > __alignof__(struct __struct), (__flags), \ > > offsetof(struct __struct, __field), \ > > - sizeof_field(struct __struct, __field), NULL) > > + FIELD_SIZEOF(struct __struct, __field), NULL) > > > > /* > > * Common kmalloc functions provided by all allocators > > diff --git a/include/linux/stddef.h b/include/linux/stddef.h > > index 998a4ba28eba..a5960e2b4a8b 100644 > > --- a/include/linux/stddef.h > > +++ b/include/linux/stddef.h > > @@ -20,12 +20,23 @@ enum { > > #endif > > > > /** > > - * sizeof_field(TYPE, MEMBER) > > + * FIELD_SIZEOF - get the size of a struct's field > > + * @t: the target struct > > + * @f: the target struct's field > > + * Return: the size of @f in the struct definition without having a > > + * declared instance of @t. > > + */ > > +#define FIELD_SIZEOF(t, f) (sizeof(((t *)0)->f)) > > + > > +/* > > + * For code compatibility > > * > > + * sizeof_field(TYPE, MEMBER) > > * @TYPE: The structure containing the field of interest > > * @MEMBER: The field to return the size of > > */ > > -#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER)) > > + > > +#define sizeof_field(TYPE, MEMBER) FIELD_SIZEOF(TYPE, MEMBER) > > > > /** > > * offsetofend(TYPE, MEMBER) > > @@ -34,6 +45,6 @@ enum { > > * @MEMBER: The member within the structure to get the end offset of > > */ > > #define offsetofend(TYPE, MEMBER) \ > > - (offsetof(TYPE, MEMBER) + sizeof_field(TYPE, MEMBER)) > > + (offsetof(TYPE, MEMBER) + FIELD_SIZEOF(TYPE, MEMBER)) > > > > #endif > > diff --git a/kernel/fork.c b/kernel/fork.c > > index 75675b9bf6df..ef40b95bf82c 100644 > > --- a/kernel/fork.c > > +++ b/kernel/fork.c > > @@ -2553,7 +2553,7 @@ void __init proc_caches_init(void) > > mm_size, ARCH_MIN_MMSTRUCT_ALIGN, > > SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_ACCOUNT, > > offsetof(struct mm_struct, saved_auxv), > > - sizeof_field(struct mm_struct, saved_auxv), > > + FIELD_SIZEOF(struct mm_struct, saved_auxv), > > NULL); > > vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC|SLAB_ACCOUNT); > > mmap_init(); > > diff --git a/kernel/utsname.c b/kernel/utsname.c > > index f0e491193009..28257c571553 100644 > > --- a/kernel/utsname.c > > +++ b/kernel/utsname.c > > @@ -174,6 +174,6 @@ void __init uts_ns_init(void) > > "uts_namespace", sizeof(struct uts_namespace), 0, > > SLAB_PANIC|SLAB_ACCOUNT, > > offsetof(struct uts_namespace, name), > > - sizeof_field(struct uts_namespace, name), > > + FIELD_SIZEOF(struct uts_namespace, name), > > NULL); > > } > > diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c > > index 13ea920600ae..3306bbed77eb 100644 > > --- a/net/caif/caif_socket.c > > +++ b/net/caif/caif_socket.c > > @@ -1033,7 +1033,7 @@ static int caif_create(struct net *net, struct socket *sock, int protocol, > > .owner = THIS_MODULE, > > .obj_size = sizeof(struct caifsock), > > .useroffset = offsetof(struct caifsock, conn_req.param), > > - .usersize = sizeof_field(struct caifsock, conn_req.param) > > + .usersize = FIELD_SIZEOF(struct caifsock, conn_req.param) > > }; > > > > if (!capable(CAP_SYS_ADMIN) && !capable(CAP_NET_ADMIN)) > > diff --git a/net/core/skbuff.c b/net/core/skbuff.c > > index 47c1aa9ee045..816bea0c4a8e 100644 > > --- a/net/core/skbuff.c > > +++ b/net/core/skbuff.c > > @@ -3983,7 +3983,7 @@ void __init skb_init(void) > > 0, > > SLAB_HWCACHE_ALIGN|SLAB_PANIC, > > offsetof(struct sk_buff, cb), > > - sizeof_field(struct sk_buff, cb), > > + FIELD_SIZEOF(struct sk_buff, cb), > > NULL); > > skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache", > > sizeof(struct sk_buff_fclones), > > diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c > > index 0b8e06ca75d6..efa4c745f7b9 100644 > > --- a/net/ipv4/raw.c > > +++ b/net/ipv4/raw.c > > @@ -977,7 +977,7 @@ struct proto raw_prot = { > > .unhash = raw_unhash_sk, > > .obj_size = sizeof(struct raw_sock), > > .useroffset = offsetof(struct raw_sock, filter), > > - .usersize = sizeof_field(struct raw_sock, filter), > > + .usersize = FIELD_SIZEOF(struct raw_sock, filter), > > .h.raw_hash = &raw_v4_hashinfo, > > #ifdef CONFIG_COMPAT > > .compat_setsockopt = compat_raw_setsockopt, > > diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c > > index 70693bc7ad9d..257c71e22d74 100644 > > --- a/net/ipv6/raw.c > > +++ b/net/ipv6/raw.c > > @@ -1292,7 +1292,7 @@ struct proto rawv6_prot = { > > .unhash = raw_unhash_sk, > > .obj_size = sizeof(struct raw6_sock), > > .useroffset = offsetof(struct raw6_sock, filter), > > - .usersize = sizeof_field(struct raw6_sock, filter), > > + .usersize = FIELD_SIZEOF(struct raw6_sock, filter), > > .h.raw_hash = &raw_v6_hashinfo, > > #ifdef CONFIG_COMPAT > > .compat_setsockopt = compat_rawv6_setsockopt, > > diff --git a/net/sctp/socket.c b/net/sctp/socket.c > > index 39ea0a37af09..6b648a6033b9 100644 > > --- a/net/sctp/socket.c > > +++ b/net/sctp/socket.c > > @@ -9377,7 +9377,7 @@ struct proto sctp_prot = { > > .useroffset = offsetof(struct sctp_sock, subscribe), > > .usersize = offsetof(struct sctp_sock, initmsg) - > > offsetof(struct sctp_sock, subscribe) + > > - sizeof_field(struct sctp_sock, initmsg), > > + FIELD_SIZEOF(struct sctp_sock, initmsg), > > .sysctl_mem = sysctl_sctp_mem, > > .sysctl_rmem = sysctl_sctp_rmem, > > .sysctl_wmem = sysctl_sctp_wmem, > > @@ -9419,7 +9419,7 @@ struct proto sctpv6_prot = { > > .useroffset = offsetof(struct sctp6_sock, sctp.subscribe), > > .usersize = offsetof(struct sctp6_sock, sctp.initmsg) - > > offsetof(struct sctp6_sock, sctp.subscribe) + > > - sizeof_field(struct sctp6_sock, sctp.initmsg), > > + FIELD_SIZEOF(struct sctp6_sock, sctp.initmsg), > > .sysctl_mem = sysctl_sctp_mem, > > .sysctl_rmem = sysctl_sctp_rmem, > > .sysctl_wmem = sysctl_sctp_wmem, > > diff --git a/tools/testing/selftests/bpf/bpf_util.h b/tools/testing/selftests/bpf/bpf_util.h > > index a29206ebbd13..571c35aac90f 100644 > > --- a/tools/testing/selftests/bpf/bpf_util.h > > +++ b/tools/testing/selftests/bpf/bpf_util.h > > @@ -58,13 +58,29 @@ static inline unsigned int bpf_num_possible_cpus(void) > > # define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) > > #endif > > > > -#ifndef sizeof_field > > -#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER)) > > +/* > > + * FIELD_SIZEOF - get the size of a struct's field > > + * @t: the target struct > > + * @f: the target struct's field > > + * Return: the size of @f in the struct definition without having a > > + * declared instance of @t. > > + */ > > +#ifndef FIELD_SIZEOF > > +#define FIELD_SIZEOF(t, f) (sizeof(((t *)0)->f)) > > #endif > > > > +/* > > + * For code compatibility > > + * > > + * sizeof_field(TYPE, MEMBER) > > + * @TYPE: The structure containing the field of interest > > + * @MEMBER: The field to return the size of > > + */ > > +#define sizeof_field(TYPE, MEMBER) FIELD_SIZEOF(TYPE, MEMBER) > > + > > #ifndef offsetofend > > #define offsetofend(TYPE, MEMBER) \ > > - (offsetof(TYPE, MEMBER) + sizeof_field(TYPE, MEMBER)) > > + (offsetof(TYPE, MEMBER) + FIELD_SIZEOF(TYPE, MEMBER)) > > #endif > > > > #endif /* __BPF_UTIL__ */ > > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > > index ca54b09adf5b..e43e3a26f6ab 100644 > > --- a/virt/kvm/kvm_main.c > > +++ b/virt/kvm/kvm_main.c > > @@ -4275,7 +4275,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, > > kmem_cache_create_usercopy("kvm_vcpu", vcpu_size, vcpu_align, > > SLAB_ACCOUNT, > > offsetof(struct kvm_vcpu, arch), > > - sizeof_field(struct kvm_vcpu, arch), > > + FIELD_SIZEOF(struct kvm_vcpu, arch), > > NULL); > > if (!kvm_vcpu_cache) { > > r = -ENOMEM; > > -- > > 2.11.0 > > > > -- > Kees Cook From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shyam Saini Date: Tue, 11 Jun 2019 21:17:28 +0000 Subject: Re: [PATCH V2] include: linux: Regularise the use of FIELD_SIZEOF macro Message-Id: List-Id: References: <20190611193836.2772-1-shyam.saini@amarulasolutions.com> <201906111345.74AA9311F5@keescook> In-Reply-To: <201906111345.74AA9311F5@keescook> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Kees Cook Cc: Shyam Saini , Kernel Hardening , linux-kernel , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, dri-devel , Network Development , linux-ext4@vger.kernel.org, devel@lists.orangefs.org, linux-mm , linux-sctp@vger.kernel.org, bpf , kvm@vger.kernel.org, William Kucharski Hi Kees, Cc'ing William Kucharski, > On Wed, Jun 12, 2019 at 01:08:36AM +0530, Shyam Saini wrote: > > In favour of FIELD_SIZEOF, this patch also deprecates other two similar > > macros sizeof_field and SIZEOF_FIELD. > > > > For code compatibility reason, retain sizeof_field macro as a wrapper macro > > to FIELD_SIZEOF > > Can you explain this part? First sentence says you want to remove > sizeof_field, and the second says you're keeping it? I thought the point > was to switch all of these to FIELD_SIZEOF()? Previously, William [1] suggested to retain sizeof_field as macro to FIELD_SIZEOF for code compatibility reason. I have removed all the usage of sizeof_field apart from retained wrapper macro definition. [1] https://patchwork.ozlabs.org/patch/1085275/ Thanks, Shyam > > > > arch/arm64/include/asm/processor.h | 10 +++++----- > > arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 9 +-------- > > drivers/gpu/drm/i915/gvt/scheduler.c | 2 +- > > drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 4 ++-- > > fs/befs/linuxvfs.c | 2 +- > > fs/ext2/super.c | 2 +- > > fs/ext4/super.c | 2 +- > > fs/freevxfs/vxfs_super.c | 2 +- > > fs/orangefs/super.c | 2 +- > > fs/ufs/super.c | 2 +- > > include/linux/kernel.h | 9 --------- > > include/linux/slab.h | 2 +- > > include/linux/stddef.h | 17 ++++++++++++++--- > > kernel/fork.c | 2 +- > > kernel/utsname.c | 2 +- > > net/caif/caif_socket.c | 2 +- > > net/core/skbuff.c | 2 +- > > net/ipv4/raw.c | 2 +- > > net/ipv6/raw.c | 2 +- > > net/sctp/socket.c | 4 ++-- > > tools/testing/selftests/bpf/bpf_util.h | 22 +++++++++++++++++++--- > > virt/kvm/kvm_main.c | 2 +- > > 22 files changed, 58 insertions(+), 47 deletions(-) > > > > diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h > > index fcd0e691b1ea..ace906d887cc 100644 > > --- a/arch/arm64/include/asm/processor.h > > +++ b/arch/arm64/include/asm/processor.h > > @@ -164,13 +164,13 @@ static inline void arch_thread_struct_whitelist(unsigned long *offset, > > unsigned long *size) > > { > > /* Verify that there is no padding among the whitelisted fields: */ > > - BUILD_BUG_ON(sizeof_field(struct thread_struct, uw) !> > - sizeof_field(struct thread_struct, uw.tp_value) + > > - sizeof_field(struct thread_struct, uw.tp2_value) + > > - sizeof_field(struct thread_struct, uw.fpsimd_state)); > > + BUILD_BUG_ON(FIELD_SIZEOF(struct thread_struct, uw) !> > + FIELD_SIZEOF(struct thread_struct, uw.tp_value) + > > + FIELD_SIZEOF(struct thread_struct, uw.tp2_value) + > > + FIELD_SIZEOF(struct thread_struct, uw.fpsimd_state)); > > > > *offset = offsetof(struct thread_struct, uw); > > - *size = sizeof_field(struct thread_struct, uw); > > + *size = FIELD_SIZEOF(struct thread_struct, uw); > > } > > > > #ifdef CONFIG_COMPAT > > diff --git a/arch/mips/cavium-octeon/executive/cvmx-bootmem.c b/arch/mips/cavium-octeon/executive/cvmx-bootmem.c > > index ba8f82a29a81..44b506a14666 100644 > > --- a/arch/mips/cavium-octeon/executive/cvmx-bootmem.c > > +++ b/arch/mips/cavium-octeon/executive/cvmx-bootmem.c > > @@ -45,13 +45,6 @@ static struct cvmx_bootmem_desc *cvmx_bootmem_desc; > > /* See header file for descriptions of functions */ > > > > /** > > - * This macro returns the size of a member of a structure. > > - * Logically it is the same as "sizeof(s::field)" in C++, but > > - * C lacks the "::" operator. > > - */ > > -#define SIZEOF_FIELD(s, field) sizeof(((s *)NULL)->field) > > - > > -/** > > * This macro returns a member of the > > * cvmx_bootmem_named_block_desc_t structure. These members can't > > * be directly addressed as they might be in memory not directly > > @@ -65,7 +58,7 @@ static struct cvmx_bootmem_desc *cvmx_bootmem_desc; > > #define CVMX_BOOTMEM_NAMED_GET_FIELD(addr, field) \ > > __cvmx_bootmem_desc_get(addr, \ > > offsetof(struct cvmx_bootmem_named_block_desc, field), \ > > - SIZEOF_FIELD(struct cvmx_bootmem_named_block_desc, field)) > > + FIELD_SIZEOF(struct cvmx_bootmem_named_block_desc, field)) > > > > /** > > * This function is the implementation of the get macros defined > > diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c > > index 0f919f0a43d4..820f95a52542 100644 > > --- a/drivers/gpu/drm/i915/gvt/scheduler.c > > +++ b/drivers/gpu/drm/i915/gvt/scheduler.c > > @@ -1243,7 +1243,7 @@ int intel_vgpu_setup_submission(struct intel_vgpu *vgpu) > > sizeof(struct intel_vgpu_workload), 0, > > SLAB_HWCACHE_ALIGN, > > offsetof(struct intel_vgpu_workload, rb_tail), > > - sizeof_field(struct intel_vgpu_workload, rb_tail), > > + FIELD_SIZEOF(struct intel_vgpu_workload, rb_tail), > > NULL); > > > > if (!s->workloads) { > > diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c > > index 46baf3b44309..c0447bf07fbb 100644 > > --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c > > +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c > > @@ -49,13 +49,13 @@ struct mlxsw_sp_fid_8021d { > > }; > > > > static const struct rhashtable_params mlxsw_sp_fid_ht_params = { > > - .key_len = sizeof_field(struct mlxsw_sp_fid, fid_index), > > + .key_len = FIELD_SIZEOF(struct mlxsw_sp_fid, fid_index), > > .key_offset = offsetof(struct mlxsw_sp_fid, fid_index), > > .head_offset = offsetof(struct mlxsw_sp_fid, ht_node), > > }; > > > > static const struct rhashtable_params mlxsw_sp_fid_vni_ht_params = { > > - .key_len = sizeof_field(struct mlxsw_sp_fid, vni), > > + .key_len = FIELD_SIZEOF(struct mlxsw_sp_fid, vni), > > .key_offset = offsetof(struct mlxsw_sp_fid, vni), > > .head_offset = offsetof(struct mlxsw_sp_fid, vni_ht_node), > > }; > > diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c > > index 462d096ff3e9..06ffd4829e2e 100644 > > --- a/fs/befs/linuxvfs.c > > +++ b/fs/befs/linuxvfs.c > > @@ -438,7 +438,7 @@ befs_init_inodecache(void) > > SLAB_ACCOUNT), > > offsetof(struct befs_inode_info, > > i_data.symlink), > > - sizeof_field(struct befs_inode_info, > > + FIELD_SIZEOF(struct befs_inode_info, > > i_data.symlink), > > init_once); > > if (befs_inode_cachep = NULL) > > diff --git a/fs/ext2/super.c b/fs/ext2/super.c > > index 1d7ab73b1014..d9a6c81f4a47 100644 > > --- a/fs/ext2/super.c > > +++ b/fs/ext2/super.c > > @@ -220,7 +220,7 @@ static int __init init_inodecache(void) > > (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| > > SLAB_ACCOUNT), > > offsetof(struct ext2_inode_info, i_data), > > - sizeof_field(struct ext2_inode_info, i_data), > > + FIELD_SIZEOF(struct ext2_inode_info, i_data), > > init_once); > > if (ext2_inode_cachep = NULL) > > return -ENOMEM; > > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > > index 4079605d437a..b1b5856248bd 100644 > > --- a/fs/ext4/super.c > > +++ b/fs/ext4/super.c > > @@ -1148,7 +1148,7 @@ static int __init init_inodecache(void) > > (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| > > SLAB_ACCOUNT), > > offsetof(struct ext4_inode_info, i_data), > > - sizeof_field(struct ext4_inode_info, i_data), > > + FIELD_SIZEOF(struct ext4_inode_info, i_data), > > init_once); > > if (ext4_inode_cachep = NULL) > > return -ENOMEM; > > diff --git a/fs/freevxfs/vxfs_super.c b/fs/freevxfs/vxfs_super.c > > index a89f68c3cbed..ffd22f85bbe0 100644 > > --- a/fs/freevxfs/vxfs_super.c > > +++ b/fs/freevxfs/vxfs_super.c > > @@ -329,7 +329,7 @@ vxfs_init(void) > > sizeof(struct vxfs_inode_info), 0, > > SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, > > offsetof(struct vxfs_inode_info, vii_immed.vi_immed), > > - sizeof_field(struct vxfs_inode_info, > > + FIELD_SIZEOF(struct vxfs_inode_info, > > vii_immed.vi_immed), > > NULL); > > if (!vxfs_inode_cachep) > > diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c > > index ee5efdc35cc1..30f625059ad9 100644 > > --- a/fs/orangefs/super.c > > +++ b/fs/orangefs/super.c > > @@ -646,7 +646,7 @@ int orangefs_inode_cache_initialize(void) > > ORANGEFS_CACHE_CREATE_FLAGS, > > offsetof(struct orangefs_inode_s, > > link_target), > > - sizeof_field(struct orangefs_inode_s, > > + FIELD_SIZEOF(struct orangefs_inode_s, > > link_target), > > orangefs_inode_cache_ctor); > > > > diff --git a/fs/ufs/super.c b/fs/ufs/super.c > > index 3d247c0d92aa..1e8bcd950f6d 100644 > > --- a/fs/ufs/super.c > > +++ b/fs/ufs/super.c > > @@ -1469,7 +1469,7 @@ static int __init init_inodecache(void) > > (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| > > SLAB_ACCOUNT), > > offsetof(struct ufs_inode_info, i_u1.i_symlink), > > - sizeof_field(struct ufs_inode_info, > > + FIELD_SIZEOF(struct ufs_inode_info, > > i_u1.i_symlink), > > init_once); > > if (ufs_inode_cachep = NULL) > > diff --git a/include/linux/kernel.h b/include/linux/kernel.h > > index 74b1ee9027f5..4672391cdb5b 100644 > > --- a/include/linux/kernel.h > > +++ b/include/linux/kernel.h > > @@ -79,15 +79,6 @@ > > */ > > #define round_down(x, y) ((x) & ~__round_mask(x, y)) > > > > -/** > > - * FIELD_SIZEOF - get the size of a struct's field > > - * @t: the target struct > > - * @f: the target struct's field > > - * Return: the size of @f in the struct definition without having a > > - * declared instance of @t. > > - */ > > -#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f)) > > - > > #define DIV_ROUND_UP __KERNEL_DIV_ROUND_UP > > > > #define DIV_ROUND_DOWN_ULL(ll, d) \ > > diff --git a/include/linux/slab.h b/include/linux/slab.h > > index 9449b19c5f10..8bdfdd389b37 100644 > > --- a/include/linux/slab.h > > +++ b/include/linux/slab.h > > @@ -175,7 +175,7 @@ void memcg_destroy_kmem_caches(struct mem_cgroup *); > > sizeof(struct __struct), \ > > __alignof__(struct __struct), (__flags), \ > > offsetof(struct __struct, __field), \ > > - sizeof_field(struct __struct, __field), NULL) > > + FIELD_SIZEOF(struct __struct, __field), NULL) > > > > /* > > * Common kmalloc functions provided by all allocators > > diff --git a/include/linux/stddef.h b/include/linux/stddef.h > > index 998a4ba28eba..a5960e2b4a8b 100644 > > --- a/include/linux/stddef.h > > +++ b/include/linux/stddef.h > > @@ -20,12 +20,23 @@ enum { > > #endif > > > > /** > > - * sizeof_field(TYPE, MEMBER) > > + * FIELD_SIZEOF - get the size of a struct's field > > + * @t: the target struct > > + * @f: the target struct's field > > + * Return: the size of @f in the struct definition without having a > > + * declared instance of @t. > > + */ > > +#define FIELD_SIZEOF(t, f) (sizeof(((t *)0)->f)) > > + > > +/* > > + * For code compatibility > > * > > + * sizeof_field(TYPE, MEMBER) > > * @TYPE: The structure containing the field of interest > > * @MEMBER: The field to return the size of > > */ > > -#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER)) > > + > > +#define sizeof_field(TYPE, MEMBER) FIELD_SIZEOF(TYPE, MEMBER) > > > > /** > > * offsetofend(TYPE, MEMBER) > > @@ -34,6 +45,6 @@ enum { > > * @MEMBER: The member within the structure to get the end offset of > > */ > > #define offsetofend(TYPE, MEMBER) \ > > - (offsetof(TYPE, MEMBER) + sizeof_field(TYPE, MEMBER)) > > + (offsetof(TYPE, MEMBER) + FIELD_SIZEOF(TYPE, MEMBER)) > > > > #endif > > diff --git a/kernel/fork.c b/kernel/fork.c > > index 75675b9bf6df..ef40b95bf82c 100644 > > --- a/kernel/fork.c > > +++ b/kernel/fork.c > > @@ -2553,7 +2553,7 @@ void __init proc_caches_init(void) > > mm_size, ARCH_MIN_MMSTRUCT_ALIGN, > > SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_ACCOUNT, > > offsetof(struct mm_struct, saved_auxv), > > - sizeof_field(struct mm_struct, saved_auxv), > > + FIELD_SIZEOF(struct mm_struct, saved_auxv), > > NULL); > > vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC|SLAB_ACCOUNT); > > mmap_init(); > > diff --git a/kernel/utsname.c b/kernel/utsname.c > > index f0e491193009..28257c571553 100644 > > --- a/kernel/utsname.c > > +++ b/kernel/utsname.c > > @@ -174,6 +174,6 @@ void __init uts_ns_init(void) > > "uts_namespace", sizeof(struct uts_namespace), 0, > > SLAB_PANIC|SLAB_ACCOUNT, > > offsetof(struct uts_namespace, name), > > - sizeof_field(struct uts_namespace, name), > > + FIELD_SIZEOF(struct uts_namespace, name), > > NULL); > > } > > diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c > > index 13ea920600ae..3306bbed77eb 100644 > > --- a/net/caif/caif_socket.c > > +++ b/net/caif/caif_socket.c > > @@ -1033,7 +1033,7 @@ static int caif_create(struct net *net, struct socket *sock, int protocol, > > .owner = THIS_MODULE, > > .obj_size = sizeof(struct caifsock), > > .useroffset = offsetof(struct caifsock, conn_req.param), > > - .usersize = sizeof_field(struct caifsock, conn_req.param) > > + .usersize = FIELD_SIZEOF(struct caifsock, conn_req.param) > > }; > > > > if (!capable(CAP_SYS_ADMIN) && !capable(CAP_NET_ADMIN)) > > diff --git a/net/core/skbuff.c b/net/core/skbuff.c > > index 47c1aa9ee045..816bea0c4a8e 100644 > > --- a/net/core/skbuff.c > > +++ b/net/core/skbuff.c > > @@ -3983,7 +3983,7 @@ void __init skb_init(void) > > 0, > > SLAB_HWCACHE_ALIGN|SLAB_PANIC, > > offsetof(struct sk_buff, cb), > > - sizeof_field(struct sk_buff, cb), > > + FIELD_SIZEOF(struct sk_buff, cb), > > NULL); > > skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache", > > sizeof(struct sk_buff_fclones), > > diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c > > index 0b8e06ca75d6..efa4c745f7b9 100644 > > --- a/net/ipv4/raw.c > > +++ b/net/ipv4/raw.c > > @@ -977,7 +977,7 @@ struct proto raw_prot = { > > .unhash = raw_unhash_sk, > > .obj_size = sizeof(struct raw_sock), > > .useroffset = offsetof(struct raw_sock, filter), > > - .usersize = sizeof_field(struct raw_sock, filter), > > + .usersize = FIELD_SIZEOF(struct raw_sock, filter), > > .h.raw_hash = &raw_v4_hashinfo, > > #ifdef CONFIG_COMPAT > > .compat_setsockopt = compat_raw_setsockopt, > > diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c > > index 70693bc7ad9d..257c71e22d74 100644 > > --- a/net/ipv6/raw.c > > +++ b/net/ipv6/raw.c > > @@ -1292,7 +1292,7 @@ struct proto rawv6_prot = { > > .unhash = raw_unhash_sk, > > .obj_size = sizeof(struct raw6_sock), > > .useroffset = offsetof(struct raw6_sock, filter), > > - .usersize = sizeof_field(struct raw6_sock, filter), > > + .usersize = FIELD_SIZEOF(struct raw6_sock, filter), > > .h.raw_hash = &raw_v6_hashinfo, > > #ifdef CONFIG_COMPAT > > .compat_setsockopt = compat_rawv6_setsockopt, > > diff --git a/net/sctp/socket.c b/net/sctp/socket.c > > index 39ea0a37af09..6b648a6033b9 100644 > > --- a/net/sctp/socket.c > > +++ b/net/sctp/socket.c > > @@ -9377,7 +9377,7 @@ struct proto sctp_prot = { > > .useroffset = offsetof(struct sctp_sock, subscribe), > > .usersize = offsetof(struct sctp_sock, initmsg) - > > offsetof(struct sctp_sock, subscribe) + > > - sizeof_field(struct sctp_sock, initmsg), > > + FIELD_SIZEOF(struct sctp_sock, initmsg), > > .sysctl_mem = sysctl_sctp_mem, > > .sysctl_rmem = sysctl_sctp_rmem, > > .sysctl_wmem = sysctl_sctp_wmem, > > @@ -9419,7 +9419,7 @@ struct proto sctpv6_prot = { > > .useroffset = offsetof(struct sctp6_sock, sctp.subscribe), > > .usersize = offsetof(struct sctp6_sock, sctp.initmsg) - > > offsetof(struct sctp6_sock, sctp.subscribe) + > > - sizeof_field(struct sctp6_sock, sctp.initmsg), > > + FIELD_SIZEOF(struct sctp6_sock, sctp.initmsg), > > .sysctl_mem = sysctl_sctp_mem, > > .sysctl_rmem = sysctl_sctp_rmem, > > .sysctl_wmem = sysctl_sctp_wmem, > > diff --git a/tools/testing/selftests/bpf/bpf_util.h b/tools/testing/selftests/bpf/bpf_util.h > > index a29206ebbd13..571c35aac90f 100644 > > --- a/tools/testing/selftests/bpf/bpf_util.h > > +++ b/tools/testing/selftests/bpf/bpf_util.h > > @@ -58,13 +58,29 @@ static inline unsigned int bpf_num_possible_cpus(void) > > # define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) > > #endif > > > > -#ifndef sizeof_field > > -#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER)) > > +/* > > + * FIELD_SIZEOF - get the size of a struct's field > > + * @t: the target struct > > + * @f: the target struct's field > > + * Return: the size of @f in the struct definition without having a > > + * declared instance of @t. > > + */ > > +#ifndef FIELD_SIZEOF > > +#define FIELD_SIZEOF(t, f) (sizeof(((t *)0)->f)) > > #endif > > > > +/* > > + * For code compatibility > > + * > > + * sizeof_field(TYPE, MEMBER) > > + * @TYPE: The structure containing the field of interest > > + * @MEMBER: The field to return the size of > > + */ > > +#define sizeof_field(TYPE, MEMBER) FIELD_SIZEOF(TYPE, MEMBER) > > + > > #ifndef offsetofend > > #define offsetofend(TYPE, MEMBER) \ > > - (offsetof(TYPE, MEMBER) + sizeof_field(TYPE, MEMBER)) > > + (offsetof(TYPE, MEMBER) + FIELD_SIZEOF(TYPE, MEMBER)) > > #endif > > > > #endif /* __BPF_UTIL__ */ > > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > > index ca54b09adf5b..e43e3a26f6ab 100644 > > --- a/virt/kvm/kvm_main.c > > +++ b/virt/kvm/kvm_main.c > > @@ -4275,7 +4275,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, > > kmem_cache_create_usercopy("kvm_vcpu", vcpu_size, vcpu_align, > > SLAB_ACCOUNT, > > offsetof(struct kvm_vcpu, arch), > > - sizeof_field(struct kvm_vcpu, arch), > > + FIELD_SIZEOF(struct kvm_vcpu, arch), > > NULL); > > if (!kvm_vcpu_cache) { > > r = -ENOMEM; > > -- > > 2.11.0 > > > > -- > Kees Cook From mboxrd@z Thu Jan 1 00:00:00 1970 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=-3.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable 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 82353C31E47 for ; Tue, 11 Jun 2019 21:05:43 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 19D0C2086A for ; Tue, 11 Jun 2019 21:05:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iJQMoCwY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 19D0C2086A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 952E56B0007; Tue, 11 Jun 2019 17:05:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9033D6B0008; Tue, 11 Jun 2019 17:05:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7CAB56B000A; Tue, 11 Jun 2019 17:05:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-oi1-f200.google.com (mail-oi1-f200.google.com [209.85.167.200]) by kanga.kvack.org (Postfix) with ESMTP id 453416B0007 for ; Tue, 11 Jun 2019 17:05:42 -0400 (EDT) Received: by mail-oi1-f200.google.com with SMTP id a198so4593401oii.15 for ; Tue, 11 Jun 2019 14:05:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:mime-version:references :in-reply-to:from:date:message-id:subject:to:cc; bh=WcanZz+mptuiFO1FOrH8ws9AjJjCLr14oWUG5p6+Hks=; b=pctd+t1ICktUtx0z3HNqqjbEexo4ftNkRi9XgLQdR1rvYfmIYqS4ArBE45d15rsDEj AdxzYnj1Errl1o1lATJa5GywgdG0uKY87L8yMoLh49YrLugs5LfeW1Smg9nGxMXLL/ed IMYjFIVjSn4Aws5uZ12rRCxDKyl5GIAQSVjgkr79/5bz6VffouNcLZOMP4yc0WfLUXe/ AKpvlWkwWE3gS+d3HRyuzuJZ8/PBb+SJIUP8E0BO0NWj1U33LKmXX/3w3rJYVeRwngOJ soaXCFUsV/1dEry6LjeSDdjaJ4tvk/QzjX1WwlIeYZrwycqr8ce+LCgKHc58yYQsa80I D3TQ== X-Gm-Message-State: APjAAAUCYcqF+NjGzh0O57amZFNem8Hm/o+DjSZzjwHqWkWBDcr0mhNU Oyjdk75hLJMd9YUCUEBXlCA9K12Eek8waBIqWJjBr1lPTHawNEhrxWG+/C5Z9njVWOuQJ7MChRD tr0VgCmfd0FC7dUo3tpPzaefeHpdW5RfVt/dPEpiBeCo075nBZKimTipXwHEqc75buA== X-Received: by 2002:aca:b50b:: with SMTP id e11mr16847486oif.53.1560287141792; Tue, 11 Jun 2019 14:05:41 -0700 (PDT) X-Received: by 2002:aca:b50b:: with SMTP id e11mr16847413oif.53.1560287140374; Tue, 11 Jun 2019 14:05:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560287140; cv=none; d=google.com; s=arc-20160816; b=BbwO+0jCr4uX6HMoXpydkTIftsJPGfzGeCx1EX/D6r41bTtZjMy8TFrOwH98f+MIf5 tLeOz2Q5ADkei/Gj7W5aHTEDQlEX8jv1Bb+9reAQHrXaTYazKR5VM8U0ouuhvkgLMJcy PT/6mQWNvlma+Uc0PcsqKZTYb1QrxU9shDEycho/EMBNoyPQuSivfpqIIdVtg9ENUspK LGyA5jUA3+eu/WJ/SHlk+jp8gSqaaZZJ5t5on5n+vZRrGRhpoPpeUU98rPqok0K6hMJM EY8t41pSDcyb4arByhR0tZm29hKL6OH2YuaEUlxxYucBmDWFrWviB/fSvGFozQybu/l2 wNJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:dkim-signature; bh=WcanZz+mptuiFO1FOrH8ws9AjJjCLr14oWUG5p6+Hks=; b=rBQgBZrqT6+ROzH8P4GQFzgH+ROn/3Gq7Azdo/7eLETGR1jNckS5NlLQmWwy9ZZ6Ir SiSyhp0iCGxwJmDmmtfVCn0SWy6zVrC3MQXRNRZvk1F3i8BTcrnFtZy2iAuOtaqC3rk/ R6fGHdD22UfS6V6Ndx00CB0W4+cDDKYeIYttpCJnnHhIf+3ITbzSMJZ58xMJdoAKYYU8 qiQCne+oinmDy8VSJcZE+3OOufqQE9xDA2NxqcZhsBdRiwAG89TEHKj6GFs2/iKhoMgs Q1JFxgloQCI+1hdiwtBN/8xMqrj+obIf4kuPWZWx/LYn6X2riTgae6XVAtzBVKwDZRly tbXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=iJQMoCwY; spf=pass (google.com: domain of mayhs11saini@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=mayhs11saini@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id j21sor1071613otk.43.2019.06.11.14.05.40 for (Google Transport Security); Tue, 11 Jun 2019 14:05:40 -0700 (PDT) Received-SPF: pass (google.com: domain of mayhs11saini@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=iJQMoCwY; spf=pass (google.com: domain of mayhs11saini@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=mayhs11saini@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=WcanZz+mptuiFO1FOrH8ws9AjJjCLr14oWUG5p6+Hks=; b=iJQMoCwYc23LAoq/nhxJ035CiFJQ2hxJn1BNye5jFP8Ck+CLav2jVQYv0vW++lqQhk FdQ5LuRoGMIXjLwW/r1NGjL8QX4oDOirRbw0KmEB01SaiIXj/GEGAGEPuQIMXxxQhWsG G/GDkauFLVXFhdh2Xxj+113U0mRxrwriwX4WmwN2pAkivZKtlFaybRhRo9Im6QP1wms2 Y8vJ9N68QW72MIZ3LPyv9vdww7ctB8Dg7ceszsxTwa/zVNKT02nv1FLKO+4ptGhfbC5k vR1P/C8PF6vQYDhXqJ6A+s2GAo1VxmU4pCtd+uBrP6F/KxkKh3I5wHNjT2cjou+ndLPS t/dQ== X-Google-Smtp-Source: APXvYqwCapXzUEU/OW0FgteBOI3Ru0UMCdmw4g13S/THGs3BP+sutXDmFQYqa8LgfH+7HTi5t3VxiZVUkypJLqgT5/o= X-Received: by 2002:a9d:3f62:: with SMTP id m89mr37392992otc.128.1560287139969; Tue, 11 Jun 2019 14:05:39 -0700 (PDT) MIME-Version: 1.0 References: <20190611193836.2772-1-shyam.saini@amarulasolutions.com> <201906111345.74AA9311F5@keescook> In-Reply-To: <201906111345.74AA9311F5@keescook> From: Shyam Saini Date: Wed, 12 Jun 2019 02:35:28 +0530 Message-ID: Subject: Re: [PATCH V2] include: linux: Regularise the use of FIELD_SIZEOF macro To: Kees Cook Cc: Shyam Saini , Kernel Hardening , linux-kernel , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, dri-devel , Network Development , linux-ext4@vger.kernel.org, devel@lists.orangefs.org, linux-mm , linux-sctp@vger.kernel.org, bpf , kvm@vger.kernel.org, William Kucharski Content-Type: text/plain; charset="UTF-8" X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Hi Kees, Cc'ing William Kucharski, > On Wed, Jun 12, 2019 at 01:08:36AM +0530, Shyam Saini wrote: > > In favour of FIELD_SIZEOF, this patch also deprecates other two similar > > macros sizeof_field and SIZEOF_FIELD. > > > > For code compatibility reason, retain sizeof_field macro as a wrapper macro > > to FIELD_SIZEOF > > Can you explain this part? First sentence says you want to remove > sizeof_field, and the second says you're keeping it? I thought the point > was to switch all of these to FIELD_SIZEOF()? Previously, William [1] suggested to retain sizeof_field as macro to FIELD_SIZEOF for code compatibility reason. I have removed all the usage of sizeof_field apart from retained wrapper macro definition. [1] https://patchwork.ozlabs.org/patch/1085275/ Thanks, Shyam > > > > arch/arm64/include/asm/processor.h | 10 +++++----- > > arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 9 +-------- > > drivers/gpu/drm/i915/gvt/scheduler.c | 2 +- > > drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 4 ++-- > > fs/befs/linuxvfs.c | 2 +- > > fs/ext2/super.c | 2 +- > > fs/ext4/super.c | 2 +- > > fs/freevxfs/vxfs_super.c | 2 +- > > fs/orangefs/super.c | 2 +- > > fs/ufs/super.c | 2 +- > > include/linux/kernel.h | 9 --------- > > include/linux/slab.h | 2 +- > > include/linux/stddef.h | 17 ++++++++++++++--- > > kernel/fork.c | 2 +- > > kernel/utsname.c | 2 +- > > net/caif/caif_socket.c | 2 +- > > net/core/skbuff.c | 2 +- > > net/ipv4/raw.c | 2 +- > > net/ipv6/raw.c | 2 +- > > net/sctp/socket.c | 4 ++-- > > tools/testing/selftests/bpf/bpf_util.h | 22 +++++++++++++++++++--- > > virt/kvm/kvm_main.c | 2 +- > > 22 files changed, 58 insertions(+), 47 deletions(-) > > > > diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h > > index fcd0e691b1ea..ace906d887cc 100644 > > --- a/arch/arm64/include/asm/processor.h > > +++ b/arch/arm64/include/asm/processor.h > > @@ -164,13 +164,13 @@ static inline void arch_thread_struct_whitelist(unsigned long *offset, > > unsigned long *size) > > { > > /* Verify that there is no padding among the whitelisted fields: */ > > - BUILD_BUG_ON(sizeof_field(struct thread_struct, uw) != > > - sizeof_field(struct thread_struct, uw.tp_value) + > > - sizeof_field(struct thread_struct, uw.tp2_value) + > > - sizeof_field(struct thread_struct, uw.fpsimd_state)); > > + BUILD_BUG_ON(FIELD_SIZEOF(struct thread_struct, uw) != > > + FIELD_SIZEOF(struct thread_struct, uw.tp_value) + > > + FIELD_SIZEOF(struct thread_struct, uw.tp2_value) + > > + FIELD_SIZEOF(struct thread_struct, uw.fpsimd_state)); > > > > *offset = offsetof(struct thread_struct, uw); > > - *size = sizeof_field(struct thread_struct, uw); > > + *size = FIELD_SIZEOF(struct thread_struct, uw); > > } > > > > #ifdef CONFIG_COMPAT > > diff --git a/arch/mips/cavium-octeon/executive/cvmx-bootmem.c b/arch/mips/cavium-octeon/executive/cvmx-bootmem.c > > index ba8f82a29a81..44b506a14666 100644 > > --- a/arch/mips/cavium-octeon/executive/cvmx-bootmem.c > > +++ b/arch/mips/cavium-octeon/executive/cvmx-bootmem.c > > @@ -45,13 +45,6 @@ static struct cvmx_bootmem_desc *cvmx_bootmem_desc; > > /* See header file for descriptions of functions */ > > > > /** > > - * This macro returns the size of a member of a structure. > > - * Logically it is the same as "sizeof(s::field)" in C++, but > > - * C lacks the "::" operator. > > - */ > > -#define SIZEOF_FIELD(s, field) sizeof(((s *)NULL)->field) > > - > > -/** > > * This macro returns a member of the > > * cvmx_bootmem_named_block_desc_t structure. These members can't > > * be directly addressed as they might be in memory not directly > > @@ -65,7 +58,7 @@ static struct cvmx_bootmem_desc *cvmx_bootmem_desc; > > #define CVMX_BOOTMEM_NAMED_GET_FIELD(addr, field) \ > > __cvmx_bootmem_desc_get(addr, \ > > offsetof(struct cvmx_bootmem_named_block_desc, field), \ > > - SIZEOF_FIELD(struct cvmx_bootmem_named_block_desc, field)) > > + FIELD_SIZEOF(struct cvmx_bootmem_named_block_desc, field)) > > > > /** > > * This function is the implementation of the get macros defined > > diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c > > index 0f919f0a43d4..820f95a52542 100644 > > --- a/drivers/gpu/drm/i915/gvt/scheduler.c > > +++ b/drivers/gpu/drm/i915/gvt/scheduler.c > > @@ -1243,7 +1243,7 @@ int intel_vgpu_setup_submission(struct intel_vgpu *vgpu) > > sizeof(struct intel_vgpu_workload), 0, > > SLAB_HWCACHE_ALIGN, > > offsetof(struct intel_vgpu_workload, rb_tail), > > - sizeof_field(struct intel_vgpu_workload, rb_tail), > > + FIELD_SIZEOF(struct intel_vgpu_workload, rb_tail), > > NULL); > > > > if (!s->workloads) { > > diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c > > index 46baf3b44309..c0447bf07fbb 100644 > > --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c > > +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c > > @@ -49,13 +49,13 @@ struct mlxsw_sp_fid_8021d { > > }; > > > > static const struct rhashtable_params mlxsw_sp_fid_ht_params = { > > - .key_len = sizeof_field(struct mlxsw_sp_fid, fid_index), > > + .key_len = FIELD_SIZEOF(struct mlxsw_sp_fid, fid_index), > > .key_offset = offsetof(struct mlxsw_sp_fid, fid_index), > > .head_offset = offsetof(struct mlxsw_sp_fid, ht_node), > > }; > > > > static const struct rhashtable_params mlxsw_sp_fid_vni_ht_params = { > > - .key_len = sizeof_field(struct mlxsw_sp_fid, vni), > > + .key_len = FIELD_SIZEOF(struct mlxsw_sp_fid, vni), > > .key_offset = offsetof(struct mlxsw_sp_fid, vni), > > .head_offset = offsetof(struct mlxsw_sp_fid, vni_ht_node), > > }; > > diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c > > index 462d096ff3e9..06ffd4829e2e 100644 > > --- a/fs/befs/linuxvfs.c > > +++ b/fs/befs/linuxvfs.c > > @@ -438,7 +438,7 @@ befs_init_inodecache(void) > > SLAB_ACCOUNT), > > offsetof(struct befs_inode_info, > > i_data.symlink), > > - sizeof_field(struct befs_inode_info, > > + FIELD_SIZEOF(struct befs_inode_info, > > i_data.symlink), > > init_once); > > if (befs_inode_cachep == NULL) > > diff --git a/fs/ext2/super.c b/fs/ext2/super.c > > index 1d7ab73b1014..d9a6c81f4a47 100644 > > --- a/fs/ext2/super.c > > +++ b/fs/ext2/super.c > > @@ -220,7 +220,7 @@ static int __init init_inodecache(void) > > (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| > > SLAB_ACCOUNT), > > offsetof(struct ext2_inode_info, i_data), > > - sizeof_field(struct ext2_inode_info, i_data), > > + FIELD_SIZEOF(struct ext2_inode_info, i_data), > > init_once); > > if (ext2_inode_cachep == NULL) > > return -ENOMEM; > > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > > index 4079605d437a..b1b5856248bd 100644 > > --- a/fs/ext4/super.c > > +++ b/fs/ext4/super.c > > @@ -1148,7 +1148,7 @@ static int __init init_inodecache(void) > > (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| > > SLAB_ACCOUNT), > > offsetof(struct ext4_inode_info, i_data), > > - sizeof_field(struct ext4_inode_info, i_data), > > + FIELD_SIZEOF(struct ext4_inode_info, i_data), > > init_once); > > if (ext4_inode_cachep == NULL) > > return -ENOMEM; > > diff --git a/fs/freevxfs/vxfs_super.c b/fs/freevxfs/vxfs_super.c > > index a89f68c3cbed..ffd22f85bbe0 100644 > > --- a/fs/freevxfs/vxfs_super.c > > +++ b/fs/freevxfs/vxfs_super.c > > @@ -329,7 +329,7 @@ vxfs_init(void) > > sizeof(struct vxfs_inode_info), 0, > > SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, > > offsetof(struct vxfs_inode_info, vii_immed.vi_immed), > > - sizeof_field(struct vxfs_inode_info, > > + FIELD_SIZEOF(struct vxfs_inode_info, > > vii_immed.vi_immed), > > NULL); > > if (!vxfs_inode_cachep) > > diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c > > index ee5efdc35cc1..30f625059ad9 100644 > > --- a/fs/orangefs/super.c > > +++ b/fs/orangefs/super.c > > @@ -646,7 +646,7 @@ int orangefs_inode_cache_initialize(void) > > ORANGEFS_CACHE_CREATE_FLAGS, > > offsetof(struct orangefs_inode_s, > > link_target), > > - sizeof_field(struct orangefs_inode_s, > > + FIELD_SIZEOF(struct orangefs_inode_s, > > link_target), > > orangefs_inode_cache_ctor); > > > > diff --git a/fs/ufs/super.c b/fs/ufs/super.c > > index 3d247c0d92aa..1e8bcd950f6d 100644 > > --- a/fs/ufs/super.c > > +++ b/fs/ufs/super.c > > @@ -1469,7 +1469,7 @@ static int __init init_inodecache(void) > > (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| > > SLAB_ACCOUNT), > > offsetof(struct ufs_inode_info, i_u1.i_symlink), > > - sizeof_field(struct ufs_inode_info, > > + FIELD_SIZEOF(struct ufs_inode_info, > > i_u1.i_symlink), > > init_once); > > if (ufs_inode_cachep == NULL) > > diff --git a/include/linux/kernel.h b/include/linux/kernel.h > > index 74b1ee9027f5..4672391cdb5b 100644 > > --- a/include/linux/kernel.h > > +++ b/include/linux/kernel.h > > @@ -79,15 +79,6 @@ > > */ > > #define round_down(x, y) ((x) & ~__round_mask(x, y)) > > > > -/** > > - * FIELD_SIZEOF - get the size of a struct's field > > - * @t: the target struct > > - * @f: the target struct's field > > - * Return: the size of @f in the struct definition without having a > > - * declared instance of @t. > > - */ > > -#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f)) > > - > > #define DIV_ROUND_UP __KERNEL_DIV_ROUND_UP > > > > #define DIV_ROUND_DOWN_ULL(ll, d) \ > > diff --git a/include/linux/slab.h b/include/linux/slab.h > > index 9449b19c5f10..8bdfdd389b37 100644 > > --- a/include/linux/slab.h > > +++ b/include/linux/slab.h > > @@ -175,7 +175,7 @@ void memcg_destroy_kmem_caches(struct mem_cgroup *); > > sizeof(struct __struct), \ > > __alignof__(struct __struct), (__flags), \ > > offsetof(struct __struct, __field), \ > > - sizeof_field(struct __struct, __field), NULL) > > + FIELD_SIZEOF(struct __struct, __field), NULL) > > > > /* > > * Common kmalloc functions provided by all allocators > > diff --git a/include/linux/stddef.h b/include/linux/stddef.h > > index 998a4ba28eba..a5960e2b4a8b 100644 > > --- a/include/linux/stddef.h > > +++ b/include/linux/stddef.h > > @@ -20,12 +20,23 @@ enum { > > #endif > > > > /** > > - * sizeof_field(TYPE, MEMBER) > > + * FIELD_SIZEOF - get the size of a struct's field > > + * @t: the target struct > > + * @f: the target struct's field > > + * Return: the size of @f in the struct definition without having a > > + * declared instance of @t. > > + */ > > +#define FIELD_SIZEOF(t, f) (sizeof(((t *)0)->f)) > > + > > +/* > > + * For code compatibility > > * > > + * sizeof_field(TYPE, MEMBER) > > * @TYPE: The structure containing the field of interest > > * @MEMBER: The field to return the size of > > */ > > -#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER)) > > + > > +#define sizeof_field(TYPE, MEMBER) FIELD_SIZEOF(TYPE, MEMBER) > > > > /** > > * offsetofend(TYPE, MEMBER) > > @@ -34,6 +45,6 @@ enum { > > * @MEMBER: The member within the structure to get the end offset of > > */ > > #define offsetofend(TYPE, MEMBER) \ > > - (offsetof(TYPE, MEMBER) + sizeof_field(TYPE, MEMBER)) > > + (offsetof(TYPE, MEMBER) + FIELD_SIZEOF(TYPE, MEMBER)) > > > > #endif > > diff --git a/kernel/fork.c b/kernel/fork.c > > index 75675b9bf6df..ef40b95bf82c 100644 > > --- a/kernel/fork.c > > +++ b/kernel/fork.c > > @@ -2553,7 +2553,7 @@ void __init proc_caches_init(void) > > mm_size, ARCH_MIN_MMSTRUCT_ALIGN, > > SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_ACCOUNT, > > offsetof(struct mm_struct, saved_auxv), > > - sizeof_field(struct mm_struct, saved_auxv), > > + FIELD_SIZEOF(struct mm_struct, saved_auxv), > > NULL); > > vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC|SLAB_ACCOUNT); > > mmap_init(); > > diff --git a/kernel/utsname.c b/kernel/utsname.c > > index f0e491193009..28257c571553 100644 > > --- a/kernel/utsname.c > > +++ b/kernel/utsname.c > > @@ -174,6 +174,6 @@ void __init uts_ns_init(void) > > "uts_namespace", sizeof(struct uts_namespace), 0, > > SLAB_PANIC|SLAB_ACCOUNT, > > offsetof(struct uts_namespace, name), > > - sizeof_field(struct uts_namespace, name), > > + FIELD_SIZEOF(struct uts_namespace, name), > > NULL); > > } > > diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c > > index 13ea920600ae..3306bbed77eb 100644 > > --- a/net/caif/caif_socket.c > > +++ b/net/caif/caif_socket.c > > @@ -1033,7 +1033,7 @@ static int caif_create(struct net *net, struct socket *sock, int protocol, > > .owner = THIS_MODULE, > > .obj_size = sizeof(struct caifsock), > > .useroffset = offsetof(struct caifsock, conn_req.param), > > - .usersize = sizeof_field(struct caifsock, conn_req.param) > > + .usersize = FIELD_SIZEOF(struct caifsock, conn_req.param) > > }; > > > > if (!capable(CAP_SYS_ADMIN) && !capable(CAP_NET_ADMIN)) > > diff --git a/net/core/skbuff.c b/net/core/skbuff.c > > index 47c1aa9ee045..816bea0c4a8e 100644 > > --- a/net/core/skbuff.c > > +++ b/net/core/skbuff.c > > @@ -3983,7 +3983,7 @@ void __init skb_init(void) > > 0, > > SLAB_HWCACHE_ALIGN|SLAB_PANIC, > > offsetof(struct sk_buff, cb), > > - sizeof_field(struct sk_buff, cb), > > + FIELD_SIZEOF(struct sk_buff, cb), > > NULL); > > skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache", > > sizeof(struct sk_buff_fclones), > > diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c > > index 0b8e06ca75d6..efa4c745f7b9 100644 > > --- a/net/ipv4/raw.c > > +++ b/net/ipv4/raw.c > > @@ -977,7 +977,7 @@ struct proto raw_prot = { > > .unhash = raw_unhash_sk, > > .obj_size = sizeof(struct raw_sock), > > .useroffset = offsetof(struct raw_sock, filter), > > - .usersize = sizeof_field(struct raw_sock, filter), > > + .usersize = FIELD_SIZEOF(struct raw_sock, filter), > > .h.raw_hash = &raw_v4_hashinfo, > > #ifdef CONFIG_COMPAT > > .compat_setsockopt = compat_raw_setsockopt, > > diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c > > index 70693bc7ad9d..257c71e22d74 100644 > > --- a/net/ipv6/raw.c > > +++ b/net/ipv6/raw.c > > @@ -1292,7 +1292,7 @@ struct proto rawv6_prot = { > > .unhash = raw_unhash_sk, > > .obj_size = sizeof(struct raw6_sock), > > .useroffset = offsetof(struct raw6_sock, filter), > > - .usersize = sizeof_field(struct raw6_sock, filter), > > + .usersize = FIELD_SIZEOF(struct raw6_sock, filter), > > .h.raw_hash = &raw_v6_hashinfo, > > #ifdef CONFIG_COMPAT > > .compat_setsockopt = compat_rawv6_setsockopt, > > diff --git a/net/sctp/socket.c b/net/sctp/socket.c > > index 39ea0a37af09..6b648a6033b9 100644 > > --- a/net/sctp/socket.c > > +++ b/net/sctp/socket.c > > @@ -9377,7 +9377,7 @@ struct proto sctp_prot = { > > .useroffset = offsetof(struct sctp_sock, subscribe), > > .usersize = offsetof(struct sctp_sock, initmsg) - > > offsetof(struct sctp_sock, subscribe) + > > - sizeof_field(struct sctp_sock, initmsg), > > + FIELD_SIZEOF(struct sctp_sock, initmsg), > > .sysctl_mem = sysctl_sctp_mem, > > .sysctl_rmem = sysctl_sctp_rmem, > > .sysctl_wmem = sysctl_sctp_wmem, > > @@ -9419,7 +9419,7 @@ struct proto sctpv6_prot = { > > .useroffset = offsetof(struct sctp6_sock, sctp.subscribe), > > .usersize = offsetof(struct sctp6_sock, sctp.initmsg) - > > offsetof(struct sctp6_sock, sctp.subscribe) + > > - sizeof_field(struct sctp6_sock, sctp.initmsg), > > + FIELD_SIZEOF(struct sctp6_sock, sctp.initmsg), > > .sysctl_mem = sysctl_sctp_mem, > > .sysctl_rmem = sysctl_sctp_rmem, > > .sysctl_wmem = sysctl_sctp_wmem, > > diff --git a/tools/testing/selftests/bpf/bpf_util.h b/tools/testing/selftests/bpf/bpf_util.h > > index a29206ebbd13..571c35aac90f 100644 > > --- a/tools/testing/selftests/bpf/bpf_util.h > > +++ b/tools/testing/selftests/bpf/bpf_util.h > > @@ -58,13 +58,29 @@ static inline unsigned int bpf_num_possible_cpus(void) > > # define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) > > #endif > > > > -#ifndef sizeof_field > > -#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER)) > > +/* > > + * FIELD_SIZEOF - get the size of a struct's field > > + * @t: the target struct > > + * @f: the target struct's field > > + * Return: the size of @f in the struct definition without having a > > + * declared instance of @t. > > + */ > > +#ifndef FIELD_SIZEOF > > +#define FIELD_SIZEOF(t, f) (sizeof(((t *)0)->f)) > > #endif > > > > +/* > > + * For code compatibility > > + * > > + * sizeof_field(TYPE, MEMBER) > > + * @TYPE: The structure containing the field of interest > > + * @MEMBER: The field to return the size of > > + */ > > +#define sizeof_field(TYPE, MEMBER) FIELD_SIZEOF(TYPE, MEMBER) > > + > > #ifndef offsetofend > > #define offsetofend(TYPE, MEMBER) \ > > - (offsetof(TYPE, MEMBER) + sizeof_field(TYPE, MEMBER)) > > + (offsetof(TYPE, MEMBER) + FIELD_SIZEOF(TYPE, MEMBER)) > > #endif > > > > #endif /* __BPF_UTIL__ */ > > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > > index ca54b09adf5b..e43e3a26f6ab 100644 > > --- a/virt/kvm/kvm_main.c > > +++ b/virt/kvm/kvm_main.c > > @@ -4275,7 +4275,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, > > kmem_cache_create_usercopy("kvm_vcpu", vcpu_size, vcpu_align, > > SLAB_ACCOUNT, > > offsetof(struct kvm_vcpu, arch), > > - sizeof_field(struct kvm_vcpu, arch), > > + FIELD_SIZEOF(struct kvm_vcpu, arch), > > NULL); > > if (!kvm_vcpu_cache) { > > r = -ENOMEM; > > -- > > 2.11.0 > > > > -- > Kees Cook From mboxrd@z Thu Jan 1 00:00:00 1970 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=-3.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable 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 8C78CC31E44 for ; Tue, 11 Jun 2019 21:05:54 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5FE6E2080A for ; Tue, 11 Jun 2019 21:05:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="sR3FoIGL"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iJQMoCwY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5FE6E2080A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=KFkkSmnDCkt5WAghZvMSDJGwpCwXO78O6JAluWj8CXk=; b=sR3FoIGLgMkVAe 9x7kDVmatRyksMFXASn4XD+lThBY1X0Y6nvjTffzsIWzAWhGzCiN2GkX9IgIYo4wo96eMR2czcYpw 9BlNK9EbMhyzQuvHCMw8ag5QFJ9ypjBEx/Eb/gDsV8D4vFogM23LVIHDLeIkz9Cl3fNiexdzBwCnI Qy9E/iie7ZN31o2KBobRKHQYKta5lGCBzsQe14DP9yd6E3nsqvGCQ55N9ErJHny6uip2C+KMDnB60 PSIgL6ZsaqiEiTXOya16Zw7LJxRFnOZZmASF2iYxOkEOE1Q0mO+TZb9sZNHHUbD0c0X7WYba0NXSw N6yxLu5/zn+umdRW0HyQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hanxp-0005f8-0j; Tue, 11 Jun 2019 21:05:53 +0000 Received: from mail-ot1-x343.google.com ([2607:f8b0:4864:20::343]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hanxk-0005dK-Ip for linux-arm-kernel@lists.infradead.org; Tue, 11 Jun 2019 21:05:50 +0000 Received: by mail-ot1-x343.google.com with SMTP id x21so2427588otq.12 for ; Tue, 11 Jun 2019 14:05:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=WcanZz+mptuiFO1FOrH8ws9AjJjCLr14oWUG5p6+Hks=; b=iJQMoCwYc23LAoq/nhxJ035CiFJQ2hxJn1BNye5jFP8Ck+CLav2jVQYv0vW++lqQhk FdQ5LuRoGMIXjLwW/r1NGjL8QX4oDOirRbw0KmEB01SaiIXj/GEGAGEPuQIMXxxQhWsG G/GDkauFLVXFhdh2Xxj+113U0mRxrwriwX4WmwN2pAkivZKtlFaybRhRo9Im6QP1wms2 Y8vJ9N68QW72MIZ3LPyv9vdww7ctB8Dg7ceszsxTwa/zVNKT02nv1FLKO+4ptGhfbC5k vR1P/C8PF6vQYDhXqJ6A+s2GAo1VxmU4pCtd+uBrP6F/KxkKh3I5wHNjT2cjou+ndLPS t/dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=WcanZz+mptuiFO1FOrH8ws9AjJjCLr14oWUG5p6+Hks=; b=lD2alyW90F8aS+ciEh+Fu5CR65ACbruh2ywKfq6EhZ2WuhLQtKBmWjOVxmTq+9FWWY FJTK3D1y9gWdKr/KFZrt8i+TTfLPGNAUsD9dMgF9oSpJ8DAAZSbzvB7JDQIor+xj7rsj Et9HNu2yfM4j4MNNGLRnV5HkIEgtgtwcazFJ/ulT97IAnMFx6EwDtN9HZq9XkMPJKjGI 4y2ziQEvr4JQb9meL8tdkEkc8+GBMENXnfBqjbu2dVZTYPC+eaOc2IdEsJy99pvmSXMh biovQ0cl3pIlTxEpzCU5O8AVd0WNAjr5SpCGklOltpdOU0DLBjrqzR5ID90ij9vAEiAo dNGA== X-Gm-Message-State: APjAAAWQFIbUiCbaJsu5j95YLlDuWKQosgi7W0ZzN9bt4kjxW3AqZ+G1 Nmz81jQsDplFWesLX/u3tfAWh2ozcBSXJixnAPs= X-Google-Smtp-Source: APXvYqwCapXzUEU/OW0FgteBOI3Ru0UMCdmw4g13S/THGs3BP+sutXDmFQYqa8LgfH+7HTi5t3VxiZVUkypJLqgT5/o= X-Received: by 2002:a9d:3f62:: with SMTP id m89mr37392992otc.128.1560287139969; Tue, 11 Jun 2019 14:05:39 -0700 (PDT) MIME-Version: 1.0 References: <20190611193836.2772-1-shyam.saini@amarulasolutions.com> <201906111345.74AA9311F5@keescook> In-Reply-To: <201906111345.74AA9311F5@keescook> From: Shyam Saini Date: Wed, 12 Jun 2019 02:35:28 +0530 Message-ID: Subject: Re: [PATCH V2] include: linux: Regularise the use of FIELD_SIZEOF macro To: Kees Cook X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190611_140548_630882_6E913A3E X-CRM114-Status: GOOD ( 24.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: William Kucharski , kvm@vger.kernel.org, Kernel Hardening , Network Development , intel-gfx@lists.freedesktop.org, devel@lists.orangefs.org, linux-mips@vger.kernel.org, Shyam Saini , linux-kernel , linux-mm , linux-sctp@vger.kernel.org, dri-devel , Andrew Morton , linux-ext4@vger.kernel.org, intel-gvt-dev@lists.freedesktop.org, bpf , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Kees, Cc'ing William Kucharski, > On Wed, Jun 12, 2019 at 01:08:36AM +0530, Shyam Saini wrote: > > In favour of FIELD_SIZEOF, this patch also deprecates other two similar > > macros sizeof_field and SIZEOF_FIELD. > > > > For code compatibility reason, retain sizeof_field macro as a wrapper macro > > to FIELD_SIZEOF > > Can you explain this part? First sentence says you want to remove > sizeof_field, and the second says you're keeping it? I thought the point > was to switch all of these to FIELD_SIZEOF()? Previously, William [1] suggested to retain sizeof_field as macro to FIELD_SIZEOF for code compatibility reason. I have removed all the usage of sizeof_field apart from retained wrapper macro definition. [1] https://patchwork.ozlabs.org/patch/1085275/ Thanks, Shyam > > > > arch/arm64/include/asm/processor.h | 10 +++++----- > > arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 9 +-------- > > drivers/gpu/drm/i915/gvt/scheduler.c | 2 +- > > drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 4 ++-- > > fs/befs/linuxvfs.c | 2 +- > > fs/ext2/super.c | 2 +- > > fs/ext4/super.c | 2 +- > > fs/freevxfs/vxfs_super.c | 2 +- > > fs/orangefs/super.c | 2 +- > > fs/ufs/super.c | 2 +- > > include/linux/kernel.h | 9 --------- > > include/linux/slab.h | 2 +- > > include/linux/stddef.h | 17 ++++++++++++++--- > > kernel/fork.c | 2 +- > > kernel/utsname.c | 2 +- > > net/caif/caif_socket.c | 2 +- > > net/core/skbuff.c | 2 +- > > net/ipv4/raw.c | 2 +- > > net/ipv6/raw.c | 2 +- > > net/sctp/socket.c | 4 ++-- > > tools/testing/selftests/bpf/bpf_util.h | 22 +++++++++++++++++++--- > > virt/kvm/kvm_main.c | 2 +- > > 22 files changed, 58 insertions(+), 47 deletions(-) > > > > diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h > > index fcd0e691b1ea..ace906d887cc 100644 > > --- a/arch/arm64/include/asm/processor.h > > +++ b/arch/arm64/include/asm/processor.h > > @@ -164,13 +164,13 @@ static inline void arch_thread_struct_whitelist(unsigned long *offset, > > unsigned long *size) > > { > > /* Verify that there is no padding among the whitelisted fields: */ > > - BUILD_BUG_ON(sizeof_field(struct thread_struct, uw) != > > - sizeof_field(struct thread_struct, uw.tp_value) + > > - sizeof_field(struct thread_struct, uw.tp2_value) + > > - sizeof_field(struct thread_struct, uw.fpsimd_state)); > > + BUILD_BUG_ON(FIELD_SIZEOF(struct thread_struct, uw) != > > + FIELD_SIZEOF(struct thread_struct, uw.tp_value) + > > + FIELD_SIZEOF(struct thread_struct, uw.tp2_value) + > > + FIELD_SIZEOF(struct thread_struct, uw.fpsimd_state)); > > > > *offset = offsetof(struct thread_struct, uw); > > - *size = sizeof_field(struct thread_struct, uw); > > + *size = FIELD_SIZEOF(struct thread_struct, uw); > > } > > > > #ifdef CONFIG_COMPAT > > diff --git a/arch/mips/cavium-octeon/executive/cvmx-bootmem.c b/arch/mips/cavium-octeon/executive/cvmx-bootmem.c > > index ba8f82a29a81..44b506a14666 100644 > > --- a/arch/mips/cavium-octeon/executive/cvmx-bootmem.c > > +++ b/arch/mips/cavium-octeon/executive/cvmx-bootmem.c > > @@ -45,13 +45,6 @@ static struct cvmx_bootmem_desc *cvmx_bootmem_desc; > > /* See header file for descriptions of functions */ > > > > /** > > - * This macro returns the size of a member of a structure. > > - * Logically it is the same as "sizeof(s::field)" in C++, but > > - * C lacks the "::" operator. > > - */ > > -#define SIZEOF_FIELD(s, field) sizeof(((s *)NULL)->field) > > - > > -/** > > * This macro returns a member of the > > * cvmx_bootmem_named_block_desc_t structure. These members can't > > * be directly addressed as they might be in memory not directly > > @@ -65,7 +58,7 @@ static struct cvmx_bootmem_desc *cvmx_bootmem_desc; > > #define CVMX_BOOTMEM_NAMED_GET_FIELD(addr, field) \ > > __cvmx_bootmem_desc_get(addr, \ > > offsetof(struct cvmx_bootmem_named_block_desc, field), \ > > - SIZEOF_FIELD(struct cvmx_bootmem_named_block_desc, field)) > > + FIELD_SIZEOF(struct cvmx_bootmem_named_block_desc, field)) > > > > /** > > * This function is the implementation of the get macros defined > > diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c > > index 0f919f0a43d4..820f95a52542 100644 > > --- a/drivers/gpu/drm/i915/gvt/scheduler.c > > +++ b/drivers/gpu/drm/i915/gvt/scheduler.c > > @@ -1243,7 +1243,7 @@ int intel_vgpu_setup_submission(struct intel_vgpu *vgpu) > > sizeof(struct intel_vgpu_workload), 0, > > SLAB_HWCACHE_ALIGN, > > offsetof(struct intel_vgpu_workload, rb_tail), > > - sizeof_field(struct intel_vgpu_workload, rb_tail), > > + FIELD_SIZEOF(struct intel_vgpu_workload, rb_tail), > > NULL); > > > > if (!s->workloads) { > > diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c > > index 46baf3b44309..c0447bf07fbb 100644 > > --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c > > +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c > > @@ -49,13 +49,13 @@ struct mlxsw_sp_fid_8021d { > > }; > > > > static const struct rhashtable_params mlxsw_sp_fid_ht_params = { > > - .key_len = sizeof_field(struct mlxsw_sp_fid, fid_index), > > + .key_len = FIELD_SIZEOF(struct mlxsw_sp_fid, fid_index), > > .key_offset = offsetof(struct mlxsw_sp_fid, fid_index), > > .head_offset = offsetof(struct mlxsw_sp_fid, ht_node), > > }; > > > > static const struct rhashtable_params mlxsw_sp_fid_vni_ht_params = { > > - .key_len = sizeof_field(struct mlxsw_sp_fid, vni), > > + .key_len = FIELD_SIZEOF(struct mlxsw_sp_fid, vni), > > .key_offset = offsetof(struct mlxsw_sp_fid, vni), > > .head_offset = offsetof(struct mlxsw_sp_fid, vni_ht_node), > > }; > > diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c > > index 462d096ff3e9..06ffd4829e2e 100644 > > --- a/fs/befs/linuxvfs.c > > +++ b/fs/befs/linuxvfs.c > > @@ -438,7 +438,7 @@ befs_init_inodecache(void) > > SLAB_ACCOUNT), > > offsetof(struct befs_inode_info, > > i_data.symlink), > > - sizeof_field(struct befs_inode_info, > > + FIELD_SIZEOF(struct befs_inode_info, > > i_data.symlink), > > init_once); > > if (befs_inode_cachep == NULL) > > diff --git a/fs/ext2/super.c b/fs/ext2/super.c > > index 1d7ab73b1014..d9a6c81f4a47 100644 > > --- a/fs/ext2/super.c > > +++ b/fs/ext2/super.c > > @@ -220,7 +220,7 @@ static int __init init_inodecache(void) > > (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| > > SLAB_ACCOUNT), > > offsetof(struct ext2_inode_info, i_data), > > - sizeof_field(struct ext2_inode_info, i_data), > > + FIELD_SIZEOF(struct ext2_inode_info, i_data), > > init_once); > > if (ext2_inode_cachep == NULL) > > return -ENOMEM; > > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > > index 4079605d437a..b1b5856248bd 100644 > > --- a/fs/ext4/super.c > > +++ b/fs/ext4/super.c > > @@ -1148,7 +1148,7 @@ static int __init init_inodecache(void) > > (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| > > SLAB_ACCOUNT), > > offsetof(struct ext4_inode_info, i_data), > > - sizeof_field(struct ext4_inode_info, i_data), > > + FIELD_SIZEOF(struct ext4_inode_info, i_data), > > init_once); > > if (ext4_inode_cachep == NULL) > > return -ENOMEM; > > diff --git a/fs/freevxfs/vxfs_super.c b/fs/freevxfs/vxfs_super.c > > index a89f68c3cbed..ffd22f85bbe0 100644 > > --- a/fs/freevxfs/vxfs_super.c > > +++ b/fs/freevxfs/vxfs_super.c > > @@ -329,7 +329,7 @@ vxfs_init(void) > > sizeof(struct vxfs_inode_info), 0, > > SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, > > offsetof(struct vxfs_inode_info, vii_immed.vi_immed), > > - sizeof_field(struct vxfs_inode_info, > > + FIELD_SIZEOF(struct vxfs_inode_info, > > vii_immed.vi_immed), > > NULL); > > if (!vxfs_inode_cachep) > > diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c > > index ee5efdc35cc1..30f625059ad9 100644 > > --- a/fs/orangefs/super.c > > +++ b/fs/orangefs/super.c > > @@ -646,7 +646,7 @@ int orangefs_inode_cache_initialize(void) > > ORANGEFS_CACHE_CREATE_FLAGS, > > offsetof(struct orangefs_inode_s, > > link_target), > > - sizeof_field(struct orangefs_inode_s, > > + FIELD_SIZEOF(struct orangefs_inode_s, > > link_target), > > orangefs_inode_cache_ctor); > > > > diff --git a/fs/ufs/super.c b/fs/ufs/super.c > > index 3d247c0d92aa..1e8bcd950f6d 100644 > > --- a/fs/ufs/super.c > > +++ b/fs/ufs/super.c > > @@ -1469,7 +1469,7 @@ static int __init init_inodecache(void) > > (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| > > SLAB_ACCOUNT), > > offsetof(struct ufs_inode_info, i_u1.i_symlink), > > - sizeof_field(struct ufs_inode_info, > > + FIELD_SIZEOF(struct ufs_inode_info, > > i_u1.i_symlink), > > init_once); > > if (ufs_inode_cachep == NULL) > > diff --git a/include/linux/kernel.h b/include/linux/kernel.h > > index 74b1ee9027f5..4672391cdb5b 100644 > > --- a/include/linux/kernel.h > > +++ b/include/linux/kernel.h > > @@ -79,15 +79,6 @@ > > */ > > #define round_down(x, y) ((x) & ~__round_mask(x, y)) > > > > -/** > > - * FIELD_SIZEOF - get the size of a struct's field > > - * @t: the target struct > > - * @f: the target struct's field > > - * Return: the size of @f in the struct definition without having a > > - * declared instance of @t. > > - */ > > -#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f)) > > - > > #define DIV_ROUND_UP __KERNEL_DIV_ROUND_UP > > > > #define DIV_ROUND_DOWN_ULL(ll, d) \ > > diff --git a/include/linux/slab.h b/include/linux/slab.h > > index 9449b19c5f10..8bdfdd389b37 100644 > > --- a/include/linux/slab.h > > +++ b/include/linux/slab.h > > @@ -175,7 +175,7 @@ void memcg_destroy_kmem_caches(struct mem_cgroup *); > > sizeof(struct __struct), \ > > __alignof__(struct __struct), (__flags), \ > > offsetof(struct __struct, __field), \ > > - sizeof_field(struct __struct, __field), NULL) > > + FIELD_SIZEOF(struct __struct, __field), NULL) > > > > /* > > * Common kmalloc functions provided by all allocators > > diff --git a/include/linux/stddef.h b/include/linux/stddef.h > > index 998a4ba28eba..a5960e2b4a8b 100644 > > --- a/include/linux/stddef.h > > +++ b/include/linux/stddef.h > > @@ -20,12 +20,23 @@ enum { > > #endif > > > > /** > > - * sizeof_field(TYPE, MEMBER) > > + * FIELD_SIZEOF - get the size of a struct's field > > + * @t: the target struct > > + * @f: the target struct's field > > + * Return: the size of @f in the struct definition without having a > > + * declared instance of @t. > > + */ > > +#define FIELD_SIZEOF(t, f) (sizeof(((t *)0)->f)) > > + > > +/* > > + * For code compatibility > > * > > + * sizeof_field(TYPE, MEMBER) > > * @TYPE: The structure containing the field of interest > > * @MEMBER: The field to return the size of > > */ > > -#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER)) > > + > > +#define sizeof_field(TYPE, MEMBER) FIELD_SIZEOF(TYPE, MEMBER) > > > > /** > > * offsetofend(TYPE, MEMBER) > > @@ -34,6 +45,6 @@ enum { > > * @MEMBER: The member within the structure to get the end offset of > > */ > > #define offsetofend(TYPE, MEMBER) \ > > - (offsetof(TYPE, MEMBER) + sizeof_field(TYPE, MEMBER)) > > + (offsetof(TYPE, MEMBER) + FIELD_SIZEOF(TYPE, MEMBER)) > > > > #endif > > diff --git a/kernel/fork.c b/kernel/fork.c > > index 75675b9bf6df..ef40b95bf82c 100644 > > --- a/kernel/fork.c > > +++ b/kernel/fork.c > > @@ -2553,7 +2553,7 @@ void __init proc_caches_init(void) > > mm_size, ARCH_MIN_MMSTRUCT_ALIGN, > > SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_ACCOUNT, > > offsetof(struct mm_struct, saved_auxv), > > - sizeof_field(struct mm_struct, saved_auxv), > > + FIELD_SIZEOF(struct mm_struct, saved_auxv), > > NULL); > > vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC|SLAB_ACCOUNT); > > mmap_init(); > > diff --git a/kernel/utsname.c b/kernel/utsname.c > > index f0e491193009..28257c571553 100644 > > --- a/kernel/utsname.c > > +++ b/kernel/utsname.c > > @@ -174,6 +174,6 @@ void __init uts_ns_init(void) > > "uts_namespace", sizeof(struct uts_namespace), 0, > > SLAB_PANIC|SLAB_ACCOUNT, > > offsetof(struct uts_namespace, name), > > - sizeof_field(struct uts_namespace, name), > > + FIELD_SIZEOF(struct uts_namespace, name), > > NULL); > > } > > diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c > > index 13ea920600ae..3306bbed77eb 100644 > > --- a/net/caif/caif_socket.c > > +++ b/net/caif/caif_socket.c > > @@ -1033,7 +1033,7 @@ static int caif_create(struct net *net, struct socket *sock, int protocol, > > .owner = THIS_MODULE, > > .obj_size = sizeof(struct caifsock), > > .useroffset = offsetof(struct caifsock, conn_req.param), > > - .usersize = sizeof_field(struct caifsock, conn_req.param) > > + .usersize = FIELD_SIZEOF(struct caifsock, conn_req.param) > > }; > > > > if (!capable(CAP_SYS_ADMIN) && !capable(CAP_NET_ADMIN)) > > diff --git a/net/core/skbuff.c b/net/core/skbuff.c > > index 47c1aa9ee045..816bea0c4a8e 100644 > > --- a/net/core/skbuff.c > > +++ b/net/core/skbuff.c > > @@ -3983,7 +3983,7 @@ void __init skb_init(void) > > 0, > > SLAB_HWCACHE_ALIGN|SLAB_PANIC, > > offsetof(struct sk_buff, cb), > > - sizeof_field(struct sk_buff, cb), > > + FIELD_SIZEOF(struct sk_buff, cb), > > NULL); > > skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache", > > sizeof(struct sk_buff_fclones), > > diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c > > index 0b8e06ca75d6..efa4c745f7b9 100644 > > --- a/net/ipv4/raw.c > > +++ b/net/ipv4/raw.c > > @@ -977,7 +977,7 @@ struct proto raw_prot = { > > .unhash = raw_unhash_sk, > > .obj_size = sizeof(struct raw_sock), > > .useroffset = offsetof(struct raw_sock, filter), > > - .usersize = sizeof_field(struct raw_sock, filter), > > + .usersize = FIELD_SIZEOF(struct raw_sock, filter), > > .h.raw_hash = &raw_v4_hashinfo, > > #ifdef CONFIG_COMPAT > > .compat_setsockopt = compat_raw_setsockopt, > > diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c > > index 70693bc7ad9d..257c71e22d74 100644 > > --- a/net/ipv6/raw.c > > +++ b/net/ipv6/raw.c > > @@ -1292,7 +1292,7 @@ struct proto rawv6_prot = { > > .unhash = raw_unhash_sk, > > .obj_size = sizeof(struct raw6_sock), > > .useroffset = offsetof(struct raw6_sock, filter), > > - .usersize = sizeof_field(struct raw6_sock, filter), > > + .usersize = FIELD_SIZEOF(struct raw6_sock, filter), > > .h.raw_hash = &raw_v6_hashinfo, > > #ifdef CONFIG_COMPAT > > .compat_setsockopt = compat_rawv6_setsockopt, > > diff --git a/net/sctp/socket.c b/net/sctp/socket.c > > index 39ea0a37af09..6b648a6033b9 100644 > > --- a/net/sctp/socket.c > > +++ b/net/sctp/socket.c > > @@ -9377,7 +9377,7 @@ struct proto sctp_prot = { > > .useroffset = offsetof(struct sctp_sock, subscribe), > > .usersize = offsetof(struct sctp_sock, initmsg) - > > offsetof(struct sctp_sock, subscribe) + > > - sizeof_field(struct sctp_sock, initmsg), > > + FIELD_SIZEOF(struct sctp_sock, initmsg), > > .sysctl_mem = sysctl_sctp_mem, > > .sysctl_rmem = sysctl_sctp_rmem, > > .sysctl_wmem = sysctl_sctp_wmem, > > @@ -9419,7 +9419,7 @@ struct proto sctpv6_prot = { > > .useroffset = offsetof(struct sctp6_sock, sctp.subscribe), > > .usersize = offsetof(struct sctp6_sock, sctp.initmsg) - > > offsetof(struct sctp6_sock, sctp.subscribe) + > > - sizeof_field(struct sctp6_sock, sctp.initmsg), > > + FIELD_SIZEOF(struct sctp6_sock, sctp.initmsg), > > .sysctl_mem = sysctl_sctp_mem, > > .sysctl_rmem = sysctl_sctp_rmem, > > .sysctl_wmem = sysctl_sctp_wmem, > > diff --git a/tools/testing/selftests/bpf/bpf_util.h b/tools/testing/selftests/bpf/bpf_util.h > > index a29206ebbd13..571c35aac90f 100644 > > --- a/tools/testing/selftests/bpf/bpf_util.h > > +++ b/tools/testing/selftests/bpf/bpf_util.h > > @@ -58,13 +58,29 @@ static inline unsigned int bpf_num_possible_cpus(void) > > # define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) > > #endif > > > > -#ifndef sizeof_field > > -#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER)) > > +/* > > + * FIELD_SIZEOF - get the size of a struct's field > > + * @t: the target struct > > + * @f: the target struct's field > > + * Return: the size of @f in the struct definition without having a > > + * declared instance of @t. > > + */ > > +#ifndef FIELD_SIZEOF > > +#define FIELD_SIZEOF(t, f) (sizeof(((t *)0)->f)) > > #endif > > > > +/* > > + * For code compatibility > > + * > > + * sizeof_field(TYPE, MEMBER) > > + * @TYPE: The structure containing the field of interest > > + * @MEMBER: The field to return the size of > > + */ > > +#define sizeof_field(TYPE, MEMBER) FIELD_SIZEOF(TYPE, MEMBER) > > + > > #ifndef offsetofend > > #define offsetofend(TYPE, MEMBER) \ > > - (offsetof(TYPE, MEMBER) + sizeof_field(TYPE, MEMBER)) > > + (offsetof(TYPE, MEMBER) + FIELD_SIZEOF(TYPE, MEMBER)) > > #endif > > > > #endif /* __BPF_UTIL__ */ > > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > > index ca54b09adf5b..e43e3a26f6ab 100644 > > --- a/virt/kvm/kvm_main.c > > +++ b/virt/kvm/kvm_main.c > > @@ -4275,7 +4275,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, > > kmem_cache_create_usercopy("kvm_vcpu", vcpu_size, vcpu_align, > > SLAB_ACCOUNT, > > offsetof(struct kvm_vcpu, arch), > > - sizeof_field(struct kvm_vcpu, arch), > > + FIELD_SIZEOF(struct kvm_vcpu, arch), > > NULL); > > if (!kvm_vcpu_cache) { > > r = -ENOMEM; > > -- > > 2.11.0 > > > > -- > Kees Cook _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel