From patchwork Sun Jan 19 12:57:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 13944428 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EDA0FEEB5 for ; Sun, 19 Jan 2025 12:57:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737291435; cv=none; b=Cgbaa1nTpe5oowd5Gj9seC+exUxEIvHKSZ5i0KbUqyoCwLehMjVXgCQckW3Ib876xLgXIJ3IaUcRazqaucWa1EFwHMOzfzjFhfxe4AOGI7bBITVcdF5sVnlovv3dh61zTt9VnVRdHdvFYPMeJ/yxNC75bvBAm7l4PMXhKCtNNOA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737291435; c=relaxed/simple; bh=jD15RZoRCklDpXXoRoVsAadZUUpIm2Kv2YDd6Jiu390=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QH7mG5yhSDv2WSfq7BAcfebNigYVlGctbDZTjvSEwYkfdToy6vlHcKOT4dU3BMKZkdq4ShKrqzKmFVvCH0sAlu0wn0+OmqwsA8TlbGZhambV6GhBROOym7Wc1Z93HHHA1GgQLNaJzLaOApQ9Qz7MaLGjoaghmf9UCRs6hm7Wt74= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YQk6WXZj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="YQk6WXZj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ABB05C4CEE7; Sun, 19 Jan 2025 12:57:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1737291433; bh=jD15RZoRCklDpXXoRoVsAadZUUpIm2Kv2YDd6Jiu390=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YQk6WXZjdNJgPp7k2IwUkxEDq4aTAMI4zY6I0WRpeAe5vt3EmOB2hsmbErRh6Xmo6 ++1czy7DazS8P1rDHLcF6qS8KXQ4plWwlcp2Nd9fLiCIwba/ICnAMS0VhoXtGkwbFA RJZTg6irZFsCmtIuuTSAUVTplsmkuBFeNxoXfBDE90mVDKGBU8HZTAzPnodNu4P0iS oekPSk676aIXeXg5Z02gpisHn+YdKglp4TUtV7cWO8kwtWCUjzbBIqNFhVvaXVquTV 8gZeWda1B41aZuk4+Fh6mWDR/2TyPp3vZxHptDwAHS6incCqr0Win5iYYwoAWNMd9P MM2iUUAM44VQA== From: Leon Romanovsky To: Jason Gunthorpe Cc: Maher Sanalla , linux-rdma@vger.kernel.org Subject: [PATCH rdma-next 1/3] IB/cache: Add log messages for IB device state changes Date: Sun, 19 Jan 2025 14:57:00 +0200 Message-ID: <836272c0a839393c71df4df5138f2c072c6f67c2.1737290406.git.leon@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Maher Sanalla Enhance visibility into IB device state transitions by adding log messages to the kernel log (dmesg). Whenever an IB device changes state, a relevant print will be printed, such as: "mlx5_core 0000:08:00.0 mlx5_0: Port DOWN" "mlx5_core 0000:08:00.0 rocep8s0f0: Port ACTIVE" Signed-off-by: Maher Sanalla Signed-off-by: Leon Romanovsky --- drivers/infiniband/core/cache.c | 5 +++++ include/rdma/ib_verbs.h | 17 +++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c index f8413f8a9f26..a35a2f3c9ab1 100644 --- a/drivers/infiniband/core/cache.c +++ b/drivers/infiniband/core/cache.c @@ -1501,6 +1501,11 @@ ib_cache_update(struct ib_device *device, u32 port, bool update_gids, device->port_data[port].cache.pkey = pkey_cache; } device->port_data[port].cache.lmc = tprops->lmc; + + if (device->port_data[port].cache.port_state != tprops->state) + ibdev_info(device, "Port %s\n", + ib_port_state_to_str(tprops->state)); + device->port_data[port].cache.port_state = tprops->state; device->port_data[port].cache.subnet_prefix = tprops->subnet_prefix; diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 0ad104dae253..b59bf30de430 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -519,6 +519,23 @@ enum ib_port_state { IB_PORT_ACTIVE_DEFER = 5 }; +static inline const char *__attribute_const__ +ib_port_state_to_str(enum ib_port_state state) +{ + const char * const states[] = { + [IB_PORT_NOP] = "NOP", + [IB_PORT_DOWN] = "DOWN", + [IB_PORT_INIT] = "INIT", + [IB_PORT_ARMED] = "ARMED", + [IB_PORT_ACTIVE] = "ACTIVE", + [IB_PORT_ACTIVE_DEFER] = "ACTIVE_DEFER", + }; + + if (state < ARRAY_SIZE(states)) + return states[state]; + return "UNKNOWN"; +} + enum ib_port_phys_state { IB_PORT_PHYS_STATE_SLEEP = 1, IB_PORT_PHYS_STATE_POLLING = 2, From patchwork Sun Jan 19 12:57:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 13944429 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3FA36EEB5 for ; Sun, 19 Jan 2025 12:57:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737291437; cv=none; b=dGgzDbPk/9gb4j/ZJ+QqWHbxTXczPUrM1qammGwMP46KNI4BijnpfHkIbQHWEgIRJLzizXA6Z73EIBoGJOJY7v/f/kIXpd31pr1vlQVvWhikDZA9+9g6DqoaZSVQ2SsuMZv669BnnkR/L18JWTyI30AXzFqJ0+L51aw6EmH0Hfs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737291437; c=relaxed/simple; bh=RE8qJVesfpU8vzkRw7dceBBasePuOpg/DRMFlgSlo08=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b4tSkTBgglsNvDZbASn7md5R3X9D+BxBI3oVFoZsKwyG64kMn4o2u9qyBPuHLU6LtigoaFQ1DKkUvwHPqJuexs4y35eyteO5ggpjm7QEHMzWkH7xF+P+NTBbBboxyfF0D6+HuZdLyfHL9rQytIqPLoMmEJ+b2mWkYqTxC9dQp5o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Lzv067oj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Lzv067oj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A86B5C4CED6; Sun, 19 Jan 2025 12:57:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1737291437; bh=RE8qJVesfpU8vzkRw7dceBBasePuOpg/DRMFlgSlo08=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lzv067ojHdD6PaA86QQGPjengntmPc7Kzrlf+iNP2VeiXBBzmEWwGYucmW3kQjNtH 04Moi2xdG5pBCsXgPRq5ultefiiSQFne2wuD+yl9Dxj7ijUy5gjUQGCOst4yGOknv5 TMJnBsBxB0pLnR0+/JCvN0yKnNT1ZC0lDIv2oW/VjSy4pG421rc7au7+K6PmaE3DZ6 oJPUSGO/zgg8lhJazAHPMl+MdHPGVMocwBcgucxSea9SFxTlkyvHo7pG7KXpJYqHS0 /dq5ugXg6WSfJI/Q3qr6DUMG2qAP0X4sdxzkqDRZSje9y87yjSQ2Y37Z/h2gYFYtZw xu+CvLeWR3vbw== From: Leon Romanovsky To: Jason Gunthorpe Cc: Maher Sanalla , linux-rdma@vger.kernel.org Subject: [PATCH rdma-next 2/3] RDMA/core: Use ib_port_state_to_str() for IB state sysfs Date: Sun, 19 Jan 2025 14:57:01 +0200 Message-ID: <5fe1664b6c363800ce2469261a9cb909473275ad.1737290406.git.leon@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Maher Sanalla Refactor the IB state sysfs implementation to replace the local array used for converting IB state to string with the ib_port_state_to_str() function. Signed-off-by: Maher Sanalla Signed-off-by: Leon Romanovsky --- drivers/infiniband/core/sysfs.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c index 9f97bef02149..7491328ca5e6 100644 --- a/drivers/infiniband/core/sysfs.c +++ b/drivers/infiniband/core/sysfs.c @@ -216,24 +216,12 @@ static ssize_t state_show(struct ib_device *ibdev, u32 port_num, struct ib_port_attr attr; ssize_t ret; - static const char *state_name[] = { - [IB_PORT_NOP] = "NOP", - [IB_PORT_DOWN] = "DOWN", - [IB_PORT_INIT] = "INIT", - [IB_PORT_ARMED] = "ARMED", - [IB_PORT_ACTIVE] = "ACTIVE", - [IB_PORT_ACTIVE_DEFER] = "ACTIVE_DEFER" - }; - ret = ib_query_port(ibdev, port_num, &attr); if (ret) return ret; return sysfs_emit(buf, "%d: %s\n", attr.state, - attr.state >= 0 && - attr.state < ARRAY_SIZE(state_name) ? - state_name[attr.state] : - "UNKNOWN"); + ib_port_state_to_str(attr.state)); } static ssize_t lid_show(struct ib_device *ibdev, u32 port_num, From patchwork Sun Jan 19 12:57:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 13944430 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 91B721D2F53 for ; Sun, 19 Jan 2025 12:57:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737291440; cv=none; b=b354ZMT2LDUwpwnehD5VcAekDqKPsetm7CDvVAkH0GOijXtHQ4lukjmuvA9r/DLY68+79aoDlcen0KJJXV+3HiOJjENdYy/EDGIILEkT+Mk5ZoePuI2HjbRN2322XKAeEkp9+UD9yVtSOhU8IYROFRSjWvwxWu0eeksD+cICXmg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737291440; c=relaxed/simple; bh=SHHOG8TbCVBkqQl8T25GgArBSGkklDnIfGX71N31ceE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b06VV1qWXKFIAKtrSnkT8xjsdL51RLwfZk/NzvrUAotWtYTVySvCC01X8Qlgedk9iSWvhpjyZXrQlFgh/fhh68X2bOXIOOwVGxkfjYg5WN3qnq19wsj54X12RGkYekddSKYwzYMp4fjWnB6LS6/7m1mkS/T/gdZ+l9Wwu4g7Dyo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RpnoTR6Z; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RpnoTR6Z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 078B2C4CED6; Sun, 19 Jan 2025 12:57:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1737291440; bh=SHHOG8TbCVBkqQl8T25GgArBSGkklDnIfGX71N31ceE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RpnoTR6ZNPw0YvVOAWU5T3XdahItHq6HpYXeesQu1cGRAoqINByZe+2v9XSxvOMiW GeKFXl4uL3/BCMtmgSpmk7hVrrZi5KBOrMkdm6wt82ve/62jWb/WJJ3rdgiPPryqc5 I/XuIKwP/x5T7Eqwtcl8EXtQg1gNiORFkyo4bnPIp4efAs/QnO2shK498ggoWFyVIr 2dj+qnVIvoZ/uvE+SNgvs7j6Id2yqwIFEd0n/f2WtOh/EbXoAmjygobvGb5Q7SlqS4 jffLmms/2cdR+bzI+glRBbABxaF4se/NkjDwrwI40Hdo0Phcism0ir9+ZkHPldvIwv 92I0XVzuv6jRQ== From: Leon Romanovsky To: Jason Gunthorpe Cc: Maher Sanalla , Dennis Dalessandro , linux-rdma@vger.kernel.org Subject: [PATCH rdma-next 3/3] IB/hfi1: Remove state transition log message and opa_lstate_name() Date: Sun, 19 Jan 2025 14:57:02 +0200 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Maher Sanalla Remove the state transition log message from the hfi1 driver, as the IB core now logs the same information when handling a cache update event. While at it, replace the hfi1-specific opa_lstate_name() function with the ib_verbs equivalent function, ib_port_state_to_str(), for converting IB port state to a string. Signed-off-by: Maher Sanalla Signed-off-by: Leon Romanovsky --- drivers/infiniband/hw/hfi1/chip.c | 18 ------------------ drivers/infiniband/hw/hfi1/chip.h | 1 - drivers/infiniband/hw/hfi1/driver.c | 2 +- drivers/infiniband/hw/hfi1/mad.c | 4 ++-- 4 files changed, 3 insertions(+), 22 deletions(-) diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c index a442eca498b8..368b6be3226f 100644 --- a/drivers/infiniband/hw/hfi1/chip.c +++ b/drivers/infiniband/hw/hfi1/chip.c @@ -12882,22 +12882,6 @@ u32 chip_to_opa_pstate(struct hfi1_devdata *dd, u32 chip_pstate) } } -/* return the OPA port logical state name */ -const char *opa_lstate_name(u32 lstate) -{ - static const char * const port_logical_names[] = { - "PORT_NOP", - "PORT_DOWN", - "PORT_INIT", - "PORT_ARMED", - "PORT_ACTIVE", - "PORT_ACTIVE_DEFER", - }; - if (lstate < ARRAY_SIZE(port_logical_names)) - return port_logical_names[lstate]; - return "unknown"; -} - /* return the OPA port physical state name */ const char *opa_pstate_name(u32 pstate) { @@ -12956,8 +12940,6 @@ static void update_statusp(struct hfi1_pportdata *ppd, u32 state) break; } } - dd_dev_info(ppd->dd, "logical state changed to %s (0x%x)\n", - opa_lstate_name(state), state); } /** diff --git a/drivers/infiniband/hw/hfi1/chip.h b/drivers/infiniband/hw/hfi1/chip.h index 8841db16bde7..6992f6d40255 100644 --- a/drivers/infiniband/hw/hfi1/chip.h +++ b/drivers/infiniband/hw/hfi1/chip.h @@ -771,7 +771,6 @@ int is_bx(struct hfi1_devdata *dd); bool is_urg_masked(struct hfi1_ctxtdata *rcd); u32 read_physical_state(struct hfi1_devdata *dd); u32 chip_to_opa_pstate(struct hfi1_devdata *dd, u32 chip_pstate); -const char *opa_lstate_name(u32 lstate); const char *opa_pstate_name(u32 pstate); u32 driver_pstate(struct hfi1_pportdata *ppd); u32 driver_lstate(struct hfi1_pportdata *ppd); diff --git a/drivers/infiniband/hw/hfi1/driver.c b/drivers/infiniband/hw/hfi1/driver.c index 37a6794885d3..50826e7cdb7e 100644 --- a/drivers/infiniband/hw/hfi1/driver.c +++ b/drivers/infiniband/hw/hfi1/driver.c @@ -968,7 +968,7 @@ static bool __set_armed_to_active(struct hfi1_packet *packet) if (hwstate != IB_PORT_ACTIVE) { dd_dev_info(packet->rcd->dd, "Unexpected link state %s\n", - opa_lstate_name(hwstate)); + ib_port_state_to_str(hwstate)); return false; } diff --git a/drivers/infiniband/hw/hfi1/mad.c b/drivers/infiniband/hw/hfi1/mad.c index a9883295f4af..b39f63ce6dfc 100644 --- a/drivers/infiniband/hw/hfi1/mad.c +++ b/drivers/infiniband/hw/hfi1/mad.c @@ -1160,8 +1160,8 @@ static int port_states_transition_allowed(struct hfi1_pportdata *ppd, if (ret == HFI_TRANSITION_DISALLOWED || ret == HFI_TRANSITION_UNDEFINED) { pr_warn("invalid logical state transition %s -> %s\n", - opa_lstate_name(logical_old), - opa_lstate_name(logical_new)); + ib_port_state_to_str(logical_old), + ib_port_state_to_str(logical_new)); return ret; }