From patchwork Thu Jan 10 14:25:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 1022955 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="n7zFGjSx"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43b7Zm4TCJz9sDL for ; Fri, 11 Jan 2019 01:25:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728891AbfAJOZv (ORCPT ); Thu, 10 Jan 2019 09:25:51 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:54795 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727768AbfAJOZt (ORCPT ); Thu, 10 Jan 2019 09:25:49 -0500 Received: by mail-wm1-f67.google.com with SMTP id a62so11456755wmh.4 for ; Thu, 10 Jan 2019 06:25:49 -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=c4s/UeBNJyzkc46ir9reiIXRjKNXrptY4vgCWcinp4I=; b=n7zFGjSxQ/uuD7KMYVXBg/udajkGwdHnpDXLnD4Vv2MwFFXAmqy+S/bDCDQpmbIgoI uDUck6b7MNq4LIwmW2bSdt7YEu73vV98JgoHyTRTubNhfBpb22z3T/5nR+PXjq1C1+F4 B4nY5Abms6+g38bw/lvq00OwhAxF11jVCzBBn3446i89ZonNRsD+V38oOMcW7DqvG1rb dyFUPyBwYWKJ7S8S5gJvuG/k6X8T3CmO5nY19xQf3optLtBnUdC6No+m8SoVXfjNE6nE LmbQP+ZtDkqSy8Uj74j6ygbNbW7bTRxnOmNZ+wcKlJ4WaWt+286ygjoy1lBLDDMZz9YZ vD2Q== 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=c4s/UeBNJyzkc46ir9reiIXRjKNXrptY4vgCWcinp4I=; b=L5flWVTeddj37l7w4I1GJAAvJr+1q726AY8627/hVtAvAwRCYk0S1xzWpg3XNb07xI 5lbUHNG60xXCOE9DQ2V3uhKN2pvtrSlTwcqq4l8rUaxEU0bqfhitKYHFcGHztPOntQdC vQfrccCnzrsh8Xe5m52eeF1xMo+q/VNPeFJBIfQDVRs+fYbbDAV2mefLA8MUdzIC68Ht WfemlMjC7EWr1AC/l8uJnq1+x17cMsZJL2KF2qTF3HpmLtTLOc4UjOL1TTQduTfLhyAi uYBHRtnZMlajX7uHs9R9Tv5cyDZRBK0qkMjFmDJ58vnc7YK69FblzDJP2u+VtBK0deN7 hUhg== X-Gm-Message-State: AJcUukcl/n6nN9wX5Tu3Gs9sPC4y7Boso2xPyPkWlz/synpV3X6bAGEC r1pdA1tQcEnrdDLoQbqvDr5RB++j X-Google-Smtp-Source: ALg8bN4nE861JRcQYOOXhv9xlCXvsiVimzjjrsqfwnIU0SCkpGaUMA5uiMHztfNCJDUqrnmDRey7tA== X-Received: by 2002:a1c:c70f:: with SMTP id x15mr10056384wmf.130.1547130348180; Thu, 10 Jan 2019 06:25:48 -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.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jan 2019 06:25:47 -0800 (PST) From: David Herrmann To: netdev@vger.kernel.org Cc: davem@davemloft.net, teg@jklm.no, David Herrmann Subject: [PATCH 3/3] net/ipv6/udp_tunnel: prefer SO_BINDTOIF over SO_BINDTODEVICE Date: Thu, 10 Jan 2019 15:25:29 +0100 Message-Id: <20190110142529.14315-3-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/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..f5fd4e05ae81 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_BINDTOIF, + (void *)&cfg->bind_ifindex, + sizeof(cfg->bind_ifindex)); if (err < 0) goto error; }