From patchwork Wed Feb 7 03:29:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junxian Huang X-Patchwork-Id: 197717 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1978056dyb; Tue, 6 Feb 2024 19:34:05 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXY/4l7ygvdEQmERotNDye2x+yf9ISx4V/Tkt2Xt9sHn59qFzZhFwdTyEt4BbeXK1jrhS0EtiEM5y+sqQP1pR2/D8X5CA== X-Google-Smtp-Source: AGHT+IHwnBKe3TGkCzMgdX2VUeUvyLb/hsQkg1/ldqVCzjLEqgFP88hKwZKQZJT40VhwBhQlQJyk X-Received: by 2002:a81:a844:0:b0:602:d1f2:3d1b with SMTP id f65-20020a81a844000000b00602d1f23d1bmr3866910ywh.3.1707276845321; Tue, 06 Feb 2024 19:34:05 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707276845; cv=pass; d=google.com; s=arc-20160816; b=cezbVI4bbzltYU10pbV7w0tVWgG6A8e/0NuZjTuxTbSjbTxdxQ78fHapNexerBnG03 aRsBHGwuyJQ7pTvvyW/nSAaBwT2rt0W+MpeWfs7F0y/rt5wev0uh2Bi+Xxcs7bwmrxGv mzPt4RcVABKBttrkKgfNtmyqf9+Z2hnGm394//feouSvf2VPjwjIZlK1c0A4dEOmgc8m ZPpRQrUQhYudS+cgiC6lFbzuOalwhaIWn//8YkZgASJpfI2GZB93uEwQfcfb2bkcjkCp OVeK4IocGYKK6PYkKFQTU6bAxqe9n2Wi1DDvkjraFtIeumb1xPCQjVbAKpjqJUlo3byl K9sw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=4eF0NE7MxLUHwaCSEAEz3NoT8w2zzGH9NEyzpG4k2xI=; fh=kbBJVdgJJtgZrfUDzjb5vbhUhIFsoD/hQO1CGBmV72c=; b=ElJWr8o/tvH4S1mrYySul4bsn2PuTO5U73E4X07qWUM5I2iJ7sav0+hD4ZUDeWMytX NYuwpKW3uMMn/jGCkVms5NHDpz9pYuq2zavPSI9BZiBGPUwwnydgFVqRaziIN1IyFnHX 6+yoA6IP8RUoA6XedYGH8NmoAEB2rApq4u+qtqPcO9KKLsXiGpoyEqFFznFL0d6M/xor 8jvNciiBZ5tSrCBcbQiuUaYZ4A/WloFjBhH5ria7A5l1lEiBY1ilIlSFZujWgsIGphkC BW6GnUAsnPiFv1E81NKh+hrlE6lGtrOAdYI3p1PCwfNkHcBiMKdp41D5iJEJoekhst71 4D0g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=hisilicon.com dmarc=pass fromdomain=hisilicon.com); spf=pass (google.com: domain of linux-kernel+bounces-55897-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55897-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=hisilicon.com X-Forwarded-Encrypted: i=2; AJvYcCX79GVw8tiybv8xtBSN1nih/BODI4RPzgLUOtVditrrZl7v9sv4BMEi2SjNWXz1YUgU1nm+o+XA1srafrEW+I6aQALC/w== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id s19-20020ac85cd3000000b0042c145dbf0asi348186qta.540.2024.02.06.19.34.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 19:34:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-55897-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=hisilicon.com dmarc=pass fromdomain=hisilicon.com); spf=pass (google.com: domain of linux-kernel+bounces-55897-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55897-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=hisilicon.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 1FD331C24FD1 for ; Wed, 7 Feb 2024 03:34:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 78B6615E8C; Wed, 7 Feb 2024 03:33:25 +0000 (UTC) Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 315C7101EE; Wed, 7 Feb 2024 03:33:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707276803; cv=none; b=TFFLh8Lp8nuBysk5/pZsIyx2nzRKdBsTqiVE2IFjncikSKiSp8LK+pxVTzGlcaITOtfE3j8qKfTfrNRxz6ZM6N84c+up2isHrMmEe9ChohIv+MwuaOMTD5fcSR40my1QmpDXFIvXyjM8GXe2Vj7A/4TEVoTIwyRLbfkCqFdAEDQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707276803; c=relaxed/simple; bh=a8R6LGuNYwr/WkPzoupwUh+q6405b6cHBfwnhZrktio=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=guTr1/JQouJS/4YTaiUg0TLSkBhDOCK4zANHBimpKAlmJSgYyU1XUXijTIoTaqdmvg+9S3OtsWCVTk2ZDaztI4lIO9J+TEGiP79ipQtTihjfBfCxp9S6SLJ0Ym8+fkIbBUMq7/o2LJqCt9rvyl/dsKUZIl5w2jyLVNtS8csi/vQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=hisilicon.com; spf=pass smtp.mailfrom=hisilicon.com; arc=none smtp.client-ip=45.249.212.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=hisilicon.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hisilicon.com Received: from mail.maildlp.com (unknown [172.19.88.163]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4TV5KY3Tztz1vt9V; Wed, 7 Feb 2024 11:32:49 +0800 (CST) Received: from kwepemi500006.china.huawei.com (unknown [7.221.188.68]) by mail.maildlp.com (Postfix) with ESMTPS id 76F7118001A; Wed, 7 Feb 2024 11:33:17 +0800 (CST) Received: from localhost.localdomain (10.67.165.2) by kwepemi500006.china.huawei.com (7.221.188.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 7 Feb 2024 11:33:16 +0800 From: Junxian Huang To: , CC: , , , Subject: [PATCH for-next 1/2] Revert "RDMA/hns: The UD mode can only be configured with DCQCN" Date: Wed, 7 Feb 2024 11:29:09 +0800 Message-ID: <20240207032910.3959426-2-huangjunxian6@hisilicon.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240207032910.3959426-1-huangjunxian6@hisilicon.com> References: <20240207032910.3959426-1-huangjunxian6@hisilicon.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemi500006.china.huawei.com (7.221.188.68) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790209525274169176 X-GMAIL-MSGID: 1790209525274169176 From: Luoyouming This reverts commit 27c5fd271d8b8730fc0bb1b6cae953ad7808a874. Commit 27c5fd271d8b ("RDMA/hns: The UD mode can only be configured with DCQCN") adds a check of congest control alorithm for UD. But that patch causes a problem: hr_dev->caps.congest_type is global, used by all QPs, so modifying this field to DCQCN for UD QPs causes other QPs unable to use any other algorithm except DCQCN. Revert that patch. The UD algorithm issue will be fixed in a subsequent patch of this series. Fixes: 27c5fd271d8b ("RDMA/hns: The UD mode can only be configured with DCQCN") Signed-off-by: Luoyouming Signed-off-by: Junxian Huang --- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c index de56dc6e3226..8907c30598ab 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c @@ -4739,9 +4739,6 @@ static int check_cong_type(struct ib_qp *ibqp, { struct hns_roce_dev *hr_dev = to_hr_dev(ibqp->device); - if (ibqp->qp_type == IB_QPT_UD) - hr_dev->caps.cong_type = CONG_TYPE_DCQCN; - /* different congestion types match different configurations */ switch (hr_dev->caps.cong_type) { case CONG_TYPE_DCQCN: