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 v3 3/4] net: tun: split run_ebpf_filter() and pskb_trim() into different "if statement"
Date:   Sun, 20 Feb 2022 21:34:39 -0800
Message-Id: <20220221053440.7320-4-dongli.zhang@oracle.com>
In-Reply-To: <20220221053440.7320-1-dongli.zhang@oracle.com>
References: <20220221053440.7320-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?D8gArPugwwYqdubGUIoKYLMOCZGXTrgeTO2Z305lz6vHlNqhkQfwAL2AoGpH?=
 =?us-ascii?Q?ahrUROXB4VZh10quymuvXQJrvZwRX2OVeNaodNA4F8Cq4AdCi/HiQrlbI57g?=
 =?us-ascii?Q?sUl4HaM2r0ggHSLWeZ1lLXb/t6mx1ILX/LzuL+fCJ9cYtMpm5Nj4l2F8czhS?=
 =?us-ascii?Q?74JpRvdcT8sLChrUaUl2QLeJAdt4hRwsgAA7gGtZGdDIIyubYhUfhPBmFFtu?=
 =?us-ascii?Q?/zEbiU3kA3Gg9F9yePGDD4buphoGsSJJrjfZiAIy1Fz/J/cvjvtz7GK/gaeB?=
 =?us-ascii?Q?9BMdFRzNSqKDoqKpBEwHx8Owd4AkwYOxjj+u0ZNhdmrP+0p20yWfgDrNQVv5?=
 =?us-ascii?Q?uVjrNEg9rtd4Ix1booIoYJnGMbEIgyvthy4GGmIoxTVVWJ34VwP6jsYR6c/v?=
 =?us-ascii?Q?3nY8eQoAMlHgrm3243hU0+PeBURyq8BM55LpgIlccOgnLtuzPSsAY5vyD/SY?=
 =?us-ascii?Q?prB9wArww2S8Zn2IVHs9N6wUwN49k7Osu4ui2DxWRLN+WQe6tIrRqscHLKPL?=
 =?us-ascii?Q?JnkbD/v2EUi6srw0rCmLNu6jMxcZUySkJNLIAjMFDzg9yZmHUNvdAqxdn+SU?=
 =?us-ascii?Q?EVPoMXuNrh6WhU5yBpWlKjIcFVaI1f8wIhLNzeomh+Ox+vEqHsyy5csKh7/r?=
 =?us-ascii?Q?HBbpOe8PmLmeUdIfBq56Q9Fqe/c+NvU+yB1AkP6thG/m7afi0tt+Mpbgllki?=
 =?us-ascii?Q?qHoVEGSHf9G7zJD23U7RgCctJBTKrq1T1I4tt77WdzaywKowAXBwkclcLBsK?=
 =?us-ascii?Q?9WkiT00UyLy07bZNkzljPqhyOSoJa6j8cTVO+dLT9QEbU3S+G7b5Q0BoSuIW?=
 =?us-ascii?Q?h/v7OWXp69QCOnojxdAosDNm8a9W3MovEzYBDHvoxywCE4SoCYmL6T9MAnsM?=
 =?us-ascii?Q?sNc1YloTcjjrSQhXHOv2+Ofw2DvVoPg6TONCWoJbE4Eyz2erGqxbW6rgOhGm?=
 =?us-ascii?Q?wsacdYF4PIkdzO+kHcHRlUK8LDe8O4Z00dlDc19bmwp1PO+v1NZsrPu92s66?=
 =?us-ascii?Q?/BGyrRXPXOzvstkJng/nMXmaXCZdQgm9plNZ894lf/8EUn7CzQ90wq3OntBt?=
 =?us-ascii?Q?5vQ1cMV2DqeO53IdxxyY5IaryI/RXxnBgZPxCwsZLhrvLAPA5fZlQ5yffqQ6?=
 =?us-ascii?Q?BJ9iyquhHBT+sVt4lHW/z3fvU0oFRZWc+TS6NSPZ9DLAhrSh8A8OT17ClQ1y?=
 =?us-ascii?Q?kex4HlD7JhM61mprjQys1BvZYS1UZyPOpQOYDY1IJZlGwPHmJ9fUUegVEAGG?=
 =?us-ascii?Q?Q+Fc0ox/0pCN9QdbGD7kvjocqbEFqZtmVfIHFXRMctw2KHiYzK331PAyYwLp?=
 =?us-ascii?Q?oaDt37ikZ2amOzGwPrLF59cD4whRK8xd4v1JD9LcYBmtmVx8NSe4laJCNhRf?=
 =?us-ascii?Q?WRW57sRKzkom5a5b4j9XliGqbjravrUhLGk8IKODa2Qymcw5HY+IjqVdn05U?=
 =?us-ascii?Q?SbthKX4xAgfzYy6oZ3prrGfq7wP7cIh2bQsupkF4awBkmMZopK7iUg4den/9?=
 =?us-ascii?Q?wvTWKMd1PjrSsdT+1/Op4Mfr2sypdmbsfgE4sy0T4qHmfvAosWDEiehLzSFF?=
 =?us-ascii?Q?wkibwhVuBjYQ1WT1I8MST4RKGlVzAEVUukhgyhJ3P1lur08IFSW7/3q66o1q?=
 =?us-ascii?Q?OfHEo7FDpqRNQ7T14OvFC+g=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5e6bbdc2-9474-44b2-1b6f-08d9f4fbf0a7
X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2663.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2022 05:35:16.3275
 (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: aXecv/aqjkO4C8+RbMVtyNgwFj4GejkOuMNiSLeT8bn8J+wb7jP09gfDsz52NkjOTgrfMPuN4m1rRN2ieEBEqg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR10MB1533
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10264 signatures=677614
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 mlxscore=0
 spamscore=0 mlxlogscore=999 adultscore=0 phishscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2202210034
X-Proofpoint-ORIG-GUID: fUPzTuBSxCMZQn7KL0Vy8ba_LHgC2vYB
X-Proofpoint-GUID: fUPzTuBSxCMZQn7KL0Vy8ba_LHgC2vYB
X-Spam-Status: No, score=-3.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>
---
 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 fed8544..aa27268 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)))
-- 
1.8.3.1