From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 A76D536F908; Tue, 12 May 2026 19:34:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778614456; cv=none; b=EzXAoVywUkCMEgJLBAgS2zW0vSBHVwSz5YHzcvs6gfwQe4bufRpEbWpP6BHUnfLb5TRX6df7UGZFaj+vKfjOe5HoyKUZApjO1hsc8uTGaAAODIaz85yRP+mcNPIQEX8+zQ9OtuKV35TUlaKWBZUOZD4pVWlCwid4rSMvC4QAx8w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778614456; c=relaxed/simple; bh=3+nSg75y6p6zOz4d2VibPFbgZawtw1IHZauV+GTSQMo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CEujDSjmak3DaTTS0jiIwFXNfUuPn/QLr7d6IJdRV+8+mhK0qg9xKKwknfil5/4Vb8Q+3Q5pjAZsjNQ5rcUrQRfkaHLdRlQRHcipi4NMlrzvVP6GHr3b5TX1qQOULAUhZ6eExhLU3Bo9aGUNqjVKVT0ivISY/n5e6Mc38yNke+o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Q2nNsfdt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Q2nNsfdt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E372C2BCFB; Tue, 12 May 2026 19:34:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778614456; bh=3+nSg75y6p6zOz4d2VibPFbgZawtw1IHZauV+GTSQMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q2nNsfdt1w3CvNz1BpMUDjxjBFOVjsWWAU8kyZhJJcVsAcDcfoczU7Nbh6beUD+KQ XfrgKR1hWVoay27334fnevzJvrTikFJseySdT3hYk/tBVTKNAiovNiw8mUnHkLex0z PJ7oO24bIEIP9koK2XyejoahssbwqFMRQCZFVS/S1BN2GS0Dn76FX92cPO1k8zwdto Gqmn78Z6aD423Sr40wwmL9pSItt/Hy6cVMAxhIf4BFC2IJOx7UitJj3vcM9bQNWiJp ll0x2sZw2r/Ka8AsIfvN6C81XtIoDr+kmcBmxicGBuxMzmxE6+LQo17mxDbE3YOJuL AQzXELOLG45SQ== From: David Ahern To: stephen@networkplumber.org Cc: netdev@vger.kernel.org, leonro@nvidia.com, linux-rdma@vger.kernel.org, David Ahern Subject: [PATCH iproute2-next v2 4/4] devlink: Drop now duplicate pid fallback for netns Date: Tue, 12 May 2026 13:34:07 -0600 Message-ID: <20260512193412.32019-5-dsahern@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260512193412.32019-1-dsahern@kernel.org> References: <20260512193412.32019-1-dsahern@kernel.org> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: David Ahern Now that netns_get_fd handles by name and pid, the special handling in devlink to fallback to PID can be removed with both cases handled by the FD attribute. Signed-off-by: David Ahern --- devlink/devlink.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/devlink/devlink.c b/devlink/devlink.c index 730515a78950..908a0e32be2b 100644 --- a/devlink/devlink.c +++ b/devlink/devlink.c @@ -428,12 +428,6 @@ static void dl_arg_inc(struct dl *dl) dl->argv++; } -static void dl_arg_dec(struct dl *dl) -{ - dl->argc++; - dl->argv--; -} - static char *dl_argv_next(struct dl *dl) { char *ret; @@ -2153,14 +2147,12 @@ static int dl_argv_parse(struct dl *dl, uint64_t o_required, err = dl_argv_str(dl, &netns_str); if (err) return err; - opts->netns = netns_get_fd(netns_str); - if ((int)opts->netns < 0) { - dl_arg_dec(dl); - err = dl_argv_uint32_t(dl, &opts->netns); - if (err) - return err; - opts->netns_is_pid = true; - } + + err = netns_get_fd(netns_str); + if (err < 0) + return err; + + opts->netns = err; o_found |= DL_OPT_NETNS; } else if (dl_argv_match(dl, "action") && (o_all & DL_OPT_RELOAD_ACTION)) { @@ -2725,10 +2717,7 @@ static void dl_opts_put(struct nlmsghdr *nlh, struct dl *dl) mnl_attr_put_u8(nlh, DEVLINK_ATTR_TRAP_ACTION, opts->trap_action); if (opts->present & DL_OPT_NETNS) - mnl_attr_put_u32(nlh, - opts->netns_is_pid ? DEVLINK_ATTR_NETNS_PID : - DEVLINK_ATTR_NETNS_FD, - opts->netns); + mnl_attr_put_u32(nlh, DEVLINK_ATTR_NETNS_FD, opts->netns); if (opts->present & DL_OPT_RELOAD_ACTION) mnl_attr_put_u8(nlh, DEVLINK_ATTR_RELOAD_ACTION, opts->reload_action); -- 2.43.0