From:   Eddy Tao <taoyuan_eddy@hotmail.com>
To:     netdev@vger.kernel.org
Cc:     Eddy Tao <taoyuan_eddy@hotmail.com>,
        Pravin B Shelar <pshelar@ovn.org>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, dev@openvswitch.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH net-next v1 1/1] net: openvswitch: remove unnecessary vlan init in key_extract
Date:   Tue,  7 Feb 2023 12:31:33 +0800
Message-ID: <OS3P286MB229551D6705894E6578778DCF5DB9@OS3P286MB2295.JPNP286.PROD.OUTLOOK.COM>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: OS3P286MB2295:EE_|OS3P286MB2043:EE_
X-MS-Office365-Filtering-Correlation-Id: eb3e6fab-9242-4136-902f-08db08c4437d
X-MS-Exchange-SLBlob-MailProps: C/ir7cSdGlv/EVvTBxMgR0dPX0q274mQCwSNZn7AKXSEGVhUH68lR0iMN8xEJgGyhIDldCR0XDiagCmsqshoahGg0m+dxnAoXbQ41DokWycUYIoBe999ohuqwQKmQ1bWknQFhDSmPl6mpL1Z3gRTdAclw0j32vYnWU5zHUlI6s14IB2poqROw4OJzJi8vIKx+gIf+QBxCEoFygzF+HBBkxslG6UqYjVCSIWvIT1z/UHtPgYT2QaxCM/D7JjYCil2+f5g8ixpyjDIDKu95tPqKTtU44/FtRUz/hoidx9Ip+MHwYxvqVz2eZnqeW74aUrL6XaJ/tbp1T1BrKRTALdvt7U1Y9Yph0L3hKMavnCOQGmna7lCAYLU5jlZ8qgQhO28IVXKx7cGiLcc/mpLu05PD0+uJfkd4xUeTxaGw1ycx4yoEyLFNv1X3B1qHYDOKKYXTQFc+tnMlC9y0wvakJKIgGVZ1+HiN9QgCbs4new4Y4ceY0c+nF2Mx4bKXdVTz6JDpRRVYSsfIC3+G7auS0ybp/Zb+510C4p7H38K/LutopnO0UayfA2PKl1nR7ZaZNRIWUZUPdceb1rfEqP7UqlgoidoAjRUYDSRGvCy8xHtSSFxbtlPVnIySImWWM5GvxBdfylp85V8johGXeWm4zRJCsgVzzWsmphDAPdb4wY/KRauT8ZqExhY43UYEojumU1F0KWUNXq922tBJ/uuQkeVUDAkMmlo2mtF/6bGzsKOBzX2L2eu4KJWE1a6pYQzYOvk
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: cfyQLfaGytFlBEB4qX+lTz4s5YHGmL1ycYYCKu4WBJ9eCsmlZoJ0hOTnBkXgZHOu4WxtblAFZ9ofE0RFYlhHa+0G89xA5HvTsJz3vi/a+QZpPsyv1FwiPrG9b+Bq3AQ7PQZEzYM4XcSG56QiwcPgZjjTHV19S3aIk3ZTyDyJU5gSS7gwMLzBR88FOYfImScc+94gB96D5jXg8JlMz/D5n9HuqvGirMQEaSdUTMRaSLn6vHihMi3k2kWKQWWi6yV/FejHyqnQ4MO/7/6EUQPtbGLa1GFOoBnTE9tVgGgcZ76OdEMzU/ps/WwkWkAKnjBuKuUTv2SP+qCgOSrgFqEDzqs/3uhZYDGzj0awriRsY51OLelGjL8eda0WNvXdIX8AiFWV13HYTRo0FftD7ubVr4+cXcI2oBlZIxCfqLRp/ztlef0LnUfbt5OghgA/7kuS2PhYP9rOK9EM7AuIau6W6EnMQwrspg5Ncs41eqa3elvzxglXPkl4fJ9ZaeYMg9vhapFmZqqra7G7bfl7e1NSZVLxKSmDtAVmPqxeIMVjqzNZ5KEBvIYfQim74RtkOmqxiUTO0LDN8GCEDRCPnEAar1WIYwZsWn2mvNvESTSaS39ipHMaAyzDfD+U5EEVeIcOA5/lVcjD//FSGTliS0PBOA==
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?k6M5kDkTR1zzf0fZFx/uKqzog2igV4JiKbHYolOft8YyQM8QSpftfJEIs/QB?=
 =?us-ascii?Q?ZzSbYWslZs+nHStN0mQJxPQIDGDdJ0p0U9+aJjRYVHUMN+RHeLhJ2y6Es3D7?=
 =?us-ascii?Q?AD67GgruN9faVnWVp3RW9XAfEsui3AX31EwqalZ8w3rbm9ROGwmZpFJ3hDTc?=
 =?us-ascii?Q?oMxnFLD3R/CFgUZvbpqT0bi0Uu0hWD9UY4mdElwkAVls0kHxGplKPy4vh/90?=
 =?us-ascii?Q?KO9RAUReIXEfHcxS3zf8xc0UZthXCOaCxzdEAAFsxwHhe/W8+NMTUQuGXFaA?=
 =?us-ascii?Q?0mM/3W6508Kc3IkkuG4C/1/To5LWkikFIZfh+SFHz4R2rhV9lvC23/mCU9T8?=
 =?us-ascii?Q?qN6773o5Uhv5HCd7Yz5nuTDMNFfEQxPcb7/ME/OCPGxie2XkrQdatKAS7pbV?=
 =?us-ascii?Q?qlfZ4bXBDwhmEmpw2/Lznuja2AmbG4lQjK0o8AXRKGgCdrHbYWBtV25ZVK6Z?=
 =?us-ascii?Q?ii43K2xfp8WNgQEhgyIY9iS6wxReK4XhStQwz5w7aqpBMb28UeiCObyYiZBL?=
 =?us-ascii?Q?kwmkj4ppsxEp7lZzzlDCPU10HAsiekJHOaKT4goBvzOWFFSx/ZZkninTQGG4?=
 =?us-ascii?Q?EdF/YbkWM8iLh4gwqrTX/qsQBnZFtEnUJOC+eQNgt2fbo1p+ABzuTjcwCo26?=
 =?us-ascii?Q?MoBVN21xyJL1+ZkEjZAGBPKeA2Vk5BWTWqVABVhjHzUs6eeBl0Se2maLBMfa?=
 =?us-ascii?Q?Ut6QqA/0/lGhmAD2ShCOKd9NqGlXnDsL7kOxMfrwcigyaR2WHvsd5FeZSXpu?=
 =?us-ascii?Q?Gt9vNCE5bbKzPOlaLTI0702xVSNcgB6U1HVTVZw8uUwNkHQvHaQwiOZP5jus?=
 =?us-ascii?Q?N0E4bSy5LZk0aFnoWvNHu/qNeO0zDrCwXQCtKohmSV2FsHrIBIRjQFk3Y48n?=
 =?us-ascii?Q?xQGayOS7I4eaPUbUIMyqPp/2Bqi1GscmImwjG/mztmPtWpD7Ztq7B6Kfm3SO?=
 =?us-ascii?Q?659+y6I8kJbimgSzi071AnWfC+t4mRX6mMx1dVFCLCAtXf8I6QuzeF7c4asV?=
 =?us-ascii?Q?kaloL+BarD+bP+5zyV+cUIY2MrVW8p2V3z6s2490tfZK+uy3ILMRN8Veyc4I?=
 =?us-ascii?Q?sHzHlTK9dovsnf1prBVqbtGVdMGc/K7JQVpmOR644g5eIYtxy/MSJ23QyDvm?=
 =?us-ascii?Q?uZ//M7xW/z1637KwteiBTU00XyPuFuCU2mluRkRwrNXlFcgOc9JQ7iiXqXwT?=
 =?us-ascii?Q?dB3MeQfIS5F8g96cmw/zVhAH4QhFxfog49YUaZodSCCPDDQ81HtPqs09slzq?=
 =?us-ascii?Q?eCGTsvHdkhZNrok1pl1cyYUJGIXC7Zl61XNx2/aAOg=3D=3D?=
X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-05f45.templateTenant
X-MS-Exchange-CrossTenant-Network-Message-Id: eb3e6fab-9242-4136-902f-08db08c4437d
X-MS-Exchange-CrossTenant-AuthSource: OS3P286MB2295.JPNP286.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2023 04:32:04.6502
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3P286MB2043
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Redefine clear_vlan to initialize one struct vlan_head
Define   clear_vlans to initialize key.eth.vlan and key.eth.cvlan
Calls the revised functions accurately

Reasoning:

For vlan packet, current code calls clear_vlan unnecessarily,
since parse_vlan sets key->eth.vlan and key->eth.cvlan correctly.
Only special case where return value <=0 needs inialization
certail key.eth.vlan or key.eth.cvlan specifically.

For none-vlan case, parse_vlan returns on the first parse_vlan_tag
which returns 0, in this case, calls clear_vlan

For MAC_PROTO_NONE, logic is intact after this revision

Signed-off-by: Eddy Tao <taoyuan_eddy@hotmail.com>
---
 net/openvswitch/flow.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index e20d1a973417..30a90597cab6 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -480,12 +480,16 @@ static int parse_vlan_tag(struct sk_buff *skb, struct vlan_head *key_vh,
 	return 1;
 }
 
-static void clear_vlan(struct sw_flow_key *key)
+static inline void clear_vlan(struct vlan_head *vlan)
 {
-	key->eth.vlan.tci = 0;
-	key->eth.vlan.tpid = 0;
-	key->eth.cvlan.tci = 0;
-	key->eth.cvlan.tpid = 0;
+	vlan->tci = 0;
+	vlan->tpid = 0;
+}
+
+static inline void clear_vlans(struct sw_flow_key *key)
+{
+	clear_vlan(&key->eth.vlan);
+	clear_vlan(&key->eth.cvlan);
 }
 
 static int parse_vlan(struct sk_buff *skb, struct sw_flow_key *key)
@@ -498,14 +502,18 @@ static int parse_vlan(struct sk_buff *skb, struct sw_flow_key *key)
 	} else {
 		/* Parse outer vlan tag in the non-accelerated case. */
 		res = parse_vlan_tag(skb, &key->eth.vlan, true);
-		if (res <= 0)
+		if (res <= 0) {
+			clear_vlans(key);
 			return res;
+		}
 	}
 
 	/* Parse inner vlan tag. */
 	res = parse_vlan_tag(skb, &key->eth.cvlan, false);
-	if (res <= 0)
+	if (res <= 0) {
+		clear_vlan(&key->eth.cvlan);
 		return res;
+	}
 
 	return 0;
 }
@@ -918,8 +926,8 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key)
 	skb_reset_mac_header(skb);
 
 	/* Link layer. */
-	clear_vlan(key);
 	if (ovs_key_mac_proto(key) == MAC_PROTO_NONE) {
+		clear_vlans(key);
 		if (unlikely(eth_type_vlan(skb->protocol)))
 			return -EINVAL;
 
-- 
2.27.0