Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp4821405ybl; Wed, 22 Jan 2020 05:23:45 -0800 (PST) X-Google-Smtp-Source: APXvYqyKwBup7ZLqF6shQE+QJrYfPfiMrsnCESpBy3WjsYCqEUV57y42hetognsVUQ0RBZfRlhDt X-Received: by 2002:aca:db43:: with SMTP id s64mr6480922oig.144.1579699425792; Wed, 22 Jan 2020 05:23:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579699425; cv=none; d=google.com; s=arc-20160816; b=F8vJrC7gtRa2HUpyCBrqrY1wHICoXkaRiqEMgZ0kjjlYS1xaH2lpxm+MWOHcjIzkMw SOitWAce4cHmlRkkW1qvtxZ3MtlNPxbJC8qJYytYHcFqUWTu/7GIzlzP/ZTZppUnap3y 94n8h8urPh3O6qBQOPWZ8KN0EJKtLptF9+dmJnulImfzzJOJtWNdEiyZYBprSALOqEa6 DEuHjd2Jlk71hB0bySS1sqB198i4SpZU5vd7/3iQSxbUv5pW4OVS9B8htGJm/g7YRvHT /GzsEJPbwUFaCVxwrBpdO4W7tU27k9q+EQ2+7/SS8ahZUeeiPe5wZHer3lfg16ydkx8Z lXUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AONH5yYYblDk02cCWT579eqp4Vpmt06VWDYq6MInCAI=; b=OMsVS6ElRRuSJRT8gpQNXIWmaiv9dTrAXUofCjOXZkef9fK6z0PLfkLmK9ZQT/07mu LgZ5aftWGn3fmxqJXHD+ZgkwK8FinuD34+6zlLMR5ZkLJjDu1DvYyY4dio21GvcPeFyQ uExc3cg2VEUfOoqMeZK2pqLGKxLfeE/KxyFKhDsGI8tpa8SoG6dBYNppn1sYMz+L7Su1 kMtTebKDVtVLglln/Y5HEoDeA/ntkYDOw4LNxwnYVCCYlMPu1cYt7BpcyMZxqknLXM3Y JScQLZfEbNVAfCeC3DO3IOWamHJFnNjj4JeSnBG/u3B2eEqjm+5IGM2kyYJqPMTmBB0e OWCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2KSmaWWd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j16si20817938oii.57.2020.01.22.05.23.33; Wed, 22 Jan 2020 05:23:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2KSmaWWd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730211AbgAVNVQ (ORCPT + 99 others); Wed, 22 Jan 2020 08:21:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:37858 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730155AbgAVNVJ (ORCPT ); Wed, 22 Jan 2020 08:21:09 -0500 Received: from localhost (unknown [84.241.205.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BA63524688; Wed, 22 Jan 2020 13:21:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579699268; bh=MNpFJ+xxo3lMFNVeamBfXT2zdZpC3ty89O9XeXXGr+M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2KSmaWWdciL3G3YZ3yvcmNwhTcXGq8u9dezlMSeG5dvCg6CgAqwKlog1BJZBX/u68 xMBNcSuuj+M6Dc6TBjxpTS4N0x5WiXpusA7KcE9hJoKmPZIhbnBeXOn0lx1/3M5N9H MUCX+yZUJqzXupBoEmtuHUDUI8J7FB23mX/e47YI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yang Shi , Song Liu , "Kirill A. Shutemov" , Anshuman Khandual , Andrew Morton , Linus Torvalds Subject: [PATCH 5.4 092/222] mm: khugepaged: add trace status description for SCAN_PAGE_HAS_PRIVATE Date: Wed, 22 Jan 2020 10:27:58 +0100 Message-Id: <20200122092840.322914725@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092833.339495161@linuxfoundation.org> References: <20200122092833.339495161@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yang Shi commit 554913f600b45d73de12ad58c1ac7baa0f22a703 upstream. Commit 99cb0dbd47a1 ("mm,thp: add read-only THP support for (non-shmem) FS") introduced a new khugepaged scan result: SCAN_PAGE_HAS_PRIVATE, but the corresponding description for trace events were not added. Link: http://lkml.kernel.org/r/1574793844-2914-1-git-send-email-yang.shi@linux.alibaba.com Fixes: 99cb0dbd47a1 ("mm,thp: add read-only THP support for (non-shmem) FS") Signed-off-by: Yang Shi Cc: Song Liu Cc: Kirill A. Shutemov Cc: Anshuman Khandual Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- include/trace/events/huge_memory.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/include/trace/events/huge_memory.h +++ b/include/trace/events/huge_memory.h @@ -31,7 +31,8 @@ EM( SCAN_ALLOC_HUGE_PAGE_FAIL, "alloc_huge_page_failed") \ EM( SCAN_CGROUP_CHARGE_FAIL, "ccgroup_charge_failed") \ EM( SCAN_EXCEED_SWAP_PTE, "exceed_swap_pte") \ - EMe(SCAN_TRUNCATED, "truncated") \ + EM( SCAN_TRUNCATED, "truncated") \ + EMe(SCAN_PAGE_HAS_PRIVATE, "page_has_private") \ #undef EM #undef EMe