From: Karsten Graul <kgraul@linux.ibm.com>

Date: Mon, 23 Jul 2018 13:53:08 +0200

Subject: net/smc: provide smc mode in smc_diag.c

Git-commit: c601171d7a60b5b09d7c2fe0579953323a80744e

Patch-mainline: v4.19-rc1

References: bsc#1106287, LTC#170892

Rename field diag_fallback into diag_mode and set the smc mode of a

connection explicitly.

Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>

Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Acked-by: Johannes Thumshirn <jthumshirn@suse.de>

---

 include/uapi/linux/smc_diag.h | 9 ++++++++-

 net/smc/smc_diag.c            | 7 ++++++-

 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/include/uapi/linux/smc_diag.h b/include/uapi/linux/smc_diag.h

index 92be255e534c..48ae3ee22b2d 100644

--- a/include/uapi/linux/smc_diag.h

+++ b/include/uapi/linux/smc_diag.h

@@ -20,7 +20,7 @@ struct smc_diag_req {

 struct smc_diag_msg {

 	__u8	diag_family;

 	__u8	diag_state;

-	__u8	diag_fallback;

+	__u8	diag_mode;

 	__u8	diag_shutdown;

 	struct inet_diag_sockid id;

@@ -28,6 +28,13 @@ struct smc_diag_msg {

 	__u64	diag_inode;

 };

+/* Mode of a connection */

+enum {

+	SMC_DIAG_MODE_SMCR,

+	SMC_DIAG_MODE_FALLBACK_TCP,

+	SMC_DIAG_MODE_SMCD,

+};

+

 /* Extensions */

 enum {

diff --git a/net/smc/smc_diag.c b/net/smc/smc_diag.c

index 6d83eef1b743..d772cd10297e 100644

--- a/net/smc/smc_diag.c

+++ b/net/smc/smc_diag.c

@@ -91,7 +91,12 @@ static int __smc_diag_dump(struct sock *sk, struct sk_buff *skb,

 	r = nlmsg_data(nlh);

 	smc_diag_msg_common_fill(r, sk);

 	r->diag_state = sk->sk_state;

-	r->diag_fallback = smc->use_fallback;

+	if (smc->use_fallback)

+		r->diag_mode = SMC_DIAG_MODE_FALLBACK_TCP;

+	else if (smc->conn.lgr && smc->conn.lgr->is_smcd)

+		r->diag_mode = SMC_DIAG_MODE_SMCD;

+	else

+		r->diag_mode = SMC_DIAG_MODE_SMCR;

 	user_ns = sk_user_ns(NETLINK_CB(cb->skb).sk);

 	if (smc_diag_msg_attrs_fill(sk, skb, r, user_ns))

 		goto errout;