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 X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28CA2C433E2 for ; Thu, 3 Sep 2020 17:48:13 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CF41D20829 for ; Thu, 3 Sep 2020 17:48:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CF41D20829 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bitdefender.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 2117D6B0062; Thu, 3 Sep 2020 13:48:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 19A028E0001; Thu, 3 Sep 2020 13:48:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F2BDC6B0062; Thu, 3 Sep 2020 13:48:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id D5DA46B0037 for ; Thu, 3 Sep 2020 13:48:11 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 94988180AD807 for ; Thu, 3 Sep 2020 17:48:11 +0000 (UTC) X-FDA: 77222483982.21.tree73_3b13bc7270ab Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id 5A22A180442C2 for ; Thu, 3 Sep 2020 17:48:11 +0000 (UTC) X-HE-Tag: tree73_3b13bc7270ab X-Filterd-Recvd-Size: 3776 Received: from mx01.bbu.dsd.mx.bitdefender.com (mx01.bbu.dsd.mx.bitdefender.com [91.199.104.161]) by imf40.hostedemail.com (Postfix) with ESMTP for ; Thu, 3 Sep 2020 17:48:10 +0000 (UTC) Received: from smtp.bitdefender.com (smtp01.buh.bitdefender.com [10.17.80.75]) by mx01.bbu.dsd.mx.bitdefender.com (Postfix) with ESMTPS id 1CC0630747C4; Thu, 3 Sep 2020 20:48:09 +0300 (EEST) Received: from localhost.localdomain (unknown [195.189.155.252]) by smtp.bitdefender.com (Postfix) with ESMTPSA id EA2273072786; Thu, 3 Sep 2020 20:48:08 +0300 (EEST) From: =?UTF-8?q?Adalbert=20Laz=C4=83r?= To: linux-mm@kvack.org Cc: Andrew Morton , Alexander Graf , Stefan Hajnoczi , Jerome Glisse , Paolo Bonzini , Mircea Cirjaliu , =?UTF-8?q?Adalbert=20Laz=C4=83r?= Subject: [RFC PATCH 1/5] mm: add atomic capability to zap_details Date: Thu, 3 Sep 2020 20:47:26 +0300 Message-Id: <20200903174730.2685-2-alazar@bitdefender.com> In-Reply-To: <20200903174730.2685-1-alazar@bitdefender.com> References: <20200903174730.2685-1-alazar@bitdefender.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Rspamd-Queue-Id: 5A22A180442C2 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 Content-Transfer-Encoding: quoted-printable 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: Mircea Cirjaliu Force zap_xxx_range() functions to loop without rescheduling. Useful for unmapping memory in an atomic context, although no checks for atomic context are being made. Signed-off-by: Mircea Cirjaliu Signed-off-by: Adalbert Laz=C4=83r --- include/linux/mm.h | 6 ++++++ mm/memory.c | 11 +++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 5a323422d783..1be4482a7b81 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1601,8 +1601,14 @@ struct zap_details { struct address_space *check_mapping; /* Check page->mapping if set */ pgoff_t first_index; /* Lowest page->index to unmap */ pgoff_t last_index; /* Highest page->index to unmap */ + bool atomic; /* Do not sleep. */ }; =20 +static inline bool zap_is_atomic(struct zap_details *details) +{ + return (unlikely(details) && details->atomic); +} + struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long ad= dr, pte_t pte); struct page *vm_normal_page_pmd(struct vm_area_struct *vma, unsigned lon= g addr, diff --git a/mm/memory.c b/mm/memory.c index f703fe8c8346..8e78fb151f8f 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1056,7 +1056,7 @@ static unsigned long zap_pte_range(struct mmu_gathe= r *tlb, if (pte_none(ptent)) continue; =20 - if (need_resched()) + if (!zap_is_atomic(details) && need_resched()) break; =20 if (pte_present(ptent)) { @@ -1159,7 +1159,8 @@ static unsigned long zap_pte_range(struct mmu_gathe= r *tlb, } =20 if (addr !=3D end) { - cond_resched(); + if (!zap_is_atomic(details)) + cond_resched(); goto again; } =20 @@ -1195,7 +1196,8 @@ static inline unsigned long zap_pmd_range(struct mm= u_gather *tlb, goto next; next =3D zap_pte_range(tlb, vma, pmd, addr, next, details); next: - cond_resched(); + if (!zap_is_atomic(details)) + cond_resched(); } while (pmd++, addr =3D next, addr !=3D end); =20 return addr; @@ -1224,7 +1226,8 @@ static inline unsigned long zap_pud_range(struct mm= u_gather *tlb, continue; next =3D zap_pmd_range(tlb, vma, pud, addr, next, details); next: - cond_resched(); + if (!zap_is_atomic(details)) + cond_resched(); } while (pud++, addr =3D next, addr !=3D end); =20 return addr;