From patchwork Tue Aug 4 08:14:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Salvaterra X-Patchwork-Id: 1340721 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=sSBrkphx; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=rA+UkP6Y; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BLSKC1zmJz9sR4 for ; Tue, 4 Aug 2020 18:17:03 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=IBvT1OOp6nPIYORrOdcEoxwqBNh7PkKf+Xryq8WgD0Y=; b=sSBrkphx4YQvs1yFsnnEXabcPy 5mQXoDAoacnNPzUbLqBswSmCMVfgb3ZKedDaEeokgf9AdtSK/3V8NLVW29hqoND20NIXUFqFsdCmp c9s5GkRnTZZOIL/AY/SwI/5UWnGLQNKjkQR6YU7DpdxWD3SF4p8KsZNuz/zikmU0frwI+xLUk2fDQ 0hj8U9dOMqOUwIhromt7DA7nOGKsBhNrfFgOtptf8CXDleE6moNngzs0vislD4crVLmQYbPFINXME LRs8zvwnyRVRBq6o8PJ2rHqxzVi2oGV0qP6MrSbQbGifB5qgD01/duFeSrFDG6au5KHag2/3Ryhmg QmxKTQ7w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k2s6J-0003M9-V2; Tue, 04 Aug 2020 08:15:12 +0000 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k2s6H-0003LB-MA for openwrt-devel@lists.openwrt.org; Tue, 04 Aug 2020 08:15:10 +0000 Received: by mail-pl1-x636.google.com with SMTP id t10so17090976plz.10 for ; Tue, 04 Aug 2020 01:15:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4kIxafvLd/JbBseIsrTSBe2wnOKpQDmcFrJl6IIk1Sc=; b=rA+UkP6YYsEkuzoMPzBEawWXyhl+/naXRDwC5dOopohxQxCzuvDVF4nOE4suPZMdWC 3arLvDOKNSuj07F2nUu6WQlvdo1LE2uecaEz8UDseKl5kDh+uDIY4lt9r0kl08bKp26j eRDiO4uCNDAY7Si9n3tCjBuS3QhVgIyhLp10f1xYmtD3SB8lOUY4XCxImKdYJTcDmoQp 3hICnZuVAhDlXMXMmEy9ibFgZAjVXSvmAXnhsrvwftpXnC4QGRkvJYgaKk0GWC74UYAm TjeVY++yNrShRP86KMDAN74Y0HWlAnxz8238E1l0J3H4MOf0GFtN+FBbKZbODJeiTKmV 7Emg== 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:mime-version :content-transfer-encoding; bh=4kIxafvLd/JbBseIsrTSBe2wnOKpQDmcFrJl6IIk1Sc=; b=hl1eW8nCKpGx+ygwGEtsjXZ/1rV1SQ3vLNOmfJ/WnLN2WyrAIkJtRBdIPotD7XcQFi poS84seBMGjOLJ5f8XOkQ99EexlomKdIqh38saRJgeLUsgaTRFJFRng+XYdN6MaXjoVI aMX5DNHoUN1hKuDFfbb28gtFTDJzh/9XlC3rS1Dt1NeziQl4IUu6qikuyegwF0tKA2w1 7CBLAxZK7/EaXq3JQ10P46r61qyklrihP9H6mM4QkLd34w7YxCnkIMuehXsMn/nrrWHI AWPURAOwPnmmTaQc9NCXStrS4A7RSBHYH6qU3/NcAV4y2bhI9jgWFxjPJYANedFrL22N E4Lw== X-Gm-Message-State: AOAM531X3/Kdmvy/ZtHypBMtfDNckkrylrBEjjRYsLVymiamCYn5wqrK Y/sdAvOC0DTQnNBfRnibY/qmIFI= X-Google-Smtp-Source: ABdhPJx8cWfaLqgKBHljNFIwoUpj8qR6YsTTWcvfNsT1Yxu24GH1stDarTz4iL6S3FLV4SBhASKEBA== X-Received: by 2002:a17:902:8e89:: with SMTP id bg9mr7938687plb.126.1596528907034; Tue, 04 Aug 2020 01:15:07 -0700 (PDT) Received: from presler.lan (a85-139-207-172.cpe.netcabo.pt. [85.139.207.172]) by smtp.gmail.com with ESMTPSA id z3sm1744790pjn.32.2020.08.04.01.15.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2020 01:15:06 -0700 (PDT) From: Rui Salvaterra To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2] busybox: fix fwmark and add fwmask support to ip rule Date: Tue, 4 Aug 2020 09:14:30 +0100 Message-Id: <20200804081429.1032-1-rsalvaterra@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200804_041509_746070_0DB5E9DE X-CRM114-Status: GOOD ( 17.51 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:636 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rsalvaterra[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rui Salvaterra Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org BusyBox ip (rule) applet supports fwmark for policy routing (albeit through the old and deprecated RTA_PROTOINFO message attribute), but fwmask is completely unsupported. For this reason, mwan3 depends on ip(-tiny), which compiles to over 280 kiB on MIPS32 (-mips16 -mtune=74kc -O2). This pending [1] BusyBox patch modernises the fwmark implementation (using the FRA_FWMARK attribute) and also implements fwmask (FRA_FWMASK) required by mwan3, allowing it to drop its dependecy on ip. Other potential candidates for dropping their ip dependency (relying only on BusyBox ip) are shadowsocks-libev, strongswan and vpn-policy-routing. [1] http://lists.busybox.net/pipermail/busybox/2020-July/088164.html Signed-off-by: Rui Salvaterra --- package/utils/busybox/Makefile | 2 +- .../302-ip-rule-add-support-for-fwmask.patch | 90 +++++++++++++++++++ 2 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 package/utils/busybox/patches/302-ip-rule-add-support-for-fwmask.patch diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile index 01441d1e87..baf375eb13 100644 --- a/package/utils/busybox/Makefile +++ b/package/utils/busybox/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=busybox PKG_VERSION:=1.31.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_FLAGS:=essential PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/package/utils/busybox/patches/302-ip-rule-add-support-for-fwmask.patch b/package/utils/busybox/patches/302-ip-rule-add-support-for-fwmask.patch new file mode 100644 index 0000000000..abdc309068 --- /dev/null +++ b/package/utils/busybox/patches/302-ip-rule-add-support-for-fwmask.patch @@ -0,0 +1,90 @@ +From f06ac1e49b4a5a57660c7b370a7ebd436981bd89 Mon Sep 17 00:00:00 2001 +From: Rui Salvaterra +Date: Fri, 31 Jul 2020 09:59:40 +0100 +Subject: [PATCH] ip rule: add support for fwmark/fwmask for policy routing + +This adds support for fwmark/fwmask in ip rule which is needed, for example, in +OpenWrt's mwan3. Masks are supported since Linux 2.6.19. + +Fixes: https://bugs.busybox.net/show_bug.cgi?id=11621 + +Signed-off-by: Rui Salvaterra +--- + networking/ip.c | 2 +- + networking/libiproute/iprule.c | 31 +++++++++++++++++++++++++------ + 2 files changed, 26 insertions(+), 7 deletions(-) + +diff --git a/networking/ip.c b/networking/ip.c +index 034ee4fc8..bade93e62 100644 +--- a/networking/ip.c ++++ b/networking/ip.c +@@ -257,7 +257,7 @@ + //usage:#define iprule_trivial_usage + //usage: "[list] | add|del SELECTOR ACTION" + //usage:#define iprule_full_usage "\n\n" +-//usage: " SELECTOR := [from PREFIX] [to PREFIX] [tos TOS] [fwmark FWMARK]\n" ++//usage: " SELECTOR := [from PREFIX] [to PREFIX] [tos TOS] [fwmark FWMARK[/MASK] ]\n" + //usage: " [dev IFACE] [pref NUMBER]\n" + //usage: " ACTION := [table TABLE_ID] [nat ADDR]\n" + //usage: " [prohibit|reject|unreachable]\n" +diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c +index 0ce0dfeef..40a09a4ab 100644 +--- a/networking/libiproute/iprule.c ++++ b/networking/libiproute/iprule.c +@@ -17,8 +17,10 @@ + #include + + /* from : */ +-#define FRA_SUPPRESS_IFGROUP 13 +-#define FRA_SUPPRESS_PREFIXLEN 14 ++#define FRA_FWMARK 10 ++#define FRA_SUPPRESS_IFGROUP 13 ++#define FRA_SUPPRESS_PREFIXLEN 14 ++#define FRA_FWMASK 16 + + #include "ip_common.h" /* #include "libbb.h" is inside */ + #include "rt_names.h" +@@ -117,8 +119,18 @@ static int FAST_FUNC print_rule(const struct sockaddr_nl *who UNUSED_PARAM, + if (r->rtm_tos) { + printf("tos %s ", rtnl_dsfield_n2a(r->rtm_tos)); + } +- if (tb[RTA_PROTOINFO]) { +- printf("fwmark %#x ", *(uint32_t*)RTA_DATA(tb[RTA_PROTOINFO])); ++ ++ if (tb[FRA_FWMARK] || tb[FRA_FWMASK]) { ++ uint32_t mark = 0, mask = 0; ++ ++ if (tb[FRA_FWMARK]) ++ mark = *(uint32_t*)RTA_DATA(tb[FRA_FWMARK]); ++ ++ if (tb[FRA_FWMASK] && ++ (mask = *(uint32_t*)RTA_DATA(tb[FRA_FWMASK])) != 0xFFFFFFFF) ++ printf("fwmark %#x/%#x ", mark, mask); ++ else ++ printf("fwmark %#x ", mark); + } + + if (tb[RTA_IIF]) { +@@ -257,10 +269,17 @@ static int iprule_modify(int cmd, char **argv) + invarg_1_to_2(*argv, "TOS"); + req.r.rtm_tos = tos; + } else if (key == ARG_fwmark) { +- uint32_t fwmark; ++ char *slash; ++ uint32_t fwmark, fwmask; + NEXT_ARG(); ++ if ((slash = strchr(*argv, '/')) != NULL) ++ *slash = '\0'; + fwmark = get_u32(*argv, keyword_fwmark); +- addattr32(&req.n, sizeof(req), RTA_PROTOINFO, fwmark); ++ addattr32(&req.n, sizeof(req), FRA_FWMARK, fwmark); ++ if (slash) { ++ fwmask = get_u32(slash + 1, "fwmask"); ++ addattr32(&req.n, sizeof(req), FRA_FWMASK, fwmask); ++ } + } else if (key == ARG_realms) { + uint32_t realm; + NEXT_ARG(); +-- +2.28.0 +