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 63E1925E829 for ; Thu, 19 Jun 2025 08:01:12 +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=1750320074; cv=none; b=g0gjsr8gkBDflHiPmH7mUeUVSzUgR1HsXfPXKQ3pb7Mz9ypwbLRryVwmA6HGZtSYrbn+ac2MAI4ZY6vcKbVP52+KHop/8xvwZW6vgnA3GUYM670IWCT2w732hUe4/dLyfbBZFUULUgSQ0flKH6I5lExnmebkTRYHjC/uHyPF95A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750320074; c=relaxed/simple; bh=TsCEVJSbAG4Ui9UU7KbJEf0wpBgmVpLIPdk5MB9uO+Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SARRx8KQZT2f5/JT1Ig6kx/pVYDGvMC3k7htyLT4a69wVxNJmaRT6/YUZzqWtE9cscoALDktbYOVd26WnvGDco2dFiyMi4ujiP11S1HThrJ8F/V63OZWJDGH8eML0JOUxKSsoDGlwetPzo7FXmie29Z6r228EF6gTMid9XJ+tIA= 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=dpKkM70+; 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="dpKkM70+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codeconstruct.com.au; s=2022a; t=1750320063; bh=R/iBcO0Na5B85cl0hG3FHnOdxLFLdGi9Q11jSvY6nw4=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=dpKkM70+GigQgdRr2eCXSHXvHzrG4+26vRdhLDZLFivR7YIwO0mRP7RuvPq41W0WO NCuvAr7hiHKNgPTAMxEl25wx7SeGP4PtBDwAWf6RURMF24YxcKlejJCQBVUZOqeaIq Qb0V8j/+DXDDpBStwCOPpSNTnFausvybRYBq3dHRV5wt/ycP1NLKai6jLBXheb4vEA 9nz3gH+C7z/7oX14ytC6WpqFdV9vok8xTXcoKQ6Dz16XwkC1AgZFLUF6VkMdZn1nKr PuHNXAyNgsr7Zhq3SCJNvlO/ihAbPIa2j/0VyZe6qWSxVKtmOzYL6JGL6GfQOVFbKf uE56Jf8LPpQpw== Received: by codeconstruct.com.au (Postfix, from userid 10000) id 71BFC68ECB; Thu, 19 Jun 2025 16:01:03 +0800 (AWST) From: Jeremy Kerr Date: Thu, 19 Jun 2025 16:00:45 +0800 Subject: [PATCH net-next v2 10/13] net: mctp: remove routes by netid, not by device 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: <20250619-dev-forwarding-v2-10-3f81801b06c2@codeconstruct.com.au> References: <20250619-dev-forwarding-v2-0-3f81801b06c2@codeconstruct.com.au> In-Reply-To: <20250619-dev-forwarding-v2-0-3f81801b06c2@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 In upcoming changes, a route may not have a device associated. Since the route is matched on the (network, eid) tuple, pass the netid itself into mctp_route_remove. Signed-off-by: Jeremy Kerr --- net/mctp/route.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/net/mctp/route.c b/net/mctp/route.c index c2495e2073c6946c3517b525b5d49b93fbfdd81f..1731cabcc30780226d39e6e0716346f7acb5bd7e 100644 --- a/net/mctp/route.c +++ b/net/mctp/route.c @@ -1080,6 +1080,11 @@ int mctp_local_output(struct sock *sk, struct mctp_dst *dst, return rc; } +static unsigned int mctp_route_netid(struct mctp_route *rt) +{ + return rt->dev->net; +} + /* route management */ static int mctp_route_add(struct net *net, struct mctp_dev *mdev, mctp_eid_t daddr_start, unsigned int daddr_extent, @@ -1132,7 +1137,7 @@ static int mctp_route_add(struct net *net, struct mctp_dev *mdev, return 0; } -static int mctp_route_remove(struct net *net, struct mctp_dev *mdev, +static int mctp_route_remove(struct net *net, unsigned int netid, mctp_eid_t daddr_start, unsigned int daddr_extent, unsigned char type) { @@ -1149,7 +1154,7 @@ static int mctp_route_remove(struct net *net, struct mctp_dev *mdev, ASSERT_RTNL(); list_for_each_entry_safe(rt, tmp, &net->mctp.routes, list) { - if (rt->dev == mdev && + if (mctp_route_netid(rt) == netid && rt->min == daddr_start && rt->max == daddr_end && rt->type == type) { list_del_rcu(&rt->list); @@ -1169,7 +1174,8 @@ int mctp_route_add_local(struct mctp_dev *mdev, mctp_eid_t addr) int mctp_route_remove_local(struct mctp_dev *mdev, mctp_eid_t addr) { - return mctp_route_remove(dev_net(mdev->dev), mdev, addr, 0, RTN_LOCAL); + return mctp_route_remove(dev_net(mdev->dev), mdev->net, + addr, 0, RTN_LOCAL); } /* removes all entries for a given device */ @@ -1389,7 +1395,7 @@ static int mctp_delroute(struct sk_buff *skb, struct nlmsghdr *nlh, if (rtm->rtm_type != RTN_UNICAST) return -EINVAL; - rc = mctp_route_remove(net, mdev, daddr_start, rtm->rtm_dst_len, + rc = mctp_route_remove(net, mdev->net, daddr_start, rtm->rtm_dst_len, RTN_UNICAST); return rc; } -- 2.39.5