Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Dongli Zhang <dongli.zhang@oracle.com>
To:     netdev@vger.kernel.org, bpf@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org, davem@davemloft.net, kuba@kernel.org,
        rostedt@goodmis.org, mingo@redhat.com, ast@kernel.org,
        daniel@iogearbox.net, andrii@kernel.org, imagedong@tencent.com,
        joao.m.martins@oracle.com, joe.jin@oracle.com, dsahern@gmail.com,
        edumazet@google.com
Subject: [PATCH net-next v5 3/4] net: tun: split run_ebpf_filter() and pskb_trim() into different "if statement"
Date:   Thu,  3 Mar 2022 22:33:06 -0800
Message-Id: <20220304063307.1388-4-dongli.zhang@oracle.com>
In-Reply-To: <20220304063307.1388-1-dongli.zhang@oracle.com>
References: <20220304063307.1388-1-dongli.zhang@oracle.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Lnccs5Le+KPfAlSQXSun1NQufsOBcp3hrDWzSzGT3J45JTSpu0LbTu0OpuLl?=
 =?us-ascii?Q?0BLSVE1MAkMOsvl/0Ua3r3MMFO/yWco7EnbdTgwxI6KZX+iwEfOv7KN/1Jcw?=
 =?us-ascii?Q?kFm0TxhbEFasqg30wE7gBN8LkpXEYYEPSCfdSp8wwkt1pbEzfiTtj70p58Zu?=
 =?us-ascii?Q?3BOpeNaDV7LZJSx1v1AmT/6hl5g900AOBd9fHkUYRbK2qNfEa7wLn0U08PlR?=
 =?us-ascii?Q?L4SapoyM80AIiKBFXMqaajpM0Qmf3lNNP2xwvY8mqNJH91rmYZ32D7YmBhJR?=
 =?us-ascii?Q?N2zOXb+O34LK7LPiYDLJT+0P1K7c1jxC/eB/PFZlksJO/3oDo86lE4kyryte?=
 =?us-ascii?Q?qnmTDMcrMiG534IeMwGFfQGmR1WNt5ouivoNxZh/OENnU1AAo9ZwpFihTa/u?=
 =?us-ascii?Q?Q7hOoSQS4aePLp/5tGq0MmypnvV43jQR6Oip0EtZ0aeLVsmXK0WklS0k4cwg?=
 =?us-ascii?Q?1WjCvIYfue9whnlKTgvg384TLqln34332L6pLlpv2ybX2Bl5/xHXCrXFE7pk?=
 =?us-ascii?Q?no6UyqHXrQVB7E8US9OEkX4mQH7n+aHRvLBI6IkrEz4ib56nCMFtJnaNZm2V?=
 =?us-ascii?Q?YGScZZL4Z6rKkp1UcMEw/ItzU/JbhtfsAx9elT5usaC5ZjOfm9lJMfqf0lwH?=
 =?us-ascii?Q?V8OQCzEQoC5cLhbgCxy+RL7vsHwMqVjyEAm6jqU7Vm/J7FWqZEntwLqOXx+C?=
 =?us-ascii?Q?OII7bA+e6a7AAHkUMB19mLN0Jw0YtGkHE1cP0PeyDJ2Asoo/EIdvFIa6693s?=
 =?us-ascii?Q?fFzuNtWS4WNsd9jIcCL9873IkAlgPVpeaO2k85NVma1P0uq9gqKN4N8g7BDi?=
 =?us-ascii?Q?kkmSyf1EjseYabpWifIezO1JIDaBVD84zU/YIT9mzw6QmX1rjZhOiZBUdHLC?=
 =?us-ascii?Q?UOUSmBCxxA10kMRPhl6VyqzrejOJvXjHcQ256DTRW0qwEcbS/dfRdTfuFQ0+?=
 =?us-ascii?Q?mW1okJInwf9+Y3YMP/Uly1iHYpVtSKIGgr9DaJNmHxE41LO1ichFPXTLOaal?=
 =?us-ascii?Q?Jwd5k/NEjTD5VafyBAw44jJBiJFMwh5dOnSVWYGteeKvzv+f+XHhVVW/kNG/?=
 =?us-ascii?Q?/3s548HNt+r+1TEHPV2kBbHif57Z+Ah9t5M4p9v+rf2bh6/NHtHTVEVjWuW6?=
 =?us-ascii?Q?cfa/nvrQM0BSuIZNGUMqPib3GNJYVL6W0rdzaWQxZLa2+qy6QQL6xyEpMU7G?=
 =?us-ascii?Q?79x3tf5eii8HY6XqpSRc49Uor7fcGzMCLihi9Yx1tC92b9sAe4KHpRTaZbgX?=
 =?us-ascii?Q?2wQ1r0hGQ2gAk26CoFuV7899/jIbtKBkKOyqJjPpgL68UVMu+0VhFsZrVoRa?=
 =?us-ascii?Q?htlwOxxvAjxPpnrsz8Lj35t5eI24ejQHIXoxaRQMZNOumusJrwd3gJ9kJ8xq?=
 =?us-ascii?Q?ZRyAIg5VDoIav9c3ytA+Am3IBE6BOI18rmSeKRSHJ0v4iGTOTvrukVjp2+3l?=
 =?us-ascii?Q?CWaRseYBba0QvY4fUDDJJoR97RsT+TmSQLAIjl6QMNA95X2eUxBtaBH0nypm?=
 =?us-ascii?Q?8M30kmq8ZNMCbPMFVlycMoYbgrd5mmn98lb6cqZBfVM0yO7vUdX0bzP/DxQ5?=
 =?us-ascii?Q?sxGmIaxSnb6dtHEGDUK/uqyH6D9kDrxs4CQyforTj/kflS8Y3/zh0QUrF9/D?=
 =?us-ascii?Q?ttY7XGFa6ry2AjCPpGgkjvo=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8848afcb-7c76-43e4-0ff7-08d9fda8e226
X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2663.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2022 06:33:24.1676
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: XmFSJoy4TcwcXC17qIuzGhxPyeadjE7nbSz0y7a2aDeF4fgsn0yKzyKho00LStI91u8nzK5J2kQfC4mTxfDSbQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4603
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10275 signatures=686983
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=999
 adultscore=0 spamscore=0 phishscore=0 suspectscore=0 bulkscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2202240000 definitions=main-2203040031
X-Proofpoint-ORIG-GUID: QbMb5efpAHGzbiaOyn8E2S7zRXjs4EUE
X-Proofpoint-GUID: QbMb5efpAHGzbiaOyn8E2S7zRXjs4EUE
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

No functional change.

Just to split the if statement into different conditions to use
kfree_skb_reason() to trace the reason later.

Cc: Joao Martins <joao.m.martins@oracle.com>
Cc: Joe Jin <joe.jin@oracle.com>
Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
---
 drivers/net/tun.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 2a0d8a5d7aec..6e06c846fe82 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1086,7 +1086,10 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev)
 		goto drop;
 
 	len = run_ebpf_filter(tun, skb, len);
-	if (len == 0 || pskb_trim(skb, len))
+	if (len == 0)
+		goto drop;
+
+	if (pskb_trim(skb, len))
 		goto drop;
 
 	if (unlikely(skb_orphan_frags_rx(skb, GFP_ATOMIC)))
-- 
2.17.1