From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-187.mta1.migadu.com (out-187.mta1.migadu.com [95.215.58.187]) (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 AA6FF4A35 for ; Wed, 8 Apr 2026 00:10:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.187 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775607021; cv=none; b=lddaW9baguj5l91FmNBOH0SaJJrT9KROtV0zh3TEazV9sbYte3lSCpPKaStScckvdSb096mVuMMlE7eZXZGKbT66QRkcEp1+FiJFXJM9QiGq50vcEoIy+Ht5Xw17TxBwPYlc57enbCyh1onBoCXxPU3MXnrAa/2sU9Gdw1Ck79g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775607021; c=relaxed/simple; bh=cw4GjcWsuYnUl046fx3PRCDnY8sVbCME0H9EzD/IhbA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MTmfmNZDhSC27T4QjI4nXsbH8iXHFR47OeVgvsRS/FA7ILbLLw8yRKhWvwAvC2IH9gHGARlg9QZbtXp09f4SfGCIW3ItrVqeW/CW9fa6rCWzwtq2+BFI2jTnrTWhE4zfVAP9CHGJtZzQf8131D+kQqqB7m/CWqC773P/vtk2zzE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=FEMy4yHZ; arc=none smtp.client-ip=95.215.58.187 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="FEMy4yHZ" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1775607016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JRFy4q6+w0PLU2dSrVBHct706edyWSjeEhmFgbFlE9k=; b=FEMy4yHZJCq05oobZMjtd6soH90YZQWLnxVl4KDoHbfZRicKJ/+O97qeeAQhF1tzMuhhZf O5uYRVU6b7/7HZR8oiByalXGPJhvcKAijrpapeee06pa0yStGICJPXrAJ5AQs4tHrvk8Y5 U6Xbp4HEU4eeV93OrTML3kn6dz92TYg= From: zhenwei pi To: linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org Cc: zyjzyj2000@gmail.com, jgg@ziepe.ca, leon@kernel.org, zhenwei pi Subject: [PATCH v5 1/3] RDMA/rxe: remove rxe_ib_device_get_netdev() and RXE_PORT Date: Wed, 8 Apr 2026 08:09:54 +0800 Message-ID: <20260408000956.486522-2-zhenwei.pi@linux.dev> In-Reply-To: <20260408000956.486522-1-zhenwei.pi@linux.dev> References: <20260408000956.486522-1-zhenwei.pi@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT Suggested by Leon, remove the rxe_ib_device_get_netdev() wrapper and the RXE_PORT definition. These additions do not improve readability, and RXE has always had only a single port. Signed-off-by: zhenwei pi --- drivers/infiniband/sw/rxe/rxe_mcast.c | 4 ++-- drivers/infiniband/sw/rxe/rxe_net.c | 7 +++---- drivers/infiniband/sw/rxe/rxe_verbs.c | 4 ++-- drivers/infiniband/sw/rxe/rxe_verbs.h | 6 ------ 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/drivers/infiniband/sw/rxe/rxe_mcast.c b/drivers/infiniband/sw/rxe/rxe_mcast.c index 5cad72073eca..acd03bd87794 100644 --- a/drivers/infiniband/sw/rxe/rxe_mcast.c +++ b/drivers/infiniband/sw/rxe/rxe_mcast.c @@ -34,7 +34,7 @@ static int rxe_mcast_add(struct rxe_dev *rxe, union ib_gid *mgid) struct net_device *ndev; int ret; - ndev = rxe_ib_device_get_netdev(&rxe->ib_dev); + ndev = ib_device_get_netdev(&rxe->ib_dev, 1); if (!ndev) return -ENODEV; @@ -59,7 +59,7 @@ static int rxe_mcast_del(struct rxe_dev *rxe, union ib_gid *mgid) struct net_device *ndev; int ret; - ndev = rxe_ib_device_get_netdev(&rxe->ib_dev); + ndev = ib_device_get_netdev(&rxe->ib_dev, 1); if (!ndev) return -ENODEV; diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c index 211bd3000acc..6621d01ac32d 100644 --- a/drivers/infiniband/sw/rxe/rxe_net.c +++ b/drivers/infiniband/sw/rxe/rxe_net.c @@ -602,7 +602,7 @@ const char *rxe_parent_name(struct rxe_dev *rxe, unsigned int port_num) struct net_device *ndev; char *ndev_name; - ndev = rxe_ib_device_get_netdev(&rxe->ib_dev); + ndev = ib_device_get_netdev(&rxe->ib_dev, 1); if (!ndev) return NULL; ndev_name = ndev->name; @@ -646,12 +646,11 @@ static void rxe_sock_put(struct sock *sk, void rxe_net_del(struct ib_device *dev) { - struct rxe_dev *rxe = container_of(dev, struct rxe_dev, ib_dev); struct net_device *ndev; struct sock *sk; struct net *net; - ndev = rxe_ib_device_get_netdev(&rxe->ib_dev); + ndev = ib_device_get_netdev(dev, 1); if (!ndev) return; @@ -699,7 +698,7 @@ void rxe_set_port_state(struct rxe_dev *rxe) { struct net_device *ndev; - ndev = rxe_ib_device_get_netdev(&rxe->ib_dev); + ndev = ib_device_get_netdev(&rxe->ib_dev, 1); if (!ndev) return; diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c index 4d4891dc2884..eb17b6086d5e 100644 --- a/drivers/infiniband/sw/rxe/rxe_verbs.c +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c @@ -50,7 +50,7 @@ static int rxe_query_port(struct ib_device *ibdev, goto err_out; } - ndev = rxe_ib_device_get_netdev(ibdev); + ndev = ib_device_get_netdev(ibdev, 1); if (!ndev) { err = -ENODEV; goto err_out; @@ -1441,7 +1441,7 @@ static int rxe_enable_driver(struct ib_device *ib_dev) struct rxe_dev *rxe = container_of(ib_dev, struct rxe_dev, ib_dev); struct net_device *ndev; - ndev = rxe_ib_device_get_netdev(ib_dev); + ndev = ib_device_get_netdev(ib_dev, 1); if (!ndev) return -ENODEV; diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.h b/drivers/infiniband/sw/rxe/rxe_verbs.h index d92f80d16f78..e800545d1046 100644 --- a/drivers/infiniband/sw/rxe/rxe_verbs.h +++ b/drivers/infiniband/sw/rxe/rxe_verbs.h @@ -415,7 +415,6 @@ struct rxe_port { u32 qp_gsi_index; }; -#define RXE_PORT 1 struct rxe_dev { struct ib_device ib_dev; struct ib_device_attr attr; @@ -451,11 +450,6 @@ struct rxe_dev { struct rxe_port port; }; -static inline struct net_device *rxe_ib_device_get_netdev(struct ib_device *dev) -{ - return ib_device_get_netdev(dev, RXE_PORT); -} - static inline void rxe_counter_inc(struct rxe_dev *rxe, enum rxe_counters index) { atomic64_inc(&rxe->stats_counters[index]); -- 2.43.0