From patchwork Fri Oct 23 16:19:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 288144 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 476A4C4363A for ; Fri, 23 Oct 2020 16:19:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D2691221F9 for ; Fri, 23 Oct 2020 16:19:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="i1Z6icDn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751441AbgJWQTx (ORCPT ); Fri, 23 Oct 2020 12:19:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:54731 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751432AbgJWQTw (ORCPT ); Fri, 23 Oct 2020 12:19:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603469991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=JEpuK5wbf5EappTK6rQ4OSbn1qz2A6hQ1PGrAbTk7j4=; b=i1Z6icDnfpmjs0FiN7oeNtl+MG4NAUS70eHPpPOQr6Ypu6sm1D6HGAehORrfjchGSQ58Bu /VyEF2zvWeUwOWz+MRFniAlYJ20gGmX0K4+DmlVrmpl8hrSgAZHNeSwT/rCtw8EevUaeYm OwYJtrS0B0IGky+IxFneS7vZN5ItFIk= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-28-ySbAQJCyPLiIhAuHzTKPLg-1; Fri, 23 Oct 2020 12:19:48 -0400 X-MC-Unique: ySbAQJCyPLiIhAuHzTKPLg-1 Received: by mail-wr1-f71.google.com with SMTP id i6so757434wrx.11 for ; Fri, 23 Oct 2020 09:19:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=JEpuK5wbf5EappTK6rQ4OSbn1qz2A6hQ1PGrAbTk7j4=; b=NLOp/euwCLkPVCO6TdtgFq5f9wYJUdhJbZMm+IvevGA4bZ6GZ5kPS/l00k/hs2jVn5 2vdmU8t+VIzAwUFk2wIPAfnXcL1aRpORw6K7gp2i5GfaC6OOJiSV0Fw4EOpzYILSdb+N E0E7h87FN45DxtTkAmNH3uhweQn1z+p5JdT7U1CvVhZFkCIfW0ly+QkZeP5JcOvcgdkY FbhW9eKjNXBOGdKdo5bA9KeG43+a8qhswmFoblWupOWEb/YuPnDYbK1cwMQHqlqStP9T MaCcDy9MqDpGlzeNUvS0X2jpVYtXaAc+0ePqNFOlctoqOgx7pRD2QcDO17RFWBPg0zsS +4WA== X-Gm-Message-State: AOAM530UJ18H9ApwKrK0lku/b0UGWkNURRT2rY9Vzt4UplSdiJgl1fEg d/1ZOfCF5v/pNUgSvR1pmKORJQC+s7ElhxX+1fMdupihPxNGBTBWzHW/tjTVJ4DZdiygJG5iV2V rlWp94hPDAangckFv X-Received: by 2002:a1c:9854:: with SMTP id a81mr3249726wme.72.1603469986550; Fri, 23 Oct 2020 09:19:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZqm1RTGWeZAHmj4MXGjlfd/lwg84Tvbw8VauBzDqmQH3RAw47a8ifRkIwd2g4MI5bbpyvqg== X-Received: by 2002:a1c:9854:: with SMTP id a81mr3249706wme.72.1603469986382; Fri, 23 Oct 2020 09:19:46 -0700 (PDT) Received: from pc-2.home (2a01cb058d4f8400c9f0d639f7c74c26.ipv6.abo.wanadoo.fr. [2a01:cb05:8d4f:8400:c9f0:d639:f7c7:4c26]) by smtp.gmail.com with ESMTPSA id t62sm4130429wmf.22.2020.10.23.09.19.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 09:19:45 -0700 (PDT) Date: Fri, 23 Oct 2020 18:19:43 +0200 From: Guillaume Nault To: David Miller , Jakub Kicinski Cc: netdev@vger.kernel.org, Alexander Ovechkin , David Ahern Subject: [PATCH net 1/2] mpls: Make MPLS_IPTUNNEL select NET_MPLS_GSO Message-ID: <5f5132fd657daa503c709b86c87ae147e28a78ad.1603469145.git.gnault@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since commit b7c24497baea ("mpls: load mpls_gso after mpls_iptunnel"), mpls_iptunnel.ko has a softdep on mpls_gso.ko. For this to work, we need to ensure that mpls_gso.ko is built whenever MPLS_IPTUNNEL is set. Fixes: b7c24497baea ("mpls: load mpls_gso after mpls_iptunnel") Signed-off-by: Guillaume Nault --- net/mpls/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mpls/Kconfig b/net/mpls/Kconfig index d672ab72ab12..b83093bcb48f 100644 --- a/net/mpls/Kconfig +++ b/net/mpls/Kconfig @@ -33,6 +33,7 @@ config MPLS_ROUTING config MPLS_IPTUNNEL tristate "MPLS: IP over MPLS tunnel support" depends on LWTUNNEL && MPLS_ROUTING + select NET_MPLS_GSO help mpls ip tunnel support. From patchwork Fri Oct 23 16:19:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 298634 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22E7EC4363A for ; Fri, 23 Oct 2020 16:19:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B9F74221F9 for ; Fri, 23 Oct 2020 16:19:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="i0grpVSf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751445AbgJWQT4 (ORCPT ); Fri, 23 Oct 2020 12:19:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:32442 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751432AbgJWQTz (ORCPT ); Fri, 23 Oct 2020 12:19:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603469994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=jCJUphoZC6wP0NOCdpMMAGCeMSBb6Vp0HwVzxHnJ7Gw=; b=i0grpVSfUbnjQ7F32aZXx9ht0QlNrxUTe6u8Rtew30Aant+uZSeYeVZ1W2XM7fbu9KK13x uiFrXlBDgJ9BUnZ6Q/TXWYluyNgsOmUsgRVGuiAKvXF5gkWP6dEtHQr8Yni63a/UKeesp/ NR5wTJ+j+rNM5wPdYam07/cA34C7ZIU= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-119-pcd8BeN7NaeesoXI0u6rJA-1; Fri, 23 Oct 2020 12:19:52 -0400 X-MC-Unique: pcd8BeN7NaeesoXI0u6rJA-1 Received: by mail-wr1-f70.google.com with SMTP id t17so762767wrm.13 for ; Fri, 23 Oct 2020 09:19:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=jCJUphoZC6wP0NOCdpMMAGCeMSBb6Vp0HwVzxHnJ7Gw=; b=f5EfKJas3zyMYZDos+Pc8tjoTAqhXCx3EG+JfnHFeG7c0Wp+Ruie50cw2TvEOFmDt8 QHxfFYTNufZz+uc21Rz/0eyTqvrsH15pyK7lmHl0FmThSGboEwflfIu3YTnWOjmulayg yqMLgE3IVugGTQUatWAIwqw3GXW47K0tnM0DGo6SluPZEbaZO6uoyVyU87ZbUYU5jLaA c1Q7czVxVjpsYp7BT4xK07uKrQEcKRmHOw8ZLp51RjWW/YTqJ2tq82gvjX55uwJc3wsQ /fUXaqcehMMjJHZnl5jwmbZ8g/0sz7EuQeeKLme8IGyeKBNkJeeumE7pijyYtbp8bUef Je1Q== X-Gm-Message-State: AOAM532BIJcsN/JZjTfXIpguqFKL3I4HcZwL0FxSex8DuRNfYPB+XX/T 2jhjxxhTTH3TShZwiZagWqm0HpogACvKX/9dYQwVhDqoJDPhuSvSkqaMLAW5jpgojqxrJb/vfxy Cysfq5JaamxJ8TNTL X-Received: by 2002:a1c:2901:: with SMTP id p1mr3238521wmp.170.1603469990914; Fri, 23 Oct 2020 09:19:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzSSULruBEujHAlyTwQ9URD4P2RlT6XdcB7Ycue/VY3d4czf7q/+07R2Opgfl9rt/zcRFXr8w== X-Received: by 2002:a1c:2901:: with SMTP id p1mr3238501wmp.170.1603469990713; Fri, 23 Oct 2020 09:19:50 -0700 (PDT) Received: from pc-2.home (2a01cb058d4f8400c9f0d639f7c74c26.ipv6.abo.wanadoo.fr. [2a01:cb05:8d4f:8400:c9f0:d639:f7c7:4c26]) by smtp.gmail.com with ESMTPSA id t83sm4333594wmt.43.2020.10.23.09.19.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 09:19:50 -0700 (PDT) Date: Fri, 23 Oct 2020 18:19:48 +0200 From: Guillaume Nault To: David Miller , Jakub Kicinski Cc: netdev@vger.kernel.org, Alexander Ovechkin , David Ahern Subject: [PATCH net 2/2] net/sched: act_mpls: Add softdep on mpls_gso.ko Message-ID: <6a93961e8f247ff17a83ab08375eba71308ae75d.1603469145.git.gnault@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org TCA_MPLS_ACT_PUSH and TCA_MPLS_ACT_MAC_PUSH might be used on gso packets. Such packets will thus require mpls_gso.ko for segmentation. Fixes: 2a2ea50870ba ("net: sched: add mpls manipulation actions to TC") Signed-off-by: Guillaume Nault --- net/sched/Kconfig | 2 ++ net/sched/act_mpls.c | 1 + 2 files changed, 3 insertions(+) diff --git a/net/sched/Kconfig b/net/sched/Kconfig index a3b37d88800e..b08b410c8084 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig @@ -879,6 +879,8 @@ config NET_ACT_CSUM config NET_ACT_MPLS tristate "MPLS manipulation" depends on NET_CLS_ACT + select MPLS + select NET_MPLS_GSO help Say Y here to push or pop MPLS headers. diff --git a/net/sched/act_mpls.c b/net/sched/act_mpls.c index f40bf9771cb9..5c7456e5b5cf 100644 --- a/net/sched/act_mpls.c +++ b/net/sched/act_mpls.c @@ -426,6 +426,7 @@ static void __exit mpls_cleanup_module(void) module_init(mpls_init_module); module_exit(mpls_cleanup_module); +MODULE_SOFTDEP("post: mpls_gso"); MODULE_AUTHOR("Netronome Systems "); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("MPLS manipulation actions");