From patchwork Mon Aug 3 22:54:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Salvaterra X-Patchwork-Id: 1340582 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=t1yDE06f; 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=DDqkZHEI; 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 4BLCtX3bNtz9sR4 for ; Tue, 4 Aug 2020 08:56:36 +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=FbavZXijVo2qEjuBo4TkAcFnBRcf2OcPTv+RBGNotp0=; b=t1yDE06fZQFm/NRFLLQhCNvl63 eb12cEQY4iZBxSnjmAUpv+6f4ANkorscxyf8Wek7EvGKu0W1ffUmdCWbZSRqzlN46G/mlXe1gDR7l ode45I0lF6YTqG5aZqt/sV9MlhMnV6RY2GvlJm/voDJdnm2YnEXa1X5EDwjNUzJMtZ/aQj+KfbpvI KZcDCSsNiao9RhxzAjd9tlotkxcjIwpuUG41pk2Gv8oy7uZNYWdUP2uwOcUWAiVeYP+jGE1OKuhdk OVKrtArHNImL7UMZhwmUJ8CensfiV79c5L4DoSVZ9qJeGbtctCVrRyiI6H1JvCV5Yjs3dr3oFYTNe pfXma6xw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k2jMH-0000aO-Fz; Mon, 03 Aug 2020 22:55:05 +0000 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k2jMF-0000Zn-9b for openwrt-devel@lists.openwrt.org; Mon, 03 Aug 2020 22:55:04 +0000 Received: by mail-pg1-x544.google.com with SMTP id g33so3600521pgb.4 for ; Mon, 03 Aug 2020 15:55:00 -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=5/06vniP+AlUzxfz63OKf45nrV2VsXbDWkaoUs1vk48=; b=DDqkZHEIh9GJ6E5Be0Qcrw7YL3FQ7PvFCgDNv8v46TsD0hZpYWeD4nNPYagEVpA5Xz C4VsOAYJhq/kswO4J0C/h0Eq+WFiQb8BKSwnBXU6FyY3NSFRqPBj7rn9wv14ma4lu4U1 ML2DWXrPNGjZ85qdR82Zgf8hLWSAjFpcu+SOmGBK7VmYvf+OorYfJntRPLOWi+9bcgDT c5alJezRs8oPLUJr4dz/bODWNIaYZ28oD2udbskpBhWpwe2EllgUJ+FxdVE2wBzZMAHV eSVaj1d0SWDOTYaP5IEiritQ1ylYk3bMjflvl0mCrfYVRHM0ewECPZnwwalC2G5k8Z5J gwbg== 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=5/06vniP+AlUzxfz63OKf45nrV2VsXbDWkaoUs1vk48=; b=Ry+rKTnnKywOkurH435dQk822MRLEB3mwTfyg60/Shw36rnwZX8RkxNsWLjdtx59/k VZTrkgkwgcmdblmCmYl1P4vw4XtnXYbwMyy4vzaPAJrqBy1D41F6rFlvlTG9tReYO0qu AO8xWHHv87kh6mQtLD92aGqY68zfBDf7tdokfDjTmvqSJmYGBxoeiriH/rWERJtM1JX8 9u+bMWReO18FrGBwfKIhLHFRbR73lhewk5mfF5zUqo88L7ISSLMCvrQ5NGfZTxU2HvYg b6grkEqO6sSVfE7e21lx2bwut6KnDbDo16T9dkxL3LGnE5b93ohBM7TXkEW6ajiPmLoZ 6Buw== X-Gm-Message-State: AOAM530c7igS+ZTbD6xjMn1o4x+JpWlYMA1jiRYliLPOGlKQGVl9v993 mzOhE3ZUzvUVgTmhDS1COmgv1mw= X-Google-Smtp-Source: ABdhPJyEJweyJBBWemYD/X8DOptg1vET6DD40XndK3amC3mnsUlB3xFspMqqkDJ8GlVZzpb1rDr3FA== X-Received: by 2002:a63:b51e:: with SMTP id y30mr16029150pge.395.1596495299020; Mon, 03 Aug 2020 15:54:59 -0700 (PDT) Received: from localhost.localdomain (a85-139-207-172.cpe.netcabo.pt. [85.139.207.172]) by smtp.gmail.com with ESMTPSA id k23sm19036249pgb.92.2020.08.03.15.54.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2020 15:54:58 -0700 (PDT) From: Rui Salvaterra To: openwrt-devel@lists.openwrt.org Subject: [PATCH] busybox: fix fwmark and add fwmask support to ip rule Date: Mon, 3 Aug 2020 23:54:45 +0100 Message-Id: <20200803225445.152283-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-20200803_185503_372952_0F97BD03 X-CRM114-Status: GOOD ( 17.27 ) 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:544 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 --- .../302-ip-rule-add-support-for-fwmask.patch | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 package/utils/busybox/patches/302-ip-rule-add-support-for-fwmask.patch 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 +