From patchwork Tue Aug 1 20:13:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ira Weiny X-Patchwork-Id: 13337216 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 154CDC04A94 for ; Tue, 1 Aug 2023 20:13:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231740AbjHAUNc (ORCPT ); Tue, 1 Aug 2023 16:13:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231506AbjHAUNa (ORCPT ); Tue, 1 Aug 2023 16:13:30 -0400 Received: from mgamail.intel.com (unknown [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 169B6E71; Tue, 1 Aug 2023 13:13:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690920810; x=1722456810; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=w62E1ZLf8Yu+1153NVpeVsjcxpI68+1rLGXh6gbkRsE=; b=HueUsx1UuJON2+28U0JYTg7jwWIYKNHwdJAYAcz/0VY8LhSd1cGqwWrv hMDUOuvTEYfqYeZMwqzc2TCI2EG3MAqIelOeqlCHynkI/4NjmPU+yLLNO OMkKzblmko7jGMdwProQfnWslTjD1CgNdaGOtRgnfykjCPVFHv9rAluLT PdodU4ipCZvc/c1SZW7ogSxKNwqzs0gOszpNDcSBUIRCxbgHA6hPmvh+N SWvMW+elDJOheHH6X+6t6wcCDMOAK7VGzvAUHxMZy56j/nM7CMLkZbxSx GvS4ZHScqJ5CeWeE/jDaYstRna80K7Z01a1emacq6/qpRU19B7lktJj3t Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10789"; a="369403666" X-IronPort-AV: E=Sophos;i="6.01,248,1684825200"; d="scan'208";a="369403666" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2023 13:13:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10789"; a="794320086" X-IronPort-AV: E=Sophos;i="6.01,248,1684825200"; d="scan'208";a="794320086" Received: from iweiny-mobl.amr.corp.intel.com (HELO localhost) ([10.212.100.136]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2023 13:13:29 -0700 From: Ira Weiny Date: Tue, 01 Aug 2023 13:13:28 -0700 Subject: [PATCH v2 1/2] cxl/mbox: Use correct handle in events debug message MIME-Version: 1.0 Message-Id: <20230731-cxl-fix-clear-event-debug-print-v2-1-9bdd08d386e9@intel.com> References: <20230731-cxl-fix-clear-event-debug-print-v2-0-9bdd08d386e9@intel.com> In-Reply-To: <20230731-cxl-fix-clear-event-debug-print-v2-0-9bdd08d386e9@intel.com> To: Davidlohr Bueso , Jonathan Cameron , Dave Jiang , Alison Schofield , Vishal Verma , Dan Williams Cc: linux-cxl@vger.kernel.org, linux-kernel@vger.kernel.org, Ira Weiny X-Mailer: b4 0.13-dev-c6835 X-Developer-Signature: v=1; a=ed25519-sha256; t=1690920808; l=1224; i=ira.weiny@intel.com; s=20221211; h=from:subject:message-id; bh=w62E1ZLf8Yu+1153NVpeVsjcxpI68+1rLGXh6gbkRsE=; b=LgCCY3xLB4TQ/N0UwBxq1bLzZyunrC1vJz8EcuE8NVOLHkyTUBDtBroGIxieIN2Xo7zydhWWh ZLzq9TTaHBID5RTkTo0MseM7KA/Wnvu+UbLzTESefrEy/AfH3jcJ+M4 X-Developer-Key: i=ira.weiny@intel.com; a=ed25519; pk=noldbkG+Wp1qXRrrkfY1QJpDf7QsOEthbOT7vm0PqsE= Precedence: bulk List-ID: X-Mailing-List: linux-cxl@vger.kernel.org The handle value used to report an event being cleared by dev_dbg() is incorrect due to a post increment of the payload handle index. Delay the increment of the index until after the print. Fixes: 6ebe28f9ec72 ("cxl/mem: Read, trace, and clear events on driver load") Signed-off-by: Ira Weiny Reviewed-by: Dave Jiang Reviewed-by: Alison Schofield Reviewed-by: Jonathan Cameron --- Changes for v2 [Dan] Go ahead and mark this for backporting [Dan] Remove 'To/Cc' cruft from individual patches [Dan/Alison] Split out the additional debugging [Alison] New oneliner --- drivers/cxl/core/mbox.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c index d6d067fbee97..a1c490f66bbf 100644 --- a/drivers/cxl/core/mbox.c +++ b/drivers/cxl/core/mbox.c @@ -882,9 +882,10 @@ static int cxl_clear_event_record(struct cxl_memdev_state *mds, */ i = 0; for (cnt = 0; cnt < total; cnt++) { - payload->handles[i++] = get_pl->records[cnt].hdr.handle; + payload->handles[i] = get_pl->records[cnt].hdr.handle; dev_dbg(mds->cxlds.dev, "Event log '%d': Clearing %u\n", log, le16_to_cpu(payload->handles[i])); + i++; if (i == max_handles) { payload->nr_recs = i; From patchwork Tue Aug 1 20:13:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ira Weiny X-Patchwork-Id: 13337217 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6898EC04A6A for ; Tue, 1 Aug 2023 20:13:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231689AbjHAUNd (ORCPT ); Tue, 1 Aug 2023 16:13:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231539AbjHAUNb (ORCPT ); Tue, 1 Aug 2023 16:13:31 -0400 Received: from mgamail.intel.com (unknown [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF9292683; Tue, 1 Aug 2023 13:13:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690920810; x=1722456810; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=9ogJFFw+u0bGujZNfOGprB9BbrBgtdwyx6Y9vnk3474=; b=EvKCyIEioHeAvaozTnqbhDS4/IGAe7c5glQFNnoBcXDoLAzZR6hB5RZn jYZCnoJWevYekPksH7ovpcOorr9WZOd9z/NfLaFGexnNGhRYameWGp7fX aWk/D2Ex00L5oQn7AouWaYzltNchdeEHgIuT/VPp/nXL0f6flk61AcHlB 2q+yc1as4IEr/uoHnQv34F7USXRGHCYdi0yPAZGgf6hISNOAne01EnPx3 d5ynncUWFO0wAP3s9EgPmVIg1Obm6Wvl4twKYZiHFxUeICnyAQGRMTqGu o2aAhwzD9wxxNh9Y6qHqkquKXx5TodnBhlgz/mu/+63iF50hAOvzG8HK4 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10789"; a="369403670" X-IronPort-AV: E=Sophos;i="6.01,248,1684825200"; d="scan'208";a="369403670" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2023 13:13:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10789"; a="794320090" X-IronPort-AV: E=Sophos;i="6.01,248,1684825200"; d="scan'208";a="794320090" Received: from iweiny-mobl.amr.corp.intel.com (HELO localhost) ([10.212.100.136]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2023 13:13:29 -0700 From: Ira Weiny Date: Tue, 01 Aug 2023 13:13:29 -0700 Subject: [PATCH v2 2/2] cxl/mbox: Add handle to event processing debug MIME-Version: 1.0 Message-Id: <20230731-cxl-fix-clear-event-debug-print-v2-2-9bdd08d386e9@intel.com> References: <20230731-cxl-fix-clear-event-debug-print-v2-0-9bdd08d386e9@intel.com> In-Reply-To: <20230731-cxl-fix-clear-event-debug-print-v2-0-9bdd08d386e9@intel.com> To: Davidlohr Bueso , Jonathan Cameron , Dave Jiang , Alison Schofield , Vishal Verma , Dan Williams Cc: linux-cxl@vger.kernel.org, linux-kernel@vger.kernel.org, Ira Weiny X-Mailer: b4 0.13-dev-c6835 X-Developer-Signature: v=1; a=ed25519-sha256; t=1690920808; l=949; i=ira.weiny@intel.com; s=20221211; h=from:subject:message-id; bh=9ogJFFw+u0bGujZNfOGprB9BbrBgtdwyx6Y9vnk3474=; b=8ppxERDqIvSOk6UFMtxM71svRp1lrx+sFqufgdT6tXtEsqFh8YvGgb6pNPjACkRt4z8Aass2o 19Ilt9royHOAxnENHp4RmlQKM5dvB/53WEpk/eIdycczv+BhfMuEh88 X-Developer-Key: i=ira.weiny@intel.com; a=ed25519; pk=noldbkG+Wp1qXRrrkfY1QJpDf7QsOEthbOT7vm0PqsE= Precedence: bulk List-ID: X-Mailing-List: linux-cxl@vger.kernel.org Knowing which handle is being processed helped in debugging new event code. Add a dev_dbg() message with this information. Signed-off-by: Ira Weiny Reviewed-by: Dave Jiang Reviewed-by: Alison Schofield Reviewed-by: Jonathan Cameron --- drivers/cxl/core/mbox.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c index a1c490f66bbf..f052d5f174ee 100644 --- a/drivers/cxl/core/mbox.c +++ b/drivers/cxl/core/mbox.c @@ -947,9 +947,13 @@ static void cxl_mem_get_records_log(struct cxl_memdev_state *mds, if (!nr_rec) break; - for (i = 0; i < nr_rec; i++) + for (i = 0; i < nr_rec; i++) { + dev_dbg(dev, "Event log %d: processing handle %u\n", + type, + le16_to_cpu(payload->records[i].hdr.handle)); cxl_event_trace_record(cxlmd, type, &payload->records[i]); + } if (payload->flags & CXL_GET_EVENT_FLAG_OVERFLOW) trace_cxl_overflow(cxlmd, type, payload);