From patchwork Wed Nov 23 14:48:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 25033 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2835674wrr; Wed, 23 Nov 2022 06:52:20 -0800 (PST) X-Google-Smtp-Source: AA0mqf6OEUUGcro3K5cdqTzrpW9F90qpUuAQHxcT2WVs7/s7P9xlPivt8c1tJBFvomoQ3yrmjBgg X-Received: by 2002:a17:90a:708a:b0:20a:eaab:137 with SMTP id g10-20020a17090a708a00b0020aeaab0137mr31302853pjk.206.1669215139761; Wed, 23 Nov 2022 06:52:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669215139; cv=none; d=google.com; s=arc-20160816; b=g+kYeYYwa1H1+KOfuM9CEw3e5AEYM0Z5kRFlaJDIrEuixoBaofRUZLB394L06I1RTl vtsoF8LG2KMjNTSz+7smNg63OAvCDoWZogdVme8gZXA4WD/SCzCwzs1UHAKuiAmZN174 YQva7nn5BVKhw3kieR8FWBoSM2/UbqTtmFVR2AbTiBBVNCSZEMZ3gSFhQmvqdZUVCpF9 14Qvonb5y/NYJOyuBki3BzJQbWVrDAFa/NP/xSyLA2wlcyInlcVyIE+OAAdxjyOMEwhx jSJCtCLmqQIRfiu0WwFCZfTuz6lPiPThz15Bq+NVKl/L4cG2qlbzp5YOVE/TrlmOM6vA EPBQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=ZeSB9qdn73Myt2i0jHzn3NwGLhoTS9nYQuS1263f0g4=; b=zvVSWhc7R3B1IQjz+5pljDl49iJdhPM3mZShmlGqOhOjvr+xpDUhoKssPMNaCk3Ke2 lVkH42pLkp2llHEvmG9q46Q9lbmI+fCybsTUVPCDsJMiJHWPCMNMqxNw6ih57NxDKLHJ m5+2H7vmQr6hEG0dxfSmDsD6QZ4YNLdWlPXNRwWQCR7R8oRJYZ6+4sTKSREzQ99pCwhg d1mdUpYhdk59nRPPWttwk9Ok1xMNdkeP6gWhKLCMN55P6QHAV6UEJO/qj1IWQRAlO+VC 1T36/YyiArD1mB4Hv7nlB1ZAQRuuiGp1dYIR8SzFm3+6H40oxbXudaoRSn1SmJQkcwID RDfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=P5vnlvey; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x69-20020a638648000000b00477c2326410si1027656pgd.298.2022.11.23.06.52.06; Wed, 23 Nov 2022 06:52:19 -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; dkim=pass header.i=@intel.com header.s=Intel header.b=P5vnlvey; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237621AbiKWOt2 (ORCPT + 99 others); Wed, 23 Nov 2022 09:49:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237580AbiKWOtQ (ORCPT ); Wed, 23 Nov 2022 09:49:16 -0500 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 264306CA12; Wed, 23 Nov 2022 06:49:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669214954; x=1700750954; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=6CaDzmwprgLasCtAjji0nqGgQ6qOSWdVD2cInwSVDOE=; b=P5vnlveyz4nNZzzJ/MQgHJOvUpWYDjlnFsFExWsTsy6GUdHXkeKoAozL HHjGuw8LcB+1tJhgjjIyuA/Ga9cYu0WrUnYFKVe8nqL4sRrsqIoa/rK0H 5OvoW2/4SPLObauGFQ6GP7yk6CsgQQ7bhzNFDrvL2SiD40R8n9R5Njoqt z2/kONs+QEIJFJSWXI0C59K+/yh50Dd+isUyAjKk3dMqkSamd2ZE/hkUC HcuxWmZBxZ4US64jL6y9RH0m+LOjsjwRqUQJWAiXPKGU3cgk3QHRmFbNb IfDFRcWi3I2jh14eMRKClfpxMuBfTdSJbvGwatRrnH51rq/4qLP74AMlL g==; X-IronPort-AV: E=McAfee;i="6500,9779,10540"; a="376225212" X-IronPort-AV: E=Sophos;i="5.96,187,1665471600"; d="scan'208";a="376225212" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2022 06:48:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10540"; a="635936973" X-IronPort-AV: E=Sophos;i="5.96,187,1665471600"; d="scan'208";a="635936973" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 23 Nov 2022 06:48:37 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 80918128; Wed, 23 Nov 2022 16:49:03 +0200 (EET) From: Andy Shevchenko To: Jakob Koschel , Andy Shevchenko , Greg Kroah-Hartman , Mathias Nyman , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Kevin Cernekee , Mathias Nyman , Hans de Goede , Jani Nikula Subject: [PATCH v4 1/4] i915: Move list_count() to list.h for broader use Date: Wed, 23 Nov 2022 16:48:58 +0200 Message-Id: <20221123144901.40493-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750298934076057813?= X-GMAIL-MSGID: =?utf-8?q?1750298934076057813?= Some of the existing users, and definitely will be new ones, want to count existing nodes in the list. Provide a generic API for that by moving code from i915 to list.h. Signed-off-by: Andy Shevchenko Acked-by: Jani Nikula Reviewed-by: Lucas De Marchi --- v4: fixed prototype when converting to static inline v3: added tag (Jani), changed to be static inline (Mike) v2: dropped the duplicate code in i915 (LKP) drivers/gpu/drm/i915/gt/intel_engine_cs.c | 13 +------------ include/linux/list.h | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c index c33e0d72d670..b96c8217743c 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c @@ -2094,17 +2094,6 @@ static void print_request_ring(struct drm_printer *m, struct i915_request *rq) } } -static unsigned long list_count(struct list_head *list) -{ - struct list_head *pos; - unsigned long count = 0; - - list_for_each(pos, list) - count++; - - return count; -} - static unsigned long read_ul(void *p, size_t x) { return *(unsigned long *)(p + x); @@ -2279,7 +2268,7 @@ void intel_engine_dump(struct intel_engine_cs *engine, spin_lock_irqsave(&engine->sched_engine->lock, flags); engine_dump_active_requests(engine, m); - drm_printf(m, "\tOn hold?: %lu\n", + drm_printf(m, "\tOn hold?: %zu\n", list_count(&engine->sched_engine->hold)); spin_unlock_irqrestore(&engine->sched_engine->lock, flags); diff --git a/include/linux/list.h b/include/linux/list.h index 61762054b4be..632a298c7018 100644 --- a/include/linux/list.h +++ b/include/linux/list.h @@ -655,6 +655,21 @@ static inline void list_splice_tail_init(struct list_head *list, !list_is_head(pos, (head)); \ pos = n, n = pos->prev) +/** + * list_count - count nodes in the list + * @head: the head for your list. + */ +static inline size_t list_count(struct list_head *head) +{ + struct list_head *pos; + size_t count = 0; + + list_for_each(pos, head) + count++; + + return count; +} + /** * list_entry_is_head - test if the entry points to the head of the list * @pos: the type * to cursor