From patchwork Tue Apr 18 14:33:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 84896 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2909979vqo; Tue, 18 Apr 2023 07:50:13 -0700 (PDT) X-Google-Smtp-Source: AKy350ZdBJQVRag2RIzYgz43lNrrTExD2vJOyN8XSPGMiW8HSpM8YmyEhG+96hruqD4oH9kgyQAn X-Received: by 2002:a05:6a21:1789:b0:ee:c9a4:7e0b with SMTP id nx9-20020a056a21178900b000eec9a47e0bmr26630pzb.23.1681829413649; Tue, 18 Apr 2023 07:50:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681829413; cv=none; d=google.com; s=arc-20160816; b=YNW0ZFO077WhMeQ3KyI6RNJdkWsZk3z2YMqWyBSep4vOTKNkIGhqvvlwzurBols1RA /3cRbMVQMSFPXXgk6inmIq/1CssqMLJXbGjTuDKzHSo3I/BIl+cRLUuaceRCrqwi9117 xv0r0d+Ob3pJDL0ox3GJZQwRmhjnI2cWcgdHdMc8ldlsRF0XXKr4Cuj8hoqq6FrXpXxT gbwB/wCX+q5ysi4j203j6hr/bi8oOCrkJhqiJ2s3JtaXswNFWZPQEHqaZ2/5eiOd6KaS qDCRvyO/Tp1WfEP1a4yy9YVxWcod+bOEniBnOINnqeqdQRIbLSNffedJYqzOIS+JFwZZ oOIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:content-disposition:mime-version :mail-followup-to:message-id:subject:cc:to:from:date; bh=aaFYRz0Qaw8ywawPvKVyJDDditmfIOjCE1wTC6vqrZQ=; b=0amZCz/t+ytY9mQDhwlbQ6J720q8aC7TnZL/4fsdzb0AOvun3jZ4+t2JTwjpqsEN3l 5xFdfheA12HwuS5GUGLbt/bPRZz8daFi6nFHtQYHi9e3JYqkb13BMoNkwhlduQQla23g XAPGCqwnZYrwrVA4pUaHpKkb0ikmzklpb4seVgSXzLb2CJVWRkcsurgBRWuxWYxaz2BS xy7q3QCvlH+dACTQKYY2pU5Jovl4hEoR1K9ozRirOTx/JaDmIFyqhSg3dHkc6nDG12Dq brR9rbwl1Q/vwbnzdi68gF1HgWsadU/UFiFnGkQpwVfvxgb4jWUWNtpdtWNtUgF3Fiqq X0pw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i12-20020a65484c000000b0051b37c000dcsi13689443pgs.81.2023.04.18.07.49.59; Tue, 18 Apr 2023 07:50:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231774AbjDROdP (ORCPT + 99 others); Tue, 18 Apr 2023 10:33:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231384AbjDROdO (ORCPT ); Tue, 18 Apr 2023 10:33:14 -0400 Received: from sonata.ens-lyon.org (sonata.ens-lyon.org [140.77.166.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3ADED83FC; Tue, 18 Apr 2023 07:33:13 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id C82DA2018B; Tue, 18 Apr 2023 16:33:11 +0200 (CEST) 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 ggrempUKGqz6; Tue, 18 Apr 2023 16:33:11 +0200 (CEST) Received: from begin (unknown [109.190.253.11]) (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 95A4520181; Tue, 18 Apr 2023 16:33:11 +0200 (CEST) Received: from samy by begin with local (Exim 4.96) (envelope-from ) id 1pomOJ-00C9qp-0h; Tue, 18 Apr 2023 16:33:07 +0200 Date: Tue, 18 Apr 2023 16:33:07 +0200 From: Samuel Thibault To: James Chapman , tparkin@katalix.com, edumazet@google.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: [PATCHv2] PPPoL2TP: Add more code snippets Message-ID: <20230418143307.hth4yjkopy5se4md@begin> Mail-Followup-To: Samuel Thibault , James Chapman , tparkin@katalix.com, edumazet@google.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 MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20170609 (1.8.3) X-Spam-Status: No, score=1.4 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_SBL_CSS,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: * X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763380903349162506?= X-GMAIL-MSGID: =?utf-8?q?1763525959002533179?= 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 Documentation/networking/l2tp.rst | 97 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 93 insertions(+), 4 deletions(-) --- a/Documentation/networking/l2tp.rst +++ b/Documentation/networking/l2tp.rst @@ -387,11 +387,16 @@ Sample userspace code: - Create session PPPoX data socket:: struct sockaddr_pppol2tp sax; - int fd; + int session_fd; + int ret; /* Note, the tunnel socket must be bound already, else it * will not be ready */ + session_fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OL2TP); + if (session_fd < 0) + return -errno; + sax.sa_family = AF_PPPOX; sax.sa_protocol = PX_PROTO_OL2TP; sax.pppol2tp.fd = tunnel_fd; @@ -406,11 +411,95 @@ 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:: + + 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 0; + + return ppp_chan_fd; + +Non-data PPP frames will be available for read on `ppp_chan_fd`. + + - Create PPP interface:: + + int ppp_if_fd; + int ifunit = -1; + + ppp_if_fd = open("/dev/ppp", O_RDWR); + if (ppp_chan_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 ppp_chan_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. + + - L2TP session bridging (also called L2TP tunnel switching or L2TP multihop) +is supported by bridging the ppp channels of the two L2TP sessions to be +bridged:: + + int chindx1; + int chindx2; + int ppp_chan_fd; + + ret = ioctl(session_fd1, PPPIOCGCHAN, &chindx1); + if (ret < 0) + return -errno; + + ret = ioctl(session_fd2, PPPIOCGCHAN, &chind2x); + if (ret < 0) + return -errno; + + ppp_chan_fd = open("/dev/ppp", O_RDWR); + 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; + +See more details for the PPP side in ppp_generic.rst. Old L2TPv2-only API -------------------