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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4D61C5479D for ; Wed, 11 Jan 2023 04:22:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 641438E0008; Tue, 10 Jan 2023 23:22:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DB0F2900004; Tue, 10 Jan 2023 23:22:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BB41B8E0009; Tue, 10 Jan 2023 23:22:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 4AD93900002 for ; Tue, 10 Jan 2023 23:22:14 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 074B34036B for ; Wed, 11 Jan 2023 04:22:14 +0000 (UTC) X-FDA: 80341220988.22.139A4A4 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf24.hostedemail.com (Postfix) with ESMTP id 9A513180005 for ; Wed, 11 Jan 2023 04:22:11 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=uodsYMsV; spf=none (imf24.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673410932; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Sd/TXFITrHs9oBCigPbZAQGp64qBzBR18nRKYWdlGyA=; b=xa7MbMK0KS7VTa07PMUcrkL6wbKok1ZIUSv/S79e7jWc7P7wCa4q3YaiEAMtPokmwNcm1T hQD9gz6h6RShxKaOy8K2TCTQcCOSvyYVTdKxJe9n9hAEoE9hARNfwD3dT5rHZcHAfOdbyI pS5/vgjzFCpXyJHCpN+0ewk3Unoba00= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=uodsYMsV; spf=none (imf24.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673410932; a=rsa-sha256; cv=none; b=enq0Ouqa3MW+eQafHjU/l5lUFJyFXsoTFAvdQHRgk7SFtH+GjtYgfJUX9dtmDFzuDYUOCw EBgyNKog3dxlMpz4gbf8zPNtrEjgYgqtypVxmY+LP91brIDTF6ChE410Xyxx4pLn8O0cuc co6VLYo4ENOhJCmHSbTMu0Z3bNCMyII= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=Sd/TXFITrHs9oBCigPbZAQGp64qBzBR18nRKYWdlGyA=; b=uodsYMsVSwkp3eHv0O/ZIrmIzF zqTlnoaGCM0c2hfy51wGkgmonqy04JlvYKGpEroBQ75AKzircoAGKR634BqCnQBzPz0VK2fpi4FN2 UUVC84sW6Pd8BRNV2lecki7A+HzPpTH2tkHaXc53cr5AbuWWVOPGpdCWL1FImfAp/JkbfVZBt8Q0/ 6hRzfuO3GyAX5CQGIG4tLPs58rf1YTnUoo0pJ5hVjN+y6vgOwKg+wDw0/ZY+jMIzbRDhjTIwdir3W +aJdE3H+Ma/idTUudjtBbxzYr7SiPmbFoPqjbl1FgVNQbq0tXO9OHGH6IUtgz+b0rxA4fgzsISoPn 4YRc3S0w==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFSd0-003nyu-1L; Wed, 11 Jan 2023 04:22:18 +0000 From: "Matthew Wilcox (Oracle)" To: Jesper Dangaard Brouer , Ilias Apalodimas Cc: "Matthew Wilcox (Oracle)" , netdev@vger.kernel.org, linux-mm@kvack.org, Shakeel Butt , Jesper Dangaard Brouer , Jesse Brandeburg Subject: [PATCH v3 21/26] mm: Remove page pool members from struct page Date: Wed, 11 Jan 2023 04:22:09 +0000 Message-Id: <20230111042214.907030-22-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230111042214.907030-1-willy@infradead.org> References: <20230111042214.907030-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 9A513180005 X-Rspam-User: X-Stat-Signature: hsptpo8wcaha4tzdpmd68u8rm7wgocbu X-HE-Tag: 1673410931-22017 X-HE-Meta: U2FsdGVkX18Agqgj+Wq/5AjYf51pPgl/P+btex49cVVGizIaBoWSDVJj2/89oJEiS6TxrfAnveXy4rFF06nTRjMS/pqUJR+vnGH9PDMgBwcsIWgmrgMsECJtrFQuyXBmolFw9yQABPInNQWEj5nncssX3AEItYUUKNhHdycpqIVNy4eZb7Xy4JzeTLxpgZ2qm61msrF30QKwvENe7/uJH3bE20t4kHxa766BMoDT5CCv4bqMab/THcfGT8a6nbA4YpU115bMZRaBLjGZh4vSuyvLaJxCnLda3ab6gRDsQdH2PqWxZhPFUIYhuVr0rJaoLkQLY/pcmuZLuD2ji3FxW2BrVlHc7ogTCb/3Q4hFTHLSzhoquI1JR1oxg7e5sRw4qobJu+Hxd6t/sWrTsFVaIpr5LUHTKKn+DZ86kycYFFHZI5COGchpXngCNxH2bakpb2OCgq623jNaY6DGFCxfTeyAESIkQPu/nyZ5HsMdHzu93a6qnMFqCwvTcclijidDnj/z6jQbjF2yEM+XTmc/al7gDpN2RzhkNseIBpQljIe8Ntvl1nFrW3sw5Wqlls/qRna42fM2TeyH+kUwFIKUFWDhlcsiNrGoiCZie/5utI9c+qlFRylanyGcQmcP+/QagsX8RMi6oo3ueQxEVneYkaYhuyAgSHuI4P0hMYHFWBB3lMf5Un6lFVCts6IxHE2BoMUHnEwL4n9gisEl4DlzXKIX2yv6PUaGaKtcRTRr7dcR+lTTxdOmoCjBaIWoQ/pKkxMUxKqNScY1fZUuaeh5rU1kjQAa1bwyLvApMkv44ERQtUN+DD4U/OO+P7iPGacnwBV1p1JQhhaKPHvv8RQLuZu4pxoH0YW8qZ8vxs5Wkc1Shy23VOPxSwhvC2xdp0XQP+w2WVk6hRI= 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: These are now split out into their own netmem struct. Signed-off-by: Matthew Wilcox (Oracle) Acked-by: Jesper Dangaard Brouer Reviewed-by: Ilias Apalodimas Reviewed-by: Jesse Brandeburg --- include/linux/mm_types.h | 22 ---------------------- include/net/page_pool.h | 4 ---- 2 files changed, 26 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 65b912ba97ef..de545f6cca3c 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -116,28 +116,6 @@ struct page { */ unsigned long private; }; - struct { /* page_pool used by netstack */ - /** - * @pp_magic: magic value to avoid recycling non - * page_pool allocated pages. - */ - unsigned long pp_magic; - struct page_pool *pp; - unsigned long _pp_mapping_pad; - unsigned long dma_addr; - union { - /** - * dma_addr_upper: might require a 64-bit - * value on 32-bit architectures. - */ - unsigned long dma_addr_upper; - /** - * For frag page support, not supported in - * 32-bit architectures with 64-bit DMA. - */ - atomic_long_t pp_frag_count; - }; - }; struct { /* Tail pages of compound page */ unsigned long compound_head; /* Bit zero is set */ diff --git a/include/net/page_pool.h b/include/net/page_pool.h index 5e5030f5bbb4..2f0cd018b8f2 100644 --- a/include/net/page_pool.h +++ b/include/net/page_pool.h @@ -86,11 +86,7 @@ struct netmem { static_assert(offsetof(struct page, pg) == offsetof(struct netmem, nm)) NETMEM_MATCH(flags, flags); NETMEM_MATCH(lru, pp_magic); -NETMEM_MATCH(pp, pp); NETMEM_MATCH(mapping, _pp_mapping_pad); -NETMEM_MATCH(dma_addr, dma_addr); -NETMEM_MATCH(dma_addr_upper, dma_addr_upper); -NETMEM_MATCH(pp_frag_count, pp_frag_count); NETMEM_MATCH(_mapcount, _mapcount); NETMEM_MATCH(_refcount, _refcount); #undef NETMEM_MATCH -- 2.35.1