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 3F1C3C433F5 for ; Sun, 2 Oct 2022 00:23:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C7B716B0074; Sat, 1 Oct 2022 20:23:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C29338D0001; Sat, 1 Oct 2022 20:23:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9E4106B0074; Sat, 1 Oct 2022 20:23:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 7142A8D0001 for ; Sat, 1 Oct 2022 20:23:35 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 3FDC3AAC84 for ; Sun, 2 Oct 2022 00:23:35 +0000 (UTC) X-FDA: 79974110790.13.ACD98DF Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf10.hostedemail.com (Postfix) with ESMTP id C99D7C000B for ; Sun, 2 Oct 2022 00:23:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664670214; x=1696206214; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CCJ9DvVnhSMgehlzBf8ksWsMMNT3cd5lyxVwLoYRSKQ=; b=lA9NuNnPPl70q6h+v+8Y95Pts7Ag9V5ob11eSsbInw9J9aPTduw5dcB9 C+gcER2WXKVkGJGBZdfsIk2KJeRNFPHcPKcPl6mqLMUGuWwLKc4ZS74Km /F6zaBvf//85wqelyVkGnr6ECfQmOOmAq4zTtqZiBozPW0q+KQfejppRS o61YhMq63+XIR8YfcxwpdEmYm/S3EzlLZ0zsQssRJqZyTO0B12CaVAiQi Evfc9nph4WRONJnPRRwWA0L+28HLRXcF6cXLgAq4zD2YI+2wvBf7o90mY cpRIEuAwWVPhhKxIF4wxvoiRBJ0MTDnckDgWIxfsTi65u9nUTIP7YxA6Z g==; X-IronPort-AV: E=McAfee;i="6500,9779,10487"; a="303336312" X-IronPort-AV: E=Sophos;i="5.93,361,1654585200"; d="scan'208";a="303336312" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2022 17:23:34 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10487"; a="656347047" X-IronPort-AV: E=Sophos;i="5.93,361,1654585200"; d="scan'208";a="656347047" Received: from iweiny-desk3.amr.corp.intel.com (HELO localhost) ([10.213.181.73]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2022 17:23:33 -0700 From: ira.weiny@intel.com To: Jens Wiklander , Sumit Garg , Andrew Morton Cc: Ira Weiny , Mel Gorman , Al Viro , "Fabio M. De Francesco" , Christoph Hellwig , op-tee@lists.trustedfirmware.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 4/4] mm: Remove get_kernel_pages() Date: Sat, 1 Oct 2022 17:23:26 -0700 Message-Id: <20221002002326.946620-5-ira.weiny@intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221002002326.946620-1-ira.weiny@intel.com> References: <20221002002326.946620-1-ira.weiny@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664670215; a=rsa-sha256; cv=none; b=ZCcKQWkGA1NGeBiTHEiTvG33rHiU+0CB+DlGl89kWU4LPmxba4TNW3XzW5MdnqUvUC3kgp 6G7EydwAA43JR+JXXXjAOYxhX42yt0sP2mY0WLfkgNxhvrH/Zn+aQnXKqarWJbShCm9VE4 fDi44AfNXb0hwXcDlzz4geBg0v00ldw= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=lA9NuNnP; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf10.hostedemail.com: domain of ira.weiny@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=ira.weiny@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664670215; 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=cXIu/0O2T1sMOIhjSWPecHQ1A43hKrebsK5MyvzrS+Y=; b=Wm01hpr6l1BSF0JSZCBK3crTDjBs8gvjpRxTPQ9/0gp6eivbQWhk82BHawjNUfOpPcmKp+ fBJ8B1XawuSvDJXVOgw/rcBihxsK41UoAKUiikqUhESOneMRdmZUOAV9uhETKk6m89pOVY mw7YpDm6t1U/6DhBGWjudCzQgVTRyHg= X-Rspamd-Queue-Id: C99D7C000B X-Rspam-User: Authentication-Results: imf10.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=lA9NuNnP; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf10.hostedemail.com: domain of ira.weiny@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=ira.weiny@intel.com X-Rspamd-Server: rspam03 X-Stat-Signature: ycfhkdsg9ts4875f5schfjwk4z6419xe X-HE-Tag: 1664670214-503014 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: From: Ira Weiny The only caller to get_kernel_pages() [shm_get_kernel_pages()] has been updated to not need it. Remove get_kernel_pages(). Cc: Mel Gorman Cc: Al Viro Cc: "Fabio M. De Francesco" Cc: Christoph Hellwig Cc: Andrew Morton Signed-off-by: Ira Weiny --- include/linux/mm.h | 2 -- mm/swap.c | 30 ------------------------------ 2 files changed, 32 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 8bbcccbc5565..9a06df4f057c 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1969,8 +1969,6 @@ int __account_locked_vm(struct mm_struct *mm, unsigned long pages, bool inc, struct task_struct *task, bool bypass_rlim); struct kvec; -int get_kernel_pages(const struct kvec *iov, int nr_pages, int write, - struct page **pages); struct page *get_dump_page(unsigned long addr); bool folio_mark_dirty(struct folio *folio); diff --git a/mm/swap.c b/mm/swap.c index 955930f41d20..a9aa648eb0d0 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -157,36 +157,6 @@ void put_pages_list(struct list_head *pages) } EXPORT_SYMBOL(put_pages_list); -/* - * get_kernel_pages() - pin kernel pages in memory - * @kiov: An array of struct kvec structures - * @nr_segs: number of segments to pin - * @write: pinning for read/write, currently ignored - * @pages: array that receives pointers to the pages pinned. - * Should be at least nr_segs long. - * - * Returns number of pages pinned. This may be fewer than the number requested. - * If nr_segs is 0 or negative, returns 0. If no pages were pinned, returns 0. - * Each page returned must be released with a put_page() call when it is - * finished with. - */ -int get_kernel_pages(const struct kvec *kiov, int nr_segs, int write, - struct page **pages) -{ - int seg; - - for (seg = 0; seg < nr_segs; seg++) { - if (WARN_ON(kiov[seg].iov_len != PAGE_SIZE)) - return seg; - - pages[seg] = kmap_to_page(kiov[seg].iov_base); - get_page(pages[seg]); - } - - return seg; -} -EXPORT_SYMBOL_GPL(get_kernel_pages); - typedef void (*move_fn_t)(struct lruvec *lruvec, struct folio *folio); static void lru_add_fn(struct lruvec *lruvec, struct folio *folio) -- 2.37.2