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 v4 3/4] net: tun: split run_ebpf_filter() and pskb_trim() into different "if statement"
Date:   Sat, 26 Feb 2022 00:49:28 -0800
Message-Id: <20220226084929.6417-4-dongli.zhang@oracle.com>
In-Reply-To: <20220226084929.6417-1-dongli.zhang@oracle.com>
References: <20220226084929.6417-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?Vec/eKXrOt3ZOMSxASoYDDuYOKqGM62LNlk6U1cJKCa8VPphljUxhd/eNYxn?=
 =?us-ascii?Q?Rky47AsD/lz6lvBC2AT3sna9SJ9KR1SADBE8bUa8GETLMcoLXVXzuemEoeTZ?=
 =?us-ascii?Q?2dUqcLechyxIsUq/yqBZ8FhTp5/qNwkHCkdnc/OFqfUdpyaOtdpXV/nEflfm?=
 =?us-ascii?Q?FZ9uyhvSihdil2uEEC7nYmOoKOs1p+9bjq+993xBn8w6/KJN10vDTsHLaJk0?=
 =?us-ascii?Q?EtMQx/ce+OKUKL9+8vASUL/kc1YZ5yLMHOhGQ8m5eKAzh5FCNvx64TNo/wlc?=
 =?us-ascii?Q?jrm6WnSjIfpReilLISIpRZ6YJmV7j+sRzgDvbQLTZ7tvlaxEHk6r+e+w6Kt2?=
 =?us-ascii?Q?9ecF1k+dZXOV6LUkz0YXnjqbiZciohvlR1mEZyCCcoM+2UT/mAcbOLUprdK0?=
 =?us-ascii?Q?ftEshc/KvptTPFl09W94rfOyK+sM0TKX6gQHqZoTlfcDh/tVNr5Amu7osIT3?=
 =?us-ascii?Q?AelNXaoAJ5lF5vbeFeaaVYQTccYhqoS/TDWtcqhZwqmDAQ5yxUAGJPWbdWJO?=
 =?us-ascii?Q?fXUMtNEg/p1y/cMt0PxVwuJz0tpUkKssi6hFpFBi3+FPdkqo9EQ2gQxkebww?=
 =?us-ascii?Q?3mLgllfpIIk8GAKlVr8CJjmq+CmodKLwu1tO0O5kyMmzaZyEGSYPHj/Ms4mf?=
 =?us-ascii?Q?Ugt2mkCZJ2JcvoFa1kXle1KeKfJZKL9vzFkRzWmwWHzW96PK4GKHhbMT7Eet?=
 =?us-ascii?Q?Qp/6ebtYzy+fWqvbrNbrjl8Edbq4eKPQRyeFJHYlcVzk44FvZM7qVwgTSH4p?=
 =?us-ascii?Q?t8Qwe2nRD1Shjdt8oJtMIpdHw39vMchSjBMGdlq7OcNNt8aTCx+oMTOv0gXE?=
 =?us-ascii?Q?nxXsnmiS0gNqlkEYFEQgvtFwYEHbNLcne3iYoxG2/FIevA+uBZCOhuQFNhKo?=
 =?us-ascii?Q?/2FnwAysR67IrdKkaeoth1A13CBWBVEisSJaZkD/P2+rJZUTANy5cQPNrJls?=
 =?us-ascii?Q?pOor5r2PvqFWmbiPczHfiPn944jyZoF7hyGra1l/+k2idYhrHTJs8UUjz9ut?=
 =?us-ascii?Q?fJN9N2b78x3B8Dr+yLSiPTK2nCiB0NhOAvUucaFGXyQkW8AMdmchVG+W0zBU?=
 =?us-ascii?Q?/B2J3fY8Z3k/D/sAEhz79BEFGwyX2tmKsARwH4WkNqd5tQZd3uMRLWAqg8aC?=
 =?us-ascii?Q?Pcyz0ZLNAtZHa3P1ji+ChKjHG9skX7VB149cAa3hAdr4cNT/bMgxXpPDwkcD?=
 =?us-ascii?Q?K+73jPDm7q7tV/rMdMTligWcxM0EIoBNAqeep1+JR1LT+3nWRq3jm0/CItB6?=
 =?us-ascii?Q?a69FrpJ44Nw1artODEM/DRLHlhxQpcoEphogXqCAeWOgN/frYzPH/MlWLy/N?=
 =?us-ascii?Q?oZ8hw4XdF/HAhCtKeAytYWj0OEblH6q7VMM4GQria0k7VAmsq4HybkTAjt3c?=
 =?us-ascii?Q?QV7QFlbbqt7V+86ZVSIPs/34PevH8HfJgpwJWVe8G1D0kbCpK1wfL3/MyI29?=
 =?us-ascii?Q?SrxoQ+FUu3J4uHnHt83a+jQ4DElBtGt3N/OQ0j5Ylh5zfTCXNklLnOXaeqvs?=
 =?us-ascii?Q?IHaBTJMl+bIdiEYd8cYdudw0nHdNlWJ1g2Lg9aYqFoUG8gYZ0clw162q+HJO?=
 =?us-ascii?Q?Ing63NO3WaK5cTaUUDi5VPYCrq7Z9GoEwqVCkM4rH8r0H2T8MZgq+iAUGLvu?=
 =?us-ascii?Q?pnc2Ju71TwE3QnxXHd8qVtM=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a79b842a-38d8-4f7f-0034-08d9f904f5ff
X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2663.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2022 08:49:55.3825
 (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: 5csJDBsqmOjHo/5nmZQAPK2yebFI8Nh7LjpPKs+cQqmV2kCyUxiFx4iCEjd48l52xdsKUn2th0a+BtJbzpTC8A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR10MB1768
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10269 signatures=684655
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 malwarescore=0
 mlxscore=0 phishscore=0 suspectscore=0 adultscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2202260060
X-Proofpoint-GUID: wuXO2kE-YC48DFrPHzJHcW-SrSLipK2Y
X-Proofpoint-ORIG-GUID: wuXO2kE-YC48DFrPHzJHcW-SrSLipK2Y
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 fed85447701a..aa27268edc5f 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