From: Wen Gu <guwen@linux.alibaba.com>
To: wintera@linux.ibm.com, twinkler@linux.ibm.com, hca@linux.ibm.com,
gor@linux.ibm.com, agordeev@linux.ibm.com, davem@davemloft.net,
edumazet@google.com, kuba@kernel.org, pabeni@redhat.com,
wenjia@linux.ibm.com, jaka@linux.ibm.com
Cc: borntraeger@linux.ibm.com, svens@linux.ibm.com,
alibuda@linux.alibaba.com, tonylu@linux.alibaba.com,
guwen@linux.alibaba.com, linux-kernel@vger.kernel.org,
linux-s390@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH net-next v2 01/11] net/smc: adapt SMC-D device dump for Emulated-ISM
Date: Thu, 7 Mar 2024 17:55:26 +0800 [thread overview]
Message-ID: <20240307095536.29648-2-guwen@linux.alibaba.com> (raw)
In-Reply-To: <20240307095536.29648-1-guwen@linux.alibaba.com>
The introduction of Emulated-ISM requires adaptation of SMC-D device
dump. Software implemented non-PCI device (loopback-ism) should be
handled correctly and the CHID reserved for Emulated-ISM should be got
from smcd_ops interface instead of PCI information.
Signed-off-by: Wen Gu <guwen@linux.alibaba.com>
---
net/smc/smc_ism.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/net/smc/smc_ism.c b/net/smc/smc_ism.c
index ac88de2a06a0..b6eca4231913 100644
--- a/net/smc/smc_ism.c
+++ b/net/smc/smc_ism.c
@@ -252,12 +252,11 @@ static int smc_nl_handle_smcd_dev(struct smcd_dev *smcd,
char smc_pnet[SMC_MAX_PNETID_LEN + 1];
struct smc_pci_dev smc_pci_dev;
struct nlattr *port_attrs;
+ struct device *device;
struct nlattr *attrs;
- struct ism_dev *ism;
int use_cnt = 0;
void *nlh;
- ism = smcd->priv;
nlh = genlmsg_put(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq,
&smc_gen_nl_family, NLM_F_MULTI,
SMC_NETLINK_GET_DEV_SMCD);
@@ -272,7 +271,15 @@ static int smc_nl_handle_smcd_dev(struct smcd_dev *smcd,
if (nla_put_u8(skb, SMC_NLA_DEV_IS_CRIT, use_cnt > 0))
goto errattr;
memset(&smc_pci_dev, 0, sizeof(smc_pci_dev));
- smc_set_pci_values(to_pci_dev(ism->dev.parent), &smc_pci_dev);
+ device = smcd->ops->get_dev(smcd);
+ if (device->parent)
+ smc_set_pci_values(to_pci_dev(device->parent), &smc_pci_dev);
+ if (smc_ism_is_emulated(smcd)) {
+ smc_pci_dev.pci_pchid = smc_ism_get_chid(smcd);
+ if (!device->parent)
+ snprintf(smc_pci_dev.pci_id, sizeof(smc_pci_dev.pci_id),
+ "%s", dev_name(device));
+ }
if (nla_put_u32(skb, SMC_NLA_DEV_PCI_FID, smc_pci_dev.pci_fid))
goto errattr;
if (nla_put_u16(skb, SMC_NLA_DEV_PCI_CHID, smc_pci_dev.pci_pchid))
--
2.32.0.3.g01195cf9f
next prev parent reply other threads:[~2024-03-07 9:55 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-07 9:55 [PATCH net-next v2 00/11] net/smc: SMC intra-OS shortcut with loopback-ism Wen Gu
2024-03-07 9:55 ` Wen Gu [this message]
2024-03-08 12:27 ` [PATCH net-next v2 01/11] net/smc: adapt SMC-D device dump for Emulated-ISM Jan Karcher
2024-03-09 6:57 ` Wen Gu
2024-03-07 9:55 ` [PATCH net-next v2 02/11] net/smc: decouple ism_client from SMC-D DMB registration Wen Gu
2024-03-07 9:55 ` [PATCH net-next v2 03/11] net/smc: introduce loopback-ism for SMC intra-OS shortcut Wen Gu
2024-03-07 9:55 ` [PATCH net-next v2 04/11] net/smc: implement ID-related operations of loopback-ism Wen Gu
2024-03-07 9:55 ` [PATCH net-next v2 05/11] net/smc: implement some unsupported " Wen Gu
2024-03-07 9:55 ` [PATCH net-next v2 06/11] net/smc: implement DMB-related " Wen Gu
2024-03-07 9:55 ` [PATCH net-next v2 07/11] net/smc: register loopback-ism into SMC-D device list Wen Gu
2024-03-07 9:55 ` [PATCH net-next v2 08/11] net/smc: add operations to merge sndbuf with peer DMB Wen Gu
2024-03-07 9:55 ` [PATCH net-next v2 09/11] net/smc: attach or detach ghost sndbuf to " Wen Gu
2024-03-07 9:55 ` [PATCH net-next v2 10/11] net/smc: adapt cursor update when sndbuf and peer DMB are merged Wen Gu
2024-03-07 9:55 ` [PATCH net-next v2 11/11] net/smc: implement DMB-merged operations of loopback-ism Wen Gu
2024-03-12 8:06 ` Jan Karcher
2024-03-12 14:11 ` Wen Gu
2024-03-08 12:22 ` [PATCH net-next v2 00/11] net/smc: SMC intra-OS shortcut with loopback-ism Jan Karcher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240307095536.29648-2-guwen@linux.alibaba.com \
--to=guwen@linux.alibaba.com \
--cc=agordeev@linux.ibm.com \
--cc=alibuda@linux.alibaba.com \
--cc=borntraeger@linux.ibm.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=jaka@linux.ibm.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=svens@linux.ibm.com \
--cc=tonylu@linux.alibaba.com \
--cc=twinkler@linux.ibm.com \
--cc=wenjia@linux.ibm.com \
--cc=wintera@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).