From: Aurelien Aptel <aaptel@nvidia•com>
To: linux-nvme@lists•infradead.org, netdev@vger•kernel.org,
sagi@grimberg•me, hch@lst•de, kbusch@kernel•org, axboe@fb•com,
chaitanyak@nvidia•com, davem@davemloft•net, kuba@kernel•org
Cc: Aurelien Aptel <aaptel@nvidia•com>,
aurelien.aptel@gmail•com, smalin@nvidia•com, malin1024@gmail•com,
ogerlitz@nvidia•com, yorayz@nvidia•com, borisp@nvidia•com
Subject: [PATCH v11 06/25] net/tls,core: export get_netdev_for_sock
Date: Fri, 3 Feb 2023 15:26:46 +0200 [thread overview]
Message-ID: <20230203132705.627232-7-aaptel@nvidia.com> (raw)
In-Reply-To: <20230203132705.627232-1-aaptel@nvidia.com>
* remove netdev_sk_get_lowest_dev() from net/core
* move get_netdev_for_sock() from net/tls to net/core
get_netdev_for_sock() is a utility that is used to obtain
the net_device structure from a connected socket.
Later patches will use this for nvme-tcp DDP and DDP DDGST offloads.
Suggested-by: Christoph Hellwig <hch@lst•de>
Signed-off-by: Ben Ben-Ishay <benishay@nvidia•com>
Signed-off-by: Shai Malin <smalin@nvidia•com>
Signed-off-by: Aurelien Aptel <aaptel@nvidia•com>
---
include/linux/netdevice.h | 3 +--
net/core/dev.c | 26 +++++++++++++-------------
net/tls/tls_device.c | 16 ----------------
3 files changed, 14 insertions(+), 31 deletions(-)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 8861a2f04e00..25a868281594 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -3096,8 +3096,7 @@ int init_dummy_netdev(struct net_device *dev);
struct net_device *netdev_get_xmit_slave(struct net_device *dev,
struct sk_buff *skb,
bool all_slaves);
-struct net_device *netdev_sk_get_lowest_dev(struct net_device *dev,
- struct sock *sk);
+struct net_device *get_netdev_for_sock(struct sock *sk);
struct net_device *dev_get_by_index(struct net *net, int ifindex);
struct net_device *__dev_get_by_index(struct net *net, int ifindex);
struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
diff --git a/net/core/dev.c b/net/core/dev.c
index bb42150a38ec..2360b70ea0b1 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -8153,27 +8153,27 @@ static struct net_device *netdev_sk_get_lower_dev(struct net_device *dev,
}
/**
- * netdev_sk_get_lowest_dev - Get the lowest device in chain given device and socket
- * @dev: device
+ * get_netdev_for_sock - Get the lowest device in socket
* @sk: the socket
*
- * %NULL is returned if no lower device is found.
+ * Assumes that the socket is already connected.
+ * Returns the lower device or %NULL if no lower device is found.
*/
-
-struct net_device *netdev_sk_get_lowest_dev(struct net_device *dev,
- struct sock *sk)
+struct net_device *get_netdev_for_sock(struct sock *sk)
{
- struct net_device *lower;
+ struct dst_entry *dst = sk_dst_get(sk);
+ struct net_device *dev, *lower;
- lower = netdev_sk_get_lower_dev(dev, sk);
- while (lower) {
+ if (unlikely(!dst))
+ return NULL;
+ dev = dst->dev;
+ while ((lower = netdev_sk_get_lower_dev(dev, sk)))
dev = lower;
- lower = netdev_sk_get_lower_dev(dev, sk);
- }
-
+ dev_hold(dev);
+ dst_release(dst);
return dev;
}
-EXPORT_SYMBOL(netdev_sk_get_lowest_dev);
+EXPORT_SYMBOL_GPL(get_netdev_for_sock);
static void netdev_adjacent_add_links(struct net_device *dev)
{
diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c
index 6c593788dc25..3c298dfb77cb 100644
--- a/net/tls/tls_device.c
+++ b/net/tls/tls_device.c
@@ -120,22 +120,6 @@ static void tls_device_queue_ctx_destruction(struct tls_context *ctx)
tls_device_free_ctx(ctx);
}
-/* We assume that the socket is already connected */
-static struct net_device *get_netdev_for_sock(struct sock *sk)
-{
- struct dst_entry *dst = sk_dst_get(sk);
- struct net_device *netdev = NULL;
-
- if (likely(dst)) {
- netdev = netdev_sk_get_lowest_dev(dst->dev, sk);
- dev_hold(netdev);
- }
-
- dst_release(dst);
-
- return netdev;
-}
-
static void destroy_record(struct tls_record_info *record)
{
int i;
--
2.31.1
next prev parent reply other threads:[~2023-02-03 13:28 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-03 13:26 [PATCH v11 00/25] nvme-tcp receive offloads Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 01/25] net: Introduce direct data placement tcp offload Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 02/25] net/ethtool: add new stringset ETH_SS_ULP_DDP_{CAPS,STATS} Aurelien Aptel
2023-02-04 3:42 ` Jakub Kicinski
2023-02-03 13:26 ` [PATCH v11 03/25] net/ethtool: add ULP_DDP_{GET,SET} operations for caps and stats Aurelien Aptel
2023-02-04 3:46 ` Jakub Kicinski
2023-02-03 13:26 ` [PATCH v11 04/25] Documentation: document netlink ULP_DDP_GET/SET messages Aurelien Aptel
2023-02-04 3:41 ` Jakub Kicinski
2023-02-06 9:48 ` Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 05/25] iov_iter: skip copy if src == dst for direct data placement Aurelien Aptel
2023-02-03 13:26 ` Aurelien Aptel [this message]
2023-02-03 13:26 ` [PATCH v11 07/25] nvme-tcp: Add DDP offload control path Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 08/25] nvme-tcp: Add DDP data-path Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 09/25] nvme-tcp: RX DDGST offload Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 10/25] nvme-tcp: Deal with netdevice DOWN events Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 11/25] nvme-tcp: Add modparam to control the ULP offload enablement Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 12/25] Documentation: add ULP DDP offload documentation Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 13/25] net/mlx5e: Rename from tls to transport static params Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 14/25] net/mlx5e: Refactor ico sq polling to get budget Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 15/25] net/mlx5e: Have mdev pointer directly on the icosq structure Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 16/25] net/mlx5e: Refactor doorbell function to allow avoiding a completion Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 17/25] net/mlx5: Add NVMEoTCP caps, HW bits, 128B CQE and enumerations Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 18/25] net/mlx5e: NVMEoTCP, offload initialization Aurelien Aptel
2023-02-03 13:26 ` [PATCH v11 19/25] net/mlx5e: TCP flow steering for nvme-tcp acceleration Aurelien Aptel
2023-02-03 13:27 ` [PATCH v11 20/25] net/mlx5e: NVMEoTCP, use KLM UMRs for buffer registration Aurelien Aptel
2023-02-03 13:27 ` [PATCH v11 21/25] net/mlx5e: NVMEoTCP, queue init/teardown Aurelien Aptel
2023-02-03 13:27 ` [PATCH v11 22/25] net/mlx5e: NVMEoTCP, ddp setup and resync Aurelien Aptel
2023-02-03 13:27 ` [PATCH v11 23/25] net/mlx5e: NVMEoTCP, async ddp invalidation Aurelien Aptel
2023-02-03 13:27 ` [PATCH v11 24/25] net/mlx5e: NVMEoTCP, data-path for DDP+DDGST offload Aurelien Aptel
2023-02-03 13:27 ` [PATCH v11 25/25] net/mlx5e: NVMEoTCP, statistics Aurelien Aptel
2023-02-23 15:33 ` [PATCH v11 00/25] nvme-tcp receive offloads Sagi Grimberg
2023-03-01 19:13 ` Shai Malin
2023-03-07 10:11 ` Sagi Grimberg
2023-03-22 10:19 ` Shai Malin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230203132705.627232-7-aaptel@nvidia.com \
--to=aaptel@nvidia$(echo .)com \
--cc=aurelien.aptel@gmail$(echo .)com \
--cc=axboe@fb$(echo .)com \
--cc=borisp@nvidia$(echo .)com \
--cc=chaitanyak@nvidia$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=hch@lst$(echo .)de \
--cc=kbusch@kernel$(echo .)org \
--cc=kuba@kernel$(echo .)org \
--cc=linux-nvme@lists$(echo .)infradead.org \
--cc=malin1024@gmail$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=ogerlitz@nvidia$(echo .)com \
--cc=sagi@grimberg$(echo .)me \
--cc=smalin@nvidia$(echo .)com \
--cc=yorayz@nvidia$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox