From patchwork Tue Jun 14 22:03:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waiman Long X-Patchwork-Id: 12881649 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48371C433EF for ; Tue, 14 Jun 2022 22:04:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 991B06B0071; Tue, 14 Jun 2022 18:04:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 940F36B0072; Tue, 14 Jun 2022 18:04:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 807CC6B0073; Tue, 14 Jun 2022 18:04:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 70F346B0071 for ; Tue, 14 Jun 2022 18:04:17 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 341FF21061 for ; Tue, 14 Jun 2022 22:04:17 +0000 (UTC) X-FDA: 79578220554.22.A5E7BB5 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf27.hostedemail.com (Postfix) with ESMTP id 8045F4009C for ; Tue, 14 Jun 2022 22:04:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655244256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A77y1Lb+c0CpuBJ2A6h47CxYcHUb1O0vwhwXfFK1d3U=; b=VS8HY7l7xqIiy1mznxImPdQyNf3tUshXV2+ct7pL5GYnfQF6Z08zwnQ/SlAEqNSbHsP1/X ynDvjCfl63fG15mE4RV0Qn5X+eEvda9iRbHGvw/mHGi7CGRwA7wZ9+ZvO0NFTeOiM73q63 nSii5m0CaTAWDECgobEh+QP3cY36Mf8= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-649-7YOsaToPPyuNnrqUVU661A-1; Tue, 14 Jun 2022 18:04:14 -0400 X-MC-Unique: 7YOsaToPPyuNnrqUVU661A-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5A1933C021A9; Tue, 14 Jun 2022 22:04:14 +0000 (UTC) Received: from llong.com (unknown [10.22.33.116]) by smtp.corp.redhat.com (Postfix) with ESMTP id 185B5492CA2; Tue, 14 Jun 2022 22:04:14 +0000 (UTC) From: Waiman Long To: Catalin Marinas , Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Muchun Song , Waiman Long Subject: [PATCH v2 1/3] mm/kmemleak: Use _irq lock/unlock variants in kmemleak_scan/_clear() Date: Tue, 14 Jun 2022 18:03:57 -0400 Message-Id: <20220614220359.59282-2-longman@redhat.com> In-Reply-To: <20220614220359.59282-1-longman@redhat.com> References: <20220614220359.59282-1-longman@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655244256; a=rsa-sha256; cv=none; b=NlUZesgrnirg4rllCKd0/jUVuPTjqKUva2Q5NKtFoEFeN5B5BYITCY7TQnPxDNjyg1tknp Rszm7M+MVrsq/lv7UWUUmdaB8vLx4vSwaK8E1OUP3Uf+IAXrOQUXuyXNW57Evb3sls5YHz 6D37Xy4eIsp/KoGhAn3smRpRH9wBHOQ= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VS8HY7l7; spf=none (imf27.hostedemail.com: domain of longman@redhat.com has no SPF policy when checking 170.10.129.124) smtp.mailfrom=longman@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655244256; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=A77y1Lb+c0CpuBJ2A6h47CxYcHUb1O0vwhwXfFK1d3U=; b=FSButSMq8TOd/ciRU4oJNoDZFPp4hp8QGFT7QCVrSr90EIidXA4DToBQgcjL6ZYcSB0ESr V8JNYobjzcqlpwMnfX4DyJKwByo2gC/VSqSMyeAJjWr7f8xDcNlrrDN62T0xmjmizxHDy0 5MLiQ8POXppMMyGtrlKqXfCxHGK/v88= X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 8045F4009C X-Stat-Signature: 9pt5ynhbpqjexqqj7yo8ync1ex59jf1a Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VS8HY7l7; spf=none (imf27.hostedemail.com: domain of longman@redhat.com has no SPF policy when checking 170.10.129.124) smtp.mailfrom=longman@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-HE-Tag: 1655244256-123643 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 kmemleak_scan() function is called only from the kmemleak scan thread or from write to the kmemleak debugfs file. Both are in task context and so we can directly use the simpler _irq() lock/unlock calls instead of the more complex _irqsave/_irqrestore variants. Similarly, kmemleak_clear() is called only from write to the kmemleak debugfs file. The same change can be applied. Signed-off-by: Waiman Long Reviewed-by: Muchun Song Reviewed-by: Catalin Marinas --- mm/kmemleak.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/mm/kmemleak.c b/mm/kmemleak.c index a182f5ddaf68..dad9219c972c 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -1413,7 +1413,6 @@ static void scan_gray_list(void) */ static void kmemleak_scan(void) { - unsigned long flags; struct kmemleak_object *object; struct zone *zone; int __maybe_unused i; @@ -1424,7 +1423,7 @@ static void kmemleak_scan(void) /* prepare the kmemleak_object's */ rcu_read_lock(); list_for_each_entry_rcu(object, &object_list, object_list) { - raw_spin_lock_irqsave(&object->lock, flags); + raw_spin_lock_irq(&object->lock); #ifdef DEBUG /* * With a few exceptions there should be a maximum of @@ -1441,7 +1440,7 @@ static void kmemleak_scan(void) if (color_gray(object) && get_object(object)) list_add_tail(&object->gray_list, &gray_list); - raw_spin_unlock_irqrestore(&object->lock, flags); + raw_spin_unlock_irq(&object->lock); } rcu_read_unlock(); @@ -1509,14 +1508,14 @@ static void kmemleak_scan(void) */ rcu_read_lock(); list_for_each_entry_rcu(object, &object_list, object_list) { - raw_spin_lock_irqsave(&object->lock, flags); + raw_spin_lock_irq(&object->lock); if (color_white(object) && (object->flags & OBJECT_ALLOCATED) && update_checksum(object) && get_object(object)) { /* color it gray temporarily */ object->count = object->min_count; list_add_tail(&object->gray_list, &gray_list); } - raw_spin_unlock_irqrestore(&object->lock, flags); + raw_spin_unlock_irq(&object->lock); } rcu_read_unlock(); @@ -1536,7 +1535,7 @@ static void kmemleak_scan(void) */ rcu_read_lock(); list_for_each_entry_rcu(object, &object_list, object_list) { - raw_spin_lock_irqsave(&object->lock, flags); + raw_spin_lock_irq(&object->lock); if (unreferenced_object(object) && !(object->flags & OBJECT_REPORTED)) { object->flags |= OBJECT_REPORTED; @@ -1546,7 +1545,7 @@ static void kmemleak_scan(void) new_leaks++; } - raw_spin_unlock_irqrestore(&object->lock, flags); + raw_spin_unlock_irq(&object->lock); } rcu_read_unlock(); @@ -1748,15 +1747,14 @@ static int dump_str_object_info(const char *str) static void kmemleak_clear(void) { struct kmemleak_object *object; - unsigned long flags; rcu_read_lock(); list_for_each_entry_rcu(object, &object_list, object_list) { - raw_spin_lock_irqsave(&object->lock, flags); + raw_spin_lock_irq(&object->lock); if ((object->flags & OBJECT_REPORTED) && unreferenced_object(object)) __paint_it(object, KMEMLEAK_GREY); - raw_spin_unlock_irqrestore(&object->lock, flags); + raw_spin_unlock_irq(&object->lock); } rcu_read_unlock();