From patchwork Thu Mar 28 11:10:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjiang Tu X-Patchwork-Id: 13608404 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 022DEC54E64 for ; Thu, 28 Mar 2024 11:10:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7EA786B008C; Thu, 28 Mar 2024 07:10:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7996F6B0092; Thu, 28 Mar 2024 07:10:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 660AF6B0096; Thu, 28 Mar 2024 07:10:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 4B27C6B008C for ; Thu, 28 Mar 2024 07:10:40 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 0C78441133 for ; Thu, 28 Mar 2024 11:10:40 +0000 (UTC) X-FDA: 81946179840.27.73141AB Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf14.hostedemail.com (Postfix) with ESMTP id 3AED6100005 for ; Thu, 28 Mar 2024 11:10:36 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.hostedemail.com: domain of tujinjiang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=tujinjiang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711624238; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cTwV8t7oMvp0yB+otbVu8cFnsneSqJ/QAllYDKvgrF4=; b=CQJFVbq2Kfwln0r2b2xLNiHAjMgm+cOoIzqKr2/GYHZFbyqO32l9IMHO1bj+a3/yvUQox9 v37lBz/KunlTKdf5Af9Iear5U15MB16oWctcvNj4D+pj0kYSIBF4vaEYuedSEZufmhdyUX H65OREIKqQsMvHHPnmf2Pe62tHWSZGI= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.hostedemail.com: domain of tujinjiang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=tujinjiang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711624238; a=rsa-sha256; cv=none; b=qpxfSgK2f5x4vkMObOVKBJhSgaPjWOHsdURGx5JcrZiAWj/N/vr/SHhXwLex5U7o9AT5Gf uKF+gXgDT4KaRuZENdDQGDBTkmzdKQXYkg8TqztuOpZnrZGg5HTAav1eEtqba+x/rWgTXv nTnrHBH4uOIQ/5fxLBlcm2OilgBC82A= Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4V513p5vZ1ztQbm; Thu, 28 Mar 2024 19:08:06 +0800 (CST) Received: from dggpeml500011.china.huawei.com (unknown [7.185.36.84]) by mail.maildlp.com (Postfix) with ESMTPS id 69A0E1401E0; Thu, 28 Mar 2024 19:10:33 +0800 (CST) Received: from huawei.com (10.175.113.32) by dggpeml500011.china.huawei.com (7.185.36.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Thu, 28 Mar 2024 19:10:32 +0800 From: Jinjiang Tu To: , , , , , , , CC: Subject: [PATCH v4 1/3] mm/ksm: fix ksm exec support for prctl Date: Thu, 28 Mar 2024 19:10:08 +0800 Message-ID: <20240328111010.1502191-2-tujinjiang@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240328111010.1502191-1-tujinjiang@huawei.com> References: <20240328111010.1502191-1-tujinjiang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.32] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpeml500011.china.huawei.com (7.185.36.84) X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 3AED6100005 X-Stat-Signature: wbb83sksi9wjdqxrafkduoyqszzm67f1 X-HE-Tag: 1711624236-561661 X-HE-Meta: U2FsdGVkX1+CmrE/VlUOLrSM/TYY1EYorSSuvthplXqK+T+J3bLFsluDt4WzfdCFL96OidF9Le62h68J/CNe8cGEdKw+R7T6dZxtA58OKdQOD75FCCHhhymW9Op476n/cL7R8AQrmO8YXNIWZWkjHcUco2k8iOwq+inRhnruDAP3PAatc8tUZn9gUkfUZUhtmxQOX+RaNOpRZs31HVHqGBhwqjgYsp+VfnyfyleAm5An8sEuwU29x7uFVRpaTtB0MHZjjFODzhEKvu33GYyUXYWEhtCcbG9HkFQmxB8PdfvYYlSwVUsOyRuJz3LE/XLZLr0/tGo1h9p1FHx7LIAysPlMcIduu+xKVUi+/asGBKudnEMnfyy+7WtnQOEfYunU2MzUb6NquMCpdyLDGlopn3BA666tYeAIMZQs32C9qB3FrJ/GT/rvAVuf9eILVIeHJ/D45afqhQT2Sc42u0rMYqVjic+Qq4aA/XMg9c7RQz/xeKP1kEZMARGzSRLoQLYA0lSyAXZifeEAQVBx93IPc++kYLbRz3ugD9bii2qfAotnCtf0gLxqwACaHEvWWQE1NIza+X8Q5NapeYCIPVjF0s1aS3alLEqPQPyPQxW3cSzU7+OP65mN/vKGitBQZRNgNKSmydHtK9NK8VMM5fXgxB+57AtOWzkjPdbCqgB+6Y2vRW8hILJAeXsD2Jhj6n0WboG1BksPYyLG8U/YOKZckHeZ6yZTvCOOK5S+YJX5yTgv1nMH8anTWANwhQ8BYoO2ux7f6bf6BhZkNO0fuqne4eEpjlB3OxQgSFuBCk72OCYiHXHK5+2QmHRM1OhxLflFkdmltEpvYVfesm5Rr4EaRCviUMLIwuwsSon4UW8T4q8dEx+LcWY1h4cR4VLPr+ArYumOGd2z09hjraITDHLHwMYBLtkTm+5PHecqQsYzEgxus+EBdbJUEtZ8ukfreSERiL55hr9xhAqt9ebVyuM lbrkibie PlzFsOq2jHTEhx+uIZ00dKKB32jYPSkli1BmVAqXRfU5KXlZOf8r76lerBUIiJ6i0rDGp8Ijkkbb+uv2L6V80cAzUxt+sMBWHj+22qiYIv5UBfvaS5StrhDbNHwTo8ZbpZ+6VoIN634IwuM5BQRP3AB1Nr3L3Cda3fwqDOYMb9mFX/PY= 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: List-Subscribe: List-Unsubscribe: commit 3c6f33b7273a ("mm/ksm: support fork/exec for prctl") inherits MMF_VM_MERGE_ANY flag when a task calls execve(). Howerver, it doesn't create the mm_slot, so ksmd will not try to scan this task. To fix it, allocate and add the mm_slot to ksm_mm_head in __bprm_mm_init() when the mm has MMF_VM_MERGE_ANY flag. Fixes: 3c6f33b7273a ("mm/ksm: support fork/exec for prctl") Signed-off-by: Jinjiang Tu Reviewed-by: David Hildenbrand --- fs/exec.c | 11 +++++++++++ include/linux/ksm.h | 13 +++++++++++++ 2 files changed, 24 insertions(+) diff --git a/fs/exec.c b/fs/exec.c index ff6f26671cfc..c2890d32232e 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -67,6 +67,7 @@ #include #include #include +#include #include #include @@ -267,6 +268,14 @@ static int __bprm_mm_init(struct linux_binprm *bprm) goto err_free; } + /* + * Need to be called with mmap write lock + * held, to avoid race with ksmd. + */ + err = ksm_execve(mm); + if (err) + goto err_ksm; + /* * Place the stack at the largest stack address the architecture * supports. Later, we'll move this to an appropriate place. We don't @@ -288,6 +297,8 @@ static int __bprm_mm_init(struct linux_binprm *bprm) bprm->p = vma->vm_end - sizeof(void *); return 0; err: + ksm_exit(mm); +err_ksm: mmap_write_unlock(mm); err_free: bprm->vma = NULL; diff --git a/include/linux/ksm.h b/include/linux/ksm.h index 401348e9f92b..7e2b1de3996a 100644 --- a/include/linux/ksm.h +++ b/include/linux/ksm.h @@ -59,6 +59,14 @@ static inline int ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm) return 0; } +static inline int ksm_execve(struct mm_struct *mm) +{ + if (test_bit(MMF_VM_MERGE_ANY, &mm->flags)) + return __ksm_enter(mm); + + return 0; +} + static inline void ksm_exit(struct mm_struct *mm) { if (test_bit(MMF_VM_MERGEABLE, &mm->flags)) @@ -107,6 +115,11 @@ static inline int ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm) return 0; } +static inline int ksm_execve(struct mm_struct *mm) +{ + return 0; +} + static inline void ksm_exit(struct mm_struct *mm) { }