From patchwork Wed Nov 16 07:50:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 20757 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp12145wru; Tue, 15 Nov 2022 23:56:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf6DFTB9ynEAgjOrrQf3LYgb1RC4f9RZfg9Se5krQmr7H2StDx1m++D66fcptvOR2GLU+XBf X-Received: by 2002:a17:906:1e10:b0:7af:6ab:1d8d with SMTP id g16-20020a1709061e1000b007af06ab1d8dmr8308180ejj.211.1668585406237; Tue, 15 Nov 2022 23:56:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668585406; cv=none; d=google.com; s=arc-20160816; b=MiB3bnitd6zfgOEWjd3aAuYjU+rNVsZQQGWaoqjzJnfFgVyqXQhkpVKvoKMVjVOzCp Nze5u3eyfYZRozosLL0+llBRhcQl96a68nX/RQslbfo7789y2u8pnVDgUJ1XajKTUUKG uVA6HAxe0KyuD/vFFz2YwAo7PPibz7s0gB3sU80+GLq+h9PHhfAxNK+Sl5zrhc3Jx0dJ mYWIXQaY5DAHVZ2AY+UW0QPHxOie7KOLpB9Ar7CeBP9HqfhkmhpnuHdwe/pntamcuKYr 6SDlKGpCHBAnXkara3u3+2vjvxTPN5qqTdkzg5v4XpaQ4Kt9QLK1QJ9mbsjUSvW2YcvL RA8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=I72SMcB9Nh5GrbTHhWHuP/ufwCqUK02E800IhbxJcvI=; b=fMnyzC3dneURrNjTgPU6NRe2cgbgjkc15OgGZ4Nr4B0qSqDVdTZk93y0HHo9BqiyKC LkHiG4z/kIB+OOTagAmNMQtyMagX1/kQj+4ZW/99Qf4hYXIVtSacp2438xNyMLkT4TU8 LCHPP9sFPKOm+3wNQcAZR9tTvzm5oTNTYg3STcmLjcmBVp4zWmkfXLx00HqJOEZL3z9l lEHrTHMc4gjVrFd3pstFG1Vya99ly9MXww/A/1v9YOBEhc0VcAzmRjJ72uAh7Xb36HY3 swuRb4tsZ2cqmFcgZNVgAfGsEw3MKoKBF1H6kUckD55j1KJC55j6yOiA9IQTGuyBuqjs crkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=JsWjsN2j; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y4-20020a056402358400b004637e16cfa4si15834941edc.599.2022.11.15.23.56.22; Tue, 15 Nov 2022 23:56:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=JsWjsN2j; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232775AbiKPHvK (ORCPT + 99 others); Wed, 16 Nov 2022 02:51:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232496AbiKPHvD (ORCPT ); Wed, 16 Nov 2022 02:51:03 -0500 Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E16B613D24 for ; Tue, 15 Nov 2022 23:51:02 -0800 (PST) Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2AG7EZN6019791; Wed, 16 Nov 2022 07:50:53 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=I72SMcB9Nh5GrbTHhWHuP/ufwCqUK02E800IhbxJcvI=; b=JsWjsN2j+gX5kHZaK9XteMv5hujZ65uoBLZBSJGZj+bvAkEGRE4yT1BHAwBRhDD+bGto /kRgPW3q2hS5ksX+78V1nolgwq750IQe0JKy149cG6jk4pgNKx4axQrfz9X/9b4mdX1F 82uwQZsY/pVuk1S/E8qZuolWtIOvpaAOl+4shvcWCUCUFx4Wkj59gbCJFtn4FBk6Uwb4 61pQzAfeRr7p4pOMd43EhCXTGN0DU9ACY9yTzcnmAycjtrqBBy/jLmEbxpQ58ox2GQ0/ VMJacw++7sX4ig/1PwyXdMcanMJ8CDaCqvyqwGBfVL20hU4h/s5/MWMxewzx6O27I9i3 nA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3kvu9wrqkh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 16 Nov 2022 07:50:52 +0000 Received: from m0098416.ppops.net (m0098416.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 2AG7FtMq027589; Wed, 16 Nov 2022 07:50:52 GMT Received: from ppma03fra.de.ibm.com (6b.4a.5195.ip4.static.sl-reverse.com [149.81.74.107]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3kvu9wrqjn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 16 Nov 2022 07:50:52 +0000 Received: from pps.filterd (ppma03fra.de.ibm.com [127.0.0.1]) by ppma03fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 2AG7oosj016626; Wed, 16 Nov 2022 07:50:50 GMT Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by ppma03fra.de.ibm.com with ESMTP id 3kt348v3vk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 16 Nov 2022 07:50:50 +0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 2AG7okxf62259648 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 16 Nov 2022 07:50:46 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DB7834C044; Wed, 16 Nov 2022 07:50:46 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3ECB14C040; Wed, 16 Nov 2022 07:50:41 +0000 (GMT) Received: from li-4a3a4a4c-28e5-11b2-a85c-a8d192c6f089.ibm.com (unknown [9.163.49.19]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Wed, 16 Nov 2022 07:50:40 +0000 (GMT) Date: Wed, 16 Nov 2022 08:50:37 +0100 From: Alexander Gordeev To: Linus Torvalds Cc: Hugh Dickins , Johannes Weiner , Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Nadav Amit , Will Deacon , Aneesh Kumar , Nick Piggin , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Sven Schnelle , Peter Zijlstra , Gerald Schaefer Subject: mm: mmu_gather: do not define delayed_rmap if not used Message-ID: References: <20221109203051.1835763-1-torvalds@linux-foundation.org> <20221109203051.1835763-4-torvalds@linux-foundation.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: cCvXpFGQE3lRE7XncXT-QScuG9jjhokm X-Proofpoint-GUID: AHiqeIdmIxzMn1bV-H05LR94Marl3dP9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-15_08,2022-11-15_03,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 clxscore=1015 spamscore=0 mlxlogscore=789 suspectscore=0 adultscore=0 impostorscore=0 priorityscore=1501 phishscore=0 bulkscore=0 mlxscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211160053 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749638611106414645?= X-GMAIL-MSGID: =?utf-8?q?1749638611106414645?= In cases the delayed rmap removal is not used (which are currently UP and s390) skip delayed_rmap flag and make the related code paths no-op. Signed-off-by: Alexander Gordeev --- include/asm-generic/tlb.h | 32 +++++++++++++++++++------------- mm/mmu_gather.c | 8 ++++---- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h index 154c774d6307..317bef9eee3c 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h @@ -265,24 +265,14 @@ extern bool __tlb_remove_page_size(struct mmu_gather *tlb, * This both sets 'delayed_rmap', and returns true. It would be an inline * function, except we define it before the 'struct mmu_gather'. */ -#define tlb_delay_rmap(tlb) (((tlb)->delayed_rmap = 1), true) +#define tlb_delay_rmap(tlb) (((tlb)->delayed_rmap = 1), true) +#define tlb_reset_delay_rmap(tlb) ((tlb)->delayed_rmap = 0) +#define tlb_rmap_delayed(tlb) ((tlb)->delayed_rmap) extern void tlb_flush_rmaps(struct mmu_gather *tlb, struct vm_area_struct *vma); #endif #endif -/* - * We have a no-op version of the rmap removal that doesn't - * delay anything. That is used on S390, which flushes remote - * TLBs synchronously, and on UP, which doesn't have any - * remote TLBs to flush and is not preemptible due to this - * all happening under the page table lock. - */ -#ifndef tlb_delay_rmap -#define tlb_delay_rmap(tlb) (false) -static inline void tlb_flush_rmaps(struct mmu_gather *tlb, struct vm_area_struct *vma) { } -#endif - /* * struct mmu_gather is an opaque type used by the mm code for passing around * any data needed by arch specific code for tlb_remove_page. @@ -313,10 +303,12 @@ struct mmu_gather { */ unsigned int freed_tables : 1; +#ifdef tlb_delay_rmap /* * Do we have pending delayed rmap removals? */ unsigned int delayed_rmap : 1; +#endif /* * at which levels have we cleared entries? @@ -346,6 +338,20 @@ struct mmu_gather { #endif }; +/* + * We have a no-op version of the rmap removal that doesn't + * delay anything. That is used on S390, which flushes remote + * TLBs synchronously, and on UP, which doesn't have any + * remote TLBs to flush and is not preemptible due to this + * all happening under the page table lock. + */ +#ifndef tlb_delay_rmap +#define tlb_delay_rmap(tlb) (false) +#define tlb_reset_delay_rmap(tlb) do { } while (0) +#define tlb_rmap_delayed(tlb) (false) +static inline void tlb_flush_rmaps(struct mmu_gather *tlb, struct vm_area_struct *vma) { } +#endif + void tlb_flush_mmu(struct mmu_gather *tlb); static inline void __tlb_adjust_range(struct mmu_gather *tlb, diff --git a/mm/mmu_gather.c b/mm/mmu_gather.c index 9f22309affee..b0f1bd20af2f 100644 --- a/mm/mmu_gather.c +++ b/mm/mmu_gather.c @@ -20,7 +20,7 @@ static bool tlb_next_batch(struct mmu_gather *tlb) struct mmu_gather_batch *batch; /* No more batching if we have delayed rmaps pending */ - if (tlb->delayed_rmap) + if (tlb_rmap_delayed(tlb)) return false; batch = tlb->active; @@ -60,7 +60,7 @@ void tlb_flush_rmaps(struct mmu_gather *tlb, struct vm_area_struct *vma) { struct mmu_gather_batch *batch; - if (!tlb->delayed_rmap) + if (!tlb_rmap_delayed(tlb)) return; batch = tlb->active; @@ -73,7 +73,7 @@ void tlb_flush_rmaps(struct mmu_gather *tlb, struct vm_area_struct *vma) } } - tlb->delayed_rmap = 0; + tlb_reset_delay_rmap(tlb); } #endif @@ -311,7 +311,7 @@ static void __tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, tlb->active = &tlb->local; tlb->batch_count = 0; #endif - tlb->delayed_rmap = 0; + tlb_reset_delay_rmap(tlb); tlb_table_init(tlb); #ifdef CONFIG_MMU_GATHER_PAGE_SIZE