From patchwork Wed Feb 17 00:13:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 12090769 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8DA2C433E0 for ; Wed, 17 Feb 2021 00:13:33 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8D34464EB1 for ; Wed, 17 Feb 2021 00:13:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8D34464EB1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 239EC8D0009; Tue, 16 Feb 2021 19:13:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 197486B007E; Tue, 16 Feb 2021 19:13:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F2ED18D0009; Tue, 16 Feb 2021 19:13:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0104.hostedemail.com [216.40.44.104]) by kanga.kvack.org (Postfix) with ESMTP id CDEBF6B007D for ; Tue, 16 Feb 2021 19:13:32 -0500 (EST) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 8E7127587 for ; Wed, 17 Feb 2021 00:13:32 +0000 (UTC) X-FDA: 77825835864.23.slope78_300038327648 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin23.hostedemail.com (Postfix) with ESMTP id 70F9D37604 for ; Wed, 17 Feb 2021 00:13:32 +0000 (UTC) X-HE-Tag: slope78_300038327648 X-Filterd-Recvd-Size: 4320 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by imf09.hostedemail.com (Postfix) with ESMTP for ; Wed, 17 Feb 2021 00:13:31 +0000 (UTC) Received: by mail-pj1-f54.google.com with SMTP id gx20so423717pjb.1 for ; Tue, 16 Feb 2021 16:13:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oDIXLxy24LDduOjAgxeksw9hKjupmB+52EkzQu0ub3U=; b=tftXLk6zX3Xb/cf8+6zK9ZM6tMvifXEmb/deF6t5Rus0pTCpIfksjhYqeeJ5a95yH4 m+4rfrfqtzyTY+ma3SBO1W0w10WAh0xhmztzyrGuj81FocIeHOoPCWe1C/2E73IntBP3 B8RaDuy91wqWcfILUAtMKgwI//V/lZGukHWyelk/KGOAOlpqyWRSFO9/49IWWJ8nr7W4 lY1PmhOdYjBe/TsWuhs5utEtqdUa0/l/ZIbNUrXUn7Hu0FpUY3n1dR6O98ddRIW0Pb5W hHcKIkAJqPYiKFMK9GQ6CMqml5wfDLhfyWtKLavN9KNhuTQH51cUMKqDliHUIb6Wm5nG Ukew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oDIXLxy24LDduOjAgxeksw9hKjupmB+52EkzQu0ub3U=; b=gX42G5JYm/6B6iKtyCP7jZ4dWjCrx9NLublmc0PYj2o7B4fsAOMxpeCqaa/Vc8aPpI Z9tVi9WuTRiLwvTnEZmIrFGqowwZRDWK9q3CNDUfhPnGyOOdUPNtw1c6zDbDkx3u4Q1z bw6S1tBRWiEgvznpaYOSNX0whsrQ0LV5Q5uxhGMzziPBoUjyriUvUOsBg0N8w3DF/vay oB6aq6c/uCDA8bMctUpI+/0JWWWXU8psjgVe0WKPIFcc0Si6dlSCSFMfzOiPCQpZviSG HmoO0c5GhRfz75fYHYOb5592/Ot6cVSZkg4YpqATd4wJd6RPnVbQBS552G3eX1Xuo+i6 nVXg== X-Gm-Message-State: AOAM533miGkog6aDbNUZ+YxFuCfj4mbN3bx2Py4q7Xmtup7HcO/v8KQG ioxHq8PG7WivLGNxvQtAO3o= X-Google-Smtp-Source: ABdhPJzwkFumlTnfhOiwYgAsXEbk8Y/K1i2XUu3wOErxAZ5+RVdNcGG132WhjXrBD4iR4KyPU84LLw== X-Received: by 2002:a17:90b:4a0b:: with SMTP id kk11mr6563422pjb.95.1613520811146; Tue, 16 Feb 2021 16:13:31 -0800 (PST) Received: from localhost.localdomain (c-73-93-239-127.hsd1.ca.comcast.net. [73.93.239.127]) by smtp.gmail.com with ESMTPSA id y12sm99220pjc.56.2021.02.16.16.13.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Feb 2021 16:13:30 -0800 (PST) From: Yang Shi To: guro@fb.com, ktkhai@virtuozzo.com, vbabka@suse.cz, shakeelb@google.com, david@fromorbit.com, hannes@cmpxchg.org, mhocko@suse.com, akpm@linux-foundation.org Cc: shy828301@gmail.com, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [v8 PATCH 01/13] mm: vmscan: use nid from shrink_control for tracepoint Date: Tue, 16 Feb 2021 16:13:10 -0800 Message-Id: <20210217001322.2226796-2-shy828301@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210217001322.2226796-1-shy828301@gmail.com> References: <20210217001322.2226796-1-shy828301@gmail.com> MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The tracepoint's nid should show what node the shrink happens on, the start tracepoint uses nid from shrinkctl, but the nid might be set to 0 before end tracepoint if the shrinker is not NUMA aware, so the tracing log may show the shrink happens on one node but end up on the other node. It seems confusing. And the following patch will remove using nid directly in do_shrink_slab(), this patch also helps cleanup the code. Acked-by: Vlastimil Babka Acked-by: Kirill Tkhai Reviewed-by: Shakeel Butt Acked-by: Roman Gushchin Signed-off-by: Yang Shi --- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index b1b574ad199d..b512dd5e3a1c 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -535,7 +535,7 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl, else new_nr = atomic_long_read(&shrinker->nr_deferred[nid]); - trace_mm_shrink_slab_end(shrinker, nid, freed, nr, new_nr, total_scan); + trace_mm_shrink_slab_end(shrinker, shrinkctl->nid, freed, nr, new_nr, total_scan); return freed; }