Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4750904pxj; Wed, 12 May 2021 12:23:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyoc/ykpOnoSZ+XqiXfGvOlmlN8EgnMIcYhbqfYgIsKfGE+dJTH2bF5RxEC85td0Hhe20bj X-Received: by 2002:a17:906:55c5:: with SMTP id z5mr38655671ejp.306.1620847385958; Wed, 12 May 2021 12:23:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620847385; cv=none; d=google.com; s=arc-20160816; b=Nr7yR+DE/gG7RryawDk4Yb1JvAtMlHfQazpL6g5sZfJPzI02Uk5H4q7kSmbDWoykbT 4Yrv/BXAH5ln/DYO50QkjrRfdZE8B3f0eAUy2HKHjIlkvjYvZB1/sq621OEKDu5/XnUg PVH9oi1GASWH/A7iZRwcrPPzrnilxYlrrPvDfiChwjjG4e5e/Y6KaPgk4VyjpYT25/rP 4h817l1JfoOuVA7tsv6gb1zuPfYAljGwjEDdFHbMMD7ZTgvHAwLgZ7RCkypWvYycD79X DdHidEo6+0LToaHQms6fkI+SOLbrDMdd686tvVaV974+xIPy7hE8pMwr1CyZfF65WOxU JIZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bHA5OR5goPbpvzNVUZgtckMAi32x+9f2RQoYZrWLtUs=; b=eDOTU2xLVpfkbPHyYX4PgusqXs26LOB7zWfH63jEvqxJ3XH6pEVTYlo6Z7MWpDD5N5 0GjOM+3/9RVVrLU1KfKqrxZOIMRNgERfVKpMfz3rP5leOofJrZwZblpg0VJP7nK/hCy2 QZgB3J0/hMQ4LlX6mGYSLHg+Ok1zvXbCLz85NDBdCVYNJMHQezreDI1TIRfwKos3T94l TZ/xF/9adKU4b4VI4KWwHktCze+5JJibTkQD5P9bHIvx8AwqwcYs9fkrsZwgmSBjW2o4 83hurWXd9Zxz4R1TP95l5vgiDa3+Vy8EKN+EcObu/w0MzvJ+qZ7GceVot7AFzle2Ro6A ykLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=j7MDiisn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ju5si698715ejc.6.2021.05.12.12.22.42; Wed, 12 May 2021 12:23:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=j7MDiisn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244507AbhELTN4 (ORCPT + 99 others); Wed, 12 May 2021 15:13:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:41520 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239537AbhELQpH (ORCPT ); Wed, 12 May 2021 12:45:07 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 320D960FD9; Wed, 12 May 2021 16:14:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620836069; bh=yMQZhlX4dWqu9jmbp5K1wfn5gFNBNWmXu20lJFC9VzE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j7MDiisnOcFddOcUo3jC9S22B7CQlIFyhaF2FKOmaM5q9+QoL23dzJo5q72qmzzBu MAXQWzCBsPreFm/GNf2ZZWDn8b4aAkScbb6TXHauuhVWtTGDHg+lXAHHt6gIWM66YD UB5IqU66tZmgpfLVtvY+LmZmNleIG56Kc2sdSzxs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 5.12 596/677] netfilter: nft_payload: fix C-VLAN offload support Date: Wed, 12 May 2021 16:50:42 +0200 Message-Id: <20210512144857.175888484@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144837.204217980@linuxfoundation.org> References: <20210512144837.204217980@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pablo Neira Ayuso [ Upstream commit 14c20643ef9457679cc6934d77adc24296505214 ] - add another struct flow_dissector_key_vlan for C-VLAN - update layer 3 dependency to allow to match on IPv4/IPv6 Fixes: 89d8fd44abfb ("netfilter: nft_payload: add C-VLAN offload support") Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- include/net/netfilter/nf_tables_offload.h | 1 + net/netfilter/nft_payload.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/net/netfilter/nf_tables_offload.h b/include/net/netfilter/nf_tables_offload.h index 1d34fe154fe0..b4d080061399 100644 --- a/include/net/netfilter/nf_tables_offload.h +++ b/include/net/netfilter/nf_tables_offload.h @@ -45,6 +45,7 @@ struct nft_flow_key { struct flow_dissector_key_ports tp; struct flow_dissector_key_ip ip; struct flow_dissector_key_vlan vlan; + struct flow_dissector_key_vlan cvlan; struct flow_dissector_key_eth_addrs eth_addrs; struct flow_dissector_key_meta meta; } __aligned(BITS_PER_LONG / 8); /* Ensure that we can do comparisons as longs. */ diff --git a/net/netfilter/nft_payload.c b/net/netfilter/nft_payload.c index cb1c8c231880..a990f37e0a60 100644 --- a/net/netfilter/nft_payload.c +++ b/net/netfilter/nft_payload.c @@ -241,7 +241,7 @@ static int nft_payload_offload_ll(struct nft_offload_ctx *ctx, if (!nft_payload_offload_mask(reg, priv->len, sizeof(__be16))) return -EOPNOTSUPP; - NFT_OFFLOAD_MATCH(FLOW_DISSECTOR_KEY_CVLAN, vlan, + NFT_OFFLOAD_MATCH(FLOW_DISSECTOR_KEY_CVLAN, cvlan, vlan_tci, sizeof(__be16), reg); break; case offsetof(struct vlan_ethhdr, h_vlan_encapsulated_proto) + @@ -249,8 +249,9 @@ static int nft_payload_offload_ll(struct nft_offload_ctx *ctx, if (!nft_payload_offload_mask(reg, priv->len, sizeof(__be16))) return -EOPNOTSUPP; - NFT_OFFLOAD_MATCH(FLOW_DISSECTOR_KEY_CVLAN, vlan, + NFT_OFFLOAD_MATCH(FLOW_DISSECTOR_KEY_CVLAN, cvlan, vlan_tpid, sizeof(__be16), reg); + nft_offload_set_dependency(ctx, NFT_OFFLOAD_DEP_NETWORK); break; default: return -EOPNOTSUPP; -- 2.30.2