From patchwork Wed Nov 16 07:52:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 13044473 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 31F5CC433FE for ; Wed, 16 Nov 2022 07:53:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BE2276B0071; Wed, 16 Nov 2022 02:53:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B929C8E0001; Wed, 16 Nov 2022 02:53:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A333C6B0073; Wed, 16 Nov 2022 02:53:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 939BC6B0071 for ; Wed, 16 Nov 2022 02:53:07 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 417A0AB828 for ; Wed, 16 Nov 2022 07:53:07 +0000 (UTC) X-FDA: 80138539614.30.A6C1451 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf06.hostedemail.com (Postfix) with ESMTP id D66B5180003 for ; Wed, 16 Nov 2022 07:53:06 +0000 (UTC) Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2AG7IFed025354; Wed, 16 Nov 2022 07:53:01 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=EcA75F8cZO2aTdwdgrbcgF7SVITLfWHUdtAzo94G/J8=; b=etGsHY18vF351w7Zc4BWolaFDclCASiFQ2qxcP8yoKeWxuX98/p6jDo0G1FveMRwXSDr GvnO2nxCaNHk21vsRbKIGMgIaZJOa8Cfueji6CL41FTtGVTzL88fsk4xMqn+li/2zLe9 h4wuYf+imtdanjaPHUF82IDMY5vZ9Q60tfOMlfTNmaezAVvi/anGUoIK9cEM1qoQOKKl m2Mc2x6XeNNHWm5mB81HpfjLQY147acY7bLyjcW92S04kEpWXBOxYTDnGoPMUOe+25dk M8ZSensmgz7fCk00pvkwZAkvgD+TAxkX8aaXVxgYcBWR7l4g/4mCIYm6mlXTY+th6+OS 4g== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3kvubk8pw3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 16 Nov 2022 07:53:00 +0000 Received: from m0098421.ppops.net (m0098421.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 2AG7KMis031866; Wed, 16 Nov 2022 07:53:00 GMT Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3kvubk8pvh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 16 Nov 2022 07:53:00 +0000 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 2AG7oe8J020609; Wed, 16 Nov 2022 07:52:58 GMT Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by ppma03ams.nl.ibm.com with ESMTP id 3kt348whsm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 16 Nov 2022 07:52:58 +0000 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 2AG7qtYP3670712 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 16 Nov 2022 07:52:55 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4E0C442042; Wed, 16 Nov 2022 07:52:55 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A2A1442041; Wed, 16 Nov 2022 07:52:49 +0000 (GMT) Received: from li-4a3a4a4c-28e5-11b2-a85c-a8d192c6f089.ibm.com (unknown [9.163.49.19]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Wed, 16 Nov 2022 07:52:49 +0000 (GMT) Date: Wed, 16 Nov 2022 08:52:45 +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: [PATCH 3/4] mm: mmu_gather: turn delayed rmap macros into inlines 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-GUID: TjCzFlvACOESvlAtylpDdab9GpHaMHK3 X-Proofpoint-ORIG-GUID: NddfzGPYSXY_LoFYeBWMpz-zUn4Nd-fN 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 impostorscore=0 bulkscore=0 lowpriorityscore=0 mlxlogscore=718 malwarescore=0 suspectscore=0 mlxscore=0 priorityscore=1501 spamscore=0 clxscore=1015 adultscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211160053 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1668585186; a=rsa-sha256; cv=none; b=M4oSSNbK7aJ7YNVYCBivmC99+chCOrCqgRRkooo0/F4d0j32Z3zjYg71NS44VwyH37zYzg zS/OKhm2NqcOskeDYs2gQ+6DLfIg77gjG/e5JTpNAFRdjykPiW1+OCIcY+C8mVoan44S+Q XuSbHxg4CJKSkoWI8n644LcanvI8FAg= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=etGsHY18; spf=pass (imf06.hostedemail.com: domain of agordeev@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=agordeev@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1668585186; 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=EcA75F8cZO2aTdwdgrbcgF7SVITLfWHUdtAzo94G/J8=; b=POzkWp9Neq/mja8UnCGCqTs7jhOVOVg1kv5TRBv8mjgf59BTmk9928eOag3/JIB+36PcK2 xFKdkAbuuphUE83qBqfzWH/ckN8QH80/KTWFnkmGlRDN2h6h/i+7TdrsRgHPOmrUKUtkPz jQWXvGc3/eW9dRb5AIRLiBQO4PSRXkc= X-Rspam-User: X-Stat-Signature: o5z3w9wasgeqgozsc31w7gfxs1i97dey X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: D66B5180003 Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=etGsHY18; spf=pass (imf06.hostedemail.com: domain of agordeev@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=agordeev@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com X-HE-Tag: 1668585186-752866 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: Make tlb_delay_rmap() and friend macros inline functions by using forward declarations, which allows defining ones after the 'struct mmu_gather' definition. Signed-off-by: Alexander Gordeev --- include/asm-generic/tlb.h | 56 ++++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 12 deletions(-) diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h index 317bef9eee3c..33943a4de5a7 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h @@ -261,13 +261,10 @@ extern bool __tlb_remove_page_size(struct mmu_gather *tlb, int page_size); #ifdef CONFIG_SMP -/* - * 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_reset_delay_rmap(tlb) ((tlb)->delayed_rmap = 0) -#define tlb_rmap_delayed(tlb) ((tlb)->delayed_rmap) +#define tlb_delay_rmap tlb_delay_rmap +static inline bool tlb_delay_rmap(struct mmu_gather *tlb); +static inline void tlb_reset_delay_rmap(struct mmu_gather *tlb); +static inline bool tlb_rmap_delayed(struct mmu_gather *tlb); extern void tlb_flush_rmaps(struct mmu_gather *tlb, struct vm_area_struct *vma); #endif @@ -338,6 +335,27 @@ struct mmu_gather { #endif }; +#ifdef tlb_delay_rmap + +static inline bool tlb_delay_rmap(struct mmu_gather *tlb) +{ + tlb->delayed_rmap = 1; + + return true; +} + +static inline void tlb_reset_delay_rmap(struct mmu_gather *tlb) +{ + tlb->delayed_rmap = 0; +} + +static inline bool tlb_rmap_delayed(struct mmu_gather *tlb) +{ + return tlb->delayed_rmap; +} + +#else + /* * We have a no-op version of the rmap removal that doesn't * delay anything. That is used on S390, which flushes remote @@ -345,11 +363,25 @@ struct mmu_gather { * 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) { } +#define tlb_delay_rmap tlb_delay_rmap +static inline bool tlb_delay_rmap(struct mmu_gather *tlb) +{ + return false; +} + +static inline void tlb_reset_delay_rmap(struct mmu_gather *tlb) +{ +} + +static inline bool tlb_rmap_delayed(struct mmu_gather *tlb) +{ + return 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);