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 E8446EE4993 for ; Sat, 19 Aug 2023 15:16:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CECBA90001D; Sat, 19 Aug 2023 11:16:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C9C92900011; Sat, 19 Aug 2023 11:16:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B63F490001D; Sat, 19 Aug 2023 11:16:23 -0400 (EDT) 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 A7A25900011 for ; Sat, 19 Aug 2023 11:16:23 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 67AA3120971 for ; Sat, 19 Aug 2023 15:16:23 +0000 (UTC) X-FDA: 81141205446.01.24F2BF8 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf22.hostedemail.com (Postfix) with ESMTP id 97399C000B for ; Sat, 19 Aug 2023 15:16:20 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=owH7BW1Y; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf22.hostedemail.com: domain of rppt@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=rppt@linux.ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692458181; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=jJXfBtPLhX018XyVztg/PNat6X6RiIrpk2Vsnlf+6F4=; b=3MJyXGPTSUe1RT9f12uX0N/gnJvqYxpJYXevpayXTvu7Xdi0VD9SLpRCFSHqJV5bG6dID+ 1qJtC+cywQ3vEA1pm34wqgYwyKZUN8BzK3HWq2hY8Cs5Bov+5SLGtt+JyLx0tCFGvqRNEK CBopuuHOCRpW8Ma9ZKtF/soniETsm9Q= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=owH7BW1Y; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf22.hostedemail.com: domain of rppt@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=rppt@linux.ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692458181; a=rsa-sha256; cv=none; b=qfrXXkIYUiAbhrrYVXCQZED9ZKyygZX2kJkXW7Ai1cFNcenIzN0ATsvHiNLi3MH5L11Gjn 3C8/+fLdyu0IGugmEBKg8fXbjjPWpHnQeOareYavmySW+ALXZvA99bQduKzWU6fvS8T4HG i0uCNEHRAzqN8LpRcl/0c0ze1GgC4Kw= Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37JEpHV8024745; Sat, 19 Aug 2023 15:15:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=pp1; bh=jJXfBtPLhX018XyVztg/PNat6X6RiIrpk2Vsnlf+6F4=; b=owH7BW1YVfm5fWcxi3uQnZ0TyoeOz7qg1ZVdHAf63Xe2vVRLxXFKANUlSRaRLm/xlJnf zzwWR60WIcsCEwOeWjupQANiZkfVP7OmQGHraSMf53v4rn6ELiAvYi7CT/MkB8GC62PE wHtIF+4PzLO2eGdvQNtp+Lbz25PxHUg5/TSok3dJodc7KQaTUT6iDzwz+xAmFQoHaaUI omi+XQ1a2xK+crQ6y2fR/Xqr+zgNW+qtsZz32p6V6QpSUuVySkMP0TzJj72PFut/zYrm hzyfIXVazRKxx7dv5vMxkSm5HNd6OHI3jPCi7P58J4Z6/HiMv94YTJuNHxdsrLNre/bc 8w== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3sjy55rp62-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 19 Aug 2023 15:15:37 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 37JCR4X4003874; Sat, 19 Aug 2023 14:57:47 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3semt07p4u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 19 Aug 2023 14:57:46 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 37JEvjWg46072438 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 19 Aug 2023 14:57:45 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0ABFF20040; Sat, 19 Aug 2023 14:57:45 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 59D5220043; Sat, 19 Aug 2023 14:57:44 +0000 (GMT) Received: from linux.ibm.com (unknown [9.171.31.160]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTPS; Sat, 19 Aug 2023 14:57:44 +0000 (GMT) Date: Sat, 19 Aug 2023 17:57:42 +0300 From: Mike Rapoport To: "Matthew Wilcox (Oracle)" Cc: Andrew Morton , linux-mm@kvack.org, Christian Dietrich Subject: Re: [PATCH] mm: Remove checks for pte_index Message-ID: References: <20230819031837.3160096-1-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230819031837.3160096-1-willy@infradead.org> X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 7XbrdZXE4v_nZ0JnOSV1ZrywnaHvqhNj X-Proofpoint-ORIG-GUID: 7XbrdZXE4v_nZ0JnOSV1ZrywnaHvqhNj X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.601,FMLib:17.11.176.26 definitions=2023-08-19_16,2023-08-18_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 phishscore=0 clxscore=1011 adultscore=0 mlxlogscore=669 spamscore=0 malwarescore=0 impostorscore=0 mlxscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308190145 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 97399C000B X-Stat-Signature: p6zazw7etcqnd7qyjt8ouifpiaaq39s4 X-HE-Tag: 1692458180-283224 X-HE-Meta: U2FsdGVkX19GTTNd8BzzpRmqGSc5g8ubO+67NwpeF1L5AE3OkOc8XJS560iw5w3p6Mu2NdRw+L/bf/k5lmmKQPYF3i34RvXMUZcuZDU8UNqsRE4JbVYsEyJ2QhGFfQeHadaAws3lwzZ6hzjkN0+Holq15L0P5xfGgo+iz5UVhRRzF0W2eG8RqGoSQC1i5BEku0VN/DJNKCe/tnzTbmLMCDJZ7IKK2aoI/mypSHMxvCpEPszRZtYhK28Ex5vm/76yGFBwrOLn070MRVdjW63w6pHW2ZqaEA5tqdWV6RytIl+DOZjH/k/bk+OjbxXw//f/3nTCogyYea1pCmrBQsOpSfpOwdHt/LT2twDsWml+/mHl8YzE/fE0bpD1UVP6gJb1OUqEC2iiCbVczSP59sfbxOG3R77AFJs1/FjeHG1bkFkqlOs0+z1PYbSJOjT204nDKdOkcoSuroiAOdcFA917bUFNkKgdyoqFQM2+2Ah170h6NhQ+L86iypYqR2058dNWxsvGsfvgDE1rbJ/4MyT4PK79oiGMh1Z38TpJcC6FxfWX0eiAf0PXF2A05bIZYIgzrvZktCSifs+VFCcAewUtCxLtCPaVJq1vjHUAVp0Pir2h4/D+dJu3pL0IFX+VEv1YdCFpOn+KfgbsMq2Q5y8Mh9nzrtjvhqdCD1CqZOaTPvJRfCTS3JAcV4lOTU2CvSeas8Eo0PI706SNgFZViP671fQHypXTphgEUyq7ZqmlU3uMM/cLIiB4m7miHsPorDdTan3TVYz2c0nI9d11q7wEf4XZZ9faId8tbhVneNRmBPVmPOpQOOB3YO3V08BhGRb0KUKnA/pVKDpav8mz81khgYNl06u6mfDWyXtMQgsoqL4+iP3712MYRWoEp214ATp+kdyUVCaSXoHyuyEOZPd3zzSAtZS8QrE4xXA8irwif2wIm1zNtBJMOqx9i/ZntiH/9IH4BgBSPVNSOx6NbmI Ttho6TvU 64edZkHOW1oBqLm0ipfB4hNgUBzHqHOMrMR91BxggPqVdWd7kzcXXJHbXKPOrKUvAyo8vy6Y12Wi8eKX4NFzpjHfBubfYjQJuWxZrxO28S/SdXW1AyLO7SIwIGOrYh55nHqXEynsdKHid1eB8CrHBiRYY8nSDh5Nge7BPcw9q8l8ha48xzlCX2MZlgGVhr5TEKpHzbEiUU4JlDsqY9GOecZELPQ0gA8mgdYWLlS9atDfWj9NMHLMeBfNCf3cWtcereec3cbXftd7paJwRH3Ig2hBXoy7XIXXF6Rei6nlnStr8IPt+C43X9SyUZajhx0evXfdTCeM0Cwni3qdKDbvnkemPLYpOYnWdXOhM 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: On Sat, Aug 19, 2023 at 04:18:37AM +0100, Matthew Wilcox (Oracle) wrote: > Since pte_index is always defined, we don't need to check whether it's > defined or not. Delete the slow version that doesn't depend on it and > remove the #define since nobody needs to test for it. > > Signed-off-by: Matthew Wilcox (Oracle) > Cc: Mike Rapoport > Cc: Christian Dietrich Reviewed-by: Mike Rapoport (IBM) > --- > include/linux/pgtable.h | 1 - > mm/memory.c | 17 +---------------- > 2 files changed, 1 insertion(+), 17 deletions(-) > > diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h > index cb5c1fad1078..1fba072b3dac 100644 > --- a/include/linux/pgtable.h > +++ b/include/linux/pgtable.h > @@ -66,7 +66,6 @@ static inline unsigned long pte_index(unsigned long address) > { > return (address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1); > } > -#define pte_index pte_index > > #ifndef pmd_index > static inline unsigned long pmd_index(unsigned long address) > diff --git a/mm/memory.c b/mm/memory.c > index 2947fbc558f6..b7ce04cb058d 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -1870,7 +1870,6 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr, > return retval; > } > > -#ifdef pte_index > static int insert_page_in_batch_locked(struct vm_area_struct *vma, pte_t *pte, > unsigned long addr, struct page *page, pgprot_t prot) > { > @@ -1885,7 +1884,7 @@ static int insert_page_in_batch_locked(struct vm_area_struct *vma, pte_t *pte, > } > > /* insert_pages() amortizes the cost of spinlock operations > - * when inserting pages in a loop. Arch *must* define pte_index. > + * when inserting pages in a loop. > */ > static int insert_pages(struct vm_area_struct *vma, unsigned long addr, > struct page **pages, unsigned long *num, pgprot_t prot) > @@ -1944,7 +1943,6 @@ static int insert_pages(struct vm_area_struct *vma, unsigned long addr, > *num = remaining_pages_total; > return ret; > } > -#endif /* ifdef pte_index */ > > /** > * vm_insert_pages - insert multiple pages into user vma, batching the pmd lock. > @@ -1964,7 +1962,6 @@ static int insert_pages(struct vm_area_struct *vma, unsigned long addr, > int vm_insert_pages(struct vm_area_struct *vma, unsigned long addr, > struct page **pages, unsigned long *num) > { > -#ifdef pte_index > const unsigned long end_addr = addr + (*num * PAGE_SIZE) - 1; > > if (addr < vma->vm_start || end_addr >= vma->vm_end) > @@ -1976,18 +1973,6 @@ int vm_insert_pages(struct vm_area_struct *vma, unsigned long addr, > } > /* Defer page refcount checking till we're about to map that page. */ > return insert_pages(vma, addr, pages, num, vma->vm_page_prot); > -#else > - unsigned long idx = 0, pgcount = *num; > - int err = -EINVAL; > - > - for (; idx < pgcount; ++idx) { > - err = vm_insert_page(vma, addr + (PAGE_SIZE * idx), pages[idx]); > - if (err) > - break; > - } > - *num = pgcount - idx; > - return err; > -#endif /* ifdef pte_index */ > } > EXPORT_SYMBOL(vm_insert_pages); > > -- > 2.40.1 > -- Sincerely yours, Mike.