From patchwork Thu Apr 18 10:57:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Yang X-Patchwork-Id: 13634514 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 63F5AC04FFF for ; Thu, 18 Apr 2024 10:58:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CDE806B008C; Thu, 18 Apr 2024 06:58:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C8EDF6B0093; Thu, 18 Apr 2024 06:58:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AE0506B0092; Thu, 18 Apr 2024 06:58:29 -0400 (EDT) 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 8E8806B0089 for ; Thu, 18 Apr 2024 06:58:29 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 608DF81241 for ; Thu, 18 Apr 2024 10:58:27 +0000 (UTC) X-FDA: 82022353854.10.00C73E8 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by imf07.hostedemail.com (Postfix) with ESMTP id B733940009 for ; Thu, 18 Apr 2024 10:58:25 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=ajy0DBoa; spf=pass (imf07.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.210.177 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713437905; 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=XITq4/hgHmAHZ0ZHlNrd2qmUtOIaf33ePb9J0ZwzOSE=; b=FP30WpHD/2b6SZJDeZc6WOpex8hM5KlSZLtyAXHX+VrM4gRvRzIEgV8qiiM6gbAL0nPMSA TsPlEBNXtBqqqiO6zS1f0z0lHO0VS1G/77zOThWeZ5e77Vdfj4NxHH+vmIWJxPT4EYrImX wjgYbIwZJkBBpdiz92g3HWocT5egWMQ= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=ajy0DBoa; spf=pass (imf07.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.210.177 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713437905; a=rsa-sha256; cv=none; b=wYELvfUbiMCeReY6BXSpQIdaxXIBGh065ucBCST36Ub/NLPQSrEwFWVLuBLdUEO9B7EJZn +3+wQVzWeYKnxao1D762R19rm27QwsmB4IV3cuWlNCk+YifzoRxWpBosoAf4xF7bIXn9zE WwZJpbcAGfhg37gdakcJg2+u5aZDsRg= Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-6ed2dc03df6so683555b3a.1 for ; Thu, 18 Apr 2024 03:58:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713437905; x=1714042705; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XITq4/hgHmAHZ0ZHlNrd2qmUtOIaf33ePb9J0ZwzOSE=; b=ajy0DBoaMX7uC8eBV/ssrbQ8sEjC+qf2tGJjhmJiDPYoCe6oSrTXJzJHx7Wsj89P4q Q1+4hYPjtiFKb5n/nxlVsMlVZJhAfboAFTAQB6f9Gd/rsEKiIBAtN4jpT1JKIvd0tDT7 yPhbwwlSGBseK3U9ZieO50g9cpgY0UeAM06xIJCClLVVPoBFdU9G6OAuhR/Qu8/smaGx A4ji8ZJ0e1Lg2IIGpOtWYMJrMNNAhIkpf9z1Qv+VoExpVtFe9ZhoHK7G+UX8HL134F78 iAZoCGK2XWvJIczDwX6pWPvvSaxJwetnbtPMqZ7CZKbMBMgYtra3W/0CytnkUBedgbZ0 5lsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713437905; x=1714042705; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XITq4/hgHmAHZ0ZHlNrd2qmUtOIaf33ePb9J0ZwzOSE=; b=AHreFMWr7Ij+tYIYfoOZ7uyRchRXp1mruZMO2XBDgfSogRvJKRCJZ6xGwTVpeSwzjM LAQHcIY9eBhxTQhA4B0sRl0F27VRA3Ft2aeL6/xMjltWKjbgCIesdzlcnAaFQFR1tgWW 28oaveQQqHkMPylLzLm4HMtPz/BL1SHHxQjSyr6yw3laq+Z0sbpIbqzcV/Sa+3oZ0/KP HtYC3mH2fdwHCC/eG1jP+8G4SDri4xV6QZObBFZXgrMMPg7op5Q6P3miJXlcXzHGqi4/ 9ZbeidncCXb6Vl3W72hFm6bpnDJiVkbR+YYWCpAbpObzpIA6Bq1LPaEPT3i252MYLmFP UWMg== X-Forwarded-Encrypted: i=1; AJvYcCVQrefRmsk7LbZgyDCBxTmcFwzuoXSGt4/1EkFxr9MnAbB1WwNKwEyHYgDNY36y2G771idgcl7VxnLQY3c0UIWFt90= X-Gm-Message-State: AOJu0Yw1lk50PYSPEP1ZvyDTmcxjTtECAfh743OzGMr5b/zDuHi8PMCn cZhlHOFa/pg1TIPoQj8HJ4AaN3Va/VAKzLBIDghyhjkEgGPmEeka X-Google-Smtp-Source: AGHT+IESWKGXs5SVUDQDCP4J36Ikudx/CjpP5NVMmnbx2ui5miMXKMf1AI2xrY+wo35NeL00v+rfzA== X-Received: by 2002:a05:6a00:1acf:b0:6ec:db05:36d2 with SMTP id f15-20020a056a001acf00b006ecdb0536d2mr3186097pfv.4.1713437904694; Thu, 18 Apr 2024 03:58:24 -0700 (PDT) Received: from LancedeMBP.lan ([112.10.225.217]) by smtp.gmail.com with ESMTPSA id gd26-20020a056a00831a00b006ea923678a6sm1200487pfb.137.2024.04.18.03.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 03:58:24 -0700 (PDT) From: Lance Yang To: akpm@linux-foundation.org Cc: ryan.roberts@arm.com, david@redhat.com, 21cnbao@gmail.com, mhocko@suse.com, fengwei.yin@intel.com, zokeefe@google.com, shy828301@gmail.com, xiehuan09@gmail.com, wangkefeng.wang@huawei.com, songmuchun@bytedance.com, peterx@redhat.com, minchan@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Lance Yang Subject: [PATCH v9 2/4] mm/arm64: override clear_young_dirty_ptes() batch helper Date: Thu, 18 Apr 2024 18:57:48 +0800 Message-Id: <20240418105750.98866-3-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240418105750.98866-1-ioworker0@gmail.com> References: <20240418105750.98866-1-ioworker0@gmail.com> MIME-Version: 1.0 X-Stat-Signature: ctteswnttgrawre5i47d9bkzeio4qkhn X-Rspamd-Queue-Id: B733940009 X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1713437905-569215 X-HE-Meta: U2FsdGVkX18rureDANi9up3oYxkRhXgEu9BUHtWbggoxnCGD3aV3lMQbSkJhx8jrc26YW7hNfN3sv//Z3YwVDB11IclXI+2lPKXxv4A6kqoCRtNh1CFgF1eZcvgar/9qD459Kw4WmEh0ECrfBmjgCINL54lP6vK1YY6xZgfLhzAFNcOQDzedKXLwP8doiXlKDKIs8mMstBbXXvgmgGG9YggLKHCnnpBrVdcA1KOw9dThooLghaBvDVoKXuekWRodoKspLlRDV5eahK6t3Xwgb2eA5AC4EBARbh9OdaTtEaX5so7Ey2skC82XT3PPeFnESW7At+w9ONhrXPC3WhWQhgoXTx51l98xC8lNcsKwSnoojqlSGo3u5MnRFwev01jzin0EiEAT93GSjzAeXeKWQ0WCySosLXL/YkH7UYYEUuaiWoNcWm5I2vseDqNIUDatPhrims+Otld991j/bBunjPbIr/EkfdcdUEnWQ6HS/iV2PxqxuPeE17O+rVJz3xNOdqIrAiXsQ0u90qm12xgiCFUN6FnoaAeUhssMpBoz2iVCxQgLCY+wESOg2xXu62LpnPCsvv1OAHi+RsqrxMC0UYA+3UBeTeARvkMARPGoQa3EWXU//zCMi3ilF/bQM7QLiq8hqWBy0xrZ0v5xCHlIVz6pB3eRdCtvCpUdIxfFUAB6u0eoBB4vmYqOepu8vltVOE12dtcfC+REZ1ZkRjk2KDatGsJTrQ6/qXdT0P14X3xEcugMwFWikmwudmzKGFXIThiE4wYV23BFzuL7YywCez/GK/IJRV6VFyPTmgKWm8LFrsJ1P9PPLCNKUJesunINPc/gqXbpXWNC8WyjgSn50L80CNdJCU2bvOgouICaR1zLU6nKsKI5taYC3W3v4fs7ROZg99sFG2SEM5TEWlcGM+knPnua4c9ai/npVYOK2xfyOvfveFvA2+OT21Cx+qraAUikmXam0MnVchE50DZ YfX6Qmmf uzrz9lUWiKWM1JCvyeS39kSQ0+Du2c0XbzYCyggfgI/35zuTSjrDWy3JZ/Ujw/nZzwX73oKVNeEVaM1QYUcyntzORMtxIp+c+MpeJmVDW+3cloM6lDtYh/5QRkjqbFjRGVwGk+S1BLbeoskaNyHlynYQIo5Wf8DgESk1P 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: List-Subscribe: List-Unsubscribe: The per-pte get_and_clear/modify/set approach would result in unfolding/refolding for contpte mappings on arm64. So we need to override clear_young_dirty_ptes() for arm64 to avoid it. Suggested-by: Barry Song <21cnbao@gmail.com> Suggested-by: Ryan Roberts Reviewed-by: Ryan Roberts Signed-off-by: Lance Yang --- arch/arm64/include/asm/pgtable.h | 55 ++++++++++++++++++++++++++++++++ arch/arm64/mm/contpte.c | 29 +++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 9fd8613b2db2..1303d30287dc 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -1223,6 +1223,46 @@ static inline void __wrprotect_ptes(struct mm_struct *mm, unsigned long address, __ptep_set_wrprotect(mm, address, ptep); } +static inline void __clear_young_dirty_pte(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, + pte_t pte, cydp_t flags) +{ + pte_t old_pte; + + do { + old_pte = pte; + + if (flags & CYDP_CLEAR_YOUNG) + pte = pte_mkold(pte); + if (flags & CYDP_CLEAR_DIRTY) + pte = pte_mkclean(pte); + + pte_val(pte) = cmpxchg_relaxed(&pte_val(*ptep), + pte_val(old_pte), pte_val(pte)); + } while (pte_val(pte) != pte_val(old_pte)); +} + +static inline void __clear_young_dirty_ptes(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, + unsigned int nr, cydp_t flags) +{ + pte_t pte; + + for (;;) { + pte = __ptep_get(ptep); + + if (flags == (CYDP_CLEAR_YOUNG | CYDP_CLEAR_DIRTY)) + __set_pte(ptep, pte_mkclean(pte_mkold(pte))); + else + __clear_young_dirty_pte(vma, addr, ptep, pte, flags); + + if (--nr == 0) + break; + ptep++; + addr += PAGE_SIZE; + } +} + #ifdef CONFIG_TRANSPARENT_HUGEPAGE #define __HAVE_ARCH_PMDP_SET_WRPROTECT static inline void pmdp_set_wrprotect(struct mm_struct *mm, @@ -1379,6 +1419,9 @@ extern void contpte_wrprotect_ptes(struct mm_struct *mm, unsigned long addr, extern int contpte_ptep_set_access_flags(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, pte_t entry, int dirty); +extern void contpte_clear_young_dirty_ptes(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, + unsigned int nr, cydp_t flags); static __always_inline void contpte_try_fold(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte) @@ -1603,6 +1646,17 @@ static inline int ptep_set_access_flags(struct vm_area_struct *vma, return contpte_ptep_set_access_flags(vma, addr, ptep, entry, dirty); } +#define clear_young_dirty_ptes clear_young_dirty_ptes +static inline void clear_young_dirty_ptes(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, + unsigned int nr, cydp_t flags) +{ + if (likely(nr == 1 && !pte_cont(__ptep_get(ptep)))) + __clear_young_dirty_ptes(vma, addr, ptep, nr, flags); + else + contpte_clear_young_dirty_ptes(vma, addr, ptep, nr, flags); +} + #else /* CONFIG_ARM64_CONTPTE */ #define ptep_get __ptep_get @@ -1622,6 +1676,7 @@ static inline int ptep_set_access_flags(struct vm_area_struct *vma, #define wrprotect_ptes __wrprotect_ptes #define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS #define ptep_set_access_flags __ptep_set_access_flags +#define clear_young_dirty_ptes __clear_young_dirty_ptes #endif /* CONFIG_ARM64_CONTPTE */ diff --git a/arch/arm64/mm/contpte.c b/arch/arm64/mm/contpte.c index 1b64b4c3f8bf..9f9486de0004 100644 --- a/arch/arm64/mm/contpte.c +++ b/arch/arm64/mm/contpte.c @@ -361,6 +361,35 @@ void contpte_wrprotect_ptes(struct mm_struct *mm, unsigned long addr, } EXPORT_SYMBOL_GPL(contpte_wrprotect_ptes); +void contpte_clear_young_dirty_ptes(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, + unsigned int nr, cydp_t flags) +{ + /* + * We can safely clear access/dirty without needing to unfold from + * the architectures perspective, even when contpte is set. If the + * range starts or ends midway through a contpte block, we can just + * expand to include the full contpte block. While this is not + * exactly what the core-mm asked for, it tracks access/dirty per + * folio, not per page. And since we only create a contpte block + * when it is covered by a single folio, we can get away with + * clearing access/dirty for the whole block. + */ + unsigned long start = addr; + unsigned long end = start + nr; + + if (pte_cont(__ptep_get(ptep + nr - 1))) + end = ALIGN(end, CONT_PTE_SIZE); + + if (pte_cont(__ptep_get(ptep))) { + start = ALIGN_DOWN(start, CONT_PTE_SIZE); + ptep = contpte_align_down(ptep); + } + + __clear_young_dirty_ptes(vma, start, ptep, end - start, flags); +} +EXPORT_SYMBOL_GPL(contpte_clear_young_dirty_ptes); + int contpte_ptep_set_access_flags(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, pte_t entry, int dirty)