From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (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 84D7D2C327C for ; Wed, 13 Aug 2025 07:08:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755068882; cv=none; b=iFvoKYANVAXfiFTQKbsSbrcbVtRs7KpHo9Z3NTritxOA6VwE1ldy4eAtUu4bUQSoHjAKEaUM0VoBfpiRUDWU4kiuPyk5Za5OHyjRylChoiDXpjtLOkfS1SOB0OPH9PVxIsykmDXt351Wd2QH4H0td2FEszVtEhfdv8eH/Bpn5tQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755068882; c=relaxed/simple; bh=FPSgSOe9+Ty0jK4JSjEYBgeSdySOqx3nIsNquyo1aOA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=qFRzIAij06xEF5V7y1qzq0o99PDAGAcKYVkKMtyUmu2+e7eqlI38zkyMthEXDPEDdaGXLQh5+Qti35lJ8o5mTSP2BWn8aw14Ntyxqcp6n7xkX1Nj25sltxJQvZ9gDJ5bZset9DLRqibdPRZYOqtvBSsV7A23LTw5g8RXUJ6JBjQ= 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=mVyOSkQR; arc=none smtp.client-ip=209.85.215.202 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="mVyOSkQR" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b2fa1a84566so5452338a12.1 for ; Wed, 13 Aug 2025 00:08:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755068880; x=1755673680; 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=Riz+hlL+yUQb2ZDNGgleZP1m3SAZBHmBYEVDZCifnzE=; b=mVyOSkQRM8UJlVb5jPjr5zbnPEZmdkjq3oFHu9OEw+FY+X+0wtzvc0cYKCygI/lulg o9eQlFGr9Is3cu4gAeWBDsKCa/EAnZBrkJXI9gFy3K8KnF2qwZMh7EtqCIIbhKecoxrL x+U6jtLIHGPpmcVCf3TkXCtdQJjr1aZELfCSYtNsCpllexXsEYcB93ezRdIqpKzxgRh3 jGYDvYIRm1dpCpiMb+JCAD0ria5xDGo1aqQ00B1I0fC+4fzuy9ebN7NCyLG7bACXyRrH HV0f1mGvUJk05f8QKY9T+sIO8Ltb0VFsVU0Cs1sdmZ9AZWm/uSqRVFbYh3WZHfg/TVTO L4fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755068880; x=1755673680; 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=Riz+hlL+yUQb2ZDNGgleZP1m3SAZBHmBYEVDZCifnzE=; b=awbrTrOIEX8vQrLjeP4ouXqUeMN+cUEnF+XtMwd8V/Jch1qRM6VxUDGZOLBV7JMkzR x39uIvGjgPjVq/vvpanBrPUTMK3Cw82YRkbAFX84WgLc+zmRcMRNUi8W2c5Fo9m7bbrP C8WaZaU9VqvHroGBiukMI+U400MlsbBQK/YPfXCg2LgVyn64sv50n81uQc27EJi4LVOW wSpk4DUhl8OrJwbA89A8LXp73g1bPgI9eOlaz8CAiX6aM79SOCYoX3z0ZinG2qYHKJDk LEVm7Y8yFBOuL1qgGn0jtAFU/lAAItOL/6Z2HknWhtZ7L1cLSGEN6oAn7MAhnNduJmqx j2wA== X-Forwarded-Encrypted: i=1; AJvYcCXU1vALNYM6f8Z/p7hSN7z2ZpP4LLqLI91cmk8ASpVymddLthkF7pMiUpy009lztpV+Ayr3x7od4qnRjzo=@vger.kernel.org X-Gm-Message-State: AOJu0YxXjI3W0xl4e6NhghiNkMQ8vVXMCbv8J7hn/C8cJ2NIAJcctPTy aYdWmHafSZjRlw5TXNm9Mq9Wh9Vh3FnFI2Y18zsofLrkzMGV136RdDBy1uUnz1jJpiqXHczDVsK Fx7iTLA== X-Google-Smtp-Source: AGHT+IGwY584L8HLIOsUz9JBoa8Wg3VDjbNSVz3/i5QKeJO85ve+Eaa2Jl7Qu6DVGSrO1M6hCLBlTAxe81E= X-Received: from pjx16.prod.google.com ([2002:a17:90b:5690:b0:31e:cee1:4d04]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:da83:b0:242:9bc4:f1c7 with SMTP id d9443c01a7336-2430d225e40mr34636395ad.54.1755068879883; Wed, 13 Aug 2025 00:07:59 -0700 (PDT) Date: Wed, 13 Aug 2025 07:07:22 +0000 In-Reply-To: <20250812125155.3808-4-richardbgobert@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250812125155.3808-4-richardbgobert@gmail.com> X-Mailer: git-send-email 2.51.0.rc0.205.g4a044479a3-goog Message-ID: <20250813070758.120210-1-kuniyu@google.com> Subject: Re: [PATCH net-next v5 3/5] net: vxlan: bind vxlan sockets to their local address if configured From: Kuniyuki Iwashima To: richardbgobert@gmail.com Cc: andrew+netdev@lunn.ch, daniel@iogearbox.net, davem@davemloft.net, donald.hunter@gmail.com, dsahern@kernel.org, edumazet@google.com, horms@kernel.org, idosch@nvidia.com, jacob.e.keller@intel.com, kuba@kernel.org, linux-kernel@vger.kernel.org, martin.lau@kernel.org, menglong8.dong@gmail.com, netdev@vger.kernel.org, pabeni@redhat.com, petrm@nvidia.com, razor@blackwall.org, shuah@kernel.org Content-Type: text/plain; charset="UTF-8" From: Richard Gobert Date: Tue, 12 Aug 2025 14:51:53 +0200 > diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c > index 15fe9d83c724..12da9595436e 100644 > --- a/drivers/net/vxlan/vxlan_core.c > +++ b/drivers/net/vxlan/vxlan_core.c > @@ -78,18 +78,34 @@ static inline bool vxlan_collect_metadata(struct vxlan_sock *vs) > } > > /* Find VXLAN socket based on network namespace, address family, UDP port, > - * enabled unshareable flags and socket device binding (see l3mdev with > - * non-default VRF). > + * bound address, enabled unshareable flags and socket device binding > + * (see l3mdev with non-default VRF). > */ > static struct vxlan_sock *vxlan_find_sock(struct net *net, sa_family_t family, > - __be16 port, u32 flags, int ifindex) > + __be16 port, u32 flags, int ifindex, > + union vxlan_addr *saddr) > { > struct vxlan_sock *vs; > > flags &= VXLAN_F_RCV_FLAGS; VXLAN_F_LOCALBIND seems to be cleared ? > > hlist_for_each_entry_rcu(vs, vs_head(net, port), hlist) { > - if (inet_sk(vs->sock->sk)->inet_sport == port && > + struct sock *sk = vs->sock->sk; > + struct inet_sock *inet = inet_sk(sk); > + > + if (flags & VXLAN_F_LOCALBIND) { Does selftest exercise this path ? > + if (family == AF_INET && > + inet->inet_rcv_saddr != saddr->sin.sin_addr.s_addr) > + continue; > +#if IS_ENABLED(CONFIG_IPV6) > + else if (family == AF_INET6 && > + ipv6_addr_cmp(&sk->sk_v6_rcv_saddr, > + &saddr->sin6.sin6_addr) != 0) > + continue; > +#endif > + } > + > + if (inet->inet_sport == port && > vxlan_get_sk_family(vs) == family && > vs->flags == flags && > vs->sock->sk->sk_bound_dev_if == ifindex)