From nobody Thu Oct 9 10:00:42 2025 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 43B3E28F5; Wed, 18 Jun 2025 09:32:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750239174; cv=none; b=NiHofn56x7v1mRIj8UaIJIu0ORKIsEFsRaBFNwjLSmRf8xUUMmPZEjYrQhnREQFUVtCiP1jPk3PUGDx3J6Z9R1Xw+wsUzpWtNezB85hGxRZcsAg1gFe2IG2oMy2DJfC1HInlhkgLWhwxdqE3q4/KrUUm69ZGJP4ux20Umbmpm+M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750239174; c=relaxed/simple; bh=8oSDJXr4MRiC6pfx36kYfYrC7pURwAUL6y1NKD3t6og=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=flEEkm8AmW7FK9f/L/z3Y+eZU7+rQVDgEPlhaTJBHAQc7Cw9k9IunqZLNc3sK/fR9SDjAQjggwiiFxo4ECzol2kVrBOVjzT8UqS3itUUit+IraTdrpWLcBgsfXAeXFWbEvTwp/OVb5i/KvpWplg1nQDHwhXfH3JQL3M1LQSlFNo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.208.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-607c2b96b29so13108136a12.1; Wed, 18 Jun 2025 02:32:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750239170; x=1750843970; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b7B+m3/rWZKz7fhQC9HEioD8ZXYaWHZgndw4mU2cxAA=; b=dEU3Exr6WBbxFfRkp+ovlOTYasojcVyl4mJeSnIlDxVM+Tp1d+lJpc3ZvBw/JIIe1K cmbreSAIENHZihwAUD++QrzQRetLeuoR6J0DztQ7V0uwKJyid675KR1n6lA0+shV7V6L OO3VDS5v1Vy5Tu9DI3TDgWp8wGHhZ1J3NW95DAFzwhyfUvnhg8GBrIIskf2Aoc4wxlRv YhzMxQk2zqAV04mtrauqINpT3AssYnKgzFDIqIp59BOS6KIX025JVPEbsDRfkK/94aLu oUf07dvBmApBc4HWvMHxWaiTRzULmGPTy6d8XhYaQ/3WMheXss/zS45iTHLikchP7neF A9Sw== X-Forwarded-Encrypted: i=1; AJvYcCWiPyZ/qwo+yP4dDjQM+CQve81lUrO8y7/13Hw2I3aW0I2a2FC8HQgDFhBHXAiB6kQ9/HmnDvxC39ncfIE=@vger.kernel.org, AJvYcCXcoL9kERhxyl++aQCy34QgnzUSh16Lo6fharXqcLP5TEYbBzkXqy/dm11XDgsRLGkBTqsbs+0Q@vger.kernel.org X-Gm-Message-State: AOJu0YwkiBpiFrTzjm4KCmKgTYtzNNVc0Ts52Mu3LZXgesEybX23TRhM JfnYijt4Fy90cTxYCenqnXVyqiSivCrWr3HsBPl5dSiwRaVcYoffSvJj X-Gm-Gg: ASbGncuf2HT08l+hxOl+LqXwbAC6uTCo8ciby+8HjeIj66uKGWsXO0sgH0s15y5iTbf PoCscP7XFxg9Gqgv93fpEs0uR1hIA/XQWZLGShYrTpKXTl5DxOE/sr84z+GYzhatiMHL1ZvxbQV bcs7xTYRVueY6Ru4mVARkVhyPafERlOc3yYaG+IIWgu5kXV5b1gXVtaMtHXb77CDpAm/vqb6C8Y qP/D8ytsBANq19MUtXdmnPxufnW+Gfh5aXpUxLg/AIb/8U2tbNO+vranQvcJdNQyeJspGX7qsDl f2k+HKRsnZrHCIpy+fYnsCwtPSN1xeJ7FigrIWJOd38FpXPafL1S X-Google-Smtp-Source: AGHT+IHD2whKBJT6RHjFj8VOP3UU58/i4PNOoFrxZYRtwP8ae/XSrw9sACv3Z9xAOxasB8pgrwDaaA== X-Received: by 2002:a17:907:cd02:b0:adf:f3c5:c858 with SMTP id a640c23a62f3a-adff3c5c968mr821668766b.15.1750239170381; Wed, 18 Jun 2025 02:32:50 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:8::]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-608b4a5e6f0sm9737680a12.42.2025.06.18.02.32.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jun 2025 02:32:49 -0700 (PDT) From: Breno Leitao Date: Wed, 18 Jun 2025 02:32:45 -0700 Subject: [PATCH 1/3] netpoll: Extract carrier wait function Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250618-netpoll_ip_ref-v1-1-c2ac00fe558f@debian.org> References: <20250618-netpoll_ip_ref-v1-0-c2ac00fe558f@debian.org> In-Reply-To: <20250618-netpoll_ip_ref-v1-0-c2ac00fe558f@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Cc: jv@jvosburgh.ne, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , gustavold@gmail.com X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1692; i=leitao@debian.org; h=from:subject:message-id; bh=8oSDJXr4MRiC6pfx36kYfYrC7pURwAUL6y1NKD3t6og=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBoUoe/n5Jsl5k4SJPPwVUnGTJGOIS6qnhw2jkrE NXwWJybxN+JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaFKHvwAKCRA1o5Of/Hh3 bXwoEAChhREsk9QIWU71OCddfwmhLp+t8M4ktJPqb1EZI8pQNxIHJdrM8AOq7CF+xjDKD8EAN14 hYWfQjRNJOM27UewJWBeuWWWeId9NgRqSjt9XFTD2RgDvaPxA2Dy88Lh1d/je7Eb0McMXY+47Fu /18lBlnMTLfusgDrjkqrxK1BnD6cdD4A0zKaP02kgomshmrtiITbx6Z7kIzWoN4w8iOyYCniVth V78kn4ng5SXa8kbYP8HqX14bRfkGVLOqCmoXHnhCEJTdP05MLbyYXhplZOpjTRKoaDrSRw+XpHQ 7Jkb+41+HvCS18chDZ1nczkgYFBadNJq7g4UJ0XNB3wJCaETnEWNQPFHI8MmNOTqwH3THHIZgL/ CK5xd11n6E24qNYEnVLhQswEUV+fqVqe2+FH0WYc7yt3E4K1benfD+mw5uN9mDJC2hZDcKFRFeC lO4Dy3P57fuJVCchqXP6n7q/xXHjEorBxhV15tByy5bnrLT5fHPWM5hmVf2vXp1ao7HpsQRCulp z7mZU/PgYd0eS2X8jlR4PMpMqzgKkYuv770RMQSGrWJV4GiQ0Wn0+3EtsKu8GoilKK31rJael5+ Fc8wT9vOuy/OBFq1obRSo32FwKMI8cClHTgCRQpSiukZi6ku+9VAJpH4ER5Va882ScOqtOTuBIp srhFXj8wJdNso5w== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Extract the carrier waiting logic into a dedicated helper function netpoll_wait_carrier() to improve code readability and reduce duplication in netpoll_setup(). Signed-off-by: Breno Leitao Reviewed-by: Simon Horman --- net/core/netpoll.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 07c453864a7df..473d0006cca1f 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -583,6 +583,21 @@ static char *egress_dev(struct netpoll *np, char *buf) return buf; } =20 +static void netpoll_wait_carrier(struct netpoll *np, struct net_device *nd= ev, + unsigned int timeout) +{ + unsigned long atmost; + + atmost =3D jiffies + timeout * HZ; + while (!netif_carrier_ok(ndev)) { + if (time_after(jiffies, atmost)) { + np_notice(np, "timeout waiting for carrier\n"); + break; + } + msleep(1); + } +} + int netpoll_setup(struct netpoll *np) { struct net *net =3D current->nsproxy->net_ns; @@ -613,28 +628,17 @@ int netpoll_setup(struct netpoll *np) } =20 if (!netif_running(ndev)) { - unsigned long atmost; - np_info(np, "device %s not up yet, forcing it\n", egress_dev(np, buf)); =20 err =3D dev_open(ndev, NULL); - if (err) { np_err(np, "failed to open %s\n", ndev->name); goto put; } =20 rtnl_unlock(); - atmost =3D jiffies + carrier_timeout * HZ; - while (!netif_carrier_ok(ndev)) { - if (time_after(jiffies, atmost)) { - np_notice(np, "timeout waiting for carrier\n"); - break; - } - msleep(1); - } - + netpoll_wait_carrier(np, ndev, carrier_timeout); rtnl_lock(); } =20 --=20 2.47.1 From nobody Thu Oct 9 10:00:42 2025 Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8E5F9285404; Wed, 18 Jun 2025 09:32:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750239175; cv=none; b=bWviikZGb7tcSiYDHRmaFzNmXhn7MHkny1ySPXUONUtNuhtTubDdLiOtnL10Aw1/kHvsskb1I1gPYc8FzSHXeC3Y9rj3h/NaGWcwWCnP7JIX2kvP5c5kAXJ451SclSmQ+fWdzhV64h8zGdKIV1wqL0bQ/KmSl2ecxksTzfpdpok= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750239175; c=relaxed/simple; bh=awJPoOTDHtQmol3taNl+GEtMGRMz/y4bUY7QGAY52zc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HpJeChvwDU2woqZRB2emKaFSjdB7HzQMDp5My9GgdLf8OEdMKf2uzg/hhVazU7pehM3Iwnk00qN0Ql1LJ3ZkOT8c3viEU3VAUR+91RjO7rvon01119DZ+pvw+SutYjAbibejIPqNMN+2qtZws0ca+0ClcYmb/4LgvpPgxWHFSVo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-ad574992fcaso1049609366b.1; Wed, 18 Jun 2025 02:32:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750239172; x=1750843972; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qCn1kZoAQdatt2uBEbXC24iQSyiWTUg7uX197Kq7yn8=; b=r/R8wj+GYqyKyVFAMDYFOPKJrPOEBxSlGyb3DIVybOP40n2Qj2l4QxF9UXKwrbYtZY 4Wysu0YYQqzgUI4XNyCWS8C7jNsqtBHbezGoGj9lMgqm85baDSG2PGhUiBdJ8q0X4JEc tLP/Cm1BrewmQ4YfIwMzPjKzsNlhSOrHFTll3g7Yyrp1vL1iA5diCS9ftsO/jmFfwB3G rlK/zl+GSytpMnuqiANKyY6jV6yTJeK/mWtf6yxCs8D1bcDX3VDmjfi8WWKtgETyEb6U 71WcNO75FXqQJQMb0XyIp+N1hHaTrA1C/LwSJpJk0LilIUoHyN139VV+oWRLUMt6qBFf vUAg== X-Forwarded-Encrypted: i=1; AJvYcCWgSqd7uD7yBovnvvHn2syO1S8CgqI5Al1asVNqdMXuuHI5rQ8M+t7UP9FSpu/InLJP5kP6Y9040i1SX7s=@vger.kernel.org, AJvYcCX3SZGYYMy8kgVJNjGQv824Nyx96U5ZMeJPjwf/MCHEs49aNyvAWIJ3nnVBwUw++ehTKI321LM9@vger.kernel.org X-Gm-Message-State: AOJu0YzpUwFb1cJhlsLNKOnTtBPyu3kCKr4IBpfmbQ9NTJwpQfMyFWL6 V9S135ShFJfd/aEVnEN/H0muTRUPUAgwoLo1ecc79ihxY3L0fWiQZOmO X-Gm-Gg: ASbGncum3GQ2RvJVJ28Xd5aLzpOGDPBBCAUU2A7NGdxunH0JWH2ecFOz1vlLpaZ4miC c6ivDZezq5bO0oeUQsY8DYbi+b+z8oHoGsKpO4a90ZngdoPJ63hpBT4AOFt7+q6FzmhgsMLcdnR /Zmyzb0uyaE4jV7hjWPcgm4WY9DXHoFcm1NPLb5N1TGvSfCrUbAWRWF5VlwaWcgOox0mMgFRyCc ti+WjrCBF18lXEh7VNAxx0fQlaGSgWjZU6pnncc8S3x5m5IlmADsCqwfINIBrGTERUUSWTlQyoq HnfVEuTIaB1viHZqnFOdRCl2yw77CPratWYMa2tEhfKG7HDbCXgT X-Google-Smtp-Source: AGHT+IEwVSlpLWAngk97Rkk6f9tqqw8KHitjG/wYvnPczz7ua90PLOZduZQNjozIp2zMBElRWHPDkQ== X-Received: by 2002:a17:907:3c83:b0:ade:348f:88ce with SMTP id a640c23a62f3a-adfad29a1a0mr1688028866b.12.1750239171805; Wed, 18 Jun 2025 02:32:51 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:4::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-adec88fda18sm1029449066b.92.2025.06.18.02.32.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jun 2025 02:32:51 -0700 (PDT) From: Breno Leitao Date: Wed, 18 Jun 2025 02:32:46 -0700 Subject: [PATCH 2/3] netpoll: extract IPv4 address retrieval into helper function Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250618-netpoll_ip_ref-v1-2-c2ac00fe558f@debian.org> References: <20250618-netpoll_ip_ref-v1-0-c2ac00fe558f@debian.org> In-Reply-To: <20250618-netpoll_ip_ref-v1-0-c2ac00fe558f@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Cc: jv@jvosburgh.ne, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , gustavold@gmail.com X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=2457; i=leitao@debian.org; h=from:subject:message-id; bh=awJPoOTDHtQmol3taNl+GEtMGRMz/y4bUY7QGAY52zc=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBoUoe/ajQhscLM4n3n6xbkH9C3/IyKDPmrAMYuP QOsKZEW0oiJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaFKHvwAKCRA1o5Of/Hh3 bW0dD/wLLtcW5Jl83TnIv+2C/HzUAX3hjINzT1KmcrPRgNp4ljOMAfIgg+nrbVbNFkDOPTprGne 022EzlE9nmG0H5rxBkZuMJj13vcJ0s3CxgAN1VGt8slmx2uO/EqQRVjLzto2QxMy4wBRbOWwVDl ZIVW2oZnsCGYkjH/U89YjnoVqY9R0dLVrdleaTmn4dSHJgjzo3e8vV2tZbZWHknYN3fPTRlH3rV qSHmQ2FJuZPz2sWWqSggUfWvJyCh7o+Oup1hZiGcKp3Hdh0K8U9b8u9xgRhIyz6IKfaBBjf54aF RaU7kBv9IlJIrNGP/WZjKQ7CCM7jMo+85AXPyXxUoyN0CafPvpGaSAy8ul5FZOTCyZbJUTZLDA3 8k1LTdqgF5wRQMIvlVBuEUg28SQrTkJe4YTPWrGttWoznvMjmB5jzsUyNqBw5R9DMieC+UpXDeg 4AQ9TbeyYmkkoEqb/qCwid30UIvNTfJlo5HC58eJ1d2G3dPjHNP6eDsbFbavDbmz7QbsrQhRDT8 9oKDm4rEstUAeVB89F+mAcAROgu0Ig84sXN0V1GqqDFapPYGGvTATfxPaVnF1sKLE+g9sAubRz1 /9T4p6u2Fxw4jpN5X28sSMdUuyhH161cUsaY6/iXnDQAIQyqtQ+SfYhreyEfL45yd0rBqYVtlvr n/wIVG/baWoxHIA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Move the IPv4 address retrieval logic from netpoll_setup() into a separate netpoll_take_ipv4() function to improve code organization and readability. This change consolidates the IPv4-specific logic and error handling into a dedicated function while maintaining the same functionality. No functional changes. Signed-off-by: Breno Leitao Reviewed-by: Simon Horman --- net/core/netpoll.c | 48 +++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 473d0006cca1f..6ab494559b5c6 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -598,13 +598,41 @@ static void netpoll_wait_carrier(struct netpoll *np, = struct net_device *ndev, } } =20 +/* + * Take the IPv4 from ndev and populate local_ip structure in netpoll + */ +static int netpoll_take_ipv4(struct netpoll *np, struct net_device *ndev) +{ + char buf[MAC_ADDR_STR_LEN + 1]; + const struct in_ifaddr *ifa; + struct in_device *in_dev; + + in_dev =3D __in_dev_get_rtnl(ndev); + if (!in_dev) { + np_err(np, "no IP address for %s, aborting\n", + egress_dev(np, buf)); + return -EDESTADDRREQ; + } + + ifa =3D rtnl_dereference(in_dev->ifa_list); + if (!ifa) { + np_err(np, "no IP address for %s, aborting\n", + egress_dev(np, buf)); + return -EDESTADDRREQ; + } + + np->local_ip.ip =3D ifa->ifa_local; + np_info(np, "local IP %pI4\n", &np->local_ip.ip); + + return 0; +} + int netpoll_setup(struct netpoll *np) { struct net *net =3D current->nsproxy->net_ns; char buf[MAC_ADDR_STR_LEN + 1]; struct net_device *ndev =3D NULL; bool ip_overwritten =3D false; - struct in_device *in_dev; int err; =20 rtnl_lock(); @@ -644,24 +672,10 @@ int netpoll_setup(struct netpoll *np) =20 if (!np->local_ip.ip) { if (!np->ipv6) { - const struct in_ifaddr *ifa; - - in_dev =3D __in_dev_get_rtnl(ndev); - if (!in_dev) - goto put_noaddr; - - ifa =3D rtnl_dereference(in_dev->ifa_list); - if (!ifa) { -put_noaddr: - np_err(np, "no IP address for %s, aborting\n", - egress_dev(np, buf)); - err =3D -EDESTADDRREQ; + err =3D netpoll_take_ipv4(np, ndev); + if (err) goto put; - } - - np->local_ip.ip =3D ifa->ifa_local; ip_overwritten =3D true; - np_info(np, "local IP %pI4\n", &np->local_ip.ip); } else { #if IS_ENABLED(CONFIG_IPV6) struct inet6_dev *idev; --=20 2.47.1 From nobody Thu Oct 9 10:00:42 2025 Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 12823285CA7; Wed, 18 Jun 2025 09:32:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750239177; cv=none; b=qtwPNTHyzvsKmy92YGafXATb7Bbbl3tbqyOuDwtDKyeXFSVhEtUiaP58Ai7p6v/ogfHghCDBE6zK6OYFjpqATj3tXDoEAPkrTAzVJn7IPAgANum2DWp/2SZZ6uSr+TybBzChjx7UnINHXPjPwmALd7JFChGe1EstMgVvgmMysGE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750239177; c=relaxed/simple; bh=xsT5+BNApZ6jnctTLrkNgwcX9E+gvGWHHUk/Qw1k1RU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tOIle8WaT6y6YsGJBO1LORR0OJs4l+Bnl2VOIz94d8FeOv5h6ysnBJnjigMH0vwNc62stxEic+NdEuSLooqyrvPs3GNQAqvmWXO4i5LMX76lwJpULH3TbIWUNQiHwybRq9+TXuIq9vt+sd5DR0qF2bZYlfbbmQlKF5gFe3CVSBU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.208.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-6097d144923so1228406a12.1; Wed, 18 Jun 2025 02:32:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750239173; x=1750843973; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x6p6CJREvtO1XNGAKGo8PsXvP3/MHGJcajliyymJsnY=; b=MTRRyK1MlLkD9DSPKSQCuIyURd8e+XGBENZvy1b7aOFTjwSetZ3Zx2TnNi/ktQTlCK KrBTJhhaXdYgWGtV2btfEc6t3JQIL28XplxK+8uClpQowCAUSwMz1kguI/9YejDDxUdP FDjIRmxV1s7+VJSLPj8B23jDKJRdJMfnKAkirUpfCtQzLz9lTDEh7IzfjLb10U87bGGR bzSBlQDpCE9wGIdw6p7W+ityITVPWL66qFxRe1Do47JEsMdBGWMeCayb73qAOBo9d/5q +AJ2BsGEnGarKUE7prCTSjleir3YZ9tqN+bcN0lajI4ZZ+OmMQwTtuEsVUd2dLf0Ogjj b8vA== X-Forwarded-Encrypted: i=1; AJvYcCVfILZQIgQmRTessC1JcsK8IP8BjR23Hxlwz66cjMJATzXBWMiTkHT9kunHKYmmKJRExOO2eaUG5qRSkd4=@vger.kernel.org, AJvYcCX1l5J+WpdXmhP0OSEHrau0ei9AeMR2tFZjR8foYSnzmDs56B11B/sNp+6H844wrg4cLfLVcY2N@vger.kernel.org X-Gm-Message-State: AOJu0YwK5npGxoskYuHkOA67Vz8r6YP84ttB80By8tJBfyO1RfOhNEWb cxUu3n/8xHJX0UQ/3s2/T59L3WUsbpcT756ZvQTvaolgsQMHfdadn++u X-Gm-Gg: ASbGnctsdu7UeUfbEtQ+yhiklbnCkm/QXPsa4nadWgtE9F/9dRIeQunko6HahsepfM/ Riwiv25hqI5s3d1XjS5i0r7XDfKl61i2aV2qIg4mqdDhViCdZ5vL6v5XqGn/MNRqcdJiHrBkfAl mXo3PljB2xmfW2rHEQ67sEmFPorC/Ot/f74lwLVVk6gMypiF7Vp6zomdPIqaf+tz2LWy0I0vUtx EP4hhC5u4gAkIS6FhthA43PmmebUGvXZkQfLKrWeX4YpPf58QP2E52DfMEKCe7CeZcFQSrvq8ru D1umeqTMXYuwbeiVah4dT6/ybmodGLgYIgv5FkouptudIQeRmv8o X-Google-Smtp-Source: AGHT+IGgFOXfHVZAMfP0pQLGkzzAuYN0D3m3K6HvSVU+5WMjrp8oQ75diCPCWqY8eQveNZ5fnrtFJA== X-Received: by 2002:a05:6402:50d0:b0:607:f42f:d58e with SMTP id 4fb4d7f45d1cf-609c1b3613cmr1421871a12.12.1750239173166; Wed, 18 Jun 2025 02:32:53 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:1::]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-608cfadeb92sm7951571a12.13.2025.06.18.02.32.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jun 2025 02:32:52 -0700 (PDT) From: Breno Leitao Date: Wed, 18 Jun 2025 02:32:47 -0700 Subject: [PATCH 3/3] netpoll: Extract IPv6 address retrieval function Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250618-netpoll_ip_ref-v1-3-c2ac00fe558f@debian.org> References: <20250618-netpoll_ip_ref-v1-0-c2ac00fe558f@debian.org> In-Reply-To: <20250618-netpoll_ip_ref-v1-0-c2ac00fe558f@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Cc: jv@jvosburgh.ne, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , gustavold@gmail.com X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=3278; i=leitao@debian.org; h=from:subject:message-id; bh=xsT5+BNApZ6jnctTLrkNgwcX9E+gvGWHHUk/Qw1k1RU=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBoUoe/oxEWlCEvp9syhQzSeHRmj67NB36R9BhC/ yptggTPNimJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaFKHvwAKCRA1o5Of/Hh3 bQvKD/48+af5LplbvaZV0RbJCddg63q0nCsr+tAgUJW/rwuv92kotqZ+vOUDZ6fOpocJK3s22UM Cf/wMVd//LPfEm1KU6aPjg/IBI8Kbkr3Er+aPZmOzVM2r280X8OUWSwLTya3uTyVnfSC8ZZ5yWZ d0QwDxECUxfPN6v7taE3TkJr6oQKeHSvhQlgjzDT9faSMb5JiRux4IO2bJ840I9hJo1vJGxGFUp bqecYT71ARu8FF2vTNDfSglygywACCNWuw8W1efExy6uWrpMlmnmNX2rTJsBFi2LJacJL4qMF/D MMr52xyEviiRJ45XiknM3gdCfUiyNPX84MMRpXSUtq8eI8H6/K7t0pqV4YAzohYQg3bOUHUyvL1 KKcmog/w3kPxSLX7trIjtDGlPmn4RScmIwsrWx2NT78xmM1Bc1rzj3FSx25h+B8cqt2TRbimyUx MRvBanVbdPnlXwihzVSzcGIoCMu+0DOXtdAGzup+5yja4ju72xtSAbbpiaFLwrb2vdm6Bwom09Y hccUtb8pug1Q07knZ2r3ICEhg8qaix6Bdvo7Mw5aRocPaS9IMUyC3UoHnnnieWfEdb9eZw94/oH 9WquLJ9wrO8wEwodU/hAS3pxucz4V+l37Hj8tdOJIh0PLfxJk41yYMr73DeuX/f9msGH6rq1QLH bfTQjfg5tCdniQA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Extract the IPv6 address retrieval logic from netpoll_setup() into a dedicated helper function netpoll_take_ipv6() to improve code organization and readability. The function handles obtaining the local IPv6 address from the network device, including proper address type matching between local and remote addresses (link-local vs global), and includes appropriate error handling when IPv6 is not supported or no suitable address is available. Signed-off-by: Breno Leitao Reviewed-by: Simon Horman --- net/core/netpoll.c | 76 +++++++++++++++++++++++++++++++-------------------= ---- 1 file changed, 44 insertions(+), 32 deletions(-) diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 6ab494559b5c6..7021ea45a0539 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -598,6 +598,47 @@ static void netpoll_wait_carrier(struct netpoll *np, s= truct net_device *ndev, } } =20 +/* + * Take the IPv6 from ndev and populate local_ip structure in netpoll + */ +static int netpoll_take_ipv6(struct netpoll *np, struct net_device *ndev) +{ + char buf[MAC_ADDR_STR_LEN + 1]; + int err =3D -EDESTADDRREQ; + struct inet6_dev *idev; + + if (!IS_ENABLED(CONFIG_IPV6)) { + np_err(np, "IPv6 is not supported %s, aborting\n", + egress_dev(np, buf)); + return -EINVAL; + } + + idev =3D __in6_dev_get(ndev); + if (idev) { + struct inet6_ifaddr *ifp; + + read_lock_bh(&idev->lock); + list_for_each_entry(ifp, &idev->addr_list, if_list) { + if (!!(ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL) !=3D + !!(ipv6_addr_type(&np->remote_ip.in6) & IPV6_ADDR_LINKLOCAL)) + continue; + /* Got the IP, let's return */ + np->local_ip.in6 =3D ifp->addr; + err =3D 0; + break; + } + read_unlock_bh(&idev->lock); + } + if (err) { + np_err(np, "no IPv6 address for %s, aborting\n", + egress_dev(np, buf)); + return err; + } + + np_info(np, "local IPv6 %pI6c\n", &np->local_ip.in6); + return 0; +} + /* * Take the IPv4 from ndev and populate local_ip structure in netpoll */ @@ -675,41 +716,12 @@ int netpoll_setup(struct netpoll *np) err =3D netpoll_take_ipv4(np, ndev); if (err) goto put; - ip_overwritten =3D true; } else { -#if IS_ENABLED(CONFIG_IPV6) - struct inet6_dev *idev; - - err =3D -EDESTADDRREQ; - idev =3D __in6_dev_get(ndev); - if (idev) { - struct inet6_ifaddr *ifp; - - read_lock_bh(&idev->lock); - list_for_each_entry(ifp, &idev->addr_list, if_list) { - if (!!(ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL) !=3D - !!(ipv6_addr_type(&np->remote_ip.in6) & IPV6_ADDR_LINKLOCAL)) - continue; - np->local_ip.in6 =3D ifp->addr; - ip_overwritten =3D true; - err =3D 0; - break; - } - read_unlock_bh(&idev->lock); - } - if (err) { - np_err(np, "no IPv6 address for %s, aborting\n", - egress_dev(np, buf)); + err =3D netpoll_take_ipv6(np, ndev); + if (err) goto put; - } else - np_info(np, "local IPv6 %pI6c\n", &np->local_ip.in6); -#else - np_err(np, "IPv6 is not supported %s, aborting\n", - egress_dev(np, buf)); - err =3D -EINVAL; - goto put; -#endif } + ip_overwritten =3D true; } =20 err =3D __netpoll_setup(np, ndev); --=20 2.47.1