From patchwork Thu Jan 10 14:25:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 1022956 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="e+uSteXo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43b7Zq4Lxjz9sCs for ; Fri, 11 Jan 2019 01:25:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728902AbfAJOZx (ORCPT ); Thu, 10 Jan 2019 09:25:53 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:37966 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728191AbfAJOZu (ORCPT ); Thu, 10 Jan 2019 09:25:50 -0500 Received: by mail-wm1-f66.google.com with SMTP id m22so12314847wml.3 for ; Thu, 10 Jan 2019 06:25:48 -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=qt/JVqnKpE6WT3N5Cq8SYedH8jeFW6IHkCF1PNL6ckg=; b=e+uSteXoOOWkwUkpA+SJoYqiFOJ1CPfN5r2VRAfkWKWFgFZxIq+IB5Gy6pcc4V2skP 7a1xIPfBAer87fcH8vS8NaxePbX/bOD//tZOsQUnHveIGNZr1r+FWHIIX8MGZYToz6xR AcYy/Ll3iQ6aZJPfTHuyITvy9hy/TUHq99h3WfU+rgf/ANDuXQZ3tUHXQCO5Lr8/BKoX gmRDd9M7qU7vB/bVC9zq9mycbM5LAtbftGfkE78QGAkziwdvDzn7aMMNifw5PtXyLPwl rI5u1cIekZuhiSoYl4tWwCjeaPnX7Cu1xNUrY0oI+WfIJy2rJmGJv4zFXqtb2m9p/Jtt XM1g== 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=qt/JVqnKpE6WT3N5Cq8SYedH8jeFW6IHkCF1PNL6ckg=; b=RtylrSL0M7YE3S9QnwYu3YumIUM7Dm67hJZjifyaHEUVfSK4cUfdi7UY5xoZhRjEW9 R/eh4yLUUXe03X2KfcsiXHujoZEK+zmKA5CFWca+oYDkG/Buf3EDmPnLN9DbKbuLXFbL UG/hWF0xD0Tw5MBT8F8ZJ9ynnAHkfYf/n9LNYjlHxAPoS/C3iK+nyXidpiHzLeZgz706 6U/CgrC6zbnFCYxFwU5ymgWrsfqaowVr9L4XF9JifIu17V5TGNVJVBHRRpyyhP/wpfkL Ie8WZBK/IyWB+zHaj1VQeNnge0U23zAUdpKs37T/tkNZB/wyQVa6ahwaFeV3WIR31WAy L2Dw== X-Gm-Message-State: AJcUukcF0g3c2JfGl/cOFJ04jq1someCQzDxCQWWxbzlaaEeUmNgo9yv +sY1I2lo5Vy5b6CBn/bPVHcY/qra X-Google-Smtp-Source: ALg8bN7V3qSneDgKyCT4zol5av/lPICf8eihpLSPA5uLuMgxiK/YZ7DI9kdHRSoKX5pvM75DTvL5UA== X-Received: by 2002:a7b:cd85:: with SMTP id y5mr9658586wmj.129.1547130346929; Thu, 10 Jan 2019 06:25:46 -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 a62sm14539812wmf.47.2019.01.10.06.25.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jan 2019 06:25:46 -0800 (PST) From: David Herrmann To: netdev@vger.kernel.org Cc: davem@davemloft.net, teg@jklm.no, David Herrmann Subject: [PATCH 2/3] net/ipv4/udp_tunnel: prefer SO_BINDTOIF over SO_BINDTODEVICE Date: Thu, 10 Jan 2019 15:25:28 +0100 Message-Id: <20190110142529.14315-2-dh.herrmann@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190110142529.14315-1-dh.herrmann@gmail.com> References: <20190110142529.14315-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_BINDTOIF to avoid temporarily resolving the device-name just to look it up in the ioctl again. Signed-off-by: David Herrmann Reviewed-by: Tom Gundersen --- net/ipv4/udp_tunnel.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/net/ipv4/udp_tunnel.c b/net/ipv4/udp_tunnel.c index be8b5b2157d8..5d26c501da3b 100644 --- a/net/ipv4/udp_tunnel.c +++ b/net/ipv4/udp_tunnel.c @@ -21,18 +21,9 @@ int udp_sock_create4(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_BINDTOIF, + (void *)&cfg->bind_ifindex, + sizeof(cfg->bind_ifindex)); if (err < 0) goto error; }