From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (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 8495F1E260C for ; Thu, 28 May 2026 00:57:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779929822; cv=none; b=aRw0w9DzKYgYTY+IOHRcWMR93i01GJg8CjYO4heCINMb6gzGifcByY/R/jhioYiOs/mlMoi8Gv4LxmecAgFBSGkvm7ekVrsSoGGFY+mQ1/Eb2rmBHmWLDTz0B2E+LRl4rGvO6YqclS3e3461KvkZ3cpp8RCp2FJyzid2i/7obZM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779929822; c=relaxed/simple; bh=fXTuTRHwGp+hCvWXzEuCMac4sBMnC1HmTCGkXAsucDg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=dgCMUkYvzqmcHEILQGSlHbuQYDQzgNZqTAXp1p1yg24aitjoKMrmAjdXAGvr5vVHwnuuxadWFaHQzA3+Ou9q65c1LNjuhpG32++rvS5pL6xNCKIilFCn/2ppnCo8ryjTN+mjhUNq7pXVl41XvnC6F4KXDtIfs10r8IoqH97YlyY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--kuniyu.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=fyz8l0ER; arc=none smtp.client-ip=209.85.210.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--kuniyu.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="fyz8l0ER" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-837d43e9ff3so8087594b3a.2 for ; Wed, 27 May 2026 17:57:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779929821; x=1780534621; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=tXLfpg1Al8O/JM+QjWDrsNSuSHoQhg/vyvJAxCM33M8=; b=fyz8l0ERXlZuJ/KRNgsENYrY+DE98rsUcs1tseCOiMNLP3O2L82NwEZLR6ebniWRua /FK37y5pOrk2K24ce6LuOnd1lmk2pMAmNiwETZ577ol7bfowZ5g1xTz5qOjK8ATAq+CS KK+kQCGOliS+bgSNMUWU/fhP9CVc/U0eOmQjl13fpnvKtzaOhAfH0t+sdPv1AHIfjaGh exUM49GstElGvq8VIMi3cDm8f/p+wEVXJwkJea/ZizUSQG5fgh15vTDLPKqglQnWJXCP Z481Y0EhYmI6oAKhReG920VTp/bLHiZH8Sy0iNFnbQ3ORkmbHo8+M5qVsH/Q9DVKK6XD 4NUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779929821; x=1780534621; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=tXLfpg1Al8O/JM+QjWDrsNSuSHoQhg/vyvJAxCM33M8=; b=D+JJ0iOGN4jImMdzcERu1ZCE3p9bKPIFWgXuPpxqSJ0egS+PDw1JVVJaHq8EgLMa40 s8tb539I8QAh64dpjnO3wYpKZcWiSo6amXz7VCMf3840g30VVD5BR1/2GakHhgZ2Lcwm jPLe3bS5Ep2KLQzZdwi22MrpeCx1Jq8max2s0piJAbMovE6sLS2+62oXr9Nd0/iLXSf6 LDCxtpYbaogSuPjLnm18GJ72XomdYtlraiA6JpWvwiUBzP0NQvH9U3l+3OoOgoKRNhb+ R/KVVo+u/aNEFx6ub3jTif2N2N9T/2TA2oleZ2EiSqWrBqDRWDgpFZ79wysPbAxc+2j9 THMA== X-Forwarded-Encrypted: i=1; AFNElJ9bETn+iMdW0vKmVhQC8i3N+XzyjHWK3y/B7p0sTFFajwBoFv9/GALiEfx09Y5sg5f8CRzPEUg=@vger.kernel.org X-Gm-Message-State: AOJu0Yxvtwd7bwSccUdki89VxgrE7xCgUKwklOizRQIj07yYuqUoZZGA zoaxnWo9f6/EqWjoJ9VMsOeIA5c3yF63PxKiWnz5g9H2P1XQupHu+s1k+ayzWn3WhMNaL1VQDnX xaz9wkQ== X-Received: from pfbei37.prod.google.com ([2002:a05:6a00:80e5:b0:82f:5d4f:734f]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:6f59:b0:841:d0c0:d9dc with SMTP id d2e1a72fcca58-841d0c0f6c2mr6409173b3a.44.1779929820572; Wed, 27 May 2026 17:57:00 -0700 (PDT) Date: Thu, 28 May 2026 00:56:44 +0000 In-Reply-To: <20260528005658.1756248-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260528005658.1756248-1-kuniyu@google.com> X-Mailer: git-send-email 2.54.0.794.g4f17f83d09-goog Message-ID: <20260528005658.1756248-2-kuniyu@google.com> Subject: [PATCH v4 net-next 1/5] geneve: Reuse ipv6_addr_type() result in geneve_nl2info(). From: Kuniyuki Iwashima To: Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Simon Horman , David Ahern , Stephen Hemminger , Kuniyuki Iwashima , Kuniyuki Iwashima , netdev@vger.kernel.org Content-Type: text/plain; charset="UTF-8" geneve_nl2info() calls ipv6_addr_type() to check if the remote IPv6 address is link-local. Then, it also calls ipv6_addr_is_multicast() for the same address. Let's not call ipv6_addr_is_multicast() and reuse ipv6_addr_type(). Signed-off-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet --- v2: Move addr_type to if-block for CONFIG_IPV6=n --- drivers/net/geneve.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index e8ff03ed87dc..8413c21fee6f 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -1924,6 +1924,8 @@ static int geneve_nl2info(struct nlattr *tb[], struct nlattr *data[], if (data[IFLA_GENEVE_REMOTE6]) { #if IS_ENABLED(CONFIG_IPV6) + int addr_type; + if (changelink && (ip_tunnel_info_af(info) == AF_INET)) { attrtype = IFLA_GENEVE_REMOTE6; goto change_notsup; @@ -1933,13 +1935,13 @@ static int geneve_nl2info(struct nlattr *tb[], struct nlattr *data[], info->key.u.ipv6.dst = nla_get_in6_addr(data[IFLA_GENEVE_REMOTE6]); - if (ipv6_addr_type(&info->key.u.ipv6.dst) & - IPV6_ADDR_LINKLOCAL) { + addr_type = ipv6_addr_type(&info->key.u.ipv6.dst); + if (addr_type & IPV6_ADDR_LINKLOCAL) { NL_SET_ERR_MSG_ATTR(extack, data[IFLA_GENEVE_REMOTE6], "Remote IPv6 address cannot be link-local"); return -EINVAL; } - if (ipv6_addr_is_multicast(&info->key.u.ipv6.dst)) { + if (addr_type & IPV6_ADDR_MULTICAST) { NL_SET_ERR_MSG_ATTR(extack, data[IFLA_GENEVE_REMOTE6], "Remote IPv6 address cannot be Multicast"); return -EINVAL; -- 2.54.0.794.g4f17f83d09-goog