From patchwork Tue Jan 30 23:40:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 867731 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="H9/UKqdP"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zWNNq3xlBz9s82 for ; Wed, 31 Jan 2018 10:48:11 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 9560DF73; Tue, 30 Jan 2018 23:41:02 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id A8505F92 for ; Tue, 30 Jan 2018 23:40:55 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 159EB2F6 for ; Tue, 30 Jan 2018 23:40:55 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id 17so9231649pfw.11 for ; Tue, 30 Jan 2018 15:40:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dVzje0Wii/OJHeBFc6bTiF3Y4cDSfh+A31vTsBTNGgI=; b=H9/UKqdPFNHAMwW5ctYYVfm8wNFnRxqQ1KeIf3gW6+8m8I+pstAlOnCqJ6mXT+Gc1S bJWcv71b66HlZZzq9X3gkpBmWIU8oIEaJOQvugzUKo5L3cKc8mq1K7qoWjWKKUF167PC L3EaRSQN2fegG50M9Rnk6j7K9tpiOiGVai/UeM1BjvvHHAY+MZygGeAcSE6AaCQqEw0A FmpJTS0U9OYrID4RLUWYbFd7fRmY+ejx3wTgWkD8f2iskwCKiT999bb5VRhGVGKx1DuT Kf3tklwFErM6wCMM/qwT9t0oYL5JyFTZP6dcZb+SaylQmXGn+vKVp0yYP3JnxTJbgQzO GVuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dVzje0Wii/OJHeBFc6bTiF3Y4cDSfh+A31vTsBTNGgI=; b=RVOsZXWfwmB3/LFzhdCrr4XH5a+fe76CJ+N/Z4BLbpBNRYvUJKV5tD7ch6PNJ/r7YL aO2GUTi12P5SviAaRyz7jI/GTLhGuSv8554noSET/FDk1K0qrg4IJfnqAu0psg5+XbDH V8PMhPz791U0x1VlcJ7VxiN7w+sS80SZ8gz0JZ0srQU16sdwOrfqzCfwyUxb5wdaR/wP zlj3e/xuk1HEkib2lY+ao/Ce+ocRp2IVN5quVieeznGH3kCgqj+PTsQTxh4mNvDxAmEq fH9dr1gxxZcl+fpUoRPCBqKAMfIWJTKvZe5NiW6x8yWnQoRqVhXQ6aPNblZiFsgXWANy 2YOA== X-Gm-Message-State: AKwxytfPpweWPqIvV9BwIK3LZerQw2S1kLnLQ0H2cs1qiqemw0dOLABu RbSFlobK/hdft/QeTsmjKBkMWA== X-Google-Smtp-Source: AH8x225Zcr49fd46x8ipcd7y/4NxYz8gd9lsWNQA8rbdjRr2ylFQe75BMSttAotH3Njw/cIxvMVZpQ== X-Received: by 10.99.37.193 with SMTP id l184mr15340299pgl.30.1517355653386; Tue, 30 Jan 2018 15:40:53 -0800 (PST) Received: from gizo.domain (184-100-240-187.ptld.qwest.net. [184.100.240.187]) by smtp.gmail.com with ESMTPSA id q16sm41403851pfg.124.2018.01.30.15.40.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Jan 2018 15:40:52 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Tue, 30 Jan 2018 15:40:16 -0800 Message-Id: <1517355622-26114-15-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1517355622-26114-1-git-send-email-gvrose8192@gmail.com> References: <1517355622-26114-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Wei Yongjun Subject: [ovs-dev] [PATCH 14/20] datapath: Using kfree_rcu() to simplify the code X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org From: Wei Yongjun Upstream commit: commit 6dc14dc40a1d1dafd8491c349b5f3e15aabc4edb Author: Wei Yongjun Date: Tue Nov 14 06:27:12 2017 +0000 openvswitch: Using kfree_rcu() to simplify the code The callback function of call_rcu() just calls a kfree(), so we can use kfree_rcu() instead of call_rcu() + callback function. Signed-off-by: Wei Yongjun Acked-by: Pravin B Shelar Signed-off-by: David S. Miller Cc: Wei Yongjun Signed-off-by: Greg Rose --- datapath/meter.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/datapath/meter.c b/datapath/meter.c index bc940ae..7b9391d 100644 --- a/datapath/meter.c +++ b/datapath/meter.c @@ -42,19 +42,12 @@ static const struct nla_policy band_policy[OVS_BAND_ATTR_MAX + 1] = { [OVS_BAND_ATTR_STATS] = { .len = sizeof(struct ovs_flow_stats) }, }; -static void rcu_free_ovs_meter_callback(struct rcu_head *rcu) -{ - struct dp_meter *meter = container_of(rcu, struct dp_meter, rcu); - - kfree(meter); -} - static void ovs_meter_free(struct dp_meter *meter) { if (!meter) return; - call_rcu(&meter->rcu, rcu_free_ovs_meter_callback); + kfree_rcu(meter, rcu); } static struct hlist_head *meter_hash_bucket(const struct datapath *dp,