From patchwork Tue Jun 20 07:59:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugh Dickins X-Patchwork-Id: 13285287 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 5D5EFEB64D8 for ; Tue, 20 Jun 2023 07:59:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F16888D0003; Tue, 20 Jun 2023 03:59:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EC6718D0001; Tue, 20 Jun 2023 03:59:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D8F408D0003; Tue, 20 Jun 2023 03:59:57 -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 C8BAE8D0001 for ; Tue, 20 Jun 2023 03:59:57 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 9E90280686 for ; Tue, 20 Jun 2023 07:59:57 +0000 (UTC) X-FDA: 80922377634.26.D0140A3 Received: from mail-yw1-f174.google.com (mail-yw1-f174.google.com [209.85.128.174]) by imf28.hostedemail.com (Postfix) with ESMTP id CFFC9C000D for ; Tue, 20 Jun 2023 07:59:55 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=PTqSZx2n; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf28.hostedemail.com: domain of hughd@google.com designates 209.85.128.174 as permitted sender) smtp.mailfrom=hughd@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687247995; 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=Aa5HWe45UW6rQUJiJNVLC4MPu6AngULI5k321Sbm9Ew=; b=lMycDXsuNXFCRJlBBJUyuQ1xCJk/pRgQv2MZy3YOgLjgIFFPxlCpU4F4llDE+EeiGjeuS+ AYrxKUbAQxSQ9MybTW/gwycXcELKfwkiGr68GVSOCsTu3rI6XrOGUY56eHheJvzVdGvEq6 X0Pqgmvqv7HlJF0ORKGwgvl/gu/B6j4= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=PTqSZx2n; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf28.hostedemail.com: domain of hughd@google.com designates 209.85.128.174 as permitted sender) smtp.mailfrom=hughd@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687247995; a=rsa-sha256; cv=none; b=6XIH04LJl3oFA/8JlW4dUHykFy6XNkqAxwpiTBHfNQSm5PxG+tK8p4E9F4qw6QvgpePyaL YALTHZeM0PQr+V6o78/GLg819h4jfEy/mSRZGVkfpe1AzrJZaTPiCmunTJKC0m1lC7uWrD Ms9Yp4cXZT00f5B2WijHxFdirWWJBmc= Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-5701810884aso39722367b3.0 for ; Tue, 20 Jun 2023 00:59:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1687247995; x=1689839995; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=Aa5HWe45UW6rQUJiJNVLC4MPu6AngULI5k321Sbm9Ew=; b=PTqSZx2nNI4PV4JwXAt99NVosmlLWlQ/KYn1Uf1f3Yd1Z3NVe7obF1sAci/vRU4j/I /dODEkNukKEVJX5QJOgx8A4SVofs7E+EBk4aUKnEe/gxIGiuFO4K0lGYei4SR6tcYKnK AduYU9eLhwRb6vByQAsUQ6tUe6SjjlibwcGiUn9EmoAEYZk/fTkwOJxts/LviFdlBYyU 2HDG5towuNEQ5CvzS8P4/0FmCn98RyYyORjokeprTYbqe1PhIQYQex8ifvvnbwDxRbO6 McJrcKmHoDDBglMt6fs5aQdKWv2A5unXxMstk7k6pfo7pQ4FA/PbwXapoPL1ZYXTeDU7 ON7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687247995; x=1689839995; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Aa5HWe45UW6rQUJiJNVLC4MPu6AngULI5k321Sbm9Ew=; b=HF62bK2Bt1k8wWshr3M+XdBw4BGMZnRpueg/FcMKKNEEbmpMvzNovYwvfqPBpOUOAb 83egEF5nbnClyMhPLqHf1Tu2CfuZGbFJu0fjVJeqF1ac622BWKULy+56WMhIvNd5Os8p RfYe/QbuCAfwYuME78c+RRINX9SMDVhz3Q8jv2yjik2XuyT38jbzUSc/6lijrzsp4Gx5 WEF+X6kMHONFLACl1cE0ICwQ+hciIyFJdsLdWMlCZ1Cepjf6wrL3U+uuUcLPO96pLb95 dCPBOagH5mUI3hRj8QCsbtiwj9gRupDFBUfjCFY55IRkMF+DwQ7uV1hoAlMfVE8+N69Q fJmA== X-Gm-Message-State: AC+VfDzMrcjTAQs9dUhpir8Psz0C1zAc5kU3K3VV9MWfL6Rcc8eqbZNs 1ij260w2ts/xZm1RNzKS5wQm5Q== X-Google-Smtp-Source: ACHHUZ515t86hS4ZGbNoo4Ty1vmElBXGedGoznKelWut2eqFES40KQtwKfY1cJoUB4hv3Ba9PnrZlQ== X-Received: by 2002:a5b:bc9:0:b0:bb4:14a2:fb4a with SMTP id c9-20020a5b0bc9000000b00bb414a2fb4amr2548922ybr.9.1687247993367; Tue, 20 Jun 2023 00:59:53 -0700 (PDT) Received: from ripple.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id v190-20020a257ac7000000b00ba88763e5b5sm268132ybc.2.2023.06.20.00.59.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 00:59:53 -0700 (PDT) Date: Tue, 20 Jun 2023 00:59:48 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.attlocal.net To: Andrew Morton cc: Gerald Schaefer , Vasily Gorbik , Mike Kravetz , Mike Rapoport , "Kirill A. Shutemov" , Matthew Wilcox , David Hildenbrand , Suren Baghdasaryan , Qi Zheng , Yang Shi , Mel Gorman , Peter Xu , Peter Zijlstra , Will Deacon , Yu Zhao , Alistair Popple , Ralph Campbell , Ira Weiny , Steven Price , SeongJae Park , Lorenzo Stoakes , Huang Ying , Naoya Horiguchi , Christophe Leroy , Zack Rusin , Jason Gunthorpe , Axel Rasmussen , Anshuman Khandual , Pasha Tatashin , Miaohe Lin , Minchan Kim , Christoph Hellwig , Song Liu , Thomas Hellstrom , Russell King , "David S. Miller" , Michael Ellerman , "Aneesh Kumar K.V" , Heiko Carstens , Christian Borntraeger , Claudio Imbrenda , Alexander Gordeev , Jann Horn , Vishal Moola , Vlastimil Babka , linux-arm-kernel@lists.infradead.org, sparclinux@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v2 12/12] mm: delete mmap_write_trylock() and vma_try_start_write() In-Reply-To: <54cb04f-3762-987f-8294-91dafd8ebfb0@google.com> Message-ID: <27505a8-e717-61ce-ab70-5f79d9bf646b@google.com> References: <54cb04f-3762-987f-8294-91dafd8ebfb0@google.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: CFFC9C000D X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 7bqaesern17ypgguzkmowqrec4gj6fsn X-HE-Tag: 1687247995-993758 X-HE-Meta: U2FsdGVkX19gaYmLqq/itrRQql8uq3KgnBG6UDRHvY0hjYDhqTZvcOqdweE4TCdToSb+aLKBF204xIyaEISNOD3dyj4X/TtMOm4Us6b5GrDu6FqmMms56+N/zeS6ylEJrO0P1WRZFI2R7tBjOeyV9nOuSwDpsZbgT7mn/pquqqetNKd+eddN0mtm1VWF7Ys+pG2fp99X0i5i9Xrpia+Hlo3KFFact1PukR6rLDmjsqIJ2WKlWLo86ES4AIU3N5eCr8Y0VSdB27YX+FfItP9vXcWTnmwdLhP46HMRi96sIfVKgPkoY7HR+atSiLndZT6yb/nBMTZBSpxVl+TQO5T4OwErmOfgBCqE1hl2MP1PZW/BozqErgWifqFIjRuLokSAQUZC/bQgXPmhdYr7GPZFJJM37MbQA/HpCMVjRve42/B0lbjt2DR0w5tnEzNh1X/fwt0mszTGbQwFyphkmsZZdnPj/p4iv1HxOjnVJI2O8gtjDC67MEqdyvDNzj7BCInLSAwYkSi8nifncI1iPZpVuF7kBUGljRHbEgze5pGBNQqhWyOq5ANthXD6EDu9WEhaVBMPkFANfYczbjcTaRyZ156qI/cBgUZU2FCrTVhO9kBsU6VRycvCNzbKZEGCmvIOjhTz3dXVgkFKbSoFqOYBrM61+GjeBr3315wXdU/8BvqAwAtkqEyrfnw/jkI0P1GrUrGasJCWhLrabpIKsv1snsfhxV8PQjpT1H2sqh5CgpbayHAelab+92ZAhQJkBReXIJYNN6uAJY2d+MCxeZ6+1iXWV/lGOAHCAe6Ip0trIk1fTcbrPG2tu3iZeBLDDvVY6GprPwLZW/BjbGDYtvrXyzxys2CYULhmjXxrOkVrbMsmhcpSqOyeQrBSdNXsFH2oGuUNNm8z1umEIpMHW3qGiLTqQt0duhzrsXECygoRVDneWlkQnId3dWenHY6/cbVrn1VY0iCj7UlUdulWQRi t+WHq2P7 Su0iDHMe7s0/BxNNt8VvXAlyE7B3xalKEn+S6TuIJ5I0rhLFfYNwmQEWUrnaP9cd3fj1SsUU1ahAwzzcUwqi5FGXTC89AbnzrYcEfyiRI7xcf75AsSogCJ+QYIdIKnAeWm20wAnTVsnYNsDsCItqYA+Ckx6CJ9TE8KquRRuVHus9BXJFVe1dyN2WJQyD4ebrV64U5yjo/k0WDaKt4+YovQ0ndUNrO0XPYcvRRzXs0ucp3gbxZ+katgp2X1jyqColPrf4+nxkXap09+GHM26qeViH3KW51Qwc80Tgzy4uWYpkBQ8GW2v+XlLBCdZuvkNC/kk3LEjL0zdc7OXpgNBL9KpP49el2Hq/uleUQ+IVVt6rhlfRS9xWcNPalPxMrPcPat/X094Hi5hFVDQHbxbz+CQhsTxHukBA0Ryjq1LnpNPoVq+MJoN7Le+MhIAgxXBIymT7S0KLH9PN629nLpbBdB+TRM0EDTn9zIBNomIQOBd/m+jDk70q6tg7K+u2Wrp6XUqBV 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: mmap_write_trylock() and vma_try_start_write() were added just for khugepaged, but now it has no use for them: delete. Signed-off-by: Hugh Dickins --- include/linux/mm.h | 17 ----------------- include/linux/mmap_lock.h | 10 ---------- 2 files changed, 27 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 3c2e56980853..9b24f8fbf899 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -690,21 +690,6 @@ static inline void vma_start_write(struct vm_area_struct *vma) up_write(&vma->vm_lock->lock); } -static inline bool vma_try_start_write(struct vm_area_struct *vma) -{ - int mm_lock_seq; - - if (__is_vma_write_locked(vma, &mm_lock_seq)) - return true; - - if (!down_write_trylock(&vma->vm_lock->lock)) - return false; - - vma->vm_lock_seq = mm_lock_seq; - up_write(&vma->vm_lock->lock); - return true; -} - static inline void vma_assert_write_locked(struct vm_area_struct *vma) { int mm_lock_seq; @@ -730,8 +715,6 @@ static inline bool vma_start_read(struct vm_area_struct *vma) { return false; } static inline void vma_end_read(struct vm_area_struct *vma) {} static inline void vma_start_write(struct vm_area_struct *vma) {} -static inline bool vma_try_start_write(struct vm_area_struct *vma) - { return true; } static inline void vma_assert_write_locked(struct vm_area_struct *vma) {} static inline void vma_mark_detached(struct vm_area_struct *vma, bool detached) {} diff --git a/include/linux/mmap_lock.h b/include/linux/mmap_lock.h index aab8f1b28d26..d1191f02c7fa 100644 --- a/include/linux/mmap_lock.h +++ b/include/linux/mmap_lock.h @@ -112,16 +112,6 @@ static inline int mmap_write_lock_killable(struct mm_struct *mm) return ret; } -static inline bool mmap_write_trylock(struct mm_struct *mm) -{ - bool ret; - - __mmap_lock_trace_start_locking(mm, true); - ret = down_write_trylock(&mm->mmap_lock) != 0; - __mmap_lock_trace_acquire_returned(mm, true, ret); - return ret; -} - static inline void mmap_write_unlock(struct mm_struct *mm) { __mmap_lock_trace_released(mm, true);