From: Karsten Graul <kgraul@linux.ibm.com>
To: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>
Cc: Heiko Carstens <hca@linux.ibm.com>,
Stefan Raspl <raspl@linux.ibm.com>,
netdev@vger.kernel.org, linux-s390@vger.kernel.org
Subject: [PATCH net-next v5 04/14] net/smc: Add link counters for IB device ports
Date: Tue, 24 Nov 2020 18:50:37 +0100 [thread overview]
Message-ID: <20201124175047.56949-5-kgraul@linux.ibm.com> (raw)
In-Reply-To: <20201124175047.56949-1-kgraul@linux.ibm.com>
From: Guvenc Gulce <guvenc@linux.ibm.com>
Add link counters to the structure of the smc ib device, one counter per
ib port. Increase/decrease the counters as needed in the corresponding
routines.
Signed-off-by: Guvenc Gulce <guvenc@linux.ibm.com>
Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
---
net/smc/smc_core.c | 13 +++++++++++++
net/smc/smc_ib.h | 2 ++
2 files changed, 15 insertions(+)
diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c
index 5bc8ebcd03f3..46087cec3bcd 100644
--- a/net/smc/smc_core.c
+++ b/net/smc/smc_core.c
@@ -63,6 +63,16 @@ static inline struct list_head *smc_lgr_list_head(struct smc_link_group *lgr,
return &smc_lgr_list.list;
}
+static void smc_ibdev_cnt_inc(struct smc_link *lnk)
+{
+ atomic_inc(&lnk->smcibdev->lnk_cnt_by_port[lnk->ibport - 1]);
+}
+
+static void smc_ibdev_cnt_dec(struct smc_link *lnk)
+{
+ atomic_dec(&lnk->smcibdev->lnk_cnt_by_port[lnk->ibport - 1]);
+}
+
static void smc_lgr_schedule_free_work(struct smc_link_group *lgr)
{
/* client link group creation always follows the server link group
@@ -316,6 +326,7 @@ int smcr_link_init(struct smc_link_group *lgr, struct smc_link *lnk,
lnk->link_idx = link_idx;
lnk->smcibdev = ini->ib_dev;
lnk->ibport = ini->ib_port;
+ smc_ibdev_cnt_inc(lnk);
lnk->path_mtu = ini->ib_dev->pattr[ini->ib_port - 1].active_mtu;
atomic_set(&lnk->conn_cnt, 0);
smc_llc_link_set_uid(lnk);
@@ -359,6 +370,7 @@ int smcr_link_init(struct smc_link_group *lgr, struct smc_link *lnk,
clear_llc_lnk:
smc_llc_link_clear(lnk, false);
out:
+ smc_ibdev_cnt_dec(lnk);
put_device(&ini->ib_dev->ibdev->dev);
memset(lnk, 0, sizeof(struct smc_link));
lnk->state = SMC_LNK_UNUSED;
@@ -749,6 +761,7 @@ void smcr_link_clear(struct smc_link *lnk, bool log)
smc_ib_destroy_queue_pair(lnk);
smc_ib_dealloc_protection_domain(lnk);
smc_wr_free_link_mem(lnk);
+ smc_ibdev_cnt_dec(lnk);
put_device(&lnk->smcibdev->ibdev->dev);
smcibdev = lnk->smcibdev;
memset(lnk, 0, sizeof(struct smc_link));
diff --git a/net/smc/smc_ib.h b/net/smc/smc_ib.h
index 2ce481187dd0..3b85360a473b 100644
--- a/net/smc/smc_ib.h
+++ b/net/smc/smc_ib.h
@@ -53,6 +53,8 @@ struct smc_ib_device { /* ib-device infos for smc */
atomic_t lnk_cnt; /* number of links on ibdev */
wait_queue_head_t lnks_deleted; /* wait 4 removal of all links*/
struct mutex mutex; /* protect dev setup+cleanup */
+ atomic_t lnk_cnt_by_port[SMC_MAX_PORTS];
+ /* number of links per port */
};
struct smc_buf_desc;
--
2.17.1
next prev parent reply other threads:[~2020-11-24 17:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-24 17:50 [PATCH net-next v5 00/14] net/smc: Add support for generic netlink API Karsten Graul
2020-11-24 17:50 ` [PATCH net-next v5 01/14] net/smc: use helper smc_conn_abort() in listen processing Karsten Graul
2020-11-24 17:50 ` [PATCH net-next v5 02/14] net/smc: Use active link of the connection Karsten Graul
2020-11-24 17:50 ` [PATCH net-next v5 03/14] net/smc: Add connection counters for links Karsten Graul
2020-11-24 17:50 ` Karsten Graul [this message]
2020-11-24 17:50 ` [PATCH net-next v5 05/14] net/smc: Add diagnostic information to smc ib-device Karsten Graul
2020-11-24 17:50 ` [PATCH net-next v5 06/14] net/smc: Add diagnostic information to link structure Karsten Graul
2020-11-24 17:50 ` [PATCH net-next v5 07/14] net/smc: Refactor smc ism v2 capability handling Karsten Graul
2020-11-24 17:50 ` [PATCH net-next v5 08/14] net/smc: Introduce generic netlink interface for diagnostic purposes Karsten Graul
2020-11-26 0:18 ` Jakub Kicinski
2020-11-24 17:50 ` [PATCH net-next v5 09/14] net/smc: Add support for obtaining system information Karsten Graul
2020-11-26 0:26 ` Jakub Kicinski
2020-11-24 17:50 ` [PATCH net-next v5 10/14] net/smc: Introduce SMCR get linkgroup command Karsten Graul
2020-11-26 0:30 ` Jakub Kicinski
2020-11-24 17:50 ` [PATCH net-next v5 11/14] net/smc: Introduce SMCR get link command Karsten Graul
2020-11-24 17:50 ` [PATCH net-next v5 12/14] net/smc: Add SMC-D Linkgroup diagnostic support Karsten Graul
2020-11-26 0:33 ` Jakub Kicinski
2020-11-24 17:50 ` [PATCH net-next v5 13/14] net/smc: Add support for obtaining SMCD device list Karsten Graul
2020-11-24 17:50 ` [PATCH net-next v5 14/14] net/smc: Add support for obtaining SMCR " Karsten Graul
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=20201124175047.56949-5-kgraul@linux.ibm.com \
--to=kgraul@linux.ibm.com \
--cc=davem@davemloft.net \
--cc=hca@linux.ibm.com \
--cc=kuba@kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=raspl@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 NNTP newsgroup(s).