{"id":816162,"url":"http://patchwork.ozlabs.org/api/1.2/patches/816162/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170920115813.63745-8-ubraun@linux.vnet.ibm.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170920115813.63745-8-ubraun@linux.vnet.ibm.com>","list_archive_url":null,"date":"2017-09-20T11:58:10","name":"[net-next,07/10] net/smc: terminate link group if out-of-sync is received","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"cb5b08f152b98ccba3babb03c93ff1b97bcaf1d6","submitter":{"id":2266,"url":"http://patchwork.ozlabs.org/api/1.2/people/2266/?format=json","name":"Ursula Braun","email":"ubraun@linux.vnet.ibm.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170920115813.63745-8-ubraun@linux.vnet.ibm.com/mbox/","series":[{"id":4092,"url":"http://patchwork.ozlabs.org/api/1.2/series/4092/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4092","date":"2017-09-20T11:58:04","name":"net/smc: updates 2017-09-20","version":1,"mbox":"http://patchwork.ozlabs.org/series/4092/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816162/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816162/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xxyv26h4yz9t2Q\n\tfor ;\n\tWed, 20 Sep 2017 21:58:38 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751957AbdITL6g (ORCPT );\n\tWed, 20 Sep 2017 07:58:36 -0400","from mx0b-001b2d01.pphosted.com ([148.163.158.5]:40974 \"EHLO\n\tmx0a-001b2d01.pphosted.com\" rhost-flags-OK-OK-OK-FAIL)\n\tby vger.kernel.org with ESMTP id S1751933AbdITL6d (ORCPT\n\t); Wed, 20 Sep 2017 07:58:33 -0400","from pps.filterd (m0098417.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv8KBsaOg143252\n\tfor ; Wed, 20 Sep 2017 07:58:33 -0400","from e06smtp13.uk.ibm.com (e06smtp13.uk.ibm.com [195.75.94.109])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2d3pkrvxcv-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Wed, 20 Sep 2017 07:58:33 -0400","from localhost\n\tby e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tWed, 20 Sep 2017 12:58:31 +0100","from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194)\n\tby e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP\n\tGateway: Authorized Use Only! Violators will be prosecuted; \n\tWed, 20 Sep 2017 12:58:29 +0100","from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com\n\t[9.149.105.59])\n\tby b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v8KBwSVv15139032; Wed, 20 Sep 2017 11:58:28 GMT","from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id ABD2BA4040;\n\tWed, 20 Sep 2017 12:54:29 +0100 (BST)","from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 5DBBFA4051;\n\tWed, 20 Sep 2017 12:54:29 +0100 (BST)","from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9])\n\tby d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTPS;\n\tWed, 20 Sep 2017 12:54:29 +0100 (BST)"],"From":"Ursula Braun ","To":"davem@davemloft.net","Cc":"netdev@vger.kernel.org, linux-rdma@vger.kernel.org,\n\tlinux-s390@vger.kernel.org, jwi@linux.vnet.ibm.com,\n\tschwidefsky@de.ibm.com, heiko.carstens@de.ibm.com,\n\traspl@linux.vnet.ibm.com, ubraun@linux.vnet.ibm.com","Subject":"[PATCH net-next 07/10] net/smc: terminate link group if out-of-sync\n\tis received","Date":"Wed, 20 Sep 2017 13:58:10 +0200","X-Mailer":"git-send-email 2.13.5","In-Reply-To":"<20170920115813.63745-1-ubraun@linux.vnet.ibm.com>","References":"<20170920115813.63745-1-ubraun@linux.vnet.ibm.com>","X-TM-AS-GCONF":"00","x-cbid":"17092011-0012-0000-0000-0000057AAE20","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17092011-0013-0000-0000-000018F3E674","Message-Id":"<20170920115813.63745-8-ubraun@linux.vnet.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-09-20_03:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=3\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1709200163","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"An out-of-sync condition can just be detected by the client.\nIf the server receives a CLC DECLINE message indicating an out-of-sync\ncondition for the link groups, the server must clean up the out-of-sync\nlink group.\nThere is no need for an extra third parameter in smc_clc_send_decline().\n\nSigned-off-by: Ursula Braun \n---\n net/smc/af_smc.c | 6 ++----\n net/smc/smc_clc.c | 10 +++++-----\n net/smc/smc_clc.h | 3 +--\n 3 files changed, 8 insertions(+), 11 deletions(-)","diff":"diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c\nindex 2e8d2dabac0c..745f145d4c4d 100644\n--- a/net/smc/af_smc.c\n+++ b/net/smc/af_smc.c\n@@ -513,7 +513,7 @@ static int smc_connect_rdma(struct smc_sock *smc)\n \t/* RDMA setup failed, switch back to TCP */\n \tsmc->use_fallback = true;\n \tif (reason_code && (reason_code != SMC_CLC_DECL_REPLY)) {\n-\t\trc = smc_clc_send_decline(smc, reason_code, 0);\n+\t\trc = smc_clc_send_decline(smc, reason_code);\n \t\tif (rc < sizeof(struct smc_clc_msg_decline))\n \t\t\tgoto out_err;\n \t}\n@@ -808,8 +808,6 @@ static void smc_listen_work(struct work_struct *work)\n \t\trc = local_contact;\n \t\tif (rc == -ENOMEM)\n \t\t\treason_code = SMC_CLC_DECL_MEM;/* insufficient memory*/\n-\t\telse if (rc == -ENOLINK)\n-\t\t\treason_code = SMC_CLC_DECL_SYNCERR; /* synchr. error */\n \t\tgoto decline_rdma;\n \t}\n \tlink = &new_smc->conn.lgr->lnk[SMC_SINGLE_LINK];\n@@ -903,7 +901,7 @@ static void smc_listen_work(struct work_struct *work)\n \tsmc_conn_free(&new_smc->conn);\n \tnew_smc->use_fallback = true;\n \tif (reason_code && (reason_code != SMC_CLC_DECL_REPLY)) {\n-\t\trc = smc_clc_send_decline(new_smc, reason_code, 0);\n+\t\trc = smc_clc_send_decline(new_smc, reason_code);\n \t\tif (rc < sizeof(struct smc_clc_msg_decline))\n \t\t\tgoto out_err;\n \t}\ndiff --git a/net/smc/smc_clc.c b/net/smc/smc_clc.c\nindex 3934913ab835..b7dd2743fb5c 100644\n--- a/net/smc/smc_clc.c\n+++ b/net/smc/smc_clc.c\n@@ -95,9 +95,10 @@ int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen,\n \t}\n \tif (clcm->type == SMC_CLC_DECLINE) {\n \t\treason_code = SMC_CLC_DECL_REPLY;\n-\t\tif (ntohl(((struct smc_clc_msg_decline *)buf)->peer_diagnosis)\n-\t\t\t== SMC_CLC_DECL_SYNCERR)\n+\t\tif (((struct smc_clc_msg_decline *)buf)->hdr.flag) {\n \t\t\tsmc->conn.lgr->sync_err = true;\n+\t\t\tsmc_lgr_terminate(smc->conn.lgr);\n+\t\t}\n \t}\n \n out:\n@@ -105,8 +106,7 @@ int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen,\n }\n \n /* send CLC DECLINE message across internal TCP socket */\n-int smc_clc_send_decline(struct smc_sock *smc, u32 peer_diag_info,\n-\t\t\t u8 out_of_sync)\n+int smc_clc_send_decline(struct smc_sock *smc, u32 peer_diag_info)\n {\n \tstruct smc_clc_msg_decline dclc;\n \tstruct msghdr msg;\n@@ -118,7 +118,7 @@ int smc_clc_send_decline(struct smc_sock *smc, u32 peer_diag_info,\n \tdclc.hdr.type = SMC_CLC_DECLINE;\n \tdclc.hdr.length = htons(sizeof(struct smc_clc_msg_decline));\n \tdclc.hdr.version = SMC_CLC_V1;\n-\tdclc.hdr.flag = out_of_sync ? 1 : 0;\n+\tdclc.hdr.flag = (peer_diag_info == SMC_CLC_DECL_SYNCERR) ? 1 : 0;\n \tmemcpy(dclc.id_for_peer, local_systemid, sizeof(local_systemid));\n \tdclc.peer_diagnosis = htonl(peer_diag_info);\n \tmemcpy(dclc.trl.eyecatcher, SMC_EYECATCHER, sizeof(SMC_EYECATCHER));\ndiff --git a/net/smc/smc_clc.h b/net/smc/smc_clc.h\nindex 13db8ce177c9..1c55414041d4 100644\n--- a/net/smc/smc_clc.h\n+++ b/net/smc/smc_clc.h\n@@ -106,8 +106,7 @@ struct smc_ib_device;\n \n int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen,\n \t\t u8 expected_type);\n-int smc_clc_send_decline(struct smc_sock *smc, u32 peer_diag_info,\n-\t\t\t u8 out_of_sync);\n+int smc_clc_send_decline(struct smc_sock *smc, u32 peer_diag_info);\n int smc_clc_send_proposal(struct smc_sock *smc, struct smc_ib_device *smcibdev,\n \t\t\t u8 ibport);\n int smc_clc_send_confirm(struct smc_sock *smc);\n","prefixes":["net-next","07/10"]}