From patchwork Fri Jan 22 08:36:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 8088251 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B521F9F1CC for ; Fri, 22 Jan 2016 08:39:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 29B5220434 for ; Fri, 22 Jan 2016 08:39:21 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7A59E2041E for ; Fri, 22 Jan 2016 08:39:20 +0000 (UTC) Received: from localhost ([::1]:51308 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMXFX-0004SE-Sw for patchwork-qemu-devel@patchwork.kernel.org; Fri, 22 Jan 2016 03:39:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMXDq-0001DK-St for qemu-devel@nongnu.org; Fri, 22 Jan 2016 03:37:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aMXDp-0002wI-3e for qemu-devel@nongnu.org; Fri, 22 Jan 2016 03:37:34 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:26225) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMXDo-0002vb-Gg for qemu-devel@nongnu.org; Fri, 22 Jan 2016 03:37:33 -0500 Received: from 172.24.1.50 (EHLO szxeml427-hub.china.huawei.com) ([172.24.1.50]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DAK00666; Fri, 22 Jan 2016 16:37:14 +0800 (CST) Received: from localhost (10.177.24.212) by szxeml427-hub.china.huawei.com (10.82.67.182) with Microsoft SMTP Server id 14.3.235.1; Fri, 22 Jan 2016 16:37:05 +0800 From: zhanghailiang To: Date: Fri, 22 Jan 2016 16:36:47 +0800 Message-ID: <1453451811-11860-4-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1453451811-11860-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1453451811-11860-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.24.212] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020206.56A1EA3B.006E, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: e1f13b71aad9edee5014863f7cf14e28 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.65 Cc: zhanghailiang , jasowang@redhat.com, zhangchen.fnst@cn.fujitsu.com, hongyang.yang@easystack.cn Subject: [Qemu-devel] [PATCH RFC 3/7] net/filter: Skip the disabled filter when delivering packets X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the filter is disabled, don't go through it. Signed-off-by: zhanghailiang --- include/net/filter.h | 5 +++++ net/net.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/include/net/filter.h b/include/net/filter.h index 9ed5ec6..d797ee4 100644 --- a/include/net/filter.h +++ b/include/net/filter.h @@ -74,6 +74,11 @@ ssize_t qemu_netfilter_pass_to_next(NetClientState *sender, int iovcnt, void *opaque); +static inline bool qemu_need_skip_netfilter(NetFilterState *nf) +{ + return nf->enabled ? false : true; +} + void netfilter_print_info(NetFilterState *nf, char *output_str, int size); #endif /* QEMU_NET_FILTER_H */ diff --git a/net/net.c b/net/net.c index 87de7c0..ec43105 100644 --- a/net/net.c +++ b/net/net.c @@ -581,6 +581,10 @@ static ssize_t filter_receive_iov(NetClientState *nc, NetFilterState *nf = NULL; QTAILQ_FOREACH(nf, &nc->filters, next) { + /* Don't go through filter if it is off */ + if (qemu_need_skip_netfilter(nf)) { + continue; + } ret = qemu_netfilter_receive(nf, direction, sender, flags, iov, iovcnt, sent_cb); if (ret) {