From patchwork Mon Jan 23 17:37:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 47304 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1745128wrn; Mon, 23 Jan 2023 10:08:42 -0800 (PST) X-Google-Smtp-Source: AK7set9J1OTjCq8EffYRnDKXgJav3S9k7GjH56DRtcKx+uBhRhWxyIHuI3wht5ZgilzrsLqXT+Yv X-Received: by 2002:a17:902:da81:b0:196:e77:f07b with SMTP id j1-20020a170902da8100b001960e77f07bmr845149plx.39.1674497321820; Mon, 23 Jan 2023 10:08:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674497321; cv=none; d=google.com; s=arc-20160816; b=kvWvfJpA936AtthxuFFFy60UVQPU+7USczzFxI0Av6R/9jd44IF6UI5ip5ttigEKHd WOvR9Xltu7/ywINqRazKP1r7eytzr+zjVSye/8EAEdxojPNK4QfCb4Vb46H7kENDbv/3 mtLSoXx3Id9/KUIQrxfSUdzZiVtHvlMBIt/IxHnZDEp30WBxYVqiOQrW4/exwIEns78e c1li68hv6QDinSpSjlnCJOjFpIz6N90I3WIxgwtsiQnT3Ew94Me2BrM2G6fYEn+fn/aU ngNqKfWvKokbmk1/ViCL/Xl9pP+4I9Nop4UOwRfLJScHI31VsgSCd5X/oEZb514gnyIk wlPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=GB7nbTR042OPBT5940sQcmscKilViV2E/45SbY5p8lA=; b=uKzJp1KYNxqWFHc/9td1gAU5PGc99rnG/y64r3rfSED67SyAG3OKbtuO8mzWwFo69d IBRKIE4yblUnZ6uiTXyOrCK1GYem3rgfidJZGQU1UvW+WunxU008u/E2db9Uk6zH5wJV wHaG4qsafmsP/VrQvt3YTNTM0zGDZOoqmwZNZO9o//EeJgLAqJP+jgOmrj02x01eLkbG HYsNO+nPAQ0NldybgFKctENpdLkNgyfkGrp/qIVPwlAlnPVILElfFPX7qXJBBbKNuQ0w /OcI1fC0bYIek9J0pVv4SiWyXCnyf1h6mhYZMt1QCgOF9a6zGkBPIdWjjDrJhA3L1aFu SVyQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m21-20020a170902d19500b001898141f0edsi5452plb.159.2023.01.23.10.08.30; Mon, 23 Jan 2023 10:08:41 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233812AbjAWSGg (ORCPT + 99 others); Mon, 23 Jan 2023 13:06:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233809AbjAWSG3 (ORCPT ); Mon, 23 Jan 2023 13:06:29 -0500 Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C21E930E94 for ; Mon, 23 Jan 2023 10:06:11 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 41C5F5616BD3; Mon, 23 Jan 2023 09:37:56 -0800 (PST) From: Stefan Roesch To: linux-mm@kvack.org Cc: shr@devkernel.io, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND RFC PATCH v1 01/20] mm: add new flag to enable ksm per process Date: Mon, 23 Jan 2023 09:37:29 -0800 Message-Id: <20230123173748.1734238-2-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173748.1734238-1-shr@devkernel.io> References: <20230123173748.1734238-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=BAYES_00,RDNS_DYNAMIC, SPF_HELO_PASS,SPF_NEUTRAL,SUSPICIOUS_RECIPS,TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837703787003886?= X-GMAIL-MSGID: =?utf-8?q?1755837703787003886?= This introduces the new flag MMF_VM_MERGE_ANY flag. When this flag is set, kernel samepage merging (ksm) gets enabled for all vma's of a process. Signed-off-by: Stefan Roesch --- include/linux/sched/coredump.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/sched/coredump.h b/include/linux/sched/coredump.h index 8270ad7ae14c..0e0de5b7469f 100644 --- a/include/linux/sched/coredump.h +++ b/include/linux/sched/coredump.h @@ -86,4 +86,5 @@ static inline int get_dumpable(struct mm_struct *mm) #define MMF_INIT_MASK (MMF_DUMPABLE_MASK | MMF_DUMP_FILTER_MASK |\ MMF_DISABLE_THP_MASK) +#define MMF_VM_MERGE_ANY 29 #endif /* _LINUX_SCHED_COREDUMP_H */ From patchwork Mon Jan 23 17:37:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 47294 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1744072wrn; Mon, 23 Jan 2023 10:06:46 -0800 (PST) X-Google-Smtp-Source: AMrXdXtATSNaiZOIcLScH8Sdxf4jP7N8kLSvQlBMdpEhO4EEpJFxN79PDRnAb2WKqYbugkOKPBCF X-Received: by 2002:a05:6a00:3006:b0:58b:5f9d:c2fe with SMTP id ay6-20020a056a00300600b0058b5f9dc2femr26601214pfb.29.1674497205716; Mon, 23 Jan 2023 10:06:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674497205; cv=none; d=google.com; s=arc-20160816; b=krpB+Bl9B6gVQoijJDbbo0oTMMMz84MZd0UhceMxA4i7b3PM2HUM+Izny3k9YKUAFc FRWePUkrpBb9yZBeWz0zt2cl+H5FRZ5RJX0RSl8Ofels9z9PQ6onnx+XnaE27HVtS5zj JuDbsgZkKEdGyVbH1G6FZMYP5WX36OPpgONX5wfuNPNaEe1cE+O9NiF4FCoWfGdrworK TCK+kI7GDCdZVH7KJHsBAGzTGzfILLd1h2Qctcvq8R0X9S0Kwtk+731+LS9GiCGl2Ha4 HgdXchYBAYs4Vwq7KwoBF5I0W4nncmH7V11xMQJ19Xv/dbvC2lmIi4UoYW8Z9HRjBKph T6kA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ukh/p78BTzUSB71/CCunrEk0jjIr0HEMFKTMZ8Ud6rI=; b=gRKlVgTmUsQqa/A4ji/6DKOKyyrXKzS85+mIT/xAHWcNaIuqM75L1PufR1y86AoUk6 pP7huchawsqK5TZL3oXYspFpcD5GauhBHlLx2oq+k4VIjEad9LkBF/TU+opvSs4urR2R fiErFWHnHhDYaApgadom4ydSOajfjFzDgquJs0l0FFhtuOIsDqumeTzzlg+6EsnEvaD3 vNkXrQxn99eiDqW4k0NrwGHs4O3/RYCrRJcnmEE6yCfOALMp9CMcLlslzkKG8tw4MSPm +nSr625IPCTfz9Rn6K3/fkEHhy6Qs69jsN+ytsM2OFB6wMjxeitonac0zXmnmHkjeDIT vk3w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b203-20020a621bd4000000b00580e559da3csi48570746pfb.202.2023.01.23.10.06.32; Mon, 23 Jan 2023 10:06:45 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233114AbjAWSEX (ORCPT + 99 others); Mon, 23 Jan 2023 13:04:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233499AbjAWSEV (ORCPT ); Mon, 23 Jan 2023 13:04:21 -0500 Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2182D2330B for ; Mon, 23 Jan 2023 10:04:05 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 45FC35616BD5; Mon, 23 Jan 2023 09:37:56 -0800 (PST) From: Stefan Roesch To: linux-mm@kvack.org Cc: shr@devkernel.io, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND RFC PATCH v1 02/20] mm: add flag to __ksm_enter Date: Mon, 23 Jan 2023 09:37:30 -0800 Message-Id: <20230123173748.1734238-3-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173748.1734238-1-shr@devkernel.io> References: <20230123173748.1734238-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=BAYES_00,RDNS_DYNAMIC, SPF_HELO_PASS,SPF_NEUTRAL,SUSPICIOUS_RECIPS,TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837581839591013?= X-GMAIL-MSGID: =?utf-8?q?1755837581839591013?= This change adds the flag parameter to __ksm_enter. This allows to distinguish if ksm was called by prctl or madvise. Signed-off-by: Stefan Roesch --- include/linux/ksm.h | 6 ++++-- mm/ksm.c | 9 +++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/include/linux/ksm.h b/include/linux/ksm.h index 7e232ba59b86..50e6b56092f3 100644 --- a/include/linux/ksm.h +++ b/include/linux/ksm.h @@ -18,13 +18,15 @@ #ifdef CONFIG_KSM int ksm_madvise(struct vm_area_struct *vma, unsigned long start, unsigned long end, int advice, unsigned long *vm_flags); -int __ksm_enter(struct mm_struct *mm); void __ksm_exit(struct mm_struct *mm); +int __ksm_enter(struct mm_struct *mm, int flag); static inline int ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm) { + if (test_bit(MMF_VM_MERGE_ANY, &oldmm->flags)) + return __ksm_enter(mm, MMF_VM_MERGE_ANY); if (test_bit(MMF_VM_MERGEABLE, &oldmm->flags)) - return __ksm_enter(mm); + return __ksm_enter(mm, MMF_VM_MERGEABLE); return 0; } diff --git a/mm/ksm.c b/mm/ksm.c index dd02780c387f..d84a244fe224 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -2493,8 +2493,9 @@ int ksm_madvise(struct vm_area_struct *vma, unsigned long start, return 0; #endif - if (!test_bit(MMF_VM_MERGEABLE, &mm->flags)) { - err = __ksm_enter(mm); + if (!test_bit(MMF_VM_MERGEABLE, &mm->flags) && + !test_bit(MMF_VM_MERGE_ANY, &mm->flags)) { + err = __ksm_enter(mm, MMF_VM_MERGEABLE); if (err) return err; } @@ -2520,7 +2521,7 @@ int ksm_madvise(struct vm_area_struct *vma, unsigned long start, } EXPORT_SYMBOL_GPL(ksm_madvise); -int __ksm_enter(struct mm_struct *mm) +int __ksm_enter(struct mm_struct *mm, int flag) { struct ksm_mm_slot *mm_slot; struct mm_slot *slot; @@ -2553,7 +2554,7 @@ int __ksm_enter(struct mm_struct *mm) list_add_tail(&slot->mm_node, &ksm_scan.mm_slot->slot.mm_node); spin_unlock(&ksm_mmlist_lock); - set_bit(MMF_VM_MERGEABLE, &mm->flags); + set_bit(flag, &mm->flags); mmgrab(mm); if (needs_wakeup) From patchwork Mon Jan 23 17:37:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 47283 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1742084wrn; Mon, 23 Jan 2023 10:03:41 -0800 (PST) X-Google-Smtp-Source: AMrXdXvC4eOnF2MNfcn3uGNbbbY5IgXfd6arXxHthIGD/j/ZA/kuwOSCESKlGqFp6uAKQ23P3H34 X-Received: by 2002:a05:6402:2b97:b0:479:ab7d:1dad with SMTP id fj23-20020a0564022b9700b00479ab7d1dadmr29209669edb.32.1674497021647; Mon, 23 Jan 2023 10:03:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674497021; cv=none; d=google.com; s=arc-20160816; b=Bs5tVN4xe7DPhJFiTE/BAuZWJtC18N7dvj2zS3eWH1SvRGopXHRH5XFEz5szAgq01F YqFPp6Hk2miHysINVzQW3WxOqXRKkZte4F09qUg/iqAatRrAfZ3INDPP53JzNx2hzQ6p JaORuJ3PK+esk2AD/lZlGCgZ1jPJjvAU+v+WeXlyEqdUS/hTfYFKLjxIsFs4gVgzGyE9 Vj3KtryY0z9xyAcInD75oUaejSP1wZiS8Ip5pKoC5aCB2bfMrsrAbjKwf9IxzHC6oLM9 zNDOhNtymZcTETXO6RuLaCfjPW5JtCddZ0p9altHIhKebPrQ+4o6NG9Vdfji7Fpd6BBD fhOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=euBbnlChzh5NyXkxd3+rY9w1+gYxyY5ES33Gy0DFQi0=; b=JQFKYugRIvb9Fk9nB6Fgqu3sV56j0R4MvqnA+03G3FAZ61vfvJIeos5q2GaJI+iihe IUuOUOHJ+sVTaXwoWw6ZTUOEbgm8/nzK7l1gt3xkbEy3wjjpw2G5y7Fuu2syJ5XxyKnU ELbsS5Y1UDJUmkHJN8PooHw9GTzIbsT8Yjoi5bUcjspsgzxYBDrzH4MUSSdY5OcRw24t WjpJaiNIkAIVmFreWJOJPveIBCIPbDHPoECN0d2W5JDRpIMzPe9oCmoxWUNdQuX0wVBK xsKaurHbD2MvMubQMvkCajYT+uPiZKU/T5fuvVDpDHU32jN6XGKJ8b4nDgL8bT+3vJSy mbBQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t21-20020a05640203d500b0046f9bcabfe6si7024219edw.601.2023.01.23.10.03.18; Mon, 23 Jan 2023 10:03:41 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232797AbjAWR4S (ORCPT + 99 others); Mon, 23 Jan 2023 12:56:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232783AbjAWR4Q (ORCPT ); Mon, 23 Jan 2023 12:56:16 -0500 X-Greylist: delayed 1086 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Mon, 23 Jan 2023 09:56:15 PST Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D803C2CFC6 for ; Mon, 23 Jan 2023 09:56:15 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 4A5615616BD7; Mon, 23 Jan 2023 09:37:56 -0800 (PST) From: Stefan Roesch To: linux-mm@kvack.org Cc: shr@devkernel.io, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND RFC PATCH v1 03/20] mm: add flag to __ksm_exit call Date: Mon, 23 Jan 2023 09:37:31 -0800 Message-Id: <20230123173748.1734238-4-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173748.1734238-1-shr@devkernel.io> References: <20230123173748.1734238-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=BAYES_00,RDNS_DYNAMIC, SPF_HELO_PASS,SPF_NEUTRAL,SUSPICIOUS_RECIPS,TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837389266740904?= X-GMAIL-MSGID: =?utf-8?q?1755837389266740904?= This adds the flag parameter to the __ksm_exit() call. This allows to distinguish if this call is for an prctl or madvise invocation. Signed-off-by: Stefan Roesch --- include/linux/ksm.h | 8 +++++--- mm/ksm.c | 8 ++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/linux/ksm.h b/include/linux/ksm.h index 50e6b56092f3..d38a05a36298 100644 --- a/include/linux/ksm.h +++ b/include/linux/ksm.h @@ -18,8 +18,8 @@ #ifdef CONFIG_KSM int ksm_madvise(struct vm_area_struct *vma, unsigned long start, unsigned long end, int advice, unsigned long *vm_flags); -void __ksm_exit(struct mm_struct *mm); int __ksm_enter(struct mm_struct *mm, int flag); +void __ksm_exit(struct mm_struct *mm, int flag); static inline int ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm) { @@ -32,8 +32,10 @@ static inline int ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm) static inline void ksm_exit(struct mm_struct *mm) { - if (test_bit(MMF_VM_MERGEABLE, &mm->flags)) - __ksm_exit(mm); + if (test_bit(MMF_VM_MERGE_ANY, &mm->flags)) + __ksm_exit(mm, MMF_VM_MERGE_ANY); + else if (test_bit(MMF_VM_MERGEABLE, &mm->flags)) + __ksm_exit(mm, MMF_VM_MERGEABLE); } /* diff --git a/mm/ksm.c b/mm/ksm.c index d84a244fe224..83796328574c 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -2563,12 +2563,16 @@ int __ksm_enter(struct mm_struct *mm, int flag) return 0; } -void __ksm_exit(struct mm_struct *mm) +void __ksm_exit(struct mm_struct *mm, int flag) { struct ksm_mm_slot *mm_slot; struct mm_slot *slot; int easy_to_free = 0; + if (!(current->flags & PF_EXITING) && flag == MMF_VM_MERGE_ANY && + test_bit(MMF_VM_MERGE_ANY, &mm->flags)) + clear_bit(MMF_VM_MERGE_ANY, &mm->flags); + /* * This process is exiting: if it's straightforward (as is the * case when ksmd was never running), free mm_slot immediately. @@ -2595,7 +2599,7 @@ void __ksm_exit(struct mm_struct *mm) if (easy_to_free) { mm_slot_free(mm_slot_cache, mm_slot); - clear_bit(MMF_VM_MERGEABLE, &mm->flags); + clear_bit(flag, &mm->flags); mmdrop(mm); } else if (mm_slot) { mmap_write_lock(mm); From patchwork Mon Jan 23 17:37:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 47299 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1744503wrn; Mon, 23 Jan 2023 10:07:35 -0800 (PST) X-Google-Smtp-Source: AMrXdXsWKuVtR6wg+RMyN6ZSLeq0Y8fomy9ENPa4jE0XthH5jiPqTlHxiOKkD3muv/9P+OAp+X/t X-Received: by 2002:a17:902:c943:b0:195:f071:900 with SMTP id i3-20020a170902c94300b00195f0710900mr14617553pla.42.1674497255105; Mon, 23 Jan 2023 10:07:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674497255; cv=none; d=google.com; s=arc-20160816; b=kV7ZNtTm99xjnDJD5IEaSia2XBfIi9zuxrbPd+Oq1e8gR2L48mepfe6xjA3wZM43t3 wVLwP+4eXFsbjRK056qiqGAYhXHJNb9Y/mP3V75Kg/WS42Rx7u9BYDziB7gxjKR92Xi/ HRhEyEfGzopYLEAQxAAz+MEyVlNubVJWBb2qnQ4RSO7Noi350YWJ4VOHz1ucsPtt7FwL lXyqhojpOVxLvOk0/Dzc3nAQ2rF+VPKR2LS6nzzpCPPjGDllS6ppXr//Jst12bwMK6nb XICny4B5+7qljoAkTzTIXx7uBoqWZqDwo7hASZJHPkDfJc9QNAXgMPMO6PFRzPBOGTX7 4wNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=/hifLxhpa0/uSr3tT88zM9tTa9s6CvyvsChFXbISRug=; b=JQtw0JjP7dTw4IyJ3SS1hE+Ekq1hCGaxPprYlVho9qNwWZ8WFifIKRZecdh1GInlWT oonYWhSJnqZCY0rUn3VQoI2R+3WnSsGcnHSDiHiMyym62lpE+xR1NN3D/ooyUFepn5xE rx0UUQUITlJMrilEC/amPzneJgeXi6R/5JQbXBo9oFcWffP5dMNwkMiZWqfGzqwYqfLn hBJfJyMaqKaFEf3OKS8e0ZjJ+9doefUe+Gi0LXxfvmA+fR49J+ACzmtRNCgH9xgXYN0B GNyKGEZsqt85hx2C95kOszIfhqaiTeXcI5TbsgZ8+IKjoAXmtKb0/UmV1ZKNkValmQEU kJ2w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o16-20020a170902779000b00194d5ec9bfbsi638993pll.439.2023.01.23.10.07.22; Mon, 23 Jan 2023 10:07:35 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233431AbjAWSDQ (ORCPT + 99 others); Mon, 23 Jan 2023 13:03:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233483AbjAWSDN (ORCPT ); Mon, 23 Jan 2023 13:03:13 -0500 Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 987E4113E4 for ; Mon, 23 Jan 2023 10:03:11 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 4EC195616BD9; Mon, 23 Jan 2023 09:37:56 -0800 (PST) From: Stefan Roesch To: linux-mm@kvack.org Cc: shr@devkernel.io, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND RFC PATCH v1 04/20] mm: invoke madvise for all vmas in scan_get_next_rmap_item Date: Mon, 23 Jan 2023 09:37:32 -0800 Message-Id: <20230123173748.1734238-5-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173748.1734238-1-shr@devkernel.io> References: <20230123173748.1734238-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=BAYES_00,RDNS_DYNAMIC, SPF_HELO_PASS,SPF_NEUTRAL,SUSPICIOUS_RECIPS,TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837633695262685?= X-GMAIL-MSGID: =?utf-8?q?1755837633695262685?= If the new flag MMF_VM_MERGE_ANY has been set for a process, iterate over all the vmas and enable ksm if possible. For the vmas that can be ksm enabled this is only done once. Signed-off-by: Stefan Roesch --- mm/ksm.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/mm/ksm.c b/mm/ksm.c index 83796328574c..967eda719fab 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -1013,6 +1013,7 @@ static int unmerge_and_remove_all_rmap_items(void) mm_slot_free(mm_slot_cache, mm_slot); clear_bit(MMF_VM_MERGEABLE, &mm->flags); + clear_bit(MMF_VM_MERGE_ANY, &mm->flags); mmdrop(mm); } else spin_unlock(&ksm_mmlist_lock); @@ -2243,6 +2244,17 @@ static struct ksm_rmap_item *get_next_rmap_item(struct ksm_mm_slot *mm_slot, return rmap_item; } +static bool vma_ksm_mergeable(struct vm_area_struct *vma) +{ + if (vma->vm_flags & VM_MERGEABLE) + return true; + + if (test_bit(MMF_VM_MERGE_ANY, &vma->vm_mm->flags)) + return true; + + return false; +} + static struct ksm_rmap_item *scan_get_next_rmap_item(struct page **page) { struct mm_struct *mm; @@ -2319,8 +2331,20 @@ static struct ksm_rmap_item *scan_get_next_rmap_item(struct page **page) goto no_vmas; for_each_vma(vmi, vma) { - if (!(vma->vm_flags & VM_MERGEABLE)) + if (!vma_ksm_mergeable(vma)) continue; + if (!(vma->vm_flags & VM_MERGEABLE)) { + unsigned long flags = vma->vm_flags; + + /* madvise failed, use next vma */ + if (ksm_madvise(vma, vma->vm_start, vma->vm_end, MADV_MERGEABLE, &flags)) + continue; + /* vma, not supported as being mergeable */ + if (!(flags & VM_MERGEABLE)) + continue; + + vma->vm_flags = flags; + } if (ksm_scan.address < vma->vm_start) ksm_scan.address = vma->vm_start; if (!vma->anon_vma) @@ -2389,6 +2413,7 @@ static struct ksm_rmap_item *scan_get_next_rmap_item(struct page **page) mm_slot_free(mm_slot_cache, mm_slot); clear_bit(MMF_VM_MERGEABLE, &mm->flags); + clear_bit(MMF_VM_MERGE_ANY, &mm->flags); mmap_read_unlock(mm); mmdrop(mm); } else { From patchwork Mon Jan 23 17:37:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 47285 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1742553wrn; Mon, 23 Jan 2023 10:04:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXvmV9BzYPpbESVD4gLuL9WJCmsfYdK5X8vZBWEi4NhhAa6Rwovtu7uo/Xgo/l83rrPcTNzE X-Received: by 2002:a17:907:6021:b0:843:a9fe:f115 with SMTP id fs33-20020a170907602100b00843a9fef115mr24358711ejc.32.1674497062692; Mon, 23 Jan 2023 10:04:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674497062; cv=none; d=google.com; s=arc-20160816; b=lZ5GYNbTKYT4ENccHnyD7dOeDrFJLxyFugfp9/KKIeln6co+w45nNuFQv77db5hn9S ai+0c966hB2XuPLpeWi21i5dLNsGJuMXcdWVisUHlt5Juyv82NhXaSE7+z+qEI0qHQZV Sme9O1BMtt5AQCThwzh08360FOS4+321O+2ytyd7zmtXMvjmAqskKRr47tsjvskdSC2v qBh+G6MC+8kqS1Hnh6HNQ2QFajrlCLoYzr+iMONwqNmNvwLlpp7aRiPP/dNAFlsXpnwj 527NAjGfPpY466YaufNflrLLGjEAqIphZMk4PNGy1UeM3qrkQ/jV6T0U8IUA6moAFbg8 zVsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=dkTe6hQ1qB/aSBv2e8jZ4aQ5awR1SuR87QIIhlPyTwQ=; b=CKhisFbYPxFsmBuPTuf/WTjnPUw/kb8nWhmuny6SNg1SfGQtes15Vq6H/o9Uhmjezp Cgd1ZDPHZTx/n3hvmdOzSPohDst5mJyNsEiGPNr3Om5ZDWrszxs1m8Wt1OeJFvAVJUUP Cusl/D3Xp9zHcfqp+Dfvf1MJGGgI+DxSszkfgqRQIqrGd3AeezWlFzjLDb1nZVnQhW8i ouaP7yoquOKjpMA3SgR79Mwcb0psA9qjPnt4WtXH1/DUpIi61Brpe18D3Lr9XDafBIMD mZTaXoBbObx21/gUvDQDGdtHJU6g9HOaleWPyr8nADXqGqxP/drGto6iSxGQRzTJCazc xc4A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ss4-20020a170907c00400b008697a71e4f0si8364560ejc.811.2023.01.23.10.03.58; Mon, 23 Jan 2023 10:04:22 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232356AbjAWR7I (ORCPT + 99 others); Mon, 23 Jan 2023 12:59:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232988AbjAWR7E (ORCPT ); Mon, 23 Jan 2023 12:59:04 -0500 Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCDF623DA5 for ; Mon, 23 Jan 2023 09:59:03 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 530B85616BDB; Mon, 23 Jan 2023 09:37:56 -0800 (PST) From: Stefan Roesch To: linux-mm@kvack.org Cc: shr@devkernel.io, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND RFC PATCH v1 05/20] mm: support disabling of ksm for a process Date: Mon, 23 Jan 2023 09:37:33 -0800 Message-Id: <20230123173748.1734238-6-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173748.1734238-1-shr@devkernel.io> References: <20230123173748.1734238-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=BAYES_00,RDNS_DYNAMIC, SPF_HELO_PASS,SPF_NEUTRAL,SUSPICIOUS_RECIPS,TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837431930307887?= X-GMAIL-MSGID: =?utf-8?q?1755837431930307887?= This adds the ability to disable ksm for a process if ksm has been enabled for the process. Signed-off-by: Stefan Roesch --- mm/ksm.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/mm/ksm.c b/mm/ksm.c index 967eda719fab..5fa6b46dfa3b 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -2588,6 +2588,27 @@ int __ksm_enter(struct mm_struct *mm, int flag) return 0; } +static void unmerge_vmas(struct mm_struct *mm) +{ + struct vm_area_struct *vma; + struct vma_iterator vmi; + + vma_iter_init(&vmi, mm, 0); + + mmap_read_lock(mm); + for_each_vma(vmi, vma) { + if (vma->vm_flags & VM_MERGEABLE) { + unsigned long flags = vma->vm_flags; + + if (ksm_madvise(vma, vma->vm_start, vma->vm_end, MADV_UNMERGEABLE, &flags)) + continue; + + vma->vm_flags = flags; + } + } + mmap_read_unlock(mm); +} + void __ksm_exit(struct mm_struct *mm, int flag) { struct ksm_mm_slot *mm_slot; @@ -2595,8 +2616,10 @@ void __ksm_exit(struct mm_struct *mm, int flag) int easy_to_free = 0; if (!(current->flags & PF_EXITING) && flag == MMF_VM_MERGE_ANY && - test_bit(MMF_VM_MERGE_ANY, &mm->flags)) + test_bit(MMF_VM_MERGE_ANY, &mm->flags)) { clear_bit(MMF_VM_MERGE_ANY, &mm->flags); + unmerge_vmas(mm); + } /* * This process is exiting: if it's straightforward (as is the From patchwork Mon Jan 23 17:37:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 47303 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1745088wrn; Mon, 23 Jan 2023 10:08:34 -0800 (PST) X-Google-Smtp-Source: AMrXdXtsIWTaH6BRqKmBTgmqI0Z+MHHaKkCDjnA4CnOtmtzh/d+FIzMKP1da+OVNu6yeEjx9ASI/ X-Received: by 2002:a05:6a20:d2c6:b0:b8:5ab4:279c with SMTP id ir6-20020a056a20d2c600b000b85ab4279cmr26164282pzb.30.1674497314476; Mon, 23 Jan 2023 10:08:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674497314; cv=none; d=google.com; s=arc-20160816; b=S+6r0WZ0hKNP40ZIVF8RksqZmkXm5lgACTD0neL4lFJsTR1YQVxaY1o61PdcpYiojA pljgV5DbDmtQVSDByhT/JIUQgY2a5TyIvmWt5o1zvAoYBT2ej48ug7yVLd2wMmPJGsE1 B3QwsTDEhixsxCd93ow9WrVdrID/1z3+lUUAf8zrh+9y/LwtQ4QIsfz7HiGfP7zHixKE ABSl4LwGU5XiSRm/PNVKyLlNafEB2Z5RgZjIWRh7/jRFmRSzTYRJ6wrL/pEAL7ZUtxFe 0XK4D+43BBWZk87QUw2ZDLTqO7bbzBBVtIdNajSMRSpyoaEx4deDtKEXo9mJqf88i4Ql ghcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ucXKiMMl7/A42LPHk0QGuSkEvmMvvR8fx4BZygA5Bmg=; b=ZWgoIt+zOLiWJSTVTCqpC3NITf99OaK1tDUTMfbnnoYA6e7NJAAhTx5b73rzANRi8D QEoaaL6faFL1IY/6OqYBP/AzdYHLgr86i3wJNx1eysEwHqZ1Aa6fSyNC2gQgYVUiDuiE S0zl94uRQecGk5V+Z66KuCCIZr0loFAeqUYCHIgAtpgespHEm1gO1cHK5vDEcfOw18rz kXvz6939zpNBfUR4u6O7HZRgpfVQR9mvvdB4r5zjb5BexE8g8j8fAjmw/VYHHqHNX6V7 zxRK+YafiT/BxO5nuO0iSStyYEqijXB3ns87Cw5iRS6LukSTFafnlQNHjDMpw7BrT/hL BtvA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n20-20020a635914000000b00498688359b6si51820164pgb.287.2023.01.23.10.08.22; Mon, 23 Jan 2023 10:08:34 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233797AbjAWSGy (ORCPT + 99 others); Mon, 23 Jan 2023 13:06:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233793AbjAWSGv (ORCPT ); Mon, 23 Jan 2023 13:06:51 -0500 Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C608330E83 for ; Mon, 23 Jan 2023 10:06:34 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 572115616BDD; Mon, 23 Jan 2023 09:37:56 -0800 (PST) From: Stefan Roesch To: linux-mm@kvack.org Cc: shr@devkernel.io, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND RFC PATCH v1 06/20] mm: add new prctl option to get and set ksm for a process Date: Mon, 23 Jan 2023 09:37:34 -0800 Message-Id: <20230123173748.1734238-7-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173748.1734238-1-shr@devkernel.io> References: <20230123173748.1734238-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=BAYES_00,RDNS_DYNAMIC, SPF_HELO_PASS,SPF_NEUTRAL,SUSPICIOUS_RECIPS,TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837695903428179?= X-GMAIL-MSGID: =?utf-8?q?1755837695903428179?= This adds two new options to the prctl system call - enable ksm for all vmas of a process (if the vmas support it). - query if ksm has been enabled for a process. Signed-off-by: Stefan Roesch --- include/uapi/linux/prctl.h | 2 ++ kernel/sys.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/include/uapi/linux/prctl.h b/include/uapi/linux/prctl.h index a5e06dcbba13..b8ba85f18e43 100644 --- a/include/uapi/linux/prctl.h +++ b/include/uapi/linux/prctl.h @@ -284,4 +284,6 @@ struct prctl_mm_map { #define PR_SET_VMA 0x53564d41 # define PR_SET_VMA_ANON_NAME 0 +#define PR_SET_MEMORY_MERGE 65 +#define PR_GET_MEMORY_MERGE 66 #endif /* _LINUX_PRCTL_H */ diff --git a/kernel/sys.c b/kernel/sys.c index 5fd54bf0e886..de218e3b6f42 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -2626,6 +2627,34 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, case PR_SET_VMA: error = prctl_set_vma(arg2, arg3, arg4, arg5); break; +#ifdef CONFIG_KSM + case PR_SET_MEMORY_MERGE: + if (!capable(CAP_SYS_RESOURCE)) + return -EPERM; + + if (arg2) { + if (mmap_write_lock_killable(me->mm)) + return -EINTR; + + if (test_bit(MMF_VM_MERGEABLE, &me->mm->flags)) + error = -EINVAL; + else if (!test_bit(MMF_VM_MERGE_ANY, &me->mm->flags)) + error = __ksm_enter(me->mm, MMF_VM_MERGE_ANY); + mmap_write_unlock(me->mm); + } else { + __ksm_exit(me->mm, MMF_VM_MERGE_ANY); + } + break; + case PR_GET_MEMORY_MERGE: + if (!capable(CAP_SYS_RESOURCE)) + return -EPERM; + + if (arg2 || arg3 || arg4 || arg5) + return -EINVAL; + + error = !!test_bit(MMF_VM_MERGE_ANY, &me->mm->flags); + break; +#endif default: error = -EINVAL; break; From patchwork Mon Jan 23 17:37:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 47292 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1743556wrn; Mon, 23 Jan 2023 10:05:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXuCXEDmyEj/pRGHedqeA2XkIK6+mSC4Ko6yrYMqBQhQDpQXReSahm8jFtD8/Tq/ocy0x7wX X-Received: by 2002:aa7:da55:0:b0:497:4f53:ee8f with SMTP id w21-20020aa7da55000000b004974f53ee8fmr27261442eds.39.1674497156531; Mon, 23 Jan 2023 10:05:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674497156; cv=none; d=google.com; s=arc-20160816; b=NzPJ+CyyIFcz7bWbI17T26LbfBMJKUOaKsonJemxQ7cq+Nrz0uA4dj+iPYWsu/AVYV DujUwlEUpLfV7k5vA1/eAz73ew/BI2aAo1IJw1ATfukX7ph1PJ2RrxQi4cVlxgKB+BcK ogcA5NWywdIpQTlZkvfvr0cFEByae4I7tz+c6vDXGsfWd4T0zIPGjlFkmXogeRPtXZJT hvayGZoqGPSphBEyjevputouAj00UJUn7Yl/m41ISmBaDMwVGZDsfqkqOUN6CiOeQf9Q EpNNYHLHtbc2F9bSTZdrN0lzs7041kCnMAcXq6YipO/wM8QoqTANQuODdj4y7U0/qsvf qL1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Q+yy9dVQzb3LP9jKQiRsz9lchW7Eo0LuwsAlK7jS7SI=; b=ykJ5hppmyU5ZbxYifW3ccvSzb6l4A5J5aCpVOwfvTpALkhhIS6ASVYUJE2tz+xqD6n D6G2sdrTxqekC4tEet/gbUjKpRJFh8720oiZU2Fxq0xDwktRA/odWUa9cwJvOfbFmRbs Mvs1PsHB7PH3KZeoUHZ8nYG0hq8QXdes1mxogehYqHoSNUMG9491ku5NM1Vcu12jRU2z gedcb5gKif47dEpECO3POS8QJZ/WfkAQhrkVwR+lunf0MEyGxlptSfthTiJYL6mKx0Gi SVmiGSXylzprdhF+1vnxSgWe9UkSGQxii8HuXruQ7QzfPsmkycIwnljQOpEV7P5I27+e 1NOg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ds5-20020a0564021cc500b00478215c1d6esi3768077edb.553.2023.01.23.10.05.32; Mon, 23 Jan 2023 10:05:56 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233326AbjAWSCD (ORCPT + 99 others); Mon, 23 Jan 2023 13:02:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233306AbjAWSCC (ORCPT ); Mon, 23 Jan 2023 13:02:02 -0500 Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D07EC303CB for ; Mon, 23 Jan 2023 10:01:58 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 5D2035616BDF; Mon, 23 Jan 2023 09:37:56 -0800 (PST) From: Stefan Roesch To: linux-mm@kvack.org Cc: shr@devkernel.io, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND RFC PATCH v1 07/20] mm: add tracepoints to ksm Date: Mon, 23 Jan 2023 09:37:35 -0800 Message-Id: <20230123173748.1734238-8-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173748.1734238-1-shr@devkernel.io> References: <20230123173748.1734238-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=BAYES_00,RDNS_DYNAMIC, SPF_HELO_PASS,SPF_NEUTRAL,SUSPICIOUS_RECIPS,TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837530221388421?= X-GMAIL-MSGID: =?utf-8?q?1755837530221388421?= This adds the following tracepoints to ksm: - start / stop scan - ksm enter / exit - merge a page - merge a page with ksm - remove a page - remove a rmap item Signed-off-by: Stefan Roesch Reviewed-by: Steven Rostedt (Google) --- MAINTAINERS | 1 + include/trace/events/ksm.h | 257 +++++++++++++++++++++++++++++++++++++ mm/ksm.c | 20 ++- 3 files changed, 276 insertions(+), 2 deletions(-) create mode 100644 include/trace/events/ksm.h diff --git a/MAINTAINERS b/MAINTAINERS index 123216b76534..990a28bdc263 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13482,6 +13482,7 @@ F: include/linux/memory_hotplug.h F: include/linux/mm.h F: include/linux/mmzone.h F: include/linux/pagewalk.h +F: include/trace/events/ksm.h F: mm/ F: tools/testing/selftests/vm/ diff --git a/include/trace/events/ksm.h b/include/trace/events/ksm.h new file mode 100644 index 000000000000..727d8f6dbc3f --- /dev/null +++ b/include/trace/events/ksm.h @@ -0,0 +1,257 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM ksm + +#if !defined(_TRACE_KSM_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_KSM_H + +#include + +/** + * ksm_scan_template - called for start / stop scan + * + * @seq: sequence number of scan + * @rmap_entries: actual number of rmap entries + * + * Allows to trace the start / stop of a ksm scan. + */ +DECLARE_EVENT_CLASS(ksm_scan_template, + + TP_PROTO(int seq, u32 rmap_entries), + + TP_ARGS(seq, rmap_entries), + + TP_STRUCT__entry( + __field(int, seq) + __field(u32, rmap_entries) + ), + + TP_fast_assign( + __entry->seq = seq; + __entry->rmap_entries = rmap_entries; + ), + + TP_printk("seq %d rmap size %d", + __entry->seq, __entry->rmap_entries) +); + +/** + * ksm_start_scan - called after a new ksm scan is started + * + * @seq: sequence number of scan + * @rmap_entries: actual number of rmap entries + * + * Allows to trace the start of a ksm scan. + */ +DEFINE_EVENT(ksm_scan_template, ksm_start_scan, + + TP_PROTO(int seq, u32 rmap_entries), + + TP_ARGS(seq, rmap_entries) +); + +/** + * ksm_stop_scan - called after a new ksm scan has completed + * + * @seq: sequence number of scan + * @rmap_entries: actual number of rmap entries + * + * Allows to trace the completion of a ksm scan. + */ +DEFINE_EVENT(ksm_scan_template, ksm_stop_scan, + + TP_PROTO(int seq, u32 rmap_entries), + + TP_ARGS(seq, rmap_entries) +); + +/** + * ksm_enter - called after a new process has been added / removed from ksm + * + * @mm: address of the mm object of the process + * @flag: specified flags + * + * Allows to trace the when a process has been added or removed from ksm. + */ +DECLARE_EVENT_CLASS(ksm_enter_exit_template, + + TP_PROTO(void *mm, unsigned int flag), + + TP_ARGS(mm, flag), + + TP_STRUCT__entry( + __field(void *, mm) + __field(unsigned int, flag) + ), + + TP_fast_assign( + __entry->mm = mm; + __entry->flag = flag; + ), + + TP_printk("mm %p flag %u", + __entry->mm, __entry->flag) +); + +/** + * ksm_enter - called after a new process has been added to ksm + * + * @mm: address of the mm object of the process + * @flag: specified flags + * + * Allows to trace the when a process has been added to ksm. + */ +DEFINE_EVENT(ksm_enter_exit_template, ksm_enter, + + TP_PROTO(void *mm, unsigned int flag), + + TP_ARGS(mm, flag) +); + +/** + * ksm_exit - called after a new process has been removed from ksm + * + * @mm: address of the mm object of the process + * @flag: specified flags + * + * Allows to trace the when a process has been removed from ksm. + */ +DEFINE_EVENT(ksm_enter_exit_template, ksm_exit, + + TP_PROTO(void *mm, unsigned int flag), + + TP_ARGS(mm, flag) +); + +/** + * ksm_merge_one_page - called after a page has been merged + * + * @pfn: page frame number of ksm page + * @rmap_item: address of rmap_item object + * @mm: address of the process mm struct + * @err: success + * + * Allows to trace the ksm merging of individual pages. + */ +TRACE_EVENT(ksm_merge_one_page, + + TP_PROTO(unsigned long pfn, void *rmap_item, void *mm, int err), + + TP_ARGS(pfn, rmap_item, mm, err), + + TP_STRUCT__entry( + __field(unsigned long, pfn) + __field(void *, rmap_item) + __field(void *, mm) + __field(int, err) + ), + + TP_fast_assign( + __entry->pfn = pfn; + __entry->rmap_item = rmap_item; + __entry->mm = mm; + __entry->err = err; + ), + + TP_printk("ksm pfn %lu rmap_item %p mm %p error %d", + __entry->pfn, __entry->rmap_item, __entry->mm, __entry->err) +); + +/** + * ksm_merge_with_ksm_page - called after a page has been merged with a ksm page + * + * @ksm_page: address ksm page + * @pfn: page frame number of ksm page + * @rmap_item: address of rmap_item object + * @mm: address of the mm object of the process + * @err: success + * + * Allows to trace the merging of a page with a ksm page. + */ +TRACE_EVENT(ksm_merge_with_ksm_page, + + TP_PROTO(void *ksm_page, unsigned long pfn, void *rmap_item, void *mm, int err), + + TP_ARGS(ksm_page, pfn, rmap_item, mm, err), + + TP_STRUCT__entry( + __field(void *, ksm_page) + __field(unsigned long, pfn) + __field(void *, rmap_item) + __field(void *, mm) + __field(int, err) + ), + + TP_fast_assign( + __entry->ksm_page = ksm_page; + __entry->pfn = pfn; + __entry->rmap_item = rmap_item; + __entry->mm = mm; + __entry->err = err; + ), + + TP_printk("%spfn %lu rmap_item %p mm %p error %d", + (__entry->ksm_page ? "ksm " : ""), + __entry->pfn, __entry->rmap_item, __entry->mm, __entry->err) +); + +/** + * ksm_remove_ksm_page - called after a ksm page has been removed + * + * @pfn: page frame number of ksm page + * + * Allows to trace the removing of stable ksm pages. + */ +TRACE_EVENT(ksm_remove_ksm_page, + + TP_PROTO(unsigned long pfn), + + TP_ARGS(pfn), + + TP_STRUCT__entry( + __field(unsigned long, pfn) + ), + + TP_fast_assign( + __entry->pfn = pfn; + ), + + TP_printk("pfn %lu", __entry->pfn) +); + +/** + * ksm_remove_rmap_item - called after a rmap_item has been removed from the + * stable tree + * + * @pfn: page frame number of ksm page + * @rmap_item: address of rmap_item object + * @mm: address of the process mm struct + * + * Allows to trace the removal of pages from the stable tree list. + */ +TRACE_EVENT(ksm_remove_rmap_item, + + TP_PROTO(unsigned long pfn, void *rmap_item, void *mm), + + TP_ARGS(pfn, rmap_item, mm), + + TP_STRUCT__entry( + __field(unsigned long, pfn) + __field(void *, rmap_item) + __field(void *, mm) + ), + + TP_fast_assign( + __entry->pfn = pfn; + __entry->rmap_item = rmap_item; + __entry->mm = mm; + ), + + TP_printk("pfn %lu rmap_item %p mm %p", + __entry->pfn, __entry->rmap_item, __entry->mm) +); + +#endif /* _TRACE_KSM_H */ + +/* This part must be outside protection */ +#include diff --git a/mm/ksm.c b/mm/ksm.c index 5fa6b46dfa3b..88a969849955 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -45,6 +45,9 @@ #include "internal.h" #include "mm_slot.h" +#define CREATE_TRACE_POINTS +#include + #ifdef CONFIG_NUMA #define NUMA(x) (x) #define DO_NUMA(x) do { (x); } while (0) @@ -633,10 +636,12 @@ static void remove_node_from_stable_tree(struct ksm_stable_node *stable_node) BUG_ON(stable_node->rmap_hlist_len < 0); hlist_for_each_entry(rmap_item, &stable_node->hlist, hlist) { - if (rmap_item->hlist.next) + if (rmap_item->hlist.next) { + trace_ksm_remove_rmap_item(stable_node->kpfn, rmap_item, rmap_item->mm); ksm_pages_sharing--; - else + } else { ksm_pages_shared--; + } rmap_item->mm->ksm_merging_pages--; @@ -657,6 +662,7 @@ static void remove_node_from_stable_tree(struct ksm_stable_node *stable_node) BUILD_BUG_ON(STABLE_NODE_DUP_HEAD <= &migrate_nodes); BUILD_BUG_ON(STABLE_NODE_DUP_HEAD >= &migrate_nodes + 1); + trace_ksm_remove_ksm_page(stable_node->kpfn); if (stable_node->head == &migrate_nodes) list_del(&stable_node->list); else @@ -1319,6 +1325,8 @@ static int try_to_merge_with_ksm_page(struct ksm_rmap_item *rmap_item, get_anon_vma(vma->anon_vma); out: mmap_read_unlock(mm); + trace_ksm_merge_with_ksm_page(kpage, page_to_pfn(kpage ? kpage : page), + rmap_item, mm, err); return err; } @@ -2137,6 +2145,8 @@ static void cmp_and_merge_page(struct page *page, struct ksm_rmap_item *rmap_ite if (vma) { err = try_to_merge_one_page(vma, page, ZERO_PAGE(rmap_item->address)); + trace_ksm_merge_one_page(page_to_pfn(ZERO_PAGE(rmap_item->address)), + rmap_item, mm, err); } else { /* * If the vma is out of date, we do not need to @@ -2270,6 +2280,8 @@ static struct ksm_rmap_item *scan_get_next_rmap_item(struct page **page) mm_slot = ksm_scan.mm_slot; if (mm_slot == &ksm_mm_head) { + trace_ksm_start_scan(ksm_scan.seqnr, ksm_rmap_items); + /* * A number of pages can hang around indefinitely on per-cpu * pagevecs, raised page count preventing write_protect_page @@ -2433,6 +2445,7 @@ static struct ksm_rmap_item *scan_get_next_rmap_item(struct page **page) if (mm_slot != &ksm_mm_head) goto next_mm; + trace_ksm_stop_scan(ksm_scan.seqnr, ksm_rmap_items); ksm_scan.seqnr++; return NULL; } @@ -2585,6 +2598,7 @@ int __ksm_enter(struct mm_struct *mm, int flag) if (needs_wakeup) wake_up_interruptible(&ksm_thread_wait); + trace_ksm_enter(mm, flag); return 0; } @@ -2653,6 +2667,8 @@ void __ksm_exit(struct mm_struct *mm, int flag) mmap_write_lock(mm); mmap_write_unlock(mm); } + + trace_ksm_exit(mm, flag); } struct page *ksm_might_need_to_copy(struct page *page, From patchwork Mon Jan 23 17:37:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 47284 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1742354wrn; Mon, 23 Jan 2023 10:04:04 -0800 (PST) X-Google-Smtp-Source: AMrXdXsrHJtkkZgCWrelyE33FH8aUItdKSd2WlgDjg0V06qhAxfIzErvclkwF9JTEchlVv1QWeop X-Received: by 2002:a17:906:fcb3:b0:86f:8ccb:5d0a with SMTP id qw19-20020a170906fcb300b0086f8ccb5d0amr26426209ejb.36.1674497044421; Mon, 23 Jan 2023 10:04:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674497044; cv=none; d=google.com; s=arc-20160816; b=PbUbVNtB67I7fHs1DrkYiVhrvcZWB10vec4VHKwvU8lSL8UxIg+SyBl2QOY3r/s2Hj 8Y0x6XlDhuYna2Ma6dDY9p/j3+aczUJxNPrK92QE9cbsU2ItMwyHg6ey/5EL+L7O0Qur Ygi+v+FroJj6BewRkkF0SHgISjRB8GYMDIDI8kfVmY4aw9n0x2MCnSRK5X1l+4Grjg9c XfpA5zkTgrvtvU/BeVh1ga5vIBZ4j4sHyfwiryupB+CqOw3LnQbjcQPQwJG9tEpmhiBd FTu9X4NSy2NcIfGXBzt5sM1V1iX3AU+Q0EFMJV6/kPlXt9HGZVdW7Uv6UcxcQ9rCONFr FjqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=0zP3lOdxr+0UCksWUl3LEQ9z7YRL6nH+bNz8mNUcGwc=; b=mGA1TKVdsQIjhDoFZ43j3dlCRhnwyx7A5a+ZbS8OY+QOfOcskvw87nk/P9SbfnXAPU x6AA7I+aC9s3dNGrKdMgE+OCLHXgMivFFFgw0CP6uKMSuNVotBfgOONjo/nMiDez8WzD xMTl5O5X4VGl3z844yc52Zc8VNp2+LayMyrvWq1acocIEbSyND0y3DwApihbvQS7B34W iPKu8TT69ZkyBnp9Qi/yW2uxG/xR8SfimJ8RMSh+tOOUwzw1JtaWVBHybT6qahTXPqUX rFVjFPbT/C7r3waaj42IV8s//yFJK32Eq04aNrX0K0RwclE/jcff9lV51vLTUU8IheXD +hbQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h16-20020a0564020e1000b0049e283e04c9si46020edh.28.2023.01.23.10.03.40; Mon, 23 Jan 2023 10:04:04 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232876AbjAWR5c (ORCPT + 99 others); Mon, 23 Jan 2023 12:57:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232770AbjAWR5b (ORCPT ); Mon, 23 Jan 2023 12:57:31 -0500 Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A60E32CFC5 for ; Mon, 23 Jan 2023 09:57:28 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 5F7EA5616BE1; Mon, 23 Jan 2023 09:37:56 -0800 (PST) From: Stefan Roesch To: linux-mm@kvack.org Cc: shr@devkernel.io, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND RFC PATCH v1 08/20] mm: split off pages_volatile function Date: Mon, 23 Jan 2023 09:37:36 -0800 Message-Id: <20230123173748.1734238-9-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173748.1734238-1-shr@devkernel.io> References: <20230123173748.1734238-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=BAYES_00,RDNS_DYNAMIC, SPF_HELO_PASS,SPF_NEUTRAL,SUSPICIOUS_RECIPS,TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837412894410420?= X-GMAIL-MSGID: =?utf-8?q?1755837412894410420?= This splits off the pages_volatile function. The next patch will use this function. Signed-off-by: Stefan Roesch --- mm/ksm.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index 88a969849955..19f434f97dc1 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -3182,8 +3182,7 @@ static ssize_t pages_unshared_show(struct kobject *kobj, } KSM_ATTR_RO(pages_unshared); -static ssize_t pages_volatile_show(struct kobject *kobj, - struct kobj_attribute *attr, char *buf) +static long pages_volatile(void) { long ksm_pages_volatile; @@ -3195,7 +3194,14 @@ static ssize_t pages_volatile_show(struct kobject *kobj, */ if (ksm_pages_volatile < 0) ksm_pages_volatile = 0; - return sysfs_emit(buf, "%ld\n", ksm_pages_volatile); + + return ksm_pages_volatile; +} + +static ssize_t pages_volatile_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return sysfs_emit(buf, "%ld\n", pages_volatile()); } KSM_ATTR_RO(pages_volatile); From patchwork Mon Jan 23 17:37:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 47286 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1742554wrn; Mon, 23 Jan 2023 10:04:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXv4wWvp5py6ZR65YF4YlNnA+hGuhpfXnPTeFAMTzt3O+X5GbbCuA6NHJyMyWRoHvR3hu55P X-Received: by 2002:a05:6402:f20:b0:499:b672:ee3a with SMTP id i32-20020a0564020f2000b00499b672ee3amr32041262eda.12.1674497062688; Mon, 23 Jan 2023 10:04:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674497062; cv=none; d=google.com; s=arc-20160816; b=FKpoA5kWoqCnJxdElL+gUZ3ZyPALkV1T+gQ/QAkkUXmf5beodFAd4nnUosDtOH6JQe Ho1DNqjNo4ES8gVEwOpyAa5oaLlPLzywjVK0IGMhA8k8+CdFmBgQYe/oIXb4PJibw/PR hulRuUdQKLwZ5v6wdZh+KnRlNyxZPR/gx3nQIiHIHWe2ZsfpnlJ20wQ14b8rQsJLYhXh pWex6jdbQctd2GWcqBbGkbQMYmpOCvg02lkyQAQPKw+4VE9SPnHx3chZutfrB1dg3tvS Tl3BfgQVFO9ONvTQ/uy1oobU6l1qEb9aGr/Fh4BSfi6diSsD0hfZiGdBCMzZuS3qh6qn Kfgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=BL99fR2JiovciqZqm6mH4hPxhKKNFtoaiqSvJzgiEIg=; b=Gca/CRS9S1uHeP0pRoG3g9C5zNJKwyAEFfmivTBlhZr2r2uyllaG90x5930kp6pvfO 75Mj/afCvEG+DZaWWh6ml6CUhBshEBC2dmEfKamzms/+FbGcnRgSFuKOUE2Axa2wAK1o rRo7V0YqpVH+dLVNxyxTvuwAHYpnqH3Q1cdjTKH/AV9cegWm8tZoXeQohE6Vv0uRFeUW BizAhfw9vFnlfoCWQjLj/fKpes2cwGOwQpeIv9Le9D7dQmW24yQgg20z+ZW3oR1ifUO0 oMsNARVswbWDV4cuGHukksS/1wpkT0Ej0Ac+bNNKHjiIbVaUTzcwXQVboqv+Vn3KlTCd LmBA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d14-20020a056402000e00b0048e1008c744si22042edu.147.2023.01.23.10.03.56; Mon, 23 Jan 2023 10:04:22 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231584AbjAWR6n (ORCPT + 99 others); Mon, 23 Jan 2023 12:58:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232223AbjAWR6m (ORCPT ); Mon, 23 Jan 2023 12:58:42 -0500 Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C088223D88 for ; Mon, 23 Jan 2023 09:58:41 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 636A05616BE3; Mon, 23 Jan 2023 09:37:56 -0800 (PST) From: Stefan Roesch To: linux-mm@kvack.org Cc: shr@devkernel.io, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND RFC PATCH v1 09/20] mm: expose general_profit metric Date: Mon, 23 Jan 2023 09:37:37 -0800 Message-Id: <20230123173748.1734238-10-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173748.1734238-1-shr@devkernel.io> References: <20230123173748.1734238-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=BAYES_00,RDNS_DYNAMIC, SPF_HELO_PASS,SPF_NEUTRAL,SUSPICIOUS_RECIPS,TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837432221252127?= X-GMAIL-MSGID: =?utf-8?q?1755837432221252127?= The documentation mentions a general profit metric, however this metric is not calculated. In addition the formula depends on the size of internal structures, which makes it more difficult for an administrator to make the calculation. Adding the metric for a better user experience. Signed-off-by: Stefan Roesch --- mm/ksm.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/mm/ksm.c b/mm/ksm.c index 19f434f97dc1..d29454a802a0 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -3205,6 +3205,21 @@ static ssize_t pages_volatile_show(struct kobject *kobj, } KSM_ATTR_RO(pages_volatile); +static ssize_t general_profit_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + long general_profit; + long all_rmap_items; + + all_rmap_items = ksm_max_page_sharing + ksm_pages_shared + + ksm_pages_unshared + pages_volatile(); + general_profit = ksm_pages_sharing * PAGE_SIZE - + all_rmap_items * sizeof(struct ksm_rmap_item); + + return sysfs_emit(buf, "%ld\n", general_profit); +} +KSM_ATTR_RO(general_profit); + static ssize_t stable_node_dups_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) { @@ -3269,6 +3284,7 @@ static struct attribute *ksm_attrs[] = { &stable_node_dups_attr.attr, &stable_node_chains_prune_millisecs_attr.attr, &use_zero_pages_attr.attr, + &general_profit_attr.attr, NULL, }; From patchwork Mon Jan 23 17:37:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 47288 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1743309wrn; Mon, 23 Jan 2023 10:05:31 -0800 (PST) X-Google-Smtp-Source: AMrXdXvDDo+auUtjhm5kiubPo5iUf+idrYyvDlZ6Us6bolK4XPbBaGx/zieIeA0bfflCon8lgzzr X-Received: by 2002:aa7:c9c7:0:b0:499:cc32:6a52 with SMTP id i7-20020aa7c9c7000000b00499cc326a52mr37935386edt.16.1674497131613; Mon, 23 Jan 2023 10:05:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674497131; cv=none; d=google.com; s=arc-20160816; b=wct7r0k8iDXPellzavZUUEVRLgtufXSQ+D4/TBIoHjp7/dC1a68KJfHQU/uz12syXq OjfGSSH8VeHwMhSIPjzZaySOE8UxSwl64o/Im8wUE2WT/H18I5+Ss3DfbizkUfImTo5y sill9fn9isY+g2vkuVn9rnQzp9pgxDaWt7fGwUTrUMIqOESV9m1mxHxzRJMB3riwJNUZ TBrFXQ/nxbO4N6jRCUsvwJRD5NUliMSYfLV74PT4Y5wqjrvpB0oY0zvEOk2IuHinlomS picCmg9fhWA+PlEF8X2fWi8Q67YjR+NGB4yUqX0vMzhtx5aHb6I6NbDecqiA0PPViaSL elxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=CA0SVXvV73URjako0cuzE5C6ugRhDCRksA+GC3YJ0zQ=; b=G94YeYLpE+OPzfNtFSUfGSCkfJAdIHsWopQxyAmLuJg6Mw4k6Jb36i6udQs3xoh9hS kKCpQxxvbVe2WBr7/spdijLBS7ir7osXg60CTpuVmbzDK9ssPvGjAaKrw9o1PrEYivuC 5hiMIZ5h9eMUDYeYIWgsw89Ek1i+9aFQ99emqpER+kQKZYL5mxBGYca8ywLn4NGdm4CP 3NVVFRljMk49i070UnNA0SRzDT9lmipWOVrUfv5Fw/tjgAxISbspExlQLE1im/z+pCwL h92KZCEPdZwdYWM4SZeRlVv94PQ7APTXVDigjNe7iXgvYta/ZiOKuOOmktqqUhSCWXf/ 764g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p26-20020a056402501a00b0049e16834b77si1650eda.346.2023.01.23.10.05.07; Mon, 23 Jan 2023 10:05:31 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233293AbjAWSBu (ORCPT + 99 others); Mon, 23 Jan 2023 13:01:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233077AbjAWSBt (ORCPT ); Mon, 23 Jan 2023 13:01:49 -0500 Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F21C444BD for ; Mon, 23 Jan 2023 10:01:47 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 67ABE5616BE5; Mon, 23 Jan 2023 09:37:56 -0800 (PST) From: Stefan Roesch To: linux-mm@kvack.org Cc: shr@devkernel.io, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND RFC PATCH v1 10/20] docs: document general_profit sysfs knob Date: Mon, 23 Jan 2023 09:37:38 -0800 Message-Id: <20230123173748.1734238-11-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173748.1734238-1-shr@devkernel.io> References: <20230123173748.1734238-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=BAYES_00,RDNS_DYNAMIC, SPF_HELO_PASS,SPF_NEUTRAL,SUSPICIOUS_RECIPS,TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837504244463334?= X-GMAIL-MSGID: =?utf-8?q?1755837504244463334?= This adds documentation for the new /sys/kernel/mm/ksm/general_profit knob. Signed-off-by: Stefan Roesch --- Documentation/ABI/testing/sysfs-kernel-mm-ksm | 8 ++++++++ Documentation/admin-guide/mm/ksm.rst | 2 ++ 2 files changed, 10 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-kernel-mm-ksm b/Documentation/ABI/testing/sysfs-kernel-mm-ksm index d244674a9480..7768e90f7a8f 100644 --- a/Documentation/ABI/testing/sysfs-kernel-mm-ksm +++ b/Documentation/ABI/testing/sysfs-kernel-mm-ksm @@ -51,3 +51,11 @@ Description: Control merging pages across different NUMA nodes. When it is set to 0 only pages from the same node are merged, otherwise pages from all nodes can be merged together (default). + +What: /sys/kernel/mm/ksm/general_profit +Date: January 2023 +KernelVersion: 6.1 +Contact: Linux memory management mailing list +Description: Measure how effective KSM is. + general_profit: how effective is KSM. The formula for the + calculation is in Documentation/admin-guide/mm/ksm.rst. diff --git a/Documentation/admin-guide/mm/ksm.rst b/Documentation/admin-guide/mm/ksm.rst index fb6ba2002a4b..72189bf1283e 100644 --- a/Documentation/admin-guide/mm/ksm.rst +++ b/Documentation/admin-guide/mm/ksm.rst @@ -159,6 +159,8 @@ stable_node_chains_prune_millisecs The effectiveness of KSM and MADV_MERGEABLE is shown in ``/sys/kernel/mm/ksm/``: +general_profit + how effective is KSM. The calculation is explained below. pages_shared how many shared pages are being used pages_sharing From patchwork Mon Jan 23 17:37:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 47295 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1744085wrn; Mon, 23 Jan 2023 10:06:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXu1JH4vriWajXHElJV+2OhlIVtc0Zhww/PmSEkolbcMCbP6BC1yC8kIZpcpt0CjK/n1fbRy X-Received: by 2002:aa7:dcd0:0:b0:49e:c9f4:1e5b with SMTP id w16-20020aa7dcd0000000b0049ec9f41e5bmr12870517edu.7.1674497207033; Mon, 23 Jan 2023 10:06:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674497207; cv=none; d=google.com; s=arc-20160816; b=qqJpFYeglbBTxfqju7PoywhIX70YzoOJmBzTL4wVfnuzEOkX8gbJMkJPjTRwRYw9Qw VltOFARtlD7xiyiuHYh7spZNj3IdhfAVh+1CSjF3Xj9NaGArZP1cxJPgc+y6HlnLM6++ HwBZilcSLU3MRXpKYm5iThGAaMmRt2v/MrxB1DKIqArI+0E8mHQDwjn9AFCPYYAFxcWu uE8rJgNe0B6YfIi8eZJEPGNYWq03FTekEMx1qJ1FnkeZKlzsIK0JQ78vpFhZMTMZDFEk HBoJ0Og57TM8c/OYi7JqXFWOxhlpyQFgQW4NlzLo7FZg7IGbrmrSuNHCYY3UgxGPRd83 ogmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=FWkDwqnduO/ODHyQgdE5Zu/r/6qm0MdGBf1NS8vrglw=; b=yQCKH8YRdhj4QCkPFUyeoy1SohogBj/Ep9KaPOjvP/KZl0mzE5j03xnleesRrG4gRt y8KDYKsne6Vu1c67CBRXB4fHVXvD+SxzhCj2o2AmzdrsxjkGqw2xQXGpwe2/vXq57GcZ xABqqEU/VKdSFjT9mXEsz7wyCxqChcUT5/ScWXJC55aNJ6peKI5b7NEchNWOxCyudzDl DYBldo0MiWapJpJq383yAmkJc77ydMlPhlwBotCyY3k5hUI5I3P7onHWp3RA6BU/ZUNQ EdOd3uFW0LyMMTHGNN3gpKnzIOl/UCk0BooMI+JA322ZMPdTyMl/1dW0Ki3pYf2SKprV EHwA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j20-20020a05640211d400b0047db5ff4936si33641616edw.490.2023.01.23.10.06.16; Mon, 23 Jan 2023 10:06:47 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233512AbjAWSDt (ORCPT + 99 others); Mon, 23 Jan 2023 13:03:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233499AbjAWSDp (ORCPT ); Mon, 23 Jan 2023 13:03:45 -0500 Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B381B2D162 for ; Mon, 23 Jan 2023 10:03:43 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 6B83A5616BE7; Mon, 23 Jan 2023 09:37:56 -0800 (PST) From: Stefan Roesch To: linux-mm@kvack.org Cc: shr@devkernel.io, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND RFC PATCH v1 11/20] mm: calculate ksm process profit metric Date: Mon, 23 Jan 2023 09:37:39 -0800 Message-Id: <20230123173748.1734238-12-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173748.1734238-1-shr@devkernel.io> References: <20230123173748.1734238-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=BAYES_00,RDNS_DYNAMIC, SPF_HELO_PASS,SPF_NEUTRAL,SUSPICIOUS_RECIPS,TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837583231481097?= X-GMAIL-MSGID: =?utf-8?q?1755837583231481097?= The ksm documentation mentions the process profit metric and how to calculate it. This adds the calculation of the metric. Signed-off-by: Stefan Roesch --- include/linux/ksm.h | 4 ++++ mm/ksm.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/include/linux/ksm.h b/include/linux/ksm.h index d38a05a36298..a18cd03efcfb 100644 --- a/include/linux/ksm.h +++ b/include/linux/ksm.h @@ -55,6 +55,10 @@ struct page *ksm_might_need_to_copy(struct page *page, void rmap_walk_ksm(struct folio *folio, struct rmap_walk_control *rwc); void folio_migrate_ksm(struct folio *newfolio, struct folio *folio); +#ifdef CONFIG_PROC_FS +long ksm_process_profit(struct mm_struct *); +#endif /* CONFIG_PROC_FS */ + #else /* !CONFIG_KSM */ static inline int ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm) diff --git a/mm/ksm.c b/mm/ksm.c index d29454a802a0..288689b59527 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -2935,6 +2935,14 @@ static void wait_while_offlining(void) } #endif /* CONFIG_MEMORY_HOTREMOVE */ +#ifdef CONFIG_PROC_FS +long ksm_process_profit(struct mm_struct *mm) +{ + return (long)mm->ksm_merging_pages * PAGE_SIZE - + mm->ksm_rmap_items * sizeof(struct ksm_rmap_item); +} +#endif /* CONFIG_PROC_FS */ + #ifdef CONFIG_SYSFS /* * This all compiles without CONFIG_SYSFS, but is a waste of space. From patchwork Mon Jan 23 17:37:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 47290 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1743460wrn; Mon, 23 Jan 2023 10:05:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXtzaAAcdvxjbj2Y7O+0ya+2uIapb7D4eBEF+iQ5CHeIZxFtri+TxAUzIDIXLvjr1F42GaXR X-Received: by 2002:a17:906:4694:b0:86d:c1b2:257b with SMTP id a20-20020a170906469400b0086dc1b2257bmr37209405ejr.19.1674497147856; Mon, 23 Jan 2023 10:05:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674497147; cv=none; d=google.com; s=arc-20160816; b=GyWV9IhOW+kARg+si6blem90dlldNQ5IpXjtB1YpDm2ZoqV3jFCRZo1bNvoRRuRV38 PEGwdBYI/aQ9Trm/aV5n0VmsgwtJLgJxK2j9SsTOJ0vb51nYy6l6P1MANcUbGmbt6v2z vdEBALgDMF1kav3X5gtqLpqFJkjb0TL7bRKm0qKqher84tq5CTrl7rQgDnNJ54hvUIba 8XtdhK0jIUDgH7+MYqVwJKjIlzCxur53pjCBlpXG2/IRBY01QDHYpC9H1OsofGQrp7Cr s52hcsvm/8po6RRu9QUymgAkscFmye33+HLnA333t4VEkrDp+LUEha8Y2Ytoj2ynQ60A IJmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=8P5nJvBBBXt+f7B98ljEhcX6LRnkeWeqEmjDASSaXMo=; b=1F9XOOBUAuge3kFnKR0/pgPuzHngPF7zxd1LMJqHvgzrvv8cyHjK6BeBAX+JIhLCzB 8iS7oUDA0HFaefnFmIhEaXrKw3nRTsY+EtP7ghO9VzIcVaJPiXBpx72698PfZp9VhxL7 Em7ubV2nBNvO+GeJLTlHnaPVGOiqNUC1BcPp/pq6n74oKpHjl+qvxAFRNbFsT96MEGRt Jz0neQGixkzcbYGVG7SDXSB3AM/4w7vfSKUqXE/pTKAyuZ8dpIaXbzB5znuRbOJrCDFY 4SFXgV7kNNwensa7hwYTOuXtmM6AfN4U2ZN74cBG5IqYNzluy43+hK1LxALPxlf1SKKo sAyg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k14-20020a170906a38e00b008697a71e4ebsi30095892ejz.853.2023.01.23.10.05.15; Mon, 23 Jan 2023 10:05:47 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233427AbjAWSDH (ORCPT + 99 others); Mon, 23 Jan 2023 13:03:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233419AbjAWSDG (ORCPT ); Mon, 23 Jan 2023 13:03:06 -0500 Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E279BCA0E for ; Mon, 23 Jan 2023 10:03:00 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 6F5EE5616BE9; Mon, 23 Jan 2023 09:37:56 -0800 (PST) From: Stefan Roesch To: linux-mm@kvack.org Cc: shr@devkernel.io, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND RFC PATCH v1 12/20] mm: add ksm_merge_type() function Date: Mon, 23 Jan 2023 09:37:40 -0800 Message-Id: <20230123173748.1734238-13-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173748.1734238-1-shr@devkernel.io> References: <20230123173748.1734238-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=BAYES_00,RDNS_DYNAMIC, SPF_HELO_PASS,SPF_NEUTRAL,SUSPICIOUS_RECIPS,TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837521226598668?= X-GMAIL-MSGID: =?utf-8?q?1755837521226598668?= This adds the ksm_merge_type function. The function returns the merge type for the process. For madvise it returns "madvise", for prctl it returns "process" and otherwise it returns "none". Signed-off-by: Stefan Roesch --- include/linux/ksm.h | 1 + mm/ksm.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/include/linux/ksm.h b/include/linux/ksm.h index a18cd03efcfb..d5f69f18ee5a 100644 --- a/include/linux/ksm.h +++ b/include/linux/ksm.h @@ -57,6 +57,7 @@ void folio_migrate_ksm(struct folio *newfolio, struct folio *folio); #ifdef CONFIG_PROC_FS long ksm_process_profit(struct mm_struct *); +const char *ksm_merge_type(struct mm_struct *mm); #endif /* CONFIG_PROC_FS */ #else /* !CONFIG_KSM */ diff --git a/mm/ksm.c b/mm/ksm.c index 288689b59527..57183deaf529 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -2941,6 +2941,17 @@ long ksm_process_profit(struct mm_struct *mm) return (long)mm->ksm_merging_pages * PAGE_SIZE - mm->ksm_rmap_items * sizeof(struct ksm_rmap_item); } + +/* Return merge type name as string. */ +const char *ksm_merge_type(struct mm_struct *mm) +{ + if (test_bit(MMF_VM_MERGE_ANY, &mm->flags)) + return "process"; + else if (test_bit(MMF_VM_MERGEABLE, &mm->flags)) + return "madvise"; + else + return "none"; +} #endif /* CONFIG_PROC_FS */ #ifdef CONFIG_SYSFS From patchwork Mon Jan 23 17:37:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 47291 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1743536wrn; Mon, 23 Jan 2023 10:05:55 -0800 (PST) X-Google-Smtp-Source: AMrXdXtsZ130uUj+MN6yYCeXnIrSZBpyjo46Qomz0iic83Ce+u7cpl3C3lZHjwAbVBiQhtdcdbT+ X-Received: by 2002:a17:907:234d:b0:81f:fc05:2ba0 with SMTP id we13-20020a170907234d00b0081ffc052ba0mr22849021ejb.2.1674497155608; Mon, 23 Jan 2023 10:05:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674497155; cv=none; d=google.com; s=arc-20160816; b=Kho89uHJTOkxzPKzFg/JGAsZm+OIatrhCMDDvDVMu0KXiu1UFV0bEYI+TcvT5dJ7EX yZIjcUznFHz2+wxStZcLYzUUeV8gXD/qhsWp/NLdzUwqgOnu1s3EmqhJIJW/Rp0h/es0 X/TspGX/UmKKtKrJruaYu37ErBrSYui9xSF4bRlNU9ytSJY9aRtIWDEyir3RPSvTU5P4 feY48S1gIKOrYebGZSFDKASdM5wEBDrFPwpoI9c5NyYxDLKswP1LMPIGDgIflh1wdzr5 C8EMtrLqaMP3khCF2hlTQqmO3tcwMm8DEA10I5tVIa+IgPNJUpG7eO/scgqXTE7YGPNZ ajdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=OEwH+3PoAg0i63suZqVpZUf8rAexTmeuq4F/YsaSxAk=; b=eH/ZHX/KUpmVkI7vFbC++KGGEO0h+MQKP79jDtw0+9OajWVXo2MBlBbwD1ZhKvdB14 hrTmr16ZmibNXiEXiOenYW1I6C2+tgfdgDFTOB9jIQJeHxGFr+/ao06jIa/ZDPHDLnUa O86sku0sU6W/Cup/ai8xd2WCraI79pMiWznLVYo1nLLHYHkwC7Gz4NWszIRyG0PpSNu0 hzNTpf9UaAC3Zxq/PvaHN3YM6cqefqQpZE2jng2fLhRl7ryBnfrkq1no6/mIsOqcyPiW it1+rhxZIIvqo/TBr9f0iO6AmmVupdVCmx7Zj/tv2IATQEzXiOyx8ZxLDogPXzfa++Wg LoZA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e12-20020a17090658cc00b0087194db3565si27777218ejs.551.2023.01.23.10.05.31; Mon, 23 Jan 2023 10:05:55 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233254AbjAWSBM (ORCPT + 99 others); Mon, 23 Jan 2023 13:01:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231705AbjAWSBL (ORCPT ); Mon, 23 Jan 2023 13:01:11 -0500 Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 069212CFC5 for ; Mon, 23 Jan 2023 10:01:08 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 732985616BEB; Mon, 23 Jan 2023 09:37:56 -0800 (PST) From: Stefan Roesch To: linux-mm@kvack.org Cc: shr@devkernel.io, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND RFC PATCH v1 13/20] mm: expose ksm process profit metric in ksm_stat Date: Mon, 23 Jan 2023 09:37:41 -0800 Message-Id: <20230123173748.1734238-14-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173748.1734238-1-shr@devkernel.io> References: <20230123173748.1734238-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=BAYES_00,RDNS_DYNAMIC, SPF_HELO_PASS,SPF_NEUTRAL,SUSPICIOUS_RECIPS,TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837529658261726?= X-GMAIL-MSGID: =?utf-8?q?1755837529658261726?= This exposes the ksm process profit metric in /proc//ksm_stat. The documentation mentions the formula for the ksm process profit metric, however it does not calculate it. In addition the formula depends on the size of internal structures. So it makes sense to expose it. Signed-off-by: Stefan Roesch --- fs/proc/base.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/proc/base.c b/fs/proc/base.c index 9e479d7d202b..a2b7779f76f6 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -96,6 +96,7 @@ #include #include #include +#include #include #include "internal.h" #include "fd.h" @@ -3207,6 +3208,8 @@ static int proc_pid_ksm_stat(struct seq_file *m, struct pid_namespace *ns, mm = get_task_mm(task); if (mm) { seq_printf(m, "ksm_rmap_items %lu\n", mm->ksm_rmap_items); + seq_printf(m, "ksm_merging_pages %lu\n", mm->ksm_merging_pages); + seq_printf(m, "ksm_process_profit %ld\n", ksm_process_profit(mm)); mmput(mm); } From patchwork Mon Jan 23 17:37:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 47301 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1744926wrn; Mon, 23 Jan 2023 10:08:18 -0800 (PST) X-Google-Smtp-Source: AMrXdXuiq4EeQQdwtiYIpGEvQOGXKF2HPV8z1Y9kkmruDPrB9QoHkXLAHsV/JT43TJWd2uW5xaso X-Received: by 2002:a05:6a20:3d0f:b0:b8:4812:70cb with SMTP id y15-20020a056a203d0f00b000b8481270cbmr34719631pzi.2.1674497297724; Mon, 23 Jan 2023 10:08:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674497297; cv=none; d=google.com; s=arc-20160816; b=mgffw81HEFFZlAC4yrRENLagniDwwskNwDswfYkxOrqpBURU+KHTthz9X9WZsXeQZ9 +va9hJnMbMmkOOtzMOE6aVHKWcloTuxa5e/uve1fEV7p2M+KCc9m6rjQPKfClAJfFhO/ bSvFm0GC3w6ZBiK6BIgqzLkbu5mbI1RW25712LLzbatJw6gKfLLzECzLw21ZBLlzyWw1 BFTxsRHFPolD7xZzSLFDJsQRBhcrElbYFRCz1bOQd6NPQQhDkkvMP5414qggnJdIkhyM Dlth1nsLr/M3RGZFMLtgK+lrygolxlwYQ+v0dG9mMvNm2RUv0t576rO83i7ztwYPa+nv G+Rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=M9n46KmmTPQMjnZG+W9yInSyzHIuWxq53EhKeS5hBuA=; b=zz8Kfm/aXCwu98YTu3M4bVVdpzHpq4MwwWR5Jk7/UO3wdhxnaV5nU0t5JQNPLJrfdV OF0JVdEPTYXl3kjRTYlWylm2xGVNxM8tUWfchfEhIeQvpZDWZvv3TNoNPe9w65z/m3w8 N3hcL365HSsasMvdFmI+B9du0So0KzMOBkTpqCNdm6dCXVpa2zEvLjljv5SteeYWR4ob 2lJxffLQcZx/uneYh/s5HauQudHf09/rFMQZpu/VzO6dFPC4EuRlPsg+UZYYF4xvyEi0 OXkXQgQL/wolHfi2SOzKsx4oc+CQvsrjXPmN3d8+rEJYJBfhdfxzQg9jSnVQVg7iP+Iu aB2g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q26-20020a63f95a000000b004a46963e2b7si49832749pgk.313.2023.01.23.10.08.05; Mon, 23 Jan 2023 10:08:17 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233837AbjAWSGa (ORCPT + 99 others); Mon, 23 Jan 2023 13:06:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233797AbjAWSGY (ORCPT ); Mon, 23 Jan 2023 13:06:24 -0500 Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5B60305DC for ; Mon, 23 Jan 2023 10:06:08 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 76E965616BED; Mon, 23 Jan 2023 09:37:56 -0800 (PST) From: Stefan Roesch To: linux-mm@kvack.org Cc: shr@devkernel.io, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND RFC PATCH v1 14/20] mm: expose ksm merge type in ksm_stat Date: Mon, 23 Jan 2023 09:37:42 -0800 Message-Id: <20230123173748.1734238-15-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173748.1734238-1-shr@devkernel.io> References: <20230123173748.1734238-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=BAYES_00,RDNS_DYNAMIC, SPF_HELO_PASS,SPF_NEUTRAL,SUSPICIOUS_RECIPS,TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837678639612499?= X-GMAIL-MSGID: =?utf-8?q?1755837678639612499?= This exposes the ksm process type in /proc//ksm_stat. The name of the value is ksm_merge_type. Signed-off-by: Stefan Roesch --- fs/proc/base.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/proc/base.c b/fs/proc/base.c index a2b7779f76f6..2b63a70fb7a6 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -3200,6 +3200,7 @@ static int proc_pid_ksm_merging_pages(struct seq_file *m, struct pid_namespace * return 0; } + static int proc_pid_ksm_stat(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task) { @@ -3209,6 +3210,7 @@ static int proc_pid_ksm_stat(struct seq_file *m, struct pid_namespace *ns, if (mm) { seq_printf(m, "ksm_rmap_items %lu\n", mm->ksm_rmap_items); seq_printf(m, "ksm_merging_pages %lu\n", mm->ksm_merging_pages); + seq_printf(m, "ksm_merge_type %s\n", ksm_merge_type(mm)); seq_printf(m, "ksm_process_profit %ld\n", ksm_process_profit(mm)); mmput(mm); } From patchwork Mon Jan 23 17:37:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 47287 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1742861wrn; Mon, 23 Jan 2023 10:04:48 -0800 (PST) X-Google-Smtp-Source: AMrXdXsENRYI47LQme3w9580UpcD5CcMl30RH0kjajQtcczVCpC67FRB8xIhzbtpfxi3DiEGJfB3 X-Received: by 2002:a05:6402:3883:b0:49e:a121:e560 with SMTP id fd3-20020a056402388300b0049ea121e560mr14945585edb.27.1674497088326; Mon, 23 Jan 2023 10:04:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674497088; cv=none; d=google.com; s=arc-20160816; b=AWRF4iowT5HQzqFzXgxowcvBT4P5hrHc9MysZsfae+BiN5Btbn96gsh5kmk4A0uGeM 0icPOGjuKhgoArPIOC4mS8ECMrRA5pN7xsymCUK2JWar++WDEJnOs9Ybvp41kW+1R1jS OSlN4pfflXuaqm7TQDUObU9I6PLTE7bmlJJSnsR7dfhtD0OOziHUni2z4kKFT+QhCLk4 M1qQKm68RkN9WT8NbYeeJ1X31dQz9lAo7KC0Hye+r4s73CpV3VCVxnuIxe0PcvlImrYE ZaPYCHVbBNTHpIWqjQLDDQ9P8Dot05xlA0fugzLP2dfOXsIJ17s5HVrZw1HsYb0ApfkV RqCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=48BaoTp/2HJ6bS79iL9g9GlQiiTNNuHFinc8DbFXwQM=; b=wJmRFVdKU667jZl1+BNqW9Gr4x+NgoWCDm9U4AqyTzfAar4rrb+HFOVnYKLYcyTYSj C64mdY3Nc/kLjJrMr7xRw9d1bHm9VWGz2/GGeHLDVci12ISErMGzh9LF8n+JkPzv82/r n1VFPuvzGTmVL3ZUMr9oNWdy9iIBIxdaLyMPUrRQ3RFRBj2Er+TA9ztNKXIfLyz7Ut8c 4NQbTEnB51UsvCALgJUGc/ijZGIcIzgfZGeDfcHjb1kZUoUPmKnhkTBe68er5nzuhncH 8vOQXJULNMFAzMBVUfJ3yS2XHjEITyeizF32ej5x4m017HOutnFGNlmxdgG0Pz79z2lr Tfgw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i19-20020a1709064fd300b0086e1572ccfdsi33817226ejw.709.2023.01.23.10.04.24; Mon, 23 Jan 2023 10:04:48 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233109AbjAWR7v (ORCPT + 99 others); Mon, 23 Jan 2023 12:59:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233171AbjAWR7s (ORCPT ); Mon, 23 Jan 2023 12:59:48 -0500 Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29E19233FC for ; Mon, 23 Jan 2023 09:59:48 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 7BBE85616BF1; Mon, 23 Jan 2023 09:37:56 -0800 (PST) From: Stefan Roesch To: linux-mm@kvack.org Cc: shr@devkernel.io, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND RFC PATCH v1 15/20] docs: document new procfs ksm knobs Date: Mon, 23 Jan 2023 09:37:43 -0800 Message-Id: <20230123173748.1734238-16-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173748.1734238-1-shr@devkernel.io> References: <20230123173748.1734238-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=BAYES_00,RDNS_DYNAMIC, SPF_HELO_PASS,SPF_NEUTRAL,SUSPICIOUS_RECIPS,TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837458917809705?= X-GMAIL-MSGID: =?utf-8?q?1755837458917809705?= This documents the ksm_process_profit and ksm_merge_type settings in ksm_stat. Signed-off-by: Stefan Roesch --- Documentation/admin-guide/mm/ksm.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/admin-guide/mm/ksm.rst b/Documentation/admin-guide/mm/ksm.rst index 72189bf1283e..70896f01d641 100644 --- a/Documentation/admin-guide/mm/ksm.rst +++ b/Documentation/admin-guide/mm/ksm.rst @@ -211,7 +211,8 @@ several times, which are unprofitable memory consumed. ksm_rmap_items * sizeof(rmap_item). where ksm_merging_pages is shown under the directory ``/proc//``, - and ksm_rmap_items is shown in ``/proc//ksm_stat``. + and ksm_rmap_items is shown in ``/proc//ksm_stat``. The process profit + is also shown in ``/proc//ksm_stat`` as ksm_process_profit. From the perspective of application, a high ratio of ``ksm_rmap_items`` to ``ksm_merging_pages`` means a bad madvise-applied policy, so developers or @@ -222,6 +223,9 @@ so if the ``ksm_rmap_items/ksm_merging_pages`` ratio exceeds 64 on 64-bit CPU or exceeds 128 on 32-bit CPU, then the app's madvise policy should be dropped, because the ksm profit is approximately zero or negative. +The ksm_merge_type in ``/proc//ksm_stat`` shows the merge type of the +process. Valid values are ``none``, ``madvise`` and ``process``. + Monitoring KSM events ===================== From patchwork Mon Jan 23 17:37:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 47300 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1744667wrn; Mon, 23 Jan 2023 10:07:51 -0800 (PST) X-Google-Smtp-Source: AMrXdXuAM+sZb1bU+O58v81ru1FTvHkkDB54oe6Ek20MEHKZjAZBN6Z4ll2YMfv7BHX5NxRG28v7 X-Received: by 2002:a17:90a:be0c:b0:229:d04:ed2 with SMTP id a12-20020a17090abe0c00b002290d040ed2mr26288568pjs.26.1674497271538; Mon, 23 Jan 2023 10:07:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674497271; cv=none; d=google.com; s=arc-20160816; b=O0kOZLd5PKrM//OvAnXF8fLnDsa3TwpCPIv+//LKdpO1m4mgn0Z06RfNSwxhBNk4fA EpTN3NK4k2/whOzfiZfa9f7Lw9QlNk9ic3jZwE/UWzgApjwPYvLPbBDXDsWwNGdCUX5h z2aRYXOucmtzG/UCimOzK2X2BVDBfAXKNIQFze35OzuVIkmFd01WSpzSX31FFYZFBcU1 +FV+yoerePeXQhyJgLbVV8Q18tm2FZKu3UFLhsyV9OIUvU0N86/fB0FBwxV1R5ty2qKi byH1YA/uinSiuTIk29s0UjI1oLFNrB/T97jHbvuBLQ8mE5KrNMhs7VkcEvMtebjwNugl yDxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=GYQtk/S5fG1KUGiyaQMgcUYBq4HZdmgsoe9i0bSjtmI=; b=aWvtaDwOCDtAdpiHA8TZW9HMOQrYrZby3AgYvuuYE0Obt10Ms8uJmSegkz6/weKunR MBiHihEqrkXDILTUY3T00aG3x6GqPzF9FZB2fVC7F2Z6n42bNZk3uNxcBBCaZUAR2yjA hKid2WyKr1Lte6kKK7HorMddkfRLLgZsIIw3awyG2XfXBEkEZYPSaDkR131U3EPa78+p 4HPzpCB8vCesrjhzXOXeheU5fuU4z/GaIhpdEnNOYq1/W0pTcHeBbZivIVb+PCcRylad V+ryE+9//QASD1o8kDZhZQ15b/JGANRFyTIhAY47D2J80+7TDZr2khnlGTM4syq2Q8/m 2VWg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r15-20020a17090a690f00b002266f608cf8si12137714pjj.125.2023.01.23.10.07.39; Mon, 23 Jan 2023 10:07:51 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233755AbjAWSGC (ORCPT + 99 others); Mon, 23 Jan 2023 13:06:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233763AbjAWSFz (ORCPT ); Mon, 23 Jan 2023 13:05:55 -0500 Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8476818B00 for ; Mon, 23 Jan 2023 10:05:30 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 7FBAC5616BF3; Mon, 23 Jan 2023 09:37:56 -0800 (PST) From: Stefan Roesch To: linux-mm@kvack.org Cc: shr@devkernel.io, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND RFC PATCH v1 16/20] tools: add new prctl flags to prctl in tools dir Date: Mon, 23 Jan 2023 09:37:44 -0800 Message-Id: <20230123173748.1734238-17-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173748.1734238-1-shr@devkernel.io> References: <20230123173748.1734238-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=BAYES_00,RDNS_DYNAMIC, SPF_HELO_PASS,SPF_NEUTRAL,SUSPICIOUS_RECIPS,TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837650936552579?= X-GMAIL-MSGID: =?utf-8?q?1755837650936552579?= This adds the new prctl flags to the include file prct.h in the tools directory. This makes sure they are available for testing. Signed-off-by: Stefan Roesch --- tools/include/uapi/linux/prctl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/include/uapi/linux/prctl.h b/tools/include/uapi/linux/prctl.h index a5e06dcbba13..b8ba85f18e43 100644 --- a/tools/include/uapi/linux/prctl.h +++ b/tools/include/uapi/linux/prctl.h @@ -284,4 +284,6 @@ struct prctl_mm_map { #define PR_SET_VMA 0x53564d41 # define PR_SET_VMA_ANON_NAME 0 +#define PR_SET_MEMORY_MERGE 65 +#define PR_GET_MEMORY_MERGE 66 #endif /* _LINUX_PRCTL_H */ From patchwork Mon Jan 23 17:37:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 47296 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1744225wrn; Mon, 23 Jan 2023 10:07:02 -0800 (PST) X-Google-Smtp-Source: AMrXdXtI4lJeGevJcWotwNjiA2+Jka5Hbt5KsqMY4xZC0vm1DeTryk2cZRwkvgpwX2LllFISaM6V X-Received: by 2002:a17:902:e54e:b0:195:eea0:5712 with SMTP id n14-20020a170902e54e00b00195eea05712mr14307590plf.38.1674497222273; Mon, 23 Jan 2023 10:07:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674497222; cv=none; d=google.com; s=arc-20160816; b=a8B4SkyHO6cqeYVRFGNWlBVt6iUn74st+jdX+kS0rC6RlG0jAOVp4943qEI0AC/ELk Fe8EDsR+teJk69OOCvMTf0VxyrZ0NgZQlvz76dGXWD8gPXX5J922RVSASmWPmIs5YWSY TCkNu6NyOKsVhieYI4+E8l4YBahPcp1kZ5ZraX2VvqvYWe+FTN4Fx6q1XG67hFqky0HF dYKx6EWVuHLftKhZi5T/bIPjdMBTJru/l39wY15sIdTzVV6BJpzW0o+3GK18QRzvDDXT YVwCiSnp25guxKPc7iroPWUD3WqyTMOKp1RJZ9BbK0f3+IhsN/Yl8VESAafx8i3xV687 pgdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=QtuSiKqGbQErcVVkdQ69vUod5ag1AqdUM9sufVQBvro=; b=mcybU8JbPCxJbuKjHjfy88uUzlWBrabD0Yjv9x3SJaxKXHmlEoBxIh5Zh4jtfFU8Ja 8bigkGlfna9D7RxchfgX1H+xzk5LuLiuTFwS0OJh9CBUWwwwkIU/WycumVGejP9Boq5N zMtqnlfRUvs3iqZl6hA8TpHS/KszUtu7F0hdT/3qRwEb7KZvw8y5jzODKnKv+m7vj6ta uUFn23o5BU6jj7q2c8fx8B7tmSQspzaqjNrB9g5+aZXBhSEtUORr3tUah2USTp3FTXEA 0recXVACF1bq1/dbE6CkmVBXx6E3zWDua8OJjuEPUa9RvjlqQoO7rOj2V4+m+NTLNt2T wwQQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u16-20020a170903125000b00186b84c723bsi6287282plh.419.2023.01.23.10.06.50; Mon, 23 Jan 2023 10:07:02 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233659AbjAWSFB (ORCPT + 99 others); Mon, 23 Jan 2023 13:05:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233701AbjAWSEi (ORCPT ); Mon, 23 Jan 2023 13:04:38 -0500 Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8843305CC for ; Mon, 23 Jan 2023 10:04:32 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 8434B5616BF5; Mon, 23 Jan 2023 09:37:56 -0800 (PST) From: Stefan Roesch To: linux-mm@kvack.org Cc: shr@devkernel.io, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND RFC PATCH v1 17/20] selftests/vm: add KSM prctl merge test Date: Mon, 23 Jan 2023 09:37:45 -0800 Message-Id: <20230123173748.1734238-18-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173748.1734238-1-shr@devkernel.io> References: <20230123173748.1734238-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=BAYES_00,RDNS_DYNAMIC, SPF_HELO_PASS,SPF_NEUTRAL,SUSPICIOUS_RECIPS,TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837599388460828?= X-GMAIL-MSGID: =?utf-8?q?1755837599388460828?= This adds the -t option to the ksm_tests program. The -t flag allows to specify if it should use madvise or prctl ksm merging. Signed-off-by: Stefan Roesch --- tools/testing/selftests/vm/Makefile | 3 +- tools/testing/selftests/vm/ksm_tests.c | 116 +++++++++++++++++-------- 2 files changed, 80 insertions(+), 39 deletions(-) diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile index 89c14e41bd43..8a50802d8700 100644 --- a/tools/testing/selftests/vm/Makefile +++ b/tools/testing/selftests/vm/Makefile @@ -25,7 +25,8 @@ MACHINE ?= $(shell echo $(uname_M) | sed -e 's/aarch64.*/arm64/' -e 's/ppc64.*/p # LDLIBS. MAKEFLAGS += --no-builtin-rules -CFLAGS = -Wall -I $(top_srcdir) -I $(top_srcdir)/usr/include $(EXTRA_CFLAGS) $(KHDR_INCLUDES) +CFLAGS = -Wall -I $(top_srcdir)/tools/include/uapi +CFLAGS += -I $(top_srcdir) -I $(top_srcdir)/usr/include $(EXTRA_CFLAGS) $(KHDR_INCLUDES) LDLIBS = -lrt -lpthread TEST_GEN_FILES = cow TEST_GEN_FILES += compaction_test diff --git a/tools/testing/selftests/vm/ksm_tests.c b/tools/testing/selftests/vm/ksm_tests.c index f9eb4d67e0dd..386a0929c8a3 100644 --- a/tools/testing/selftests/vm/ksm_tests.c +++ b/tools/testing/selftests/vm/ksm_tests.c @@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 #include +#include +#include #include #include #include @@ -21,6 +23,7 @@ #define KSM_PROT_STR_DEFAULT "rw" #define KSM_USE_ZERO_PAGES_DEFAULT false #define KSM_MERGE_ACROSS_NODES_DEFAULT true +#define KSM_MERGE_TYPE_DEFAULT 0 #define MB (1ul << 20) struct ksm_sysfs { @@ -33,6 +36,12 @@ struct ksm_sysfs { unsigned long use_zero_pages; }; +enum ksm_merge_type { + KSM_MERGE_MADVISE, + KSM_MERGE_PRCTL, + KSM_MERGE_LAST = KSM_MERGE_PRCTL +}; + enum ksm_test_name { CHECK_KSM_MERGE, CHECK_KSM_UNMERGE, @@ -129,6 +138,10 @@ static void print_help(void) printf(" -m: change merge_across_nodes tunable\n" " Default: %d\n", KSM_MERGE_ACROSS_NODES_DEFAULT); printf(" -s: the size of duplicated memory area (in MiB)\n"); + printf(" -t: KSM merge type\n" + " Default: 0\n" + " 0: madvise merging\n" + " 1: prctl merging\n"); exit(0); } @@ -176,12 +189,21 @@ static int ksm_do_scan(int scan_count, struct timespec start_time, int timeout) return 0; } -static int ksm_merge_pages(void *addr, size_t size, struct timespec start_time, int timeout) +static int ksm_merge_pages(int merge_type, void *addr, size_t size, + struct timespec start_time, int timeout) { - if (madvise(addr, size, MADV_MERGEABLE)) { - perror("madvise"); - return 1; + if (merge_type == KSM_MERGE_MADVISE) { + if (madvise(addr, size, MADV_MERGEABLE)) { + perror("madvise"); + return 1; + } + } else if (merge_type == KSM_MERGE_PRCTL) { + if (prctl(PR_SET_MEMORY_MERGE, 1)) { + perror("prctl"); + return 1; + } } + if (ksm_write_sysfs(KSM_FP("run"), 1)) return 1; @@ -266,7 +288,8 @@ static int ksm_restore(struct ksm_sysfs *ksm_sysfs) return 0; } -static int check_ksm_merge(int mapping, int prot, long page_count, int timeout, size_t page_size) +static int check_ksm_merge(int merge_type, int mapping, int prot, + long page_count, int timeout, size_t page_size) { void *map_ptr; struct timespec start_time; @@ -281,13 +304,16 @@ static int check_ksm_merge(int mapping, int prot, long page_count, int timeout, if (!map_ptr) return KSFT_FAIL; - if (ksm_merge_pages(map_ptr, page_size * page_count, start_time, timeout)) + if (ksm_merge_pages(merge_type, map_ptr, page_size * page_count, start_time, timeout)) goto err_out; /* verify that the right number of pages are merged */ if (assert_ksm_pages_count(page_count)) { printf("OK\n"); - munmap(map_ptr, page_size * page_count); + if (merge_type == KSM_MERGE_MADVISE) + munmap(map_ptr, page_size * page_count); + else if (merge_type == KSM_MERGE_PRCTL) + prctl(PR_SET_MEMORY_MERGE, 0); return KSFT_PASS; } @@ -297,7 +323,7 @@ static int check_ksm_merge(int mapping, int prot, long page_count, int timeout, return KSFT_FAIL; } -static int check_ksm_unmerge(int mapping, int prot, int timeout, size_t page_size) +static int check_ksm_unmerge(int merge_type, int mapping, int prot, int timeout, size_t page_size) { void *map_ptr; struct timespec start_time; @@ -313,7 +339,7 @@ static int check_ksm_unmerge(int mapping, int prot, int timeout, size_t page_siz if (!map_ptr) return KSFT_FAIL; - if (ksm_merge_pages(map_ptr, page_size * page_count, start_time, timeout)) + if (ksm_merge_pages(merge_type, map_ptr, page_size * page_count, start_time, timeout)) goto err_out; /* change 1 byte in each of the 2 pages -- KSM must automatically unmerge them */ @@ -337,8 +363,8 @@ static int check_ksm_unmerge(int mapping, int prot, int timeout, size_t page_siz return KSFT_FAIL; } -static int check_ksm_zero_page_merge(int mapping, int prot, long page_count, int timeout, - bool use_zero_pages, size_t page_size) +static int check_ksm_zero_page_merge(int merge_type, int mapping, int prot, long page_count, + int timeout, bool use_zero_pages, size_t page_size) { void *map_ptr; struct timespec start_time; @@ -356,7 +382,7 @@ static int check_ksm_zero_page_merge(int mapping, int prot, long page_count, int if (!map_ptr) return KSFT_FAIL; - if (ksm_merge_pages(map_ptr, page_size * page_count, start_time, timeout)) + if (ksm_merge_pages(merge_type, map_ptr, page_size * page_count, start_time, timeout)) goto err_out; /* @@ -402,8 +428,8 @@ static int get_first_mem_node(void) return get_next_mem_node(numa_max_node()); } -static int check_ksm_numa_merge(int mapping, int prot, int timeout, bool merge_across_nodes, - size_t page_size) +static int check_ksm_numa_merge(int merge_type, int mapping, int prot, int timeout, + bool merge_across_nodes, size_t page_size) { void *numa1_map_ptr, *numa2_map_ptr; struct timespec start_time; @@ -439,8 +465,8 @@ static int check_ksm_numa_merge(int mapping, int prot, int timeout, bool merge_a memset(numa2_map_ptr, '*', page_size); /* try to merge the pages */ - if (ksm_merge_pages(numa1_map_ptr, page_size, start_time, timeout) || - ksm_merge_pages(numa2_map_ptr, page_size, start_time, timeout)) + if (ksm_merge_pages(merge_type, numa1_map_ptr, page_size, start_time, timeout) || + ksm_merge_pages(merge_type, numa2_map_ptr, page_size, start_time, timeout)) goto err_out; /* @@ -466,7 +492,8 @@ static int check_ksm_numa_merge(int mapping, int prot, int timeout, bool merge_a return KSFT_FAIL; } -static int ksm_merge_hugepages_time(int mapping, int prot, int timeout, size_t map_size) +static int ksm_merge_hugepages_time(int merge_type, int mapping, int prot, + int timeout, size_t map_size) { void *map_ptr, *map_ptr_orig; struct timespec start_time, end_time; @@ -508,7 +535,7 @@ static int ksm_merge_hugepages_time(int mapping, int prot, int timeout, size_t m perror("clock_gettime"); goto err_out; } - if (ksm_merge_pages(map_ptr, map_size, start_time, timeout)) + if (ksm_merge_pages(merge_type, map_ptr, map_size, start_time, timeout)) goto err_out; if (clock_gettime(CLOCK_MONOTONIC_RAW, &end_time)) { perror("clock_gettime"); @@ -533,7 +560,7 @@ static int ksm_merge_hugepages_time(int mapping, int prot, int timeout, size_t m return KSFT_FAIL; } -static int ksm_merge_time(int mapping, int prot, int timeout, size_t map_size) +static int ksm_merge_time(int merge_type, int mapping, int prot, int timeout, size_t map_size) { void *map_ptr; struct timespec start_time, end_time; @@ -549,7 +576,7 @@ static int ksm_merge_time(int mapping, int prot, int timeout, size_t map_size) perror("clock_gettime"); goto err_out; } - if (ksm_merge_pages(map_ptr, map_size, start_time, timeout)) + if (ksm_merge_pages(merge_type, map_ptr, map_size, start_time, timeout)) goto err_out; if (clock_gettime(CLOCK_MONOTONIC_RAW, &end_time)) { perror("clock_gettime"); @@ -574,7 +601,7 @@ static int ksm_merge_time(int mapping, int prot, int timeout, size_t map_size) return KSFT_FAIL; } -static int ksm_unmerge_time(int mapping, int prot, int timeout, size_t map_size) +static int ksm_unmerge_time(int merge_type, int mapping, int prot, int timeout, size_t map_size) { void *map_ptr; struct timespec start_time, end_time; @@ -589,7 +616,7 @@ static int ksm_unmerge_time(int mapping, int prot, int timeout, size_t map_size) perror("clock_gettime"); goto err_out; } - if (ksm_merge_pages(map_ptr, map_size, start_time, timeout)) + if (ksm_merge_pages(merge_type, map_ptr, map_size, start_time, timeout)) goto err_out; if (clock_gettime(CLOCK_MONOTONIC_RAW, &start_time)) { @@ -621,7 +648,7 @@ static int ksm_unmerge_time(int mapping, int prot, int timeout, size_t map_size) return KSFT_FAIL; } -static int ksm_cow_time(int mapping, int prot, int timeout, size_t page_size) +static int ksm_cow_time(int merge_type, int mapping, int prot, int timeout, size_t page_size) { void *map_ptr; struct timespec start_time, end_time; @@ -660,7 +687,7 @@ static int ksm_cow_time(int mapping, int prot, int timeout, size_t page_size) memset(map_ptr + page_size * i, '+', i / 2 + 1); memset(map_ptr + page_size * (i + 1), '+', i / 2 + 1); } - if (ksm_merge_pages(map_ptr, page_size * page_count, start_time, timeout)) + if (ksm_merge_pages(merge_type, map_ptr, page_size * page_count, start_time, timeout)) goto err_out; if (clock_gettime(CLOCK_MONOTONIC_RAW, &start_time)) { @@ -697,6 +724,7 @@ int main(int argc, char *argv[]) int ret, opt; int prot = 0; int ksm_scan_limit_sec = KSM_SCAN_LIMIT_SEC_DEFAULT; + int merge_type = KSM_MERGE_TYPE_DEFAULT; long page_count = KSM_PAGE_COUNT_DEFAULT; size_t page_size = sysconf(_SC_PAGESIZE); struct ksm_sysfs ksm_sysfs_old; @@ -705,7 +733,7 @@ int main(int argc, char *argv[]) bool merge_across_nodes = KSM_MERGE_ACROSS_NODES_DEFAULT; long size_MB = 0; - while ((opt = getopt(argc, argv, "ha:p:l:z:m:s:MUZNPCHD")) != -1) { + while ((opt = getopt(argc, argv, "ha:p:l:z:m:s:t:MUZNPCHD")) != -1) { switch (opt) { case 'a': prot = str_to_prot(optarg); @@ -745,6 +773,17 @@ int main(int argc, char *argv[]) printf("Size must be greater than 0\n"); return KSFT_FAIL; } + case 't': + { + int tmp = atoi(optarg); + + if (tmp < 0 || tmp > KSM_MERGE_LAST) { + printf("Invalid merge type\n"); + return KSFT_FAIL; + } + merge_type = atoi(optarg); + } + break; case 'M': break; case 'U': @@ -795,35 +834,36 @@ int main(int argc, char *argv[]) switch (test_name) { case CHECK_KSM_MERGE: - ret = check_ksm_merge(MAP_PRIVATE | MAP_ANONYMOUS, prot, page_count, + ret = check_ksm_merge(merge_type, MAP_PRIVATE | MAP_ANONYMOUS, prot, page_count, ksm_scan_limit_sec, page_size); break; case CHECK_KSM_UNMERGE: - ret = check_ksm_unmerge(MAP_PRIVATE | MAP_ANONYMOUS, prot, ksm_scan_limit_sec, - page_size); + ret = check_ksm_unmerge(merge_type, MAP_PRIVATE | MAP_ANONYMOUS, prot, + ksm_scan_limit_sec, page_size); break; case CHECK_KSM_ZERO_PAGE_MERGE: - ret = check_ksm_zero_page_merge(MAP_PRIVATE | MAP_ANONYMOUS, prot, page_count, - ksm_scan_limit_sec, use_zero_pages, page_size); + ret = check_ksm_zero_page_merge(merge_type, MAP_PRIVATE | MAP_ANONYMOUS, prot, + page_count, ksm_scan_limit_sec, use_zero_pages, + page_size); break; case CHECK_KSM_NUMA_MERGE: - ret = check_ksm_numa_merge(MAP_PRIVATE | MAP_ANONYMOUS, prot, ksm_scan_limit_sec, - merge_across_nodes, page_size); + ret = check_ksm_numa_merge(merge_type, MAP_PRIVATE | MAP_ANONYMOUS, prot, + ksm_scan_limit_sec, merge_across_nodes, page_size); break; case KSM_MERGE_TIME: if (size_MB == 0) { printf("Option '-s' is required.\n"); return KSFT_FAIL; } - ret = ksm_merge_time(MAP_PRIVATE | MAP_ANONYMOUS, prot, ksm_scan_limit_sec, - size_MB); + ret = ksm_merge_time(merge_type, MAP_PRIVATE | MAP_ANONYMOUS, prot, + ksm_scan_limit_sec, size_MB); break; case KSM_MERGE_TIME_HUGE_PAGES: if (size_MB == 0) { printf("Option '-s' is required.\n"); return KSFT_FAIL; } - ret = ksm_merge_hugepages_time(MAP_PRIVATE | MAP_ANONYMOUS, prot, + ret = ksm_merge_hugepages_time(merge_type, MAP_PRIVATE | MAP_ANONYMOUS, prot, ksm_scan_limit_sec, size_MB); break; case KSM_UNMERGE_TIME: @@ -831,12 +871,12 @@ int main(int argc, char *argv[]) printf("Option '-s' is required.\n"); return KSFT_FAIL; } - ret = ksm_unmerge_time(MAP_PRIVATE | MAP_ANONYMOUS, prot, + ret = ksm_unmerge_time(merge_type, MAP_PRIVATE | MAP_ANONYMOUS, prot, ksm_scan_limit_sec, size_MB); break; case KSM_COW_TIME: - ret = ksm_cow_time(MAP_PRIVATE | MAP_ANONYMOUS, prot, ksm_scan_limit_sec, - page_size); + ret = ksm_cow_time(merge_type, MAP_PRIVATE | MAP_ANONYMOUS, prot, + ksm_scan_limit_sec, page_size); break; } From patchwork Mon Jan 23 17:37:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 47302 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1745070wrn; Mon, 23 Jan 2023 10:08:33 -0800 (PST) X-Google-Smtp-Source: AMrXdXsHO2ankO32n5TW7p3tOfEj8ft7rvosRVzgPLU2OvxtGn9L+d0eQhcGL6eEsCpDnHtI6TaL X-Received: by 2002:a05:6a00:331b:b0:578:333d:d6ab with SMTP id cq27-20020a056a00331b00b00578333dd6abmr28468459pfb.21.1674497313342; Mon, 23 Jan 2023 10:08:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674497313; cv=none; d=google.com; s=arc-20160816; b=V3Z1rDTJE0O2yilk15v2jmrDNzycs30Q514NjkClZUlxjF15Gss22GT6ARQXpMlzOH u7enFL8+0OmPe2YycdOgbuoWrn5qVvO8fEqW7zgbvU8CbQuKbLyYXspMb9ObqVWATAGH KdaptXiyBGTa9q0dteJIwsJ9cpcYoroZse6oHDMVB6UNYUaC01Dxw+FCiP+rSNam5lo/ RD1zZJ3S1xXksnqLkCDwUe2IVuA+JCxzFvjvv4J/r3oYMXBMLt3NBK/A3cwiDn6u/8m9 7o4pi4WS1gYIap0+TFrAliFNFsVCbdgR4FsqSQt6u4h+cCpVAjH1uZUFeKqjuR29kAbh S3Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=qo39C54PDBSxRE2rOgUDTJu01fh/PEDP/brvH8YsOkc=; b=Q+FeUkOMzIPx/eHDuBSfxGBvT6bX5cJcgL/Nx/LeXwKFSadigg61qwZTje6XlHlPVh +jA3nLaW6YrZInulzC4VmDRnAkA5fmaUu/RsD+KvUPH4zFVelTE2wraS0Rl1cUv8pHX1 ejjzYZfiHa4s5qwqcI2ssOzty3RwkFbZQKI9ssIV+xQRShoZhbYWHC9KWQi6DguWmeTI Sb+HvnE+PkreAGbSKKhd3zbpPAuHifpLjXyuC3kHi50E0aGBlGI7ig5ZhTncNoVlmRAr 4mzS2hYELXm7Eef+Ab8HkR2IebFbIHUGM5ZHe33XxyfFIZ8NgDT+Crjl5oZeaMXJyqsG uNDQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w4-20020a634744000000b0047842533cc4si48606996pgk.838.2023.01.23.10.08.21; Mon, 23 Jan 2023 10:08:33 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233745AbjAWSGt (ORCPT + 99 others); Mon, 23 Jan 2023 13:06:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233580AbjAWSGq (ORCPT ); Mon, 23 Jan 2023 13:06:46 -0500 Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C84130EBB for ; Mon, 23 Jan 2023 10:06:28 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 8864D5616BF7; Mon, 23 Jan 2023 09:37:56 -0800 (PST) From: Stefan Roesch To: linux-mm@kvack.org Cc: shr@devkernel.io, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND RFC PATCH v1 18/20] selftests/vm: add KSM get merge type test Date: Mon, 23 Jan 2023 09:37:46 -0800 Message-Id: <20230123173748.1734238-19-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173748.1734238-1-shr@devkernel.io> References: <20230123173748.1734238-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=BAYES_00,RDNS_DYNAMIC, SPF_HELO_PASS,SPF_NEUTRAL,SUSPICIOUS_RECIPS,TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837695288621414?= X-GMAIL-MSGID: =?utf-8?q?1755837695288621414?= This adds the -G flag to the ksm_tests to query if prctl has been used to enable ksm merging. Signed-off-by: Stefan Roesch --- tools/testing/selftests/vm/ksm_tests.c | 37 ++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/vm/ksm_tests.c b/tools/testing/selftests/vm/ksm_tests.c index 386a0929c8a3..9667cb3b8c6a 100644 --- a/tools/testing/selftests/vm/ksm_tests.c +++ b/tools/testing/selftests/vm/ksm_tests.c @@ -45,6 +45,7 @@ enum ksm_merge_type { enum ksm_test_name { CHECK_KSM_MERGE, CHECK_KSM_UNMERGE, + CHECK_KSM_GET_MERGE_TYPE, CHECK_KSM_ZERO_PAGE_MERGE, CHECK_KSM_NUMA_MERGE, KSM_MERGE_TIME, @@ -124,7 +125,8 @@ static void print_help(void) " -D evaluate unmerging time and speed when disabling KSM.\n" " For this test, the size of duplicated memory area (in MiB)\n" " must be provided using -s option\n" - " -C evaluate the time required to break COW of merged pages.\n\n"); + " -C evaluate the time required to break COW of merged pages.\n" + " -G query merge mode\n\n"); printf(" -a: specify the access protections of pages.\n" " must be of the form [rwx].\n" @@ -323,6 +325,31 @@ static int check_ksm_merge(int merge_type, int mapping, int prot, return KSFT_FAIL; } +static int check_ksm_get_merge_type(void) +{ + if (prctl(PR_SET_MEMORY_MERGE, 1)) { + perror("prctl set"); + return 1; + } + + int is_on = prctl(PR_GET_MEMORY_MERGE, 0); + + if (prctl(PR_SET_MEMORY_MERGE, 0)) { + perror("prctl set"); + return 1; + } + + int is_off = prctl(PR_GET_MEMORY_MERGE, 0); + + if (is_on && is_off) { + printf("OK\n"); + return KSFT_PASS; + } + + printf("Not OK\n"); + return KSFT_FAIL; +} + static int check_ksm_unmerge(int merge_type, int mapping, int prot, int timeout, size_t page_size) { void *map_ptr; @@ -733,7 +760,7 @@ int main(int argc, char *argv[]) bool merge_across_nodes = KSM_MERGE_ACROSS_NODES_DEFAULT; long size_MB = 0; - while ((opt = getopt(argc, argv, "ha:p:l:z:m:s:t:MUZNPCHD")) != -1) { + while ((opt = getopt(argc, argv, "ha:p:l:z:m:s:t:GMUZNPCHD")) != -1) { switch (opt) { case 'a': prot = str_to_prot(optarg); @@ -792,6 +819,9 @@ int main(int argc, char *argv[]) case 'Z': test_name = CHECK_KSM_ZERO_PAGE_MERGE; break; + case 'G': + test_name = CHECK_KSM_GET_MERGE_TYPE; + break; case 'N': test_name = CHECK_KSM_NUMA_MERGE; break; @@ -841,6 +871,9 @@ int main(int argc, char *argv[]) ret = check_ksm_unmerge(merge_type, MAP_PRIVATE | MAP_ANONYMOUS, prot, ksm_scan_limit_sec, page_size); break; + case CHECK_KSM_GET_MERGE_TYPE: + ret = check_ksm_get_merge_type(); + break; case CHECK_KSM_ZERO_PAGE_MERGE: ret = check_ksm_zero_page_merge(merge_type, MAP_PRIVATE | MAP_ANONYMOUS, prot, page_count, ksm_scan_limit_sec, use_zero_pages, From patchwork Mon Jan 23 17:37:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 47293 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1743948wrn; Mon, 23 Jan 2023 10:06:34 -0800 (PST) X-Google-Smtp-Source: AMrXdXvHVES7DdDNjQKcTquj+qboeE4q7tx0eGehyK0Yn/aQYTidBtI19G+rprRvjpIfdJ72eAzh X-Received: by 2002:a17:907:76e1:b0:7c0:e7a8:bc41 with SMTP id kg1-20020a17090776e100b007c0e7a8bc41mr40061592ejc.74.1674497194717; Mon, 23 Jan 2023 10:06:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674497194; cv=none; d=google.com; s=arc-20160816; b=myCVDVEuHyLqj9YpHsibTKaDO1Tdr17ZzRBkmA2QCCX8exaLZlRMKWl2hbgW8iqAV3 aeNSZyonMiQM1SQhVDaUqocODj7eTDko9w7mpHvbcyBSYOj54ueNcHqX44CdHtlumxu5 5fuVb/f7t9PvLGwJK0sRA/WzfEfA78BAQIl6hiKOk2JidXeC0YC8aMmvudsTKg2g20zT hfeaFIOzPXFq8lAdFUf22riPDR4rT8a86e/XBR9rd4K9dt/AKdGumwZkuwf3ElcQdXxL 0xYTrsyi1bCVA5QlBwA6qqj8pr7mTWF6oCc0NRJf1gHEc3aGRCuYDjZcMi/erCc946EN EC2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=3bAJwifag69+je0WBSnlVAQ9+kANBDi2Pdxva4sytJM=; b=prRQ2Zcivv+8SYJlRQp3mcPMGwudrZozmWphlrwzjRnru7sgylKLI2ZN73oZlAxtaA 1GApuk3sIU9mlz7r0rHszpHFoIW0f9Jvj6JKQM1cnlJXqnSeQUWdvJYM5wpYkRxzVWEF poIWZD6FzpX5USuMnet6hQi3/Teu+vaiP591tlN9wUg0HQ5CRrpXwS/y8++ebSHjw2eb S+YAiQ4JhuEKdvsTJZ8cnwXAJTWl0WlPoDZ/fE83GfQFfIIjFNhCrBqLOKkdjoI4FYuq h52KBStB2XfHqswHDCJGQS+r9n7qwz3OIO31mypHgD7ZquvnGmvkiazZx/aToRIVh+8E KTLQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hr37-20020a1709073fa500b008775fc70980si20752105ejc.776.2023.01.23.10.06.11; Mon, 23 Jan 2023 10:06:34 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233533AbjAWSDr (ORCPT + 99 others); Mon, 23 Jan 2023 13:03:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233521AbjAWSDp (ORCPT ); Mon, 23 Jan 2023 13:03:45 -0500 Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3EC7303D7 for ; Mon, 23 Jan 2023 10:03:43 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 8CE0B5616BF9; Mon, 23 Jan 2023 09:37:56 -0800 (PST) From: Stefan Roesch To: linux-mm@kvack.org Cc: shr@devkernel.io, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND RFC PATCH v1 19/20] selftests/vm: add KSM fork test Date: Mon, 23 Jan 2023 09:37:47 -0800 Message-Id: <20230123173748.1734238-20-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173748.1734238-1-shr@devkernel.io> References: <20230123173748.1734238-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=BAYES_00,RDNS_DYNAMIC, SPF_HELO_PASS,SPF_NEUTRAL,SUSPICIOUS_RECIPS,TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837570385600585?= X-GMAIL-MSGID: =?utf-8?q?1755837570385600585?= Add fork test to verify that the MMF_VM_MERGE_ANY flag is inherited by the child process. Signed-off-by: Stefan Roesch --- tools/testing/selftests/vm/ksm_tests.c | 53 +++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/vm/ksm_tests.c b/tools/testing/selftests/vm/ksm_tests.c index 9667cb3b8c6a..a0a48ac43b29 100644 --- a/tools/testing/selftests/vm/ksm_tests.c +++ b/tools/testing/selftests/vm/ksm_tests.c @@ -44,6 +44,7 @@ enum ksm_merge_type { enum ksm_test_name { CHECK_KSM_MERGE, + CHECK_KSM_MERGE_FORK, CHECK_KSM_UNMERGE, CHECK_KSM_GET_MERGE_TYPE, CHECK_KSM_ZERO_PAGE_MERGE, @@ -126,7 +127,8 @@ static void print_help(void) " For this test, the size of duplicated memory area (in MiB)\n" " must be provided using -s option\n" " -C evaluate the time required to break COW of merged pages.\n" - " -G query merge mode\n\n"); + " -G query merge mode\n" + " -F evaluate that the KSM process flag is inherited\n\n"); printf(" -a: specify the access protections of pages.\n" " must be of the form [rwx].\n" @@ -325,6 +327,47 @@ static int check_ksm_merge(int merge_type, int mapping, int prot, return KSFT_FAIL; } +/* Verify that prctl ksm flag is inherited. */ +static int check_ksm_fork(void) +{ + int rc = KSFT_FAIL; + pid_t child_pid; + + if (prctl(PR_SET_MEMORY_MERGE, 1)) { + perror("prctl"); + return KSFT_FAIL; + } + + child_pid = fork(); + if (child_pid == 0) { + int is_on = prctl(PR_GET_MEMORY_MERGE, 0); + + if (!is_on) + exit(KSFT_FAIL); + + exit(KSFT_PASS); + } + + if (child_pid < 0) + goto out; + + if (waitpid(child_pid, &rc, 0) < 0) + rc = KSFT_FAIL; + + if (prctl(PR_SET_MEMORY_MERGE, 0)) { + perror("prctl"); + rc = KSFT_FAIL; + } + +out: + if (rc == KSFT_PASS) + printf("OK\n"); + else + printf("Not OK\n"); + + return rc; +} + static int check_ksm_get_merge_type(void) { if (prctl(PR_SET_MEMORY_MERGE, 1)) { @@ -760,7 +803,7 @@ int main(int argc, char *argv[]) bool merge_across_nodes = KSM_MERGE_ACROSS_NODES_DEFAULT; long size_MB = 0; - while ((opt = getopt(argc, argv, "ha:p:l:z:m:s:t:GMUZNPCHD")) != -1) { + while ((opt = getopt(argc, argv, "ha:p:l:z:m:s:t:FGMUZNPCHD")) != -1) { switch (opt) { case 'a': prot = str_to_prot(optarg); @@ -811,6 +854,9 @@ int main(int argc, char *argv[]) merge_type = atoi(optarg); } break; + case 'F': + test_name = CHECK_KSM_MERGE_FORK; + break; case 'M': break; case 'U': @@ -867,6 +913,9 @@ int main(int argc, char *argv[]) ret = check_ksm_merge(merge_type, MAP_PRIVATE | MAP_ANONYMOUS, prot, page_count, ksm_scan_limit_sec, page_size); break; + case CHECK_KSM_MERGE_FORK: + ret = check_ksm_fork(); + break; case CHECK_KSM_UNMERGE: ret = check_ksm_unmerge(merge_type, MAP_PRIVATE | MAP_ANONYMOUS, prot, ksm_scan_limit_sec, page_size); From patchwork Mon Jan 23 17:37:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 47289 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1743431wrn; Mon, 23 Jan 2023 10:05:45 -0800 (PST) X-Google-Smtp-Source: AMrXdXt4yzZ0W3Qrf0ggXLl2MRMBNGS8Z2FeA4jbeaC1opaYlsc2d7I6O9np4ioGRrxc5QKyaJQE X-Received: by 2002:a05:6402:1770:b0:48e:9afd:de66 with SMTP id da16-20020a056402177000b0048e9afdde66mr26525940edb.34.1674497144986; Mon, 23 Jan 2023 10:05:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674497144; cv=none; d=google.com; s=arc-20160816; b=XbSkSU31KlgR8xYw/AHU2mA1sVb/uNpM3tBno0HonEqXltd0ts1DfLBTS62pANBKkK BMcUB0Haj5rFFl14j7C6BVYMJeP/xMcf9/chRyY1njpRN37hsOp78kxpm05fqyyR61wo Yreym92La/LoUPTM/R7OodFrMzUzWrLaqfUJaLs57HFJO6jits6eyC7WHASqzaiMUtKa b+zfHbA0/hcTJTluwd+VSe+0Y1bcvwurppnrhD2SYy/VQeuapDJDHr3vOrrBQQ31s3m5 u7B3EA/M+uEz60brJuIRNFgaPdRERnZYtcmRBDICKfHmwCRX4ws7H3Xj/noJu+/NvgbA JG3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=taEcnC/WZm0w3gtaQ6mI5xKRplneQ9QYqvw5OXfWRYE=; b=YKbzyYZZM/AIKb1xJHzJzmGJ8zvkPhV18Wi7xuD0Ki+LseixbTj0r3MczeDf7/Kbmt ljT4Hag25GmVilpbxr0Jsc6D2bJbOzpvT81nrbHhbTpB2rHFO44I4JFW+HRC3kLeUSGn CNHUVnpn97DUGCB7JPpV4fa/P3+cPwdacNNYnemV75dDcoS9eMCWFEemecky8AmCTDn+ hOd2G8JueuPPCdlYl50ILjCqwHo070XKWN2GaqdjRCdP47BaDY1H5vTThm/3w6xTqzaO jfqM5tZoQBrhDRF8zNcrpkeMAHyIoMrIfLRxh1sQIJ6T/XSPv4XFenFmj6B5e5Br1g7j ngkw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p5-20020a056402500500b00494cb3beb5bsi25874eda.180.2023.01.23.10.05.21; Mon, 23 Jan 2023 10:05:44 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233158AbjAWSAk (ORCPT + 99 others); Mon, 23 Jan 2023 13:00:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233179AbjAWSAU (ORCPT ); Mon, 23 Jan 2023 13:00:20 -0500 Received: from 66-220-144-178.mail-mxout.facebook.com (66-220-144-178.mail-mxout.facebook.com [66.220.144.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DB4923DA5 for ; Mon, 23 Jan 2023 10:00:17 -0800 (PST) Received: by dev0134.prn3.facebook.com (Postfix, from userid 425415) id 910905616BFB; Mon, 23 Jan 2023 09:37:56 -0800 (PST) From: Stefan Roesch To: linux-mm@kvack.org Cc: shr@devkernel.io, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND RFC PATCH v1 20/20] selftests/vm: add two functions for debugging merge outcome Date: Mon, 23 Jan 2023 09:37:48 -0800 Message-Id: <20230123173748.1734238-21-shr@devkernel.io> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173748.1734238-1-shr@devkernel.io> References: <20230123173748.1734238-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=BAYES_00,RDNS_DYNAMIC, SPF_HELO_PASS,SPF_NEUTRAL,SUSPICIOUS_RECIPS,TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837518536736716?= X-GMAIL-MSGID: =?utf-8?q?1755837518536736716?= This adds two functions to report the metrics in /proc/self/ksm_stat and /sys/kernel/debug/mm/ksm. The debugging can be enabled with the following command line: make -C tools/testing/selftests TARGETS="vm" --keep-going \ EXTRA_CFLAGS=-DDEBUG=1 Signed-off-by: Stefan Roesch --- tools/testing/selftests/vm/ksm_tests.c | 54 ++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/tools/testing/selftests/vm/ksm_tests.c b/tools/testing/selftests/vm/ksm_tests.c index a0a48ac43b29..9fb21b982dc9 100644 --- a/tools/testing/selftests/vm/ksm_tests.c +++ b/tools/testing/selftests/vm/ksm_tests.c @@ -93,6 +93,55 @@ static int ksm_read_sysfs(const char *file_path, unsigned long *val) return 0; } +#ifdef DEBUG +static void ksm_print_sysfs(void) +{ + unsigned long max_page_sharing, pages_sharing, pages_shared; + unsigned long full_scans, pages_unshared, pages_volatile; + unsigned long stable_node_chains, stable_node_dups; + long general_profit; + + if (ksm_read_sysfs(KSM_FP("pages_shared"), &pages_shared) || + ksm_read_sysfs(KSM_FP("pages_sharing"), &pages_sharing) || + ksm_read_sysfs(KSM_FP("max_page_sharing"), &max_page_sharing) || + ksm_read_sysfs(KSM_FP("full_scans"), &full_scans) || + ksm_read_sysfs(KSM_FP("pages_unshared"), &pages_unshared) || + ksm_read_sysfs(KSM_FP("pages_volatile"), &pages_volatile) || + ksm_read_sysfs(KSM_FP("stable_node_chains"), &stable_node_chains) || + ksm_read_sysfs(KSM_FP("stable_node_dups"), &stable_node_dups) || + ksm_read_sysfs(KSM_FP("general_profit"), (unsigned long *)&general_profit)) + return; + + printf("pages_shared : %lu\n", pages_shared); + printf("pages_sharing : %lu\n", pages_sharing); + printf("max_page_sharing : %lu\n", max_page_sharing); + printf("full_scans : %lu\n", full_scans); + printf("pages_unshared : %lu\n", pages_unshared); + printf("pages_volatile : %lu\n", pages_volatile); + printf("stable_node_chains: %lu\n", stable_node_chains); + printf("stable_node_dups : %lu\n", stable_node_dups); + printf("general_profit : %ld\n", general_profit); +} + +static void ksm_print_procfs(void) +{ + const char *file_name = "/proc/self/ksm_stat"; + char buffer[512]; + FILE *f = fopen(file_name, "r"); + + if (!f) { + fprintf(stderr, "f %s\n", file_name); + perror("fopen"); + return; + } + + while (fgets(buffer, sizeof(buffer), f)) + printf("%s", buffer); + + fclose(f); +} +#endif + static int str_to_prot(char *prot_str) { int prot = 0; @@ -237,6 +286,11 @@ static bool assert_ksm_pages_count(long dupl_page_count) ksm_read_sysfs(KSM_FP("max_page_sharing"), &max_page_sharing)) return false; +#ifdef DEBUG + ksm_print_sysfs(); + ksm_print_procfs(); +#endif + /* * Since there must be at least 2 pages for merging and 1 page can be * shared with the limited number of pages (max_page_sharing), sometimes