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=-6.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 394E3C433E7 for ; Tue, 13 Oct 2020 23:54:15 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CE4D3206D5 for ; Tue, 13 Oct 2020 23:54:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="BRRfxGkG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CE4D3206D5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 69E2F6B00FB; Tue, 13 Oct 2020 19:54:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 675946B00FC; Tue, 13 Oct 2020 19:54:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5907E6B00FD; Tue, 13 Oct 2020 19:54:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0047.hostedemail.com [216.40.44.47]) by kanga.kvack.org (Postfix) with ESMTP id 270BE6B00FB for ; Tue, 13 Oct 2020 19:54:14 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id C5577181AEF00 for ; Tue, 13 Oct 2020 23:54:13 +0000 (UTC) X-FDA: 77368558386.13.jewel04_221719927207 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin13.hostedemail.com (Postfix) with ESMTP id 9C18C18140B67 for ; Tue, 13 Oct 2020 23:54:13 +0000 (UTC) X-HE-Tag: jewel04_221719927207 X-Filterd-Recvd-Size: 3606 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf37.hostedemail.com (Postfix) with ESMTP for ; Tue, 13 Oct 2020 23:54:13 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 20245208B3; Tue, 13 Oct 2020 23:54:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602633252; bh=eZx/+p9pjZeGQMZf+/wF0I2y51pqHOUQEod/u8TRQ14=; h=Date:From:To:Subject:In-Reply-To:From; b=BRRfxGkGQq+OX6PyPQSw8nPB1ck6ywOICVHUpP6rJQsp8zrysrdoPDoYFBAzfj2S7 cWjLDzkeTnpgbXwZvaa1ApoKXschV39uvW8nU7w4tOwQoyRDmVhAbjdPKI4u1wIttm ZBe1+D//l4NPv9C75fR+eFD7rNsHew/f9figTY28= Date: Tue, 13 Oct 2020 16:54:10 -0700 From: Andrew Morton To: akpm@linux-foundation.org, areber@redhat.com, christian.brauner@ubuntu.com, christian@kellner.me, cyphar@cyphar.com, ebiederm@xmission.com, linmiaohe@huawei.com, linux-mm@kvack.org, mingo@kernel.org, mm-commits@vger.kernel.org, peterz@infradead.org, shakeelb@google.com, surenb@google.com, tglx@linutronix.de, torvalds@linux-foundation.org Subject: [patch 106/181] mm: use helper function mapping_allow_writable() Message-ID: <20201013235410.0lyDYA9ho%akpm@linux-foundation.org> In-Reply-To: <20201013164658.3bfd96cc224d8923e66a9f4e@linux-foundation.org> User-Agent: s-nail v14.8.16 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: Miaohe Lin Subject: mm: use helper function mapping_allow_writable() Commit 4bb5f5d9395b ("mm: allow drivers to prevent new writable mappings") changed i_mmap_writable from unsigned int to atomic_t and add the helper function mapping_allow_writable() to atomic_inc i_mmap_writable. But it forgot to use this helper function in dup_mmap() and __vma_link_file(). Link: https://lkml.kernel.org/r/20200917112736.7789-1-linmiaohe@huawei.com Signed-off-by: Miaohe Lin Cc: Christian Brauner Cc: Ingo Molnar Cc: Peter Zijlstra Cc: "Eric W. Biederman" Cc: Christian Kellner Cc: Suren Baghdasaryan Cc: Adrian Reber Cc: Shakeel Butt Cc: Aleksa Sarai Cc: Thomas Gleixner Signed-off-by: Andrew Morton --- kernel/fork.c | 2 +- mm/mmap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/kernel/fork.c~mm-use-helper-function-mapping_allow_writable +++ a/kernel/fork.c @@ -559,7 +559,7 @@ static __latent_entropy int dup_mmap(str atomic_dec(&inode->i_writecount); i_mmap_lock_write(mapping); if (tmp->vm_flags & VM_SHARED) - atomic_inc(&mapping->i_mmap_writable); + mapping_allow_writable(mapping); flush_dcache_mmap_lock(mapping); /* insert tmp into the share list, just after mpnt */ vma_interval_tree_insert_after(tmp, mpnt, --- a/mm/mmap.c~mm-use-helper-function-mapping_allow_writable +++ a/mm/mmap.c @@ -621,7 +621,7 @@ static void __vma_link_file(struct vm_ar if (vma->vm_flags & VM_DENYWRITE) atomic_dec(&file_inode(file)->i_writecount); if (vma->vm_flags & VM_SHARED) - atomic_inc(&mapping->i_mmap_writable); + mapping_allow_writable(mapping); flush_dcache_mmap_lock(mapping); vma_interval_tree_insert(vma, &mapping->i_mmap); _