From patchwork Mon Feb 12 22:23:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 200086 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp198572dyb; Mon, 12 Feb 2024 14:24:12 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWURGkkAa4AzeMrTdReymw7O8AFt8IPlPQCcMcEcPb/dVF8rW4Io5hOhGQAO4EjdbFLnoRPm0amOx7JkWnRBFbnglpc9A== X-Google-Smtp-Source: AGHT+IEUuGGyAOJoWPgbAc5ZXk+XJIip17dbrrGYzfZLmmC2Js+Sd28A6ym8K1g74L1Eb2Vu+8RV X-Received: by 2002:a25:97c8:0:b0:dc2:470b:887e with SMTP id j8-20020a2597c8000000b00dc2470b887emr7023248ybo.21.1707776652447; Mon, 12 Feb 2024 14:24:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707776652; cv=pass; d=google.com; s=arc-20160816; b=vM8QQzyxleya7EUXDvFRlxK1NsxcCzIMh3JRfFs2JP+z5+IxfFSmFGp3uIyd/XLyu1 tCcstmxN28N+cIkmShLz2QFfHwifh0NUgs2ZDJz8ruMuchYwpLyDOH/5yjJ8wvRkQAHe NY9N45JE6mNyb6fCrNQIFNRLQ3kZJVplN2ZI5i0u3YUTffqv1yRj0qslofnOozF/0egQ R+HFMQw1uZbutSznMoXFBEpaOkdVfh/UznSF302uiPjd6TcchDmfF74VlYgeoPRXSTTH cc7mYsmydysTmnYn3yEnARUNkHYANtVSFMEqGWBxtJYfLgmnDoB368Y5/RsC3BHm+aB/ dJIg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:content-disposition:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:mail-followup-to:message-id :subject:cc:to:from:date; bh=E/vUjFwed3VkOnpNuDIJ9bHcpPmrKL7dkCev6m68zTU=; fh=KSkhiCRFAuZ3Vve/1NYbam8iVu1LY7O8NWaZ/n+J7aw=; b=yfN39CNncW7kKDJUMNk2NQWk6k9Jh6gUYw7wNGskhUqNyndQDdGay+PHvwMUAHEC+b vxCV5dNta7iRkLjj+5V9/hn31PdBFXWKGz7e2Db9Wv3jDEEeBsvZLzQmQ+MmFlCnFAlP KdWkuZOvmNzGh6FFBwZbe/GuN9AYf+t5oD482SgamQpAL+He+VYVzlnypRfrTzffZ287 R2d6y+vf3/dFxLrLbJ7eT/MXo9aO5h3HqyU4tJ7y/NMRSlMjOQhY6KSaKz/cIvBSi+BJ gyuVvSj4iUORf/3qcrj/SUvVVuVsJ0nJXt9b9D79DNElhypb5j91Y2O7pH6e6PJtHYSL feYQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=bounce.ens-lyon.org); spf=pass (google.com: domain of linux-kernel+bounces-62473-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-62473-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=2; AJvYcCVNwKm+UQXoxC6eB33kpjNnLezRwJUi4zXnbRRNobavZIjIaJv5CaiGiLOllqd0iT8k/Ei3vl3E//ZtL48e+TtRruF0EA== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id jq11-20020ad45fcb000000b0068c945bb71asi256001qvb.315.2024.02.12.14.24.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 14:24:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-62473-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=bounce.ens-lyon.org); spf=pass (google.com: domain of linux-kernel+bounces-62473-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-62473-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 30B721C21B7F for ; Mon, 12 Feb 2024 22:24:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1DDBB4EB2D; Mon, 12 Feb 2024 22:23:52 +0000 (UTC) Received: from sonata.ens-lyon.org (domu-toccata.ens-lyon.fr [140.77.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F386C47A53; Mon, 12 Feb 2024 22:23:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=140.77.166.138 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707776630; cv=none; b=q+YqUqQk3zsi9z0Hy23YVB7L3zgmemphmG8/W4A6Kun4gkOzg7NMKczWRwn7llYyxLlfxD5y970G3PnCHJcQNyzyayXgG5i7BtFo5o52kAJE0nLa2EmS/Tvzd1zmkBivNdpUC/UyOsrxWD6ssCl2e4Bf0PQ37TP8Wq30aR4v7WA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707776630; c=relaxed/simple; bh=rswK67lRPW2w2mGzLlf2hfF9gf8lba3HfNWGCdYFaro=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=VmFEmJ/VtQZqv3d1CAmrUcMD9R4wWDR5T2pCSvBe23ENLZIxEXGcEBZjqN9KVG/faaUN21GmFE1YFZSm5P2x0cdx0G8qyVOwaewiQGCgOss7vc81u+cjyDBzT4Av2NQIYzFxebouu2ZRkp/2jhYg9zZGAj80cuivvnvsU2ZGkaI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org; arc=none smtp.client-ip=140.77.166.138 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id A84B0A02EA; Mon, 12 Feb 2024 23:23:45 +0100 (CET) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IUE8nl6jzjy6; Mon, 12 Feb 2024 23:23:45 +0100 (CET) Received: from begin (aamiens-653-1-111-57.w83-192.abo.wanadoo.fr [83.192.234.57]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id 51E24A02E8; Mon, 12 Feb 2024 23:23:45 +0100 (CET) Received: from samy by begin with local (Exim 4.97) (envelope-from ) id 1rZeiG-0000000GUJD-3Vc3; Mon, 12 Feb 2024 23:23:44 +0100 Date: Mon, 12 Feb 2024 23:23:44 +0100 From: Samuel Thibault To: James Chapman , tparkin@katalix.com, edumazet@google.com, gnault@redhat.com Cc: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, corbet@lwn.net, netdev@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCHv4] PPPoL2TP: Add more code snippets Message-ID: <20240212222344.xtv233r5sixme32h@begin> Mail-Followup-To: Samuel Thibault , James Chapman , tparkin@katalix.com, edumazet@google.com, gnault@redhat.com, davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, corbet@lwn.net, netdev@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20170609 (1.8.3) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790733611432434065 X-GMAIL-MSGID: 1790733611432434065 The existing documentation was not telling that one has to create a PPP channel and a PPP interface to get PPPoL2TP data offloading working. Also, tunnel switching was not mentioned, so that people were thinking it was not supported, while it actually is. Signed-off-by: Samuel Thibault --- Difference from v1: - follow kernel coding style - check for failures - also mention netlink and ip for configuring the link - fix bridging channels Difference from v2: - fix text alignment Difference from v3: - fix some variables references - explicit inputs of the code snippets - explicit that bridging is supported for l2tp with PPP pseudowire type. - explicit that after bridging only the pppox sockets need to be kept - explicit that bridging can also be done with other types of ppp channels --- a/Documentation/networking/l2tp.rst +++ b/Documentation/networking/l2tp.rst @@ -386,12 +386,17 @@ Sample userspace code: - Create session PPPoX data socket:: + /* Input: the L2TP tunnel UDP socket `tunnel_fd`, which needs to be + * bound already, otherwise it will not be ready. */ + struct sockaddr_pppol2tp sax; - int fd; + int session_fd; + int ret; + + session_fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OL2TP); + if (session_fd < 0) + return -errno; - /* Note, the tunnel socket must be bound already, else it - * will not be ready - */ sax.sa_family = AF_PPPOX; sax.sa_protocol = PX_PROTO_OL2TP; sax.pppol2tp.fd = tunnel_fd; @@ -406,11 +411,117 @@ Sample userspace code: /* session_fd is the fd of the session's PPPoL2TP socket. * tunnel_fd is the fd of the tunnel UDP / L2TPIP socket. */ - fd = connect(session_fd, (struct sockaddr *)&sax, sizeof(sax)); - if (fd < 0 ) { + ret = connect(session_fd, (struct sockaddr *)&sax, sizeof(sax)); + if (ret < 0 ) { + close(session_fd); + return -errno; + } + + return session_fd; + +L2TP control packets will still be available for read on `tunnel_fd`. + + - Create PPP channel:: + + /* Input: the session PPPoX data socket session_fd which was created as + * described above. */ + + int chindx; + int ppp_chan_fd; + + ret = ioctl(session_fd, PPPIOCGCHAN, &chindx); + if (ret < 0) + return -errno; + + ppp_chan_fd = open("/dev/ppp", O_RDWR); + if (ppp_chan_fd < 0) + return -errno; + + ret = ioctl(ppp_chan_fd, PPPIOCATTCHAN, &chindx); + if (ret < 0) { + close(ppp_chan_fd); + return -errno; + } + + return ppp_chan_fd; + +LCP PPP frames will be available for read on `ppp_chan_fd`. + + - Create PPP interface:: + + /* Input: the PPP channel ppp_chan_fd which was created as described + * above */ + + int ppp_if_fd; + int ifunit = -1; + + ppp_if_fd = open("/dev/ppp", O_RDWR); + if (ppp_if_fd < 0) + return -errno; + + ret = ioctl(ppp_if_fd, PPPIOCNEWUNIT, &ifunit); + if (ret < 0) { + close(ppp_if_fd); + return -errno; + } + + ret = ioctl(ppp_chan_fd, PPPIOCCONNECT, ifunit); + if (ret < 0) { + close(ppp_if_fd); return -errno; } - return 0; + + return ppp_if_fd; + +IPCP/IPv6CP PPP frames will be available for read on `ppp_if_fd`. + +The ppp interface can then be configured as usual with netlink's +RTM_NEWLINK, RTM_NEWADDR, RTM_NEWROUTE, or ioctl's SIOCSIFMTU, SIOCSIFADDR, +SIOCSIFDSTADDR, SIOCSIFNETMASK, SIOCSIFFLAGS, or with the `ip` command. + + - Bridging L2TP sessions which have PPP pseudowire types (this is also called + L2TP tunnel switching or L2TP multihop) is supported by bridging the ppp + channels of the two L2TP sessions to be bridged:: + + /* Input: the session PPPoX data sockets session_fd1 and session_fd2 + * which were created as described further above. */ + + int chindx1; + int chindx2; + int ppp_chan_fd; + + ret = ioctl(session_fd1, PPPIOCGCHAN, &chindx1); + if (ret < 0) + return -errno; + + ret = ioctl(session_fd2, PPPIOCGCHAN, &chindx2); + if (ret < 0) + return -errno; + + ppp_chan_fd = open("/dev/ppp", O_RDWR); + if (ppp_chan_fd < 0) { + return -errno; + } + + ret = ioctl(ppp_chan_fd, PPPIOCATTCHAN, &chindx1); + if (ret < 0) { + close(ppp_chan_fd); + return -errno; + } + + ret = ioctl(ppp_chan_fd, PPPIOCBRIDGECHAN, &chindx2); + close(ppp_chan_fd); + if (ret < 0) + return -errno; + +It can be noted that in this case no PPP interface is needed, and the PPP +channel does not need to be kept open. Only the session PPPoX data sockets need +to be kept open. + +More generally, it is also possible in the same way to e.g. bridge a PPPol2tp +ppp channel with other types of ppp channels, such as PPPoE. + +See more details for the PPP side in ppp_generic.rst. Old L2TPv2-only API -------------------