Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp197321pxb; Fri, 9 Apr 2021 23:32:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzSAlE3km6Ij4Dci9T5GSo9jkYrw8UQf37HTvWo2evI3Kdl70T4S3vV67g9uVF+XTs8U5uE X-Received: by 2002:a17:906:9b2:: with SMTP id q18mr19134877eje.147.1618036368593; Fri, 09 Apr 2021 23:32:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618036368; cv=none; d=google.com; s=arc-20160816; b=BR6Gi6GsI0AQdWPFEfz70LK1zPX5cZWHp7WhfowTqzeb1QFD6BUHAqb2ZuyrucqITJ 23hpO++J8iwnMng/Mc8CN2Kzpl3QGSJoYdzcswWZTXRCWTJw3b20QTan0X04Dv0EyfYO /vkD7r8Ck/h8D3/9YxgLCFuLkcYjpFE8eypQ1J84UcxX83RMGGP+Z3GCEHHBcIZfYNyf 1yXCILLBJGgAs8+tvsdrMqgYaGHG+WK8W4r3wtoJk/JRm5GgkUiXPOl8S/BB6EYWG7EH Hr2BI8Ey6jJkAQgQT2L8gqFZ70Vte6op/m0xD59BWgJv0hS/iQ4R1DosPZNsRp9C/2Zm LnRg== 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 :references:in-reply-to:message-id:subject:cc:to:from:date :dkim-signature; bh=Nv0p4RXdpoXEf7jqWszTL6fVOOyMMq+6cdW6F9BHRE8=; b=pDG2WIdXgz9UKrn3qAy7/HeCH7/qGyuFfTg9+tO0ZNIx3xWDp1JPoZRH+epIOjKl1+ Y5YAgVMrOPBfyQsAXhOm2h/3wj1SYR7it4qNNwrDTHMv2oO3LaBPx7JsjAlufe/IxIWC C+MHjeBWOv1m1NyMT6S94knN9JePRXlsBSASGnEaaL1wzfc8yfkBXFw1e+2PyUH5Ka6P jNlrKokktdru4kAGIRikyL9wg9Z9KuPLWGhSWV/x76hnqgCPtEtiPpcFPM08amH2mIMT TqmOAcjj/AizhsSxhkMWk0pcbiCRE6dmUMX6J7z9nKosxANuQCP9xbcoCCH0FUBDvm6e aDOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=cDx2Kr02; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y12si3849020eda.74.2021.04.09.23.32.01; Fri, 09 Apr 2021 23:32:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=cDx2Kr02; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234180AbhDJGWf (ORCPT + 99 others); Sat, 10 Apr 2021 02:22:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:28811 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230235AbhDJGWe (ORCPT ); Sat, 10 Apr 2021 02:22:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618035739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Nv0p4RXdpoXEf7jqWszTL6fVOOyMMq+6cdW6F9BHRE8=; b=cDx2Kr02pDCs3CexD206x/O+ZbG6UBaC+1ppHR+0pnBNWVbzadgc24K/zMtt7o+pjBJ7SD bhxDPMuft3DcGg7WsAYmal07EFa618wGU6fFKya8BrZNE5WVbApxPh2EJqJTcCPYurfeQO d6zYBxc87mbw9eZzDdiadEH7Q6XsRtQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-169-H9vV9Gg_ME-THv76LsVBSA-1; Sat, 10 Apr 2021 02:22:12 -0400 X-MC-Unique: H9vV9Gg_ME-THv76LsVBSA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B3FA4593C0; Sat, 10 Apr 2021 06:22:08 +0000 (UTC) Received: from carbon (unknown [10.36.110.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD3276F968; Sat, 10 Apr 2021 06:21:59 +0000 (UTC) Date: Sat, 10 Apr 2021 08:21:58 +0200 From: Jesper Dangaard Brouer To: Matthew Wilcox Cc: kernel test robot , linux-mm@kvack.org, kbuild-all@lists.01.org, clang-built-linux@googlegroups.com, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, "David S. Miller" , brouer@redhat.com, Ilias Apalodimas , Ivan Khoronzhuk , Matteo Croce , "netdev@vger.kernel.org" Subject: Re: Bogus struct page layout on 32-bit Message-ID: <20210410082158.79ad09a6@carbon> In-Reply-To: <20210410024313.GX2531743@casper.infradead.org> References: <20210409185105.188284-3-willy@infradead.org> <202104100656.N7EVvkNZ-lkp@intel.com> <20210410024313.GX2531743@casper.infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 10 Apr 2021 03:43:13 +0100 Matthew Wilcox wrote: > On Sat, Apr 10, 2021 at 06:45:35AM +0800, kernel test robot wrote: > > >> include/linux/mm_types.h:274:1: error: static_assert failed due to requirement '__builtin_offsetof(struct page, lru) == __builtin_offsetof(struct folio, lru)' "offsetof(struct page, lru) == offsetof(struct folio, lru)" > > FOLIO_MATCH(lru, lru); > > include/linux/mm_types.h:272:2: note: expanded from macro 'FOLIO_MATCH' > > static_assert(offsetof(struct page, pg) == offsetof(struct folio, fl)) > > Well, this is interesting. pahole reports: > > struct page { > long unsigned int flags; /* 0 4 */ > /* XXX 4 bytes hole, try to pack */ > union { > struct { > struct list_head lru; /* 8 8 */ > ... > struct folio { > union { > struct { > long unsigned int flags; /* 0 4 */ > struct list_head lru; /* 4 8 */ > > so this assert has absolutely done its job. > > But why has this assert triggered? Why is struct page layout not what > we thought it was? Turns out it's the dma_addr added in 2019 by commit > c25fff7171be ("mm: add dma_addr_t to struct page"). On this particular > config, it's 64-bit, and ppc32 requires alignment to 64-bit. So > the whole union gets moved out by 4 bytes. Argh, good that you are catching this! > Unfortunately, we can't just fix this by putting an 'unsigned long pad' > in front of it. It still aligns the entire union to 8 bytes, and then > it skips another 4 bytes after the pad. > > We can fix it like this ... > > +++ b/include/linux/mm_types.h > @@ -96,11 +96,12 @@ struct page { > unsigned long private; > }; > struct { /* page_pool used by netstack */ > + unsigned long _page_pool_pad; I'm fine with this pad. Matteo is currently proposing[1] to add a 32-bit value after @dma_addr, and he could use this area instead. [1] https://lore.kernel.org/netdev/20210409223801.104657-3-mcroce@linux.microsoft.com/ When adding/changing this, we need to make sure that it doesn't overlap member @index, because network stack use/check page_is_pfmemalloc(). As far as my calculations this is safe to add. I always try to keep an eye out for this, but I wonder if we could have a build check like yours. > /** > * @dma_addr: might require a 64-bit value even on > * 32-bit architectures. > */ > - dma_addr_t dma_addr; > + dma_addr_t dma_addr __packed; > }; > struct { /* slab, slob and slub */ > union { > > but I don't know if GCC is smart enough to realise that dma_addr is now > on an 8 byte boundary and it can use a normal instruction to access it, > or whether it'll do something daft like use byte loads to access it. > > We could also do: > > + dma_addr_t dma_addr __packed __aligned(sizeof(void *)); > > and I see pahole, at least sees this correctly: > > struct { > long unsigned int _page_pool_pad; /* 4 4 */ > dma_addr_t dma_addr __attribute__((__aligned__(4))); /* 8 8 */ > } __attribute__((__packed__)) __attribute__((__aligned__(4))); > > This presumably affects any 32-bit architecture with a 64-bit phys_addr_t > / dma_addr_t. Advice, please? I'm not sure that the 32-bit behavior is with 64-bit (dma) addrs. I don't have any 32-bit boards with 64-bit DMA. Cc. Ivan, wasn't your board (572x ?) 32-bit with driver 'cpsw' this case (where Ivan added XDP+page_pool) ? -- Best regards, Jesper Dangaard Brouer MSc.CS, Principal Kernel Engineer at Red Hat LinkedIn: http://www.linkedin.com/in/brouer