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 A6B5EC54E58 for ; Mon, 18 Mar 2024 08:19:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1D5F16B0085; Mon, 18 Mar 2024 04:19:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 15F396B0087; Mon, 18 Mar 2024 04:19:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F41CB6B0088; Mon, 18 Mar 2024 04:19:38 -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 DEF126B0085 for ; Mon, 18 Mar 2024 04:19:38 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 9FF7F140D95 for ; Mon, 18 Mar 2024 08:19:38 +0000 (UTC) X-FDA: 81909460836.14.E8DB2F5 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf26.hostedemail.com (Postfix) with ESMTP id 44AA814000D for ; Mon, 18 Mar 2024 08:19:35 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=none; spf=pass (imf26.hostedemail.com: domain of tujinjiang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=tujinjiang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710749976; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/qx+v+IUqgTRfuinXMyAyyq967xyAYbrqIMiuM6kFi0=; b=t7d4/whAbP5yE7cUBvnRoCA+o74QicwuZUVHso8dzakt0xJyQc8LqVPyhhBqEX4ctpwB4C J2MVzCNgS/Mg0+uSdQcBpl2VfjA1U/t4yVzjzCMuMo00exLHyzqj+1N97DOsB5c56fF+ii msOzVoKIr1TDjzHBPvjgtUnrtUeTPYQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710749976; a=rsa-sha256; cv=none; b=uTr+SigGofrUVd1vpBVFD9wy5aMstpN5y41roG//3spJ4hVE0ie0qBDF9M9QFJnIRlQXbI +LJAAt7ws1tuxMaxsvAJz6PXoureUBcMLHWtLoLjeoVoN4g9zYQXaluWb5y5Z4eDvAfsHq rnoczS7aVHS/or5x8x0M3JoMTz8Ws7w= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=none; spf=pass (imf26.hostedemail.com: domain of tujinjiang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=tujinjiang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.48]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Tynkz0BjwzXjGk; Mon, 18 Mar 2024 16:16:59 +0800 (CST) Received: from dggpeml500011.china.huawei.com (unknown [7.185.36.84]) by mail.maildlp.com (Postfix) with ESMTPS id 6862A18006B; Mon, 18 Mar 2024 16:19:32 +0800 (CST) Received: from [10.174.179.13] (10.174.179.13) 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; Mon, 18 Mar 2024 16:19:31 +0800 Message-ID: Date: Mon, 18 Mar 2024 16:19:31 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.11.2 Subject: Re: [PATCH v3] mm/ksm: fix ksm exec support for prctl To: , , , , , , , References: <20240318090441.179486-1-tujinjiang@huawei.com> From: Jinjiang Tu In-Reply-To: <20240318090441.179486-1-tujinjiang@huawei.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.179.13] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpeml500011.china.huawei.com (7.185.36.84) X-Stat-Signature: twsio3zw7484wp3usoajye6g8cqgo8uy X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 44AA814000D X-Rspam-User: X-HE-Tag: 1710749975-876871 X-HE-Meta: U2FsdGVkX1+wQp7A3tZoRHjLqcON0h2AAdqb/I10R7cwZfrgx/gvpI8+I+IuG0lz/+x8eM73qwWXSuzwJc7PiGqOW9UIHkom1gM9b96XoZzRs5R3sYUnqUWkknLhJz/7+TRSLq7xg7Jn5VlsueyTmy8M6vlIG+GoTK6x1GeT73WTznjUo6pZLHlNh/9RwaxpJlN2Qy+nHCVh4+6foC1U0hAhWWNTKma6AnfwnL8vzoAKoVT67QDRT5ujCB5xQmioqk0lBgiYI/fFu9zKyFe6QikjPegz3m/5drcI6F1Sjgwq0GpmKluutH/Is8+CQ0cbRXtPvIQfvrLz9GTpq2+h9Qb9cYABx6JQ9HIvHpZvDEfzvIXwRoy4FvXSHeuTwAtj/vA6HySPO9ob3lag9RGAaPDEZsoIOdBemw77joCJzXuX3qsCWfgoj/4rKigEwQmDTrdDNGdMksswQAigpdHTMuKdaLIE+duX8MidHxeYDCnQsQ5L6iBw34GTnmmO/iASNv2Z4FRwiLAKqk2iCTvH0bcucf/QvJnja2LeXdASvRw6m7Px3YW6Iv3FdpMSkLRQ+4Fmx+RDcemu1D3GcKarbroAvtKrcPdJXALScpXYISlfy3+JZBMAVd7MJYWkrCabjKLE04Qk8bgWn0rEC0Un9i58opf34vE1FlpWQFF9kua1rAicfADMlebKQ7nylb2NdBZGxvKGa9tJYlKLF9hsc38ZKb8zt/4a4X+zhA4u66+Oanpl5C/R8wBZ7dh4QBINgLUP+IyB0glUf4y6lkcq3GfiP/P3Npt9YucRWt6lNItqGLQ5lVZ+4Qv1S23Q/9dl+u7kBY0MLzSsdCxYXljRiTnfoGIr0Lxn8Vvn/QZABVcFEjXLTkhzY3GisRU1nNpTGNQ1X8VfIF1gxepnU9eZ0eC899PN1+fJcDnfU7Y7FoxmZLkmLIsnpjxmiibPFMwtH2HKXg78hZE6VONMV6K iCH9LFqq +OulRqcw5X7YQ2lSBBSD44bKTOhzL29bP4ZFHddZ8yUmRK0KYhFei6caCZUViAKNA5gAa2ex1eMjSnzee3NmdBtz0a96U5dQCieplW9Fi34fJ94c/Y1PrFZR3V0M9dLfl/16es5WjfFM3rxsrX31zttHkiDgxE2KoLnS4fDQ9lIMOfYHb5l3DbTUVCQmy8SQqrlz5 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: Sorry, the v3 tag is erroneous. This patch is the first version. 在 2024/3/18 17:04, Jinjiang Tu 写道: > 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 > --- > fs/exec.c | 4 ++++ > include/linux/ksm.h | 13 +++++++++++++ > 2 files changed, 17 insertions(+) > > diff --git a/fs/exec.c b/fs/exec.c > index ff6f26671cfc..00f40163cc12 100644 > --- a/fs/exec.c > +++ b/fs/exec.c > @@ -67,6 +67,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -267,6 +268,9 @@ static int __bprm_mm_init(struct linux_binprm *bprm) > goto err_free; > } > > + if (ksm_execve(mm)) > + goto err; > + > /* > * Place the stack at the largest stack address the architecture > * supports. Later, we'll move this to an appropriate place. We don't > 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) > { > }