From patchwork Tue Dec 19 16:58:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 850931 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="UCBhVl/k"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z1PJk6wkmz9s0g for ; Wed, 20 Dec 2017 03:59:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753144AbdLSQ7e (ORCPT ); Tue, 19 Dec 2017 11:59:34 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:45084 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751315AbdLSQ6t (ORCPT ); Tue, 19 Dec 2017 11:58:49 -0500 Received: by mail-wm0-f67.google.com with SMTP id 9so5012211wme.4 for ; Tue, 19 Dec 2017 08:58:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7FXv1xzcflfNTJBPs2XlulnXyxxkHEWiJrC6n+BPUPg=; b=UCBhVl/k8wZ+w9+uxrfdX4GFpVmy6NglpOCCB+8Nf8z3bLYvtMTedlVEPLlNBfytaU WPzzr2KLbLlvVWTcy1LuZ7Ljo2XpSsx1wCRtJGCuydA7MSlYIxE2c5/v7r6vvKFUhKpV LujtlLh2lad49MBaOTjal4DmX7B58scwGyZ0f+2jvjz3xZTF136zaDuQIwwywy3llyDJ cUzuwt26mS3W+2A7YV6BupPiXnjQhVAQvalbPSY29fjLe5GAi1FTYMtdA7rGNSkbyoc7 eIwzIUJXBqnc2iPzn1ac7j6bwRFaBVQ4pWyHipPf2mOSEeL5BMiZpqWc8scPH5JLeOZJ Y3sA== 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:in-reply-to :references; bh=7FXv1xzcflfNTJBPs2XlulnXyxxkHEWiJrC6n+BPUPg=; b=WDzmV9uagBjFGsu05Lrblme8VkW69F7JZpCXuIPZEaFa9ctDPnpd4FUmYblTsUXR2I wveCOCvmqOpDe0TiodqnV9m8Fr4Yzo4TFttsdqeGvubu+nlD33EC7GWNl7eOwpYgabSi cW0ssM2sRX0fLeXybzF+i00Xabg5NokUsMJqlYRLHrv4rk+q5KEfyEax910M45CNpPji FofrB8yYfu+sJbfJ1j+vPodBHPXmXiRfq4yhO4dNVB45vlfraSqnmMaFXUm6LMhS9F7y qNd2+d6SuSaqly2A2NQN0dcN4+LO4XeXwDVNmLeazikx0piAuq4vhBRrbiwfudnCXaCw 6Y8g== X-Gm-Message-State: AKGB3mLdrOvv71ijiE7AutBDhJOiBzzviGDRCaxN3lUWUai2ayombUPm S9/ovlNKIaB6stwk6fUf275Tpw== X-Google-Smtp-Source: ACJfBotSn9pmNpz7csOS8THyEbsuvnqNKLbmUSwvI9oMbQhZ/tQxWsEnXbplWhy685hE75vcwIYGCw== X-Received: by 10.80.170.87 with SMTP id p23mr1458968edc.289.1513702728284; Tue, 19 Dec 2017 08:58:48 -0800 (PST) Received: from penelope.horms.nl (penelope.horms.nl. [2001:470:7eb3:403:201:8eff:fe22:8fea]) by smtp.gmail.com with ESMTPSA id b30sm15591502ede.53.2017.12.19.08.58.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Dec 2017 08:58:47 -0800 (PST) From: Simon Horman To: David Miller , Jakub Kicinski Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, John Hurley , Simon Horman Subject: [PATCH net-next 1/4] nfp: flower: remove unused tun_mask variable Date: Tue, 19 Dec 2017 17:58:26 +0100 Message-Id: <20171219165829.8202-2-simon.horman@netronome.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171219165829.8202-1-simon.horman@netronome.com> References: <20171219165829.8202-1-simon.horman@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: John Hurley The tunnel dest IP is required for separate offload to the NFP. It is already verified that a dest IP must be present and must be an exact match in the flower rule. Therefore, we can just extract the IP from the generated offload rule and remove the unused mask variable. The function is then no longer required to return the IP separately. Because tun_dst is localised to tunnel matches, move the declaration to the tunnel if branch. Signed-off-by: John Hurley Reviewed-by: Jakub Kicinski Signed-off-by: Simon Horman --- drivers/net/ethernet/netronome/nfp/flower/match.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/flower/match.c b/drivers/net/ethernet/netronome/nfp/flower/match.c index 1f2b879e12d4..e3b10b34035b 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/match.c +++ b/drivers/net/ethernet/netronome/nfp/flower/match.c @@ -218,7 +218,7 @@ nfp_flower_compile_ipv6(struct nfp_flower_ipv6 *frame, static void nfp_flower_compile_vxlan(struct nfp_flower_vxlan *frame, struct tc_cls_flower_offload *flow, - bool mask_version, __be32 *tun_dst) + bool mask_version) { struct fl_flow_key *target = mask_version ? flow->mask : flow->key; struct flow_dissector_key_ipv4_addrs *vxlan_ips; @@ -246,7 +246,6 @@ nfp_flower_compile_vxlan(struct nfp_flower_vxlan *frame, target); frame->ip_src = vxlan_ips->src; frame->ip_dst = vxlan_ips->dst; - *tun_dst = vxlan_ips->dst; } } @@ -256,7 +255,6 @@ int nfp_flower_compile_flow_match(struct tc_cls_flower_offload *flow, struct nfp_fl_payload *nfp_flow) { enum nfp_flower_tun_type tun_type = NFP_FL_TUNNEL_NONE; - __be32 tun_dst, tun_dst_mask = 0; struct nfp_repr *netdev_repr; int err; u8 *ext; @@ -342,12 +340,15 @@ int nfp_flower_compile_flow_match(struct tc_cls_flower_offload *flow, } if (key_ls->key_layer & NFP_FLOWER_LAYER_VXLAN) { + __be32 tun_dst; + /* Populate Exact VXLAN Data. */ nfp_flower_compile_vxlan((struct nfp_flower_vxlan *)ext, - flow, false, &tun_dst); + flow, false); /* Populate Mask VXLAN Data. */ nfp_flower_compile_vxlan((struct nfp_flower_vxlan *)msk, - flow, true, &tun_dst_mask); + flow, true); + tun_dst = ((struct nfp_flower_vxlan *)ext)->ip_dst; ext += sizeof(struct nfp_flower_vxlan); msk += sizeof(struct nfp_flower_vxlan);