From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D711EC433E0 for ; Mon, 25 May 2020 18:14:27 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9E81F2071C for ; Mon, 25 May 2020 18:14:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="UyHGDWwP"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=ziepe.ca header.i=@ziepe.ca header.b="h813B2eC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9E81F2071C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ziepe.ca Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1AgmwnynWdJyB38vPyVzfkx2n3KK5kh6H9v116Gvd4Q=; b=UyHGDWwPb3I/XS cn687SR1/zdBiCoEIwl01woHXhAcCBjd7Eix6VVBWro7rJVtWsL6yKmC+TqKOhQzRCBrsWq7TUlcJ zm8n8JkLf/KdGBlHv4hpjxFELDDEaEVB2udd2jOdP7aIa9Wpd2Q/+wuoJgQqxhWwofjoOQVLoS+mH vKlOG/HPJNC7i53rFKj+vslGc/4l5Z7gQu/A7QmH0cwORQIOeTeN5ds4k3CHEGg/3hnqr/m4fYKNL HRSl39Nd56MYL5K/PfJoCpcbnUdAVZRnDvtLAi8h76nRJHV3b2uzukGT2VO7rSCuwKDodO15dUgs5 5TaffcyBntM5QAjNP6KA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jdHcG-0007Sn-2l; Mon, 25 May 2020 18:14:24 +0000 Received: from mail-qk1-x744.google.com ([2607:f8b0:4864:20::744]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jdHcC-0007Rg-VQ for linux-nvme@lists.infradead.org; Mon, 25 May 2020 18:14:22 +0000 Received: by mail-qk1-x744.google.com with SMTP id f18so1397770qkh.1 for ; Mon, 25 May 2020 11:14:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=eKX0+uPoGaQwvkR7iF4FDx2mROTsEwClo5tOoflVnLM=; b=h813B2eCq22ZfiFh40v7iFpHf8quNJEXWIkDwgxcT5F7Z3eNtzgbKdpxGrzRl7o/dz g3SqkZMmfMgttjGPlESxbUGnkMoPgLhGabKlquoeluusqSVCC2ZYzTqP6riEUnx2TjkJ 9KPFimmp8o9qttba2YFNqGb8SXS6e4DuR9R3IcxlEl6GBEelWG8jyxgNfPbl0GnzJRxd r5V3F6uGAbkhSR66+T2W+yTWEnjYbck1V8vWNxamVe9ItLoGnrzf9KxP10+G/eZTy7vX Ow6mKgrhbsd7d021bPl61YejCBzj47YBdYgGmBSBNtSJDvy133Pbs2mdOiKzfswmd4FU 3KCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=eKX0+uPoGaQwvkR7iF4FDx2mROTsEwClo5tOoflVnLM=; b=Dw3ZpGO3tV2GjjdU1zp7tRqp1irasuyURCHP5BXMd+DUnAzpkbmrqIRKaIlC7LO/st Sg6PWR/m1bXV/+S0X5EeML30wxGbJjbcSPA8eXOSqyW1/8SSoll3whj6XyF63XZcaJCe sOl/YyaJtTrvOW0ZkRRRAUrRvLCGxx9KhB1R+ui4zSpfFYyUE8/RlDtrV06REwBb2ggM JVgi82Ce3UyNTw5ryiSby9evqzmoXLlIyjo26MpFPUjeF/USNpF9NYi4dWck5jTchO5J Nz60JaKOhxic+PJlMLV21i/C65Gck70mShgl6a+oPdlRKH1ULN/xqXOh3FBaJKlYzC0I H97w== X-Gm-Message-State: AOAM533hVAtfMMAktT5AMvl6jglub7aK0Z+71XJukAE33wjc8bAI4B7G G+7XudSXibgywNPC2nsa8uAKeA== X-Google-Smtp-Source: ABdhPJwLyD55r8bw1XTSt/MRjSo+WXge4biwlAYf0ydhc+lJWNdthkd53udQb5oArh0e9K5LrYdqew== X-Received: by 2002:a37:e101:: with SMTP id c1mr13747043qkm.433.1590430458530; Mon, 25 May 2020 11:14:18 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-48-30.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.48.30]) by smtp.gmail.com with ESMTPSA id x2sm10541822qke.42.2020.05.25.11.14.17 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 May 2020 11:14:17 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1jdHc9-00078A-Hn; Mon, 25 May 2020 15:14:17 -0300 Date: Mon, 25 May 2020 15:14:17 -0300 From: Jason Gunthorpe To: Leon Romanovsky Subject: Re: [PATCH rdma-next v2 7/7] RDMA/cma: Provide ECE reject reason Message-ID: <20200525181417.GC24366@ziepe.ca> References: <20200413141538.935574-1-leon@kernel.org> <20200413141538.935574-8-leon@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200413141538.935574-8-leon@kernel.org> User-Agent: Mutt/1.9.4 (2018-02-28) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200525_111421_011646_6A220FE1 X-CRM114-Status: GOOD ( 13.96 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: rds-devel@oss.oracle.com, Bart Van Assche , Chaitanya Kulkarni , linux-rdma@vger.kernel.org, netdev@vger.kernel.org, Santosh Shilimkar , linux-nvme@lists.infradead.org, Christoph Hellwig , Leon Romanovsky , Doug Ledford , target-devel@vger.kernel.org, Jakub Kicinski , "David S. Miller" , Sagi Grimberg Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org On Mon, Apr 13, 2020 at 05:15:38PM +0300, Leon Romanovsky wrote: > @@ -4223,7 +4223,7 @@ int rdma_notify(struct rdma_cm_id *id, enum ib_event_type event) > EXPORT_SYMBOL(rdma_notify); > > int rdma_reject(struct rdma_cm_id *id, const void *private_data, > - u8 private_data_len) > + u8 private_data_len, enum rdma_ucm_reject_reason reason) > { > struct rdma_id_private *id_priv; > int ret; > @@ -4237,10 +4237,12 @@ int rdma_reject(struct rdma_cm_id *id, const void *private_data, > ret = cma_send_sidr_rep(id_priv, IB_SIDR_REJECT, 0, > private_data, private_data_len); > } else { > + enum ib_cm_rej_reason r = > + (reason) ?: IB_CM_REJ_CONSUMER_DEFINED; > + > trace_cm_send_rej(id_priv); > - ret = ib_send_cm_rej(id_priv->cm_id.ib, > - IB_CM_REJ_CONSUMER_DEFINED, NULL, > - 0, private_data, private_data_len); > + ret = ib_send_cm_rej(id_priv->cm_id.ib, r, NULL, 0, > + private_data, private_data_len); > } > } else if (rdma_cap_iw_cm(id->device, id->port_num)) { > ret = iw_cm_reject(id_priv->cm_id.iw, > diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c > index d41598954cc4..99482dc5934b 100644 > +++ b/drivers/infiniband/core/ucma.c > @@ -1178,12 +1178,17 @@ static ssize_t ucma_reject(struct ucma_file *file, const char __user *inbuf, > if (copy_from_user(&cmd, inbuf, sizeof(cmd))) > return -EFAULT; > > + if (cmd.reason && > + cmd.reason != RDMA_USER_CM_REJ_VENDOR_OPTION_NOT_SUPPORTED) > + return -EINVAL; It would be clearer to set cmd.reason to IB_CM_REJ_CONSUMER_DEFINED at this point.. if (!cmd.reason) cmd.reason = IB_CM_REJ_CONSUMER_DEFINED if (cmd.reason != IB_CM_REJ_CONSUMER_DEFINED && cmd.reason != RDMA_USER_CM_REJ_VENDOR_OPTION_NOT_SUPPORTED) return -EINVAL Esaier to follow and no reason userspace shouldn't be able to explicitly specifiy the reason's that it is allowed to use. > index 8d961d8b7cdb..f8781b132f62 100644 > +++ b/include/rdma/rdma_cm.h > @@ -324,11 +324,12 @@ int __rdma_accept_ece(struct rdma_cm_id *id, struct rdma_conn_param *conn_param, > */ > int rdma_notify(struct rdma_cm_id *id, enum ib_event_type event); > > + > /** Extra hunk? > * rdma_reject - Called to reject a connection request or response. > */ > int rdma_reject(struct rdma_cm_id *id, const void *private_data, > - u8 private_data_len); > + u8 private_data_len, enum rdma_ucm_reject_reason reason); > > /** > * rdma_disconnect - This function disconnects the associated QP and > diff --git a/include/uapi/rdma/rdma_user_cm.h b/include/uapi/rdma/rdma_user_cm.h > index c4ca1412bcf9..e545f2de1e13 100644 > +++ b/include/uapi/rdma/rdma_user_cm.h > @@ -78,6 +78,10 @@ enum rdma_ucm_port_space { > RDMA_PS_UDP = 0x0111, > }; > > +enum rdma_ucm_reject_reason { > + RDMA_USER_CM_REJ_VENDOR_OPTION_NOT_SUPPORTED = 35 > +}; not sure we need ABI defines for IBTA constants? Jason _______________________________________________ linux-nvme mailing list linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme