From patchwork Sat Oct 28 00:09: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: 159202 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp959162vqb; Fri, 27 Oct 2023 17:13:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGbzXwa/7l7wa6Wz3G1GG3lJ7Da4lwOg7Xt5o9lgbsY1CyPBBDiZMA+BMpJftT9/j2NiG+J X-Received: by 2002:a05:6870:ac87:b0:1ea:bb5:a531 with SMTP id ns7-20020a056870ac8700b001ea0bb5a531mr5279581oab.13.1698451989300; Fri, 27 Oct 2023 17:13:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698451989; cv=none; d=google.com; s=arc-20160816; b=tBYg8y0/n5OaX0yKPFy9k1FFzA5W3Q8MPydhqzgP0sJAm5Ya1u2DaYTxoGpIe7GL70 ZWw679u0cdKzk07J7Lj+W3Ns/P7V+thyOzZZBLO5VYNZpGLFejC49GdhbLyF3AWG1bpD RJj10VjPV5g1EouJDceRtCzMIGJze61OGjoSuSu2rOUjKX0HvvAPur/3nisU4XpEMjW7 4nEXqMCZKKEQ0B2hkTGHUnVrwlTezK57OcQw5gNqDTNo23HqkKT1tfiho1+3ao9T4HpO g5od3YFOA23HZQLI6WmkrGkyW0GB+PETKSXhU9pIq/FgTgP3n8rZKzb3S3XgoLuWinzN pfnA== 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=31VaYngcTYzlNRfnB5nKk/Q/RitTaJ38QTejLRm4eBI=; fh=sS+J4OyOC0EcVLWJpS3mBHGeO+0+dYZJ+ImCUfzsrH4=; b=hhy3GYKdwAMQnKE4wDkdkGKsoT1v6z891MuPrYEri2Ow8kjkvRnQnDThMdJ+BkHWd3 8d5CfnkMDYCEYcwhVLyRgvgA3Ml0b4xCpMe2spMuJX8jgOMtu/IMh1oIZbcZq1c/+ADC HIznMj3ZZcprmAsyfGatcYgzlgrvZECuwCC0vOjJodC5KGppZn0ppJZbVAxVOiF5YBym sFocApIdI2+ztpiejmA/hIrXHZwRqnyGp9Rgpd9GQDZbQaKEQPTelemcG24RCjopDSl2 e8rL7PmwuLTxQOZDYs7h1KtJ9fOpJZTdzrtUov1HyzZjdIrzyxNS4Ia6Awf2NRGtcvc3 47fw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id y29-20020a056a00181d00b006b54b82dac0si1692201pfa.298.2023.10.27.17.13.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 17:13:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 1A3E680699C7; Fri, 27 Oct 2023 17:13:08 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346743AbjJ1ANC (ORCPT + 27 others); Fri, 27 Oct 2023 20:13:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231444AbjJ1AM7 (ORCPT ); Fri, 27 Oct 2023 20:12:59 -0400 Received: from 66-220-144-179.mail-mxout.facebook.com (66-220-144-179.mail-mxout.facebook.com [66.220.144.179]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5F511B8 for ; Fri, 27 Oct 2023 17:12:57 -0700 (PDT) Received: by devbig1114.prn1.facebook.com (Postfix, from userid 425415) id 6C454E5A25F5; Fri, 27 Oct 2023 17:10:25 -0700 (PDT) From: Stefan Roesch To: kernel-team@fb.com Cc: shr@devkernel.io, akpm@linux-foundation.org, david@redhat.com, hannes@cmpxchg.org, riel@surriel.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v2 3/4] mm/ksm: add tracepoint for ksm advisor Date: Fri, 27 Oct 2023 17:09:44 -0700 Message-Id: <20231028000945.2428830-4-shr@devkernel.io> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231028000945.2428830-1-shr@devkernel.io> References: <20231028000945.2428830-1-shr@devkernel.io> MIME-Version: 1.0 X-Spam-Status: No, score=-0.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RDNS_DYNAMIC,SPF_HELO_PASS,SPF_NEUTRAL, TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 27 Oct 2023 17:13:08 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780955993268588104 X-GMAIL-MSGID: 1780955993268588104 This adds a new tracepoint for the ksm advisor. It reports the last scan time, the new setting of the pages_to_scan parameter and the average cpu percent usage of the ksmd background thread for the last scan. Signed-off-by: Stefan Roesch --- include/trace/events/ksm.h | 33 +++++++++++++++++++++++++++++++++ mm/ksm.c | 1 + 2 files changed, 34 insertions(+) diff --git a/include/trace/events/ksm.h b/include/trace/events/ksm.h index b5ac35c1d0e8..e728647b5d26 100644 --- a/include/trace/events/ksm.h +++ b/include/trace/events/ksm.h @@ -245,6 +245,39 @@ TRACE_EVENT(ksm_remove_rmap_item, __entry->pfn, __entry->rmap_item, __entry->mm) ); +/** + * ksm_advisor - called after the advisor has run + * + * @scan_time: scan time in seconds + * @pages_to_scan: new pages_to_scan value + * @cpu_percent: cpu usage in percent + * + * Allows to trace the ksm advisor. + */ +TRACE_EVENT(ksm_advisor, + + TP_PROTO(s64 scan_time, unsigned long pages_to_scan, + unsigned int cpu_percent), + + TP_ARGS(scan_time, pages_to_scan, cpu_percent), + + TP_STRUCT__entry( + __field(s64, scan_time) + __field(unsigned long, pages_to_scan) + __field(unsigned int, cpu_percent) + ), + + TP_fast_assign( + __entry->scan_time = scan_time; + __entry->pages_to_scan = pages_to_scan; + __entry->cpu_percent = cpu_percent; + ), + + TP_printk("ksm scan time %lld pages_to_scan %lu cpu percent %u", + __entry->scan_time, __entry->pages_to_scan, + __entry->cpu_percent) +); + #endif /* _TRACE_KSM_H */ /* This part must be outside protection */ diff --git a/mm/ksm.c b/mm/ksm.c index 042ecaeb0beb..b2a519083d66 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -442,6 +442,7 @@ static void scan_time_advisor(unsigned long scan_time) advisor_ctx.cpu_time = cpu_time; ksm_thread_pages_to_scan = pages; + trace_ksm_advisor(scan_time, pages, cpu_percent); } static void run_advisor(void)