From patchwork Tue Jan 15 13:42:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 1025185 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OfVejXyt"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fBPB38yDz9sBQ for ; Wed, 16 Jan 2019 00:43:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729829AbfAONnJ (ORCPT ); Tue, 15 Jan 2019 08:43:09 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:44577 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729245AbfAONnH (ORCPT ); Tue, 15 Jan 2019 08:43:07 -0500 Received: by mail-wr1-f68.google.com with SMTP id z5so2965721wrt.11 for ; Tue, 15 Jan 2019 05:43:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HkQn4bG3pISjDbxvsZvRVeGYaPLNxlcaFkxUZcNsh1M=; b=OfVejXytTIhBBxfpULyLiPX0Y/eTTCsDoi6iLQAs+e+R2hjcMN+Bpr7mTrhLMIP0I7 A45J3/a/4MPGRvevHtSauJgHv9qIhA4ZkzZQfzWpSeEHatz1xsDPeOEeVdiOAWw9G6GO Mdl7laPj10eEeMrZXt7ynkwkAEajphYUxM+xjnxdRpyeRYwd7i2XXmHeFuA/TrfGPSOH Vd9fLrr6e4iZCVhY45khknKJRmrZ2lltJ2CjuD3o76He8L2UzXPA825Nua55RXWQZRkH dqLtdN5qZaNbg2GOtWbeGJC1spDG3z4MqE/63eoeZ35F66NkyfCopca2qms6s0LptQnt uXQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HkQn4bG3pISjDbxvsZvRVeGYaPLNxlcaFkxUZcNsh1M=; b=kZQp+mIHwCjPXQ7bhI/Yc4AtJcoQ8D6yz3fXoUaclXBA6JMYn6riTLNQ+pRWV+0n0C 3Uh4RraTgipGK7oavjeBLptWXJZKYXvvSncqnurePgmasmUAvGNOFhR9gqOYt+/kLaPM ZyISyynj9MQDPdXj8ryLbvmLzmPM1sdxFlo8Q3bcHy24URnAWPPs+H69S1ltcLMq6G4l oVVdkDPX+M/LkNUPBS651vQiaAIUTFL0HAumz8GTJcAY65ln/Fw2KJg4D0itzULLcSDD UZe5O2fWqAv2Wzo7rjPNPv3szCqt/YoE2V2YM2gBGq3xVlyu+FmG9vCaeIWXpVZQ5Ow+ iEHA== X-Gm-Message-State: AJcUukdqu4tRAg7oLfG7dANg4fxRQM65EYv2ZmLmigsoFBBkRBZEo4UR 1VKW9ELNzG9Vaz76cXiBejlEA1Q+ X-Google-Smtp-Source: ALg8bN6EggYU8L7nAldOUYDdE+3/CP5TUDEMonU0/S81d5AOIpad/Nj5PIlsHJ6cgWzhc0P0hBJfVA== X-Received: by 2002:a5d:6907:: with SMTP id t7mr3159003wru.226.1547559784975; Tue, 15 Jan 2019 05:43:04 -0800 (PST) Received: from david-x1.fritz.box (p200300C2A71D0D0011DEB1B092EC6547.dip0.t-ipconnect.de. [2003:c2:a71d:d00:11de:b1b0:92ec:6547]) by smtp.gmail.com with ESMTPSA id t4sm81085998wrm.6.2019.01.15.05.43.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Jan 2019 05:43:04 -0800 (PST) From: David Herrmann To: netdev@vger.kernel.org Cc: davem@davemloft.net, David Ahern , Roopa Prabhu , David Herrmann , Tom Gundersen Subject: [PATCH v2 3/3] net/ipv6/udp_tunnel: prefer SO_BINDTOIFINDEX over SO_BINDTODEVICE Date: Tue, 15 Jan 2019 14:42:16 +0100 Message-Id: <20190115134216.1757-3-dh.herrmann@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190115134216.1757-1-dh.herrmann@gmail.com> References: <20190115134216.1757-1-dh.herrmann@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The udp-tunnel setup allows binding sockets to a network device. Prefer the new SO_BINDTOIFINDEX to avoid temporarily resolving the device-name just to look it up in the ioctl again. Reviewed-by: Tom Gundersen Signed-off-by: David Herrmann --- v2: - Rename to SO_BINDTOIFINDEX from SO_BINDTOIF net/ipv6/ip6_udp_tunnel.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/net/ipv6/ip6_udp_tunnel.c b/net/ipv6/ip6_udp_tunnel.c index ad1a9ccd4b44..25430c991cea 100644 --- a/net/ipv6/ip6_udp_tunnel.c +++ b/net/ipv6/ip6_udp_tunnel.c @@ -32,18 +32,9 @@ int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg, goto error; } if (cfg->bind_ifindex) { - struct net_device *dev; - - dev = dev_get_by_index(net, cfg->bind_ifindex); - if (!dev) { - err = -ENODEV; - goto error; - } - - err = kernel_setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, - dev->name, strlen(dev->name) + 1); - dev_put(dev); - + err = kernel_setsockopt(sock, SOL_SOCKET, SO_BINDTOIFINDEX, + (void *)&cfg->bind_ifindex, + sizeof(cfg->bind_ifindex)); if (err < 0) goto error; }