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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C888FC77B7A for ; Mon, 29 May 2023 06:30:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 41A41900003; Mon, 29 May 2023 02:30:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3CA34900002; Mon, 29 May 2023 02:30:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 26B5F900003; Mon, 29 May 2023 02:30:32 -0400 (EDT) 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 184C7900002 for ; Mon, 29 May 2023 02:30:32 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D48F2C0210 for ; Mon, 29 May 2023 06:30:31 +0000 (UTC) X-FDA: 80842318662.22.67D88CE Received: from mail-yb1-f175.google.com (mail-yb1-f175.google.com [209.85.219.175]) by imf17.hostedemail.com (Postfix) with ESMTP id D8DED40020 for ; Mon, 29 May 2023 06:30:29 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=UNKL1Q0P; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf17.hostedemail.com: domain of hughd@google.com designates 209.85.219.175 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=1685341829; 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=Odeb20p5/bWLraN6uwmg+5x/7ixsx6dmd5QessBSA4bLZsfgY/ZihkM1o3Xqx9hqwCaMsT zBDKEso3Trkwg+COyEm1vMPHEDf+tF+HRhZTfS/A03dwIkIrlgoumv6ZyuRTCAn3wEH8x7 B9TOdKplCPvdXDcohDywnBg3ooR5+l8= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=UNKL1Q0P; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf17.hostedemail.com: domain of hughd@google.com designates 209.85.219.175 as permitted sender) smtp.mailfrom=hughd@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685341829; a=rsa-sha256; cv=none; b=tBE43Syb2LN1+dDs0zedLC//Hj0MjzICWIBPb6ON51q0KAAPjkqGsXdaT4ekBbAQh60AKB 6siWIgrGz0jcqvrNjcPN48ACztq47Y5SIbq3LXQTaI/OVoiC1GHSgvrzTgy+1S82OfXTsQ f7IhGf8oM2lh7lOkvl3g1vy0IpaoIqQ= Received: by mail-yb1-f175.google.com with SMTP id 3f1490d57ef6-ba86ea269e0so4431137276.1 for ; Sun, 28 May 2023 23:30:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685341829; x=1687933829; 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=UNKL1Q0Pec+L5oOba/99kxWNjcCwq8SenPXFdijAb/ObswMKjM7OUUmz2ZEICNHgFi Qv4ppRRcA3yebk/gcCjK1B/b31tItw1kcbI5MNnORL3Ys8OpaxJh/WEpZJ/SInbs7OtQ pID86tFe1+AG4qmsZJbOnM+7iKwXNWky09aARIe2tetg2zR8PTrceT/1TSWkarzFIet1 8YIKNPCa18G6ke7Me2QA0b5ztYnbCNDIOf/BDmkOzEl5UNMMd2c3BAGItXCN3K8DkXAw E9u7Ntp2cVwujFtJI7hoKruoONwfQaLYMkiR2S/Hp/B93RwLn01nkmija5yTld6gsNK0 YpVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685341829; x=1687933829; 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=B2pJ+mlMCE6O5iLr2Mq5aS0XByUZa85mTvmedu8cRbYSNwj6UYcE0ISDqLCX3iu8qc 6fwBipMPVqTnSwCSI3XFV/vC0hdicr13lZvez0T2SRHEloiyCI2egwigDRE+XZtK0XYD dozbkcGNaF6cuVyLkGoQt3+JT6n0QLfGskBRiwgbmQfwTQ+mRz3/HfOi+AMp0pPTEW56 7TqDvttIJFVOIYRKpxOp456ta+T1bq/fvhN4OlCUCkc8zSSLannOCoO+gm+UJ7Bjagj6 faWcM5mRcDEqzzPnXa+6eGdqzvGLpC8djdJ1QHRHu8s8tEmXBPvGp0pDMZrUrtXXrzIp rakA== X-Gm-Message-State: AC+VfDzYqY2w4yQCbeh8RpgMOnTrPyoqu2Cz9pqsq2TiIlLx5WJz0CDR +d0dsJQElWcvaLzRB3yjhZ1jbQ== X-Google-Smtp-Source: ACHHUZ6M1tOYR5IzxCkUxy+sUt0Djeqr4hN+mskEbw3iamyUciaGMEXp/45S6Zcf95QTtDJx+FPlXA== X-Received: by 2002:a81:b40c:0:b0:544:9180:3104 with SMTP id h12-20020a81b40c000000b0054491803104mr11920044ywi.34.1685341828878; Sun, 28 May 2023 23:30:28 -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 a7-20020a818a07000000b00555c30ec361sm3363238ywg.143.2023.05.28.23.30.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 May 2023 23:30:28 -0700 (PDT) Date: Sun, 28 May 2023 23:30:24 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.attlocal.net To: Andrew Morton cc: 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 , 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 , 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 12/12] mm: delete mmap_write_trylock() and vma_try_start_write() In-Reply-To: <35e983f5-7ed3-b310-d949-9ae8b130cdab@google.com> Message-ID: References: <35e983f5-7ed3-b310-d949-9ae8b130cdab@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Rspam-User: X-Stat-Signature: njknqb7eyu7t4ffnqcxybgqg78nbuue3 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: D8DED40020 X-HE-Tag: 1685341829-774568 X-HE-Meta: U2FsdGVkX18guvZ9XotERFOjqnd5pD6/9jbLwoKZc9bo4kkzUayD3cJXn6u/Sm/gYKwgGC6O7Q0RZFB1DwdtMrCFyWHrTVEd7oWjIQvWXPxMa9vfxVlDxLzl9lvZemGqz5JrXkmuTM/p3NyLaMbFdrLzYdFuoi2s49dXztDPV0mJ5mB8FUhtCEY4Lr5u0+wxjlJLro6Qry7POHlDybs2O+1XNClvNuW0GySqiK7/6qvj5xuJUHKoNH/E8a49KeKpsjddS3pF7z/SZmvdLLGkEco86P3HR78zXFnWCHZYb7hcwgzP8qCdhaF186wg9TfNDuuB9J7WEVq+w42Q1EHk+CWGtHjtPaVxBb9g2fKMbSckqZK8v38mW2sf62BSQehcAqLnxv3ZFKkzmSAYHf/uMMYtHf9nnj0xsEY6HJN+HIQLhArseMmA15ia9uQs2D0cL6/r+q8mvon3IgUkJhSklFEA+fj0jbimIljGDVKUFZewRNUDqUalXdEgUznM+ai4oGa9f9QqbTw8HawLNugvalbjQI/NvoL7FgEc684yJaZiaLPaOKjSzriBJSI+xj4MIbTy0P0lqhZGzBcgC7a8LSgBoGc0UNkUlXsbEmzkOkOhMvaeRAs9U5WC4agDWARbIGh2bJaQ4pUt3cORaJbiWCm1Jb76J9/yHwracaFo7FLHp7hw1CU7z76SKJJspVdpZAYCnwIzCayRjCvZj7yJxJ+MMXp+s0YBsZ9ojuJ0NpVc1GNJlueSN74jvEwhR05XgMvUf2V6Bb1yTLJvA40Z26wIwyEYD1wkqgWDLdAbQt1FM5w3nB5WsTKGWnuOkmApSV8JQAQSapsKwGYSZqZwgFF8mBC3+mi1iEL7Fhxfb0DT4mdY7PDUSxi+F1e2562XlzF94nRE2aIseYNqiNxYlL1t9XvgIvruDknFx5YqyVO+jnpLt5VA5sHIOlQ4oKAaZ4yYb4Gpe/dURxPmXQd C+ohGfvq WxpGGOcK2KSKK+eegiSwV8OHyD6BU6qBG3vFLAlV7vyFOeTcSnbQr2vCqeE861AzAzWOKzBy7Sza5cKcC5xYWHIwAikwVgrdfkGF3XMb1lu6YT52D6UU1xgtmjU1NDAl2YQTtP2SImQUoXWYO8KNfP3mAI//2lHY2pMmRGpE9L5y5fwJskhFv4UyrApou9U1lNLWjRBjX3wgKi4th9PeJ5h8SJEpgeCnOkqDcHVRzHAFkTeDbccIYfWuXhA7P68HTikSYGGPMIpCINma8/YWSjxrV8KrAKbpmphxwBrA6Y+YK51+lxK/aYFvaoc5dVlcZEiN4QcMuK2Ar4hPBfVAb2ytBKIL+BzT1cng8KhGlTYLxq3bZoSlD/FibhMDTGEsDy7qIGCsdGCEx/EpcrT1MpCmXtsRkFeaiyywNSV1hDAzlsgAuJBG7ft7kyw== 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); -- 2.35.3