From patchwork Wed Nov 30 22:07:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13060506 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 6D1F3C47089 for ; Wed, 30 Nov 2022 22:08:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E277B6B0073; Wed, 30 Nov 2022 17:08:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D12256B0078; Wed, 30 Nov 2022 17:08:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B36BC6B0078; Wed, 30 Nov 2022 17:08:06 -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 9CDA96B0073 for ; Wed, 30 Nov 2022 17:08:06 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 6D89E1403AB for ; Wed, 30 Nov 2022 22:08:06 +0000 (UTC) X-FDA: 80191497372.22.9CB3FDE Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf15.hostedemail.com (Postfix) with ESMTP id 1218DA000E for ; Wed, 30 Nov 2022 22:08:05 +0000 (UTC) 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=zWebMUOZHo9GaCcn2DPCoqafVDMpG7RCOZ9SaEUIFhI=; b=Mxgpw5JuDdm3aUTpbihdlCNz7B Orno3S0npaZteP2tCsC3vn+2XJrW5EWfw3qXyjmVDJvCs9w/gQ9HLK0TOYNJYjMwCn8+qSwvZoMJh ELKC6HWD+qqWDnOYeTWiWLCH0/OVgnt0cbcFuYOWDHBdwqX9ycD0lKQZ82zd6j6AyXQXl/MhfXNue 58UO5s+X+oTUzS4AgMKU7nngYF21ck1B90Xbv7Q74ufKONaMoo+/ME68jtr2kRmnxpAYo9bWY/dPN TNZPtmdHkm0Dr9zYZqINtRJRnZLM6vwYLWXw2Zn/Jco6g9pephvDp0627tTIs9uWxgyyhBVpnXlHy WaxAEJew==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1p0VFO-00FLWR-EU; Wed, 30 Nov 2022 22:08:06 +0000 From: "Matthew Wilcox (Oracle)" To: Jesper Dangaard Brouer , Ilias Apalodimas Cc: "Matthew Wilcox (Oracle)" , netdev@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 20/24] mm: Remove page pool members from struct page Date: Wed, 30 Nov 2022 22:07:59 +0000 Message-Id: <20221130220803.3657490-21-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221130220803.3657490-1-willy@infradead.org> References: <20221130220803.3657490-1-willy@infradead.org> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1669846086; a=rsa-sha256; cv=none; b=aQHRxQu3ZWAALeHts7O2IOBVBt9gR1Ao3RlBDKzi2K1GYbn3Y/jMhbYBR0cBW/LFaOBfUW lcBQHHAN1DTILBwP5EBtzXRiGnlf1zzdFpcDfpP1J9aqEd4Dgz6iZDjghg5j1w16H0Daus D0Av+eJuV8cm39Rm/nvxyhEKJZTY4wQ= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Mxgpw5Ju; dmarc=none; spf=none (imf15.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=1669846086; 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=zWebMUOZHo9GaCcn2DPCoqafVDMpG7RCOZ9SaEUIFhI=; b=ZhJrwJWlx+fx58h2ezG06Ak64tJvoOdArHWaKTlw4FGDL3lXDVWrshaUSM4H3RWrAxJjgX +OUti0y6f2FCJVdGBvAo0GXbzN1sikRxiQc8dxSRMgP6d867FE9I0BZg91zExKyTT2q/o6 2PyZGTRK5a1cPC3LC0ketTaH13cOCiE= X-Rspamd-Queue-Id: 1218DA000E X-Rspam-User: Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Mxgpw5Ju; dmarc=none; spf=none (imf15.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspamd-Server: rspam09 X-Stat-Signature: 7jha3ac4t4fe1knjcss7eox8x9kgmqum X-HE-Tag: 1669846085-868886 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) --- 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 1ad1ef3a1288..6999af135f1d 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -113,28 +113,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 ce1049a03f2d..222eedc39140 100644 --- a/include/net/page_pool.h +++ b/include/net/page_pool.h @@ -81,11 +81,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