From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 581DCC433F5 for ; Thu, 17 Feb 2022 07:47:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235247AbiBQHrS (ORCPT ); Thu, 17 Feb 2022 02:47:18 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:40432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234942AbiBQHrR (ORCPT ); Thu, 17 Feb 2022 02:47:17 -0500 Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE21A24BF6 for ; Wed, 16 Feb 2022 23:47:02 -0800 (PST) Received: by mail-pl1-x642.google.com with SMTP id u5so3995918ple.3 for ; Wed, 16 Feb 2022 23:47:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8SHJLuV4zLjy32ezYei5WUPkDFEPwVswbW0SFXhjfXM=; b=jCE9lMaGtc0i0nhWVa+nlW4IPKKYTdeBxCmc90tH8B9jtnEvupKxa3iiuEUPHNbpcL kSpD41f0D73WUUUxcNwHKMOlXxWSWrqd8MN2MdLSUJta8h/Bie5XN0YjOGL8B4D86uN2 IE4IjBWnXd13ZWP97Orpvr6g+GFtZuY4mBvte2OWHN9UmsDiuifw4EXUE7nCbl63v9rR zlspIXXDUyVQNewYnXJz4mLhBEpGmOPN6unlMAKht1lk1xXudkRhdcYBkeOO4yaFUSKO JFIIrVFQCo7MZ2BF4t702GpIj6klbRQsL7g1vZW1S8zhEBZUO/JppR8BQN3UHG3ee++w YLlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8SHJLuV4zLjy32ezYei5WUPkDFEPwVswbW0SFXhjfXM=; b=dEqLlDvFwiBlIrkUJ3KaWHabebTjE+rSc9KkZZraFeFJAPwpsgk4aAHwTWEPNGvFsh P7zvVdkxFSf4/Hd3Ih0y4eiRNj/fe9gs7wr7e3Ml+oEfyJXnz8lIOkBnFJQb6bkmrJQU /DAgl6bCrIvtApvgV73FZHrPROrgAT8oAz8M0Yk586uY84f/XtLi5xH4uXfa5UUM3qfB OtlkdwK//AaB0KeZpIrjXKENPXaiyuGOc5J9fRk5hL8V0jLEKt/lXXx2LWaFDmEcUbJz AxYzSBM6NDe5q57CGznd5LkFNj0tRdJisf4iLwvqisvWb6dpxOsHvMVZTLEIabIpaCqM bsbw== X-Gm-Message-State: AOAM533Qgg3nOMVmCEWP5JKRIvwnQA3iDxJcVzOmSg8st3whd8zToR8g j41zXIoU72RgkJRX45378MU= X-Google-Smtp-Source: ABdhPJztmuDk6uFYZ/KXMHd3RkB6HYI7/EAUVDJVNXB+080qOeJ0/4Dk6IYYjYsASWGAdsoSVkSP8A== X-Received: by 2002:a17:90a:5794:b0:1b9:8932:d475 with SMTP id g20-20020a17090a579400b001b98932d475mr1836973pji.24.1645084022335; Wed, 16 Feb 2022 23:47:02 -0800 (PST) Received: from mhl-ubstemp.MHLLAN ([115.187.43.205]) by smtp.gmail.com with ESMTPSA id rm8sm757393pjb.5.2022.02.16.23.46.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Feb 2022 23:47:01 -0800 (PST) From: Mobashshera Rasool To: davem@davemloft.net, oshfuji@linux-ipv6.org, dsahern@kernel.org, kuba@kernel.org, netdev@vger.kernel.org, equinox@opensourcerouting.org, razor@blackwall.org, sharpd@cumulusnetworks.com, mrasool@vmware.com Cc: Mobashshera Rasool Subject: [PATCH] net: ip6mr: add support for passing full packet on wrong mif Date: Thu, 17 Feb 2022 07:46:40 +0000 Message-Id: <20220217074640.4472-1-mobash.rasool.linux@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch adds support for MRT6MSG_WRMIFWHOLE which is used to pass full packet and real vif id when the incoming interface is wrong. While the RP and FHR are setting up state we need to be sending the registers encapsulated with all the data inside otherwise we lose it. The RP then decapsulates it and forwards it to the interested parties. Currently with WRONGMIF we can only be sending empty register packets and will lose that data. This behaviour can be enabled by using MRT_PIM with val == MRT6MSG_WRMIFWHOLE. This doesn't prevent MRT6MSG_WRONGMIF from happening, it happens in addition to it, also it is controlled by the same throttling parameters as WRONGMIF (i.e. 1 packet per 3 seconds currently). Both messages are generated to keep backwards compatibily and avoid breaking someone who was enabling MRT_PIM with val == 4, since any positive val is accepted and treated the same. Signed-off-by: Mobashshera Rasool --- include/uapi/linux/mroute6.h | 1 + net/ipv6/ip6mr.c | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/include/uapi/linux/mroute6.h b/include/uapi/linux/mroute6.h index a1fd6173e2db..1d90c21a6251 100644 --- a/include/uapi/linux/mroute6.h +++ b/include/uapi/linux/mroute6.h @@ -134,6 +134,7 @@ struct mrt6msg { #define MRT6MSG_NOCACHE 1 #define MRT6MSG_WRONGMIF 2 #define MRT6MSG_WHOLEPKT 3 /* used for use level encap */ +#define MRT6MSG_WRMIFWHOLE 4 /* For PIM Register and assert processing */ __u8 im6_mbz; /* must be zero */ __u8 im6_msgtype; /* what type of message */ __u16 im6_mif; /* mif rec'd on */ diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 0ebaaec3faf9..a9775c830194 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -1040,7 +1040,7 @@ static int ip6mr_cache_report(struct mr_table *mrt, struct sk_buff *pkt, int ret; #ifdef CONFIG_IPV6_PIMSM_V2 - if (assert == MRT6MSG_WHOLEPKT) + if (assert == MRT6MSG_WHOLEPKT || assert == MRT6MSG_WRMIFWHOLE) skb = skb_realloc_headroom(pkt, -skb_network_offset(pkt) +sizeof(*msg)); else @@ -1056,7 +1056,7 @@ static int ip6mr_cache_report(struct mr_table *mrt, struct sk_buff *pkt, skb->ip_summed = CHECKSUM_UNNECESSARY; #ifdef CONFIG_IPV6_PIMSM_V2 - if (assert == MRT6MSG_WHOLEPKT) { + if (assert == MRT6MSG_WHOLEPKT || assert == MRT6MSG_WRMIFWHOLE) { /* Ugly, but we have no choice with this interface. Duplicate old header, fix length etc. And all this only to mangle msg->im6_msgtype and @@ -1068,8 +1068,11 @@ static int ip6mr_cache_report(struct mr_table *mrt, struct sk_buff *pkt, skb_reset_transport_header(skb); msg = (struct mrt6msg *)skb_transport_header(skb); msg->im6_mbz = 0; - msg->im6_msgtype = MRT6MSG_WHOLEPKT; - msg->im6_mif = mrt->mroute_reg_vif_num; + msg->im6_msgtype = assert; + if (assert == MRT6MSG_WRMIFWHOLE) + msg->im6_mif = mifi; + else + msg->im6_mif = mrt->mroute_reg_vif_num; msg->im6_pad = 0; msg->im6_src = ipv6_hdr(pkt)->saddr; msg->im6_dst = ipv6_hdr(pkt)->daddr; @@ -1650,6 +1653,7 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, sockptr_t optval, mifi_t mifi; struct net *net = sock_net(sk); struct mr_table *mrt; + bool do_wrmifwhole; if (sk->sk_type != SOCK_RAW || inet_sk(sk)->inet_num != IPPROTO_ICMPV6) @@ -1763,12 +1767,15 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, sockptr_t optval, return -EINVAL; if (copy_from_sockptr(&v, optval, sizeof(v))) return -EFAULT; + + do_wrmifwhole = (v == MRT6MSG_WRMIFWHOLE); v = !!v; rtnl_lock(); ret = 0; if (v != mrt->mroute_do_pim) { mrt->mroute_do_pim = v; mrt->mroute_do_assert = v; + mrt->mroute_do_wrvifwhole = do_wrmifwhole; } rtnl_unlock(); return ret; @@ -2144,6 +2151,9 @@ static void ip6_mr_forward(struct net *net, struct mr_table *mrt, MFC_ASSERT_THRESH)) { c->_c.mfc_un.res.last_assert = jiffies; ip6mr_cache_report(mrt, skb, true_vifi, MRT6MSG_WRONGMIF); + if (mrt->mroute_do_wrvifwhole) + ip6mr_cache_report(mrt, skb, true_vifi, + MRT6MSG_WRMIFWHOLE); } goto dont_forward; } -- 2.25.1