Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Khalid Aziz <khalid.aziz@oracle.com>
To:     akpm@linux-foundation.org, willy@infradead.org
Cc:     Khalid Aziz <khalid.aziz@oracle.com>, aneesh.kumar@linux.ibm.com,
        arnd@arndb.de, 21cnbao@gmail.com, corbet@lwn.net,
        dave.hansen@linux.intel.com, david@redhat.com,
        ebiederm@xmission.com, hagen@jauu.net, jack@suse.cz,
        keescook@chromium.org, kirill@shutemov.name, kucharsk@gmail.com,
        linkinjeon@kernel.org, linux-fsdevel@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-mm@kvack.org,
        longpeng2@huawei.com, luto@kernel.org, markhemm@googlemail.com,
        pcc@google.com, rppt@kernel.org, sieberf@amazon.com,
        sjpark@amazon.de, surenb@google.com, tst@schoebel-theuer.de,
        yzaikin@google.com
Subject: [PATCH v2 7/9] mm/mshare: Add unlink and munmap support
Date:   Wed, 29 Jun 2022 16:53:58 -0600
Message-Id: <1b0a0e8c9558766f13a64ae93092eb8c9ea7965d.1656531090.git.khalid.aziz@oracle.com>
In-Reply-To: <cover.1656531090.git.khalid.aziz@oracle.com>
References: <cover.1656531090.git.khalid.aziz@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?QEFs8qikYrylmBiwI4ctrXRKdAGqyBlDG4WUZm3QsFiY/mtaSNc/JKRWD3Z5?=
 =?us-ascii?Q?nX6BejqyN3luWiHhlGqMv8hjA6AwOzzjf1BYDfUvk72r/grGEmaSmTdXbgLU?=
 =?us-ascii?Q?CHRDoOMtXwG5Yls0zQWmabwHxMXExLps4sUXKnzZNewoz2TCDlXHDRO+92mc?=
 =?us-ascii?Q?/HAl/BuKUkm/WqVW7SAce06Ua7QOEGGNPKY5hytJTIi65O00zwy2VG75hb5Y?=
 =?us-ascii?Q?rEYnhRAZflTr5D7MrZoxzQCLAKORU2HIQV+6axkD6PHu1WbfR10+eLrQpvvX?=
 =?us-ascii?Q?vmbc7O4XLQMpbaCIHw+GiCFDuhxYFGPRoIyZG5oIHOsnmwXRe73+gX0xqoPf?=
 =?us-ascii?Q?ji+0piZnsAzxkZ4t7QhYAwebcfCCrMmtlXMNznZfHAleQqmHE0I/gWgZI+Q1?=
 =?us-ascii?Q?pgpLhVBs59ilB8X2pPH1+lxKlyv8gZpZ5bW2a1JqGiZJhR7ETrrnWVLIyj1H?=
 =?us-ascii?Q?43BjydLjSQAoYIsaULg+/UHWs2xynx3NCDKm4M2+Ko7HoQuZy3BXhAmV3wcb?=
 =?us-ascii?Q?sOhFCFkOcyZE2yr2tDDZ6cmtnJvpBpZdmkOSMhq0ZVGl/KkBpJeBicGJ0Mb6?=
 =?us-ascii?Q?MtN2HHcjQJpRZPhNQU5tOAHfMscCsMltoj3YGM1d+M9ydVaOLRF3BhOIHWme?=
 =?us-ascii?Q?0iy2LlR+5SLfk7/vj91HcLV3Xtq0Iut6KvKIvL3xDh9B2p5KH+1EkQeURkBC?=
 =?us-ascii?Q?pBmBqa3fxUb+S7G2P/8T94e2/Cjw5zUIkRPQwS7ZwIDUGDUZTwPQZHZ8NKUh?=
 =?us-ascii?Q?aqGvqiSPZl21pHCKaMqi0/wRAPLF707nA1eASAHK1fQhqr7q7nuZfVIFFlQv?=
 =?us-ascii?Q?frP/sxoZPuPpBqSC3McDqBf+B1UwRJlrXQJ45UfjPiGcw0LsgRQguBDbvkZY?=
 =?us-ascii?Q?NjFJ7bXTvgBoRAA+ySZbHr2bZiS225OkcXQY/7M8YY5lKj8oRoJHSDMNUH/f?=
 =?us-ascii?Q?ksyYAUrEyRBv6evxZGoSx3Cl0uNn2Q+0cKomjNmkbuFEar/lao99V4LNTZmT?=
 =?us-ascii?Q?zFFSTuaTzB9aWGCoASXFnNvFqnKfzgt+YK6fjymIxij8pH7IimqnWPdNFEW1?=
 =?us-ascii?Q?XJDX+ajOCJnOTOd3kXdSkBPq6R2rquJrc+vHii+DZIyruuU6xD5HbC/U2bRP?=
 =?us-ascii?Q?969V4okSYNktPPLbbTqX6y23or9h8ed6rFky2rgETWquETI7HF6y/jLSNVzk?=
 =?us-ascii?Q?TrNuHYLnXq5oFrrJ68JxRddxj/4OVFj5TGvlchb2UQmJgfTJKev9T4UJZlen?=
 =?us-ascii?Q?1x0rvgm5JHI5PlZEpO+JrdQaBriPuZWBfUq9CjdrjSFfIsdaXy4zgdvNnh6D?=
 =?us-ascii?Q?Bc2kh+1Wp56fcyTYNYxExZrhCj/c//71mlqaTOwgymVyhoVAVJNWD6jltn0d?=
 =?us-ascii?Q?0ocdj62R0G+ZVygLciX0a52onmf1LVW/ZulLG+9RtLOF4vF4ANuRV80X8bQD?=
 =?us-ascii?Q?je12b+5JNloNENjeQ3tZz36guZ23LcxDGGDnX5YuMr+1K66Ma+6z5zsXhy0Z?=
 =?us-ascii?Q?9Sc180ly2B+Zf8aqF54o1CDsthh+lQlOSHT6bGKBAUhhJ8ovbGMENQEXDw+v?=
 =?us-ascii?Q?Y8DtG47xDTfHsuOTy+9yE1oA168824zCMwJQYQVs60Hnhatsk02QXYQ0yASC?=
 =?us-ascii?Q?mZhrDbbwBtTCiyAlaUI1vBRd+SrugUoo70/IQN0LIbtOszql/ljSLlr+WR/k?=
 =?us-ascii?Q?mEXZaA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 80ccaab6-be60-4ccb-f6a4-08da5a2253cf
X-MS-Exchange-CrossTenant-AuthSource: BN8PR10MB3220.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2022 22:54:31.0372
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 7M2bYWm8z8vp+FXX19gRULJuzpsNvjKHI6COPgkaB/smSuWvfzF4tno3IfecwSru3evAfxSqjYy96dpHniWT0Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR10MB1834
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.883
 definitions=2022-06-29_22:2022-06-28,2022-06-29 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0
 phishscore=0 adultscore=0 malwarescore=0 bulkscore=0 spamscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2204290000 definitions=main-2206290078
X-Proofpoint-ORIG-GUID: UvVb3F1D3dDET9EL-jKWdHk-zyao54z2
X-Proofpoint-GUID: UvVb3F1D3dDET9EL-jKWdHk-zyao54z2
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Number of mappings of an mshare region should be tracked so it can
be removed when there are no more references to it and associated
file has been deleted. This add code to support the unlink operation
for associated file, remove the mshare region on file deletion if
refcount goes to zero, add munmap operation to maintain refcount
to mshare region and remove it on last munmap if file has been
deleted.

Signed-off-by: Khalid Aziz <khalid.aziz@oracle.com>
---
 mm/mshare.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

diff --git a/mm/mshare.c b/mm/mshare.c
index 088a6cab1e93..90ce0564a138 100644
--- a/mm/mshare.c
+++ b/mm/mshare.c
@@ -29,6 +29,7 @@ static struct super_block *msharefs_sb;
 struct mshare_data {
 	struct mm_struct *mm;
 	refcount_t refcnt;
+	int deleted;
 	struct mshare_info *minfo;
 };
 
@@ -48,6 +49,7 @@ msharefs_read(struct kiocb *iocb, struct iov_iter *iov)
 	size_t ret;
 	struct mshare_info m_info;
 
+	mmap_read_lock(info->mm);
 	if (info->minfo != NULL) {
 		m_info.start = info->minfo->start;
 		m_info.size = info->minfo->size;
@@ -55,18 +57,42 @@ msharefs_read(struct kiocb *iocb, struct iov_iter *iov)
 		m_info.start = 0;
 		m_info.size = 0;
 	}
+	mmap_read_unlock(info->mm);
 	ret = copy_to_iter(&m_info, sizeof(m_info), iov);
 	if (!ret)
 		return -EFAULT;
 	return ret;
 }
 
+static void
+msharefs_close(struct vm_area_struct *vma)
+{
+	struct mshare_data *info = vma->vm_private_data;
+
+	if (refcount_dec_and_test(&info->refcnt)) {
+		mmap_read_lock(info->mm);
+		if (info->deleted) {
+			mmap_read_unlock(info->mm);
+			mmput(info->mm);
+			kfree(info->minfo);
+			kfree(info);
+		} else {
+			mmap_read_unlock(info->mm);
+		}
+	}
+}
+
+static const struct vm_operations_struct msharefs_vm_ops = {
+	.close	= msharefs_close,
+};
+
 static int
 msharefs_mmap(struct file *file, struct vm_area_struct *vma)
 {
 	struct mshare_data *info = file->private_data;
 	struct mm_struct *mm = info->mm;
 
+	mmap_write_lock(mm);
 	/*
 	 * If this mshare region has been set up once already, bail out
 	 */
@@ -80,10 +106,14 @@ msharefs_mmap(struct file *file, struct vm_area_struct *vma)
 	mm->task_size = vma->vm_end - vma->vm_start;
 	if (!mm->task_size)
 		mm->task_size--;
+	mmap_write_unlock(mm);
 	info->minfo->start = mm->mmap_base;
 	info->minfo->size = mm->task_size;
+	info->deleted = 0;
+	refcount_inc(&info->refcnt);
 	vma->vm_flags |= VM_SHARED_PT;
 	vma->vm_private_data = info;
+	vma->vm_ops = &msharefs_vm_ops;
 	return 0;
 }
 
@@ -240,6 +270,38 @@ msharefs_mkdir(struct user_namespace *mnt_userns, struct inode *dir,
 	return ret;
 }
 
+static int
+msharefs_unlink(struct inode *dir, struct dentry *dentry)
+{
+	struct inode *inode = d_inode(dentry);
+	struct mshare_data *info = inode->i_private;
+
+	/*
+	 * Unmap the mshare region if it is still mapped in
+	 */
+	vm_munmap(info->minfo->start, info->minfo->size);
+
+	/*
+	 * Mark msharefs file for deletion so it can not be opened
+	 * and used for mshare mappings any more
+	 */
+	simple_unlink(dir, dentry);
+	mmap_write_lock(info->mm);
+	info->deleted = 1;
+	mmap_write_unlock(info->mm);
+
+	/*
+	 * Is this the last reference? If so, delete mshare region and
+	 * remove the file
+	 */
+	if (!refcount_dec_and_test(&info->refcnt)) {
+		mmput(info->mm);
+		kfree(info->minfo);
+		kfree(info);
+	}
+	return 0;
+}
+
 static const struct inode_operations msharefs_file_inode_ops = {
 	.setattr	= simple_setattr,
 	.getattr	= simple_getattr,
@@ -248,7 +310,7 @@ static const struct inode_operations msharefs_dir_inode_ops = {
 	.create		= msharefs_create,
 	.lookup		= simple_lookup,
 	.link		= simple_link,
-	.unlink		= simple_unlink,
+	.unlink		= msharefs_unlink,
 	.mkdir		= msharefs_mkdir,
 	.rmdir		= simple_rmdir,
 	.mknod		= msharefs_mknod,
-- 
2.32.0