From patchwork Thu Jan 5 21:46:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthew Wilcox (Oracle)" X-Patchwork-Id: 13090547 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 5EACEC4708E for ; Thu, 5 Jan 2023 21:46:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7C6FB8E0007; Thu, 5 Jan 2023 16:46:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4CFCD8E000B; Thu, 5 Jan 2023 16:46:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C993C8E000C; Thu, 5 Jan 2023 16:46:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id AEF698E0007 for ; Thu, 5 Jan 2023 16:46:34 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 8D4ED120C49 for ; Thu, 5 Jan 2023 21:46:34 +0000 (UTC) X-FDA: 80322079908.07.14519DF Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf25.hostedemail.com (Postfix) with ESMTP id 1290AA0003 for ; Thu, 5 Jan 2023 21:46:32 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=u4dKmd+G; dmarc=none; spf=none (imf25.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672955193; 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=XzNLmzeaTRndPTdBRkbz1QwQlJaxQtYQ8oYGbdWHgIU=; b=gQFKvl5JON7Wlo1ibx6mH9vpOCBFRmbTGIeNZBbWY90wLJwlVdKCjrMkxDKaAdV2bKNO+W Q5egM4CBvvAZl8NyNQ6g4yf+J85qLnYRZXiZQG9nmkmUslOKunS9t7GCmTkpX31BqZT+H6 xsux5tzEc5xS0+YDLev1KL/0s5lHYB0= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=u4dKmd+G; dmarc=none; spf=none (imf25.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672955193; a=rsa-sha256; cv=none; b=S53P8tYdWMnn05hs7PPsdLQEsjkkqpUOcQvH7AE776IFDHnQgrYGh/Xoavbdv0NuiGP+8m +QPU5aUW5ZjGep1w2RMKoUIB0KXEOA4VqpIyO+/ee4EEu8G/79UbO9k8Ea/vK5PukFDYwA v43ifzezFSo1p11507dICUlN2UCeVWM= 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=XzNLmzeaTRndPTdBRkbz1QwQlJaxQtYQ8oYGbdWHgIU=; b=u4dKmd+GIBUTWoEI1d2yL90ucO smpmlMFOAM9jvJ8P9o3Nra6X56WE+7Cgjh7qFCAbDGNPEZz297FCeMCIWPizsR4AxNSTzclv6vSbh mFWtoewljDFBlsdqYvDNXr8XR4PeyuhuMvSQR8EyAWnjpiptAZo1jwhVNFPoklDXNEkvCoOyYKXB9 5xgcTwduMQuLQO9VFcfRKltuy27//Pac1PGuEiYSvrpn8hECnviKdW6r/YT+r+ErCAUy1Asz765C9 AnUlTaMkaEP5HdYd1xvryUDuy5DSwwTpftrhVn41OQZbJYBDoWVCHHocqnah/5Y5qn/aOB7E1ddbx S+Jx4aKQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDY4J-00GWoR-CI; Thu, 05 Jan 2023 21:46:35 +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 Subject: [PATCH v2 20/24] mm: Remove page pool members from struct page Date: Thu, 5 Jan 2023 21:46:27 +0000 Message-Id: <20230105214631.3939268-21-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230105214631.3939268-1-willy@infradead.org> References: <20230105214631.3939268-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 1290AA0003 X-Stat-Signature: g3nfc84rseuigrq1dn5yd8ty3zgxzdyw X-HE-Tag: 1672955192-431768 X-HE-Meta: U2FsdGVkX18GFQGKpZEhR+TsL88yNh93R5afcXfd11djy3xm1PNR4Ohzh2D+NhkKuyUJkqsW27ye0Gji31LpvfBH2TuZOw5v+Bax6lJyiF8UMhg0MFDHzNjfd2CRg4/ZbUOS+i6QdUtzTiBTlgmq5YvblgfPJQmbr/e/47peKDh+QNnuXabi6PSd4/XbnTEowAhZs2f+lBkfIwNhSLjzJvhJ/en++qUoecXUbVxOzBSVvns6eQzV/EW3ff/lu0WdejT4vHsQfe62NpGCD5BE/RIpJ6ENJ1BB5tiQW9NrAFUkebv2hX8Mpdza4lOYXMLsMrc28BYAeERBGVf9jg4CHrF09i2S8L6/Z5TEmjSGseHp5ysYotYJGP/ywz9QJ7Ulv5RUxgUBmP0d0tzGTr5kpv4wwS8UC9qos5rs0uXHjYDwhxE1v3f8fq10n98iW87CWQSXX+9TgX/pnmsbOH1s8zL8+6KQVuJ7R8uUy1uWfTko3esv2bmxea+6EAVnRdKYIediv+blJvejCxPNWkNEl4ChaLEkGSdYIdZe7054AGbU0ZpeNJij5ZvXbjI9rCQ7mx/nsd+gqgAjIet8FZme2ZbBV9F6yDMCeEK0fwHmMsZVkQY9z4o8VimqxlupFrxDv5t5ARQIHcTzy1da+uqPYPZ3fxDEewwDbZtBGpmJJwflzmOOi3772kkDAA8/7QZ+A2b5UhDor/uFzCNnRrjoR4LUeAUGterZk+WknsV5vb1nKTJRrFWh7NaW8US06LYtxydrYBU4jwlXBKfmFJqSAx3O39qbyTM8ARz61l5XmWB5dzsArZqE20k6uwZM7kNV9x9xIQEWBicEZnCnJRNNohp72d4ae9VqRLTqYil7bs2YCsIQH95p0EZTtlpGI18u 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 --- 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 603b615f1bf3..90d91088a9d5 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 a9dae4b5f2f7..c607d67c96dc 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