From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from codeconstruct.com.au (pi.codeconstruct.com.au [203.29.241.158]) (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 D668E224AED for ; Wed, 2 Jul 2025 06:20:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=203.29.241.158 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751437223; cv=none; b=UAcl+EoYHtmX9bduUkI7Vbe30Hxy9c4BITkZXzmvitI64ppdoPuG+/wHCAhBYKvSQWELVoD1Evm7XjutMB/J0bI18QnOBCOea4PG1Rfj9mCHsHw2zn5fu8H10GneFtuHfCIaOSQWs7DtF3PqUVuaiUyvelBQSlDLuUQwW23F+Iw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751437223; c=relaxed/simple; bh=u+DmLtlYEcFHPfaW4jJEDc074hWED4wIRvLKkUbcgko=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IIGll8aIVqgEz+DqshdURWW2fR1dTQE71RkHaGZKWOSgZQlF59NFNbP1Gmn2sUl9T9mWAAn9b9OKzJix746f0oG9XnirNzYdWNMFHI64ZuskDHkszFT2IW12K29VbcvA4adP/skRmPaBI58/NN2AoS8QPnSv2gMGZAIzxQ3VinU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=codeconstruct.com.au; spf=pass smtp.mailfrom=codeconstruct.com.au; dkim=pass (2048-bit key) header.d=codeconstruct.com.au header.i=@codeconstruct.com.au header.b=G6DPWvQS; arc=none smtp.client-ip=203.29.241.158 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=codeconstruct.com.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=codeconstruct.com.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=codeconstruct.com.au header.i=@codeconstruct.com.au header.b="G6DPWvQS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codeconstruct.com.au; s=2022a; t=1751437218; bh=lYR8LaGya5G0el5kc7ZidNKjHCvxYilWfjWLPB4ov78=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=G6DPWvQSFMRYEp6f47Xe0nOWlmb8QrCiCKc+IlcSUL8XtvWAniszgU5jruq7pTseE 7/F1uywQPrRmeSpfFHqvvNDGnxt419V2AgGNMkkoCjTbtRrdQLfmer3rCIOqTvAy0i bFO770ZTqM3CdjHyosgir5Xoq4ZgNV9dGSQDqS2oDZlgC3aN5ypgtaQxN/QquD9zhJ 1Zoy1Ug7deRnqCsPdB7Duerhs/7QU08Zqx/L3Hx2H5szNPSU6dYdbt9Y811EghWcqk Q3ztWV+QU5xqg7/uE1OO3mYSnbQYSXyTxjhqmPkd4C1odhmBLETC3Zkue2c7KpbkBM bvIfpLJvyd16w== Received: by codeconstruct.com.au (Postfix, from userid 10000) id 009CE6A715; Wed, 2 Jul 2025 14:20:17 +0800 (AWST) From: Jeremy Kerr Date: Wed, 02 Jul 2025 14:20:10 +0800 Subject: [PATCH net-next v5 10/14] net: mctp: pass net into route creation Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250702-dev-forwarding-v5-10-1468191da8a4@codeconstruct.com.au> References: <20250702-dev-forwarding-v5-0-1468191da8a4@codeconstruct.com.au> In-Reply-To: <20250702-dev-forwarding-v5-0-1468191da8a4@codeconstruct.com.au> To: Matt Johnston , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Cc: netdev@vger.kernel.org X-Mailer: b4 0.14.2 We may not have a mdev pointer, from which we currently extract the net. Instead, pass the net directly. Signed-off-by: Jeremy Kerr --- net/mctp/route.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/net/mctp/route.c b/net/mctp/route.c index c49c35c989d89e1c199c8f60ace4d6584ea0d8c8..66395f782759b6a2131342fda099fe5d7cdc4c38 100644 --- a/net/mctp/route.c +++ b/net/mctp/route.c @@ -1086,12 +1086,11 @@ int mctp_local_output(struct sock *sk, struct mctp_dst *dst, } /* route management */ -static int mctp_route_add(struct mctp_dev *mdev, mctp_eid_t daddr_start, - unsigned int daddr_extent, unsigned int mtu, - unsigned char type) +static int mctp_route_add(struct net *net, struct mctp_dev *mdev, + mctp_eid_t daddr_start, unsigned int daddr_extent, + unsigned int mtu, unsigned char type) { int (*rtfn)(struct mctp_dst *dst, struct sk_buff *skb); - struct net *net = dev_net(mdev->dev); struct mctp_route *rt, *ert; if (!mctp_address_unicast(daddr_start)) @@ -1138,10 +1137,10 @@ static int mctp_route_add(struct mctp_dev *mdev, mctp_eid_t daddr_start, return 0; } -static int mctp_route_remove(struct mctp_dev *mdev, mctp_eid_t daddr_start, - unsigned int daddr_extent, unsigned char type) +static int mctp_route_remove(struct net *net, struct mctp_dev *mdev, + mctp_eid_t daddr_start, unsigned int daddr_extent, + unsigned char type) { - struct net *net = dev_net(mdev->dev); struct mctp_route *rt, *tmp; mctp_eid_t daddr_end; bool dropped; @@ -1170,12 +1169,12 @@ static int mctp_route_remove(struct mctp_dev *mdev, mctp_eid_t daddr_start, int mctp_route_add_local(struct mctp_dev *mdev, mctp_eid_t addr) { - return mctp_route_add(mdev, addr, 0, 0, RTN_LOCAL); + return mctp_route_add(dev_net(mdev->dev), mdev, addr, 0, 0, RTN_LOCAL); } int mctp_route_remove_local(struct mctp_dev *mdev, mctp_eid_t addr) { - return mctp_route_remove(mdev, addr, 0, RTN_LOCAL); + return mctp_route_remove(dev_net(mdev->dev), mdev, addr, 0, RTN_LOCAL); } /* removes all entries for a given device */ @@ -1284,12 +1283,11 @@ static const struct nla_policy rta_mctp_policy[RTA_MAX + 1] = { /* Common part for RTM_NEWROUTE and RTM_DELROUTE parsing. * tb must hold RTA_MAX+1 elements. */ -static int mctp_route_nlparse(struct sk_buff *skb, struct nlmsghdr *nlh, +static int mctp_route_nlparse(struct net *net, struct nlmsghdr *nlh, struct netlink_ext_ack *extack, struct nlattr **tb, struct rtmsg **rtm, struct mctp_dev **mdev, mctp_eid_t *daddr_start) { - struct net *net = sock_net(skb->sk); struct net_device *dev; unsigned int ifindex; int rc; @@ -1343,6 +1341,7 @@ static const struct nla_policy rta_metrics_policy[RTAX_MAX + 1] = { static int mctp_newroute(struct sk_buff *skb, struct nlmsghdr *nlh, struct netlink_ext_ack *extack) { + struct net *net = sock_net(skb->sk); struct nlattr *tb[RTA_MAX + 1]; struct nlattr *tbx[RTAX_MAX + 1]; mctp_eid_t daddr_start; @@ -1351,7 +1350,7 @@ static int mctp_newroute(struct sk_buff *skb, struct nlmsghdr *nlh, unsigned int mtu; int rc; - rc = mctp_route_nlparse(skb, nlh, extack, tb, + rc = mctp_route_nlparse(net, nlh, extack, tb, &rtm, &mdev, &daddr_start); if (rc < 0) return rc; @@ -1371,7 +1370,7 @@ static int mctp_newroute(struct sk_buff *skb, struct nlmsghdr *nlh, mtu = nla_get_u32(tbx[RTAX_MTU]); } - rc = mctp_route_add(mdev, daddr_start, rtm->rtm_dst_len, mtu, + rc = mctp_route_add(net, mdev, daddr_start, rtm->rtm_dst_len, mtu, rtm->rtm_type); return rc; } @@ -1379,13 +1378,14 @@ static int mctp_newroute(struct sk_buff *skb, struct nlmsghdr *nlh, static int mctp_delroute(struct sk_buff *skb, struct nlmsghdr *nlh, struct netlink_ext_ack *extack) { + struct net *net = sock_net(skb->sk); struct nlattr *tb[RTA_MAX + 1]; mctp_eid_t daddr_start; struct mctp_dev *mdev; struct rtmsg *rtm; int rc; - rc = mctp_route_nlparse(skb, nlh, extack, tb, + rc = mctp_route_nlparse(net, nlh, extack, tb, &rtm, &mdev, &daddr_start); if (rc < 0) return rc; @@ -1394,7 +1394,8 @@ static int mctp_delroute(struct sk_buff *skb, struct nlmsghdr *nlh, if (rtm->rtm_type != RTN_UNICAST) return -EINVAL; - rc = mctp_route_remove(mdev, daddr_start, rtm->rtm_dst_len, RTN_UNICAST); + rc = mctp_route_remove(net, mdev, daddr_start, rtm->rtm_dst_len, + RTN_UNICAST); return rc; } -- 2.39.5