Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
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 v6 2/3] net: tun: split run_ebpf_filter() and pskb_trim() into different "if statement"
Date:   Fri,  4 Mar 2022 06:55:06 -0800
Message-Id: <20220304145507.1883-3-dongli.zhang@oracle.com>
In-Reply-To: <20220304145507.1883-1-dongli.zhang@oracle.com>
References: <20220304145507.1883-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?jVIvFbV36/m6GHGKPjd/Nfi3XPpKhroVk1Li417No3escY53Uzu/FHLdjsDv?=
 =?us-ascii?Q?vLEFi2jwz/cP/uVyNL6D3giD6XMacTlynLVfzMZOOd46aw6Ub5i1hsvKxi5Z?=
 =?us-ascii?Q?Niejh1jdb9vZ6s6gh476mbXzJMuB4PN9Egyl9x62SwWxybP+OBSNCo99M/B5?=
 =?us-ascii?Q?BhzLGg+kPqvj/vs9GHt421EP6oNOmrPTrGkIN4nixg9MPOvPkV+V0z96Nl+g?=
 =?us-ascii?Q?izPcqzisO82EV+6ogDawur7qWf8py9FphUCOze5+fFGzU6f185Q6IEJpFlzE?=
 =?us-ascii?Q?cGs+A7GsOd6+uvRMHzohcdJ1NEws5bo0li6lY6OzOyn2olrCnEidmFy+3EqS?=
 =?us-ascii?Q?o4D/vT3SJtK68Nhlkqk1SKJ6RapZgxAtIN2SwcU7/ewzR4b9c7gueyEo8pFg?=
 =?us-ascii?Q?5sMWPCmoi9GbcgnpAFv5WRLuXZkPwkGIpObi2dJBVxVq6aDRPDWHiH5ye/zV?=
 =?us-ascii?Q?p60yWWE30bGr4TU3t7Ff7E9iR+5PeHbHKmXCVVEivSVNl+EN4bfSKQq6SD7k?=
 =?us-ascii?Q?XXxQ31ORgt0C+rWANQQInOSCFlg//GZG0FTwLTqeF4Zz6KXDu8IaBHeZirGL?=
 =?us-ascii?Q?6bujkP5JEXUU7j9ujmos6QFqCZq+3qxWXh8rxpJckjdOWLZ1lTUCkhRkNQ2a?=
 =?us-ascii?Q?dPej+gWczk7PaCMHQepP8HvLwV85dAVvnVnDieD5hzKw51TgXG4oq02PTWRj?=
 =?us-ascii?Q?8EmsPVaXF/mMYD/h0vnrKUSvkcc5t1U3oph3OzhIrQsCKj4G1118HdR8pQ+7?=
 =?us-ascii?Q?6pJ/RGod1MUCSF5POd07Jto7yV4wGKZofhNlZ3CcfOLsiXupRV4513sXgSK6?=
 =?us-ascii?Q?CjAhVl4awp7Cp/hNQfaFUgsAbRZbjCLgkggfBc8RMgMD6Qtp+4UVV6ASxRd7?=
 =?us-ascii?Q?SEhgQbuDDVkHy9OMRetpNIQiRxFRFvP4TnE3pMG6Ep+veNED07oFd8sDnkQj?=
 =?us-ascii?Q?7FyFN8JdGwydTn7ZKBbcYKlnRBbMQrv6mI0S9pxM8+0bZKDHDaAoGHfTl+YP?=
 =?us-ascii?Q?FOVavlFJpVtHOAzK5+QDJFic6iO27oTSlyjdOJfvduvwZVjFPH2N2udrWzQC?=
 =?us-ascii?Q?dmZ5XzcWrd4B5cSJL6M9BFeNwRiiEsrsJQu5/4mdZHgu8AxqlDaUacHnY2Cd?=
 =?us-ascii?Q?DG6jUpK4IaKAj01iLvlS9BsteoWUNfgSyeUl6bL2djERuHRHw6iVeZmKP4lZ?=
 =?us-ascii?Q?8rhEQ1HNRRgd243BPj1BclnjLkA/dvz/dwxDVUmZGQWLT9budjyvvRttuRFx?=
 =?us-ascii?Q?eCj/GscL8Zm/AKluVTq0lc+5UTU3O2TSfhvr17UFiqE3JwwpnsmFCbcXxr5Z?=
 =?us-ascii?Q?Uv1p/nAz0VzV62CkmzrfdgkmVpsdL6Epd18Ywbxt8a97yrNjLPPp9hOd1RAZ?=
 =?us-ascii?Q?/kSbS6oEU+b2RxrFduIEd8ybA8a5czJJGb307HsYLxszoqmx5yMBy3rf7HCY?=
 =?us-ascii?Q?2E9935DP+fEgTIacz45DJ/lwJH0xi1CGm46TsSuoP7BI1JAXSBdQWY46yRYO?=
 =?us-ascii?Q?5ZCP7/GteS67lOOZss/A9hH1ozyGRg46oXtRpBHy1/a65cEO0alxmIFNkw/D?=
 =?us-ascii?Q?Y7JWlDdEqqK5vUT8nFEf56QdD6Esb3nOBpJ8Asgmd4ouCs060PTiWfA5DEnf?=
 =?us-ascii?Q?99oZNlxsr7vMXhk1stonDOM=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 99d28df1-a729-4c05-e157-08d9fdeefea6
X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2663.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2022 14:55:16.7747
 (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: 1qqo1gRsbwqbdi0z2Oyl12Ef/e862v1HGPouaZqCX5ehl25GmNPmPeA9UKIDKyNO0BFtkYjyb+GENPT9sW/37w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB3977
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10276 signatures=690470
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-2203040080
X-Proofpoint-ORIG-GUID: HHdY0y4WrUN45xT1Y8-Fdnqh0jORzxUC
X-Proofpoint-GUID: HHdY0y4WrUN45xT1Y8-Fdnqh0jORzxUC
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=no 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