From patchwork Tue Jan 15 13:42:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 1025184 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="IgeVx6fy"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fBP858RJz9sBQ for ; Wed, 16 Jan 2019 00:43:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729825AbfAONnH (ORCPT ); Tue, 15 Jan 2019 08:43:07 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:46979 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729370AbfAONnG (ORCPT ); Tue, 15 Jan 2019 08:43:06 -0500 Received: by mail-wr1-f68.google.com with SMTP id l9so2950853wrt.13 for ; Tue, 15 Jan 2019 05:43:04 -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=K3m1i0UMfTa4Fvk61ZdAjfUBd/S5v6yyxQWfax7CAJc=; b=IgeVx6fyq6W3D0IFDaQawMO5zMyuZIOU5G22zFDmYQtAhs2u5q/Sgdi2VyZVhso0+V kWndmEDcLXW8q+OxE5wQ7N43xgTcLOwxS0f/uv32lsjZr6HM8hmCt7MDduIrLZ7R4mng lscQsipqMIUrMqTw3D3p83npglVZ06tajG1tFTYKiXkn2QwjXfw06M1hlcZXrzzY6y3U EmYbNSRvQcrccRiRUto+JseH2/qKURaaIcBWNlV7edB99MX8t5v7V2Wn4VwuBfSjyinf 1X7bj/EKunHj+ExsZ0rwJFgnd7a8fceo4B3ELUUl0r8FPL511sEXYZ9rMwAuT2EkT2On DoEQ== 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=K3m1i0UMfTa4Fvk61ZdAjfUBd/S5v6yyxQWfax7CAJc=; b=ex42i4GX3kIhBRvU5WNjFrSIQy2mhI+oYgOcPChvKc4v9bAq1cz0WPm5NqZ9kjisGW W0cXXX7r9LgwLs7r63wkkRLfyjt+9LYYK4bxcXRyTR48G6hBXzm2D/yPOR2/tdj0ytnJ NWzsID829ED2vNUteU+/Qdc8w0fIhsLti3TGfg8dDbuD7X1sQ7/hCusBcWFDs3r4QPd5 DxrnLotadwpbisLGWP0iIsurofQx7aMt/kSTATopA2sk9rXU2ZihpZqY6F1COowlUdpY DYo0f8yL3WkYp26PUNvaD63ggGJZ16Mpb7hBsCa9+pBlSkCg+0G9YEhlI/6K6Hr/ZI39 V18g== X-Gm-Message-State: AJcUukc24vnB9VsSACiw3FOd+NkWN82E5HQrSus0mgmS7eN5frCJODkf 7aQ+bxtDRERgFw1OoIvgSDJBx12b X-Google-Smtp-Source: ALg8bN7FNZHhwtoOk48cjn4L+Ypf8Frbbw+sanxpQ/RQ1fXcEJRkRTwfJ6AQ9w3UWbx48aB3CWPgUg== X-Received: by 2002:adf:b595:: with SMTP id c21mr3088421wre.125.1547559783816; Tue, 15 Jan 2019 05:43:03 -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.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Jan 2019 05:43:02 -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 2/3] net/ipv4/udp_tunnel: prefer SO_BINDTOIFINDEX over SO_BINDTODEVICE Date: Tue, 15 Jan 2019 14:42:15 +0100 Message-Id: <20190115134216.1757-2-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/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..e93cc0379201 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_BINDTOIFINDEX, + (void *)&cfg->bind_ifindex, + sizeof(cfg->bind_ifindex)); if (err < 0) goto error; }