From patchwork Thu Oct 29 06:17:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 537677 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 982CD14110C for ; Thu, 29 Oct 2015 17:14:33 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=NoKXNKU4; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756643AbbJ2GO2 (ORCPT ); Thu, 29 Oct 2015 02:14:28 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:33557 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756341AbbJ2GOY (ORCPT ); Thu, 29 Oct 2015 02:14:24 -0400 Received: by padhy1 with SMTP id hy1so24634512pad.0 for ; Wed, 28 Oct 2015 23:14:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VViUlmNoTKDBOet6Q1N8dz4DZlogU1T0oZQ1bfOtW5w=; b=NoKXNKU4wIf9ga4EWjruEZ41jC4CYV8HEZraSCRgUdqmiPB2ixMjmPe2KiaUrhvSH5 cKtoB3qI2osxI1VY9HfexOwdh7XISECqj1z9wGyiGjJbPl2W3pD53pcK3n3Xdt2viaPM wgf/MqJDoZyELRyKhUGxc72OyOBECZ3gpRehXfjLt07xmp1p+fIvXlnWOTVpJgA0clnN RcpLHQEwGMLVYXAEzJCXZ5Tssc2RB/oqrvdxoJTASHq8FjF6DrtxPk0I0/qpZwCswwBQ /fdh3ohdarxroFfjwwBiY5lrardMDJnBJgsURAUMRHrDAuEqxkeuNjQOeLw1ghLkaBbQ 6RMA== X-Received: by 10.66.164.10 with SMTP id ym10mr26198pab.26.1446099264328; Wed, 28 Oct 2015 23:14:24 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.35]) by smtp.gmail.com with ESMTPSA id iy1sm48844106pbb.85.2015.10.28.23.14.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Oct 2015 23:14:23 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org Cc: jiri@resnulli.us, vivien.didelot@savoirfairelinux.com Subject: [PATCH net-next v4 2/2] switchdev: fix: pass correct obj size when deferring obj add Date: Wed, 28 Oct 2015 23:17:31 -0700 Message-Id: <1446099451-62999-2-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1446099451-62999-1-git-send-email-sfeldma@gmail.com> References: <1446099451-62999-1-git-send-email-sfeldma@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Scott Feldman Fixes: 4d429c5dd ("switchdev: introduce possibility to defer obj_add/del") Signed-off-by: Scott Feldman Acked-by: Jiri Pirko --- v3->v4: rebase sync v2->v3: add Jiri's Acked-by v1->v2: use correct "Fixes" tag, use common func to calc obj size for add/del net/switchdev/switchdev.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 8d3e6c3..2433e75 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -337,6 +337,21 @@ int switchdev_port_attr_set(struct net_device *dev, } EXPORT_SYMBOL_GPL(switchdev_port_attr_set); +static size_t switchdev_obj_size(const struct switchdev_obj *obj) +{ + switch (obj->id) { + case SWITCHDEV_OBJ_ID_PORT_VLAN: + return sizeof(struct switchdev_obj_port_vlan); + case SWITCHDEV_OBJ_ID_IPV4_FIB: + return sizeof(struct switchdev_obj_ipv4_fib); + case SWITCHDEV_OBJ_ID_PORT_FDB: + return sizeof(struct switchdev_obj_port_fdb); + default: + BUG(); + } + return 0; +} + static int __switchdev_port_obj_add(struct net_device *dev, const struct switchdev_obj *obj, struct switchdev_trans *trans) @@ -422,7 +437,7 @@ static void switchdev_port_obj_add_deferred(struct net_device *dev, static int switchdev_port_obj_add_defer(struct net_device *dev, const struct switchdev_obj *obj) { - return switchdev_deferred_enqueue(dev, obj, sizeof(*obj), + return switchdev_deferred_enqueue(dev, obj, switchdev_obj_size(obj), switchdev_port_obj_add_deferred); } @@ -490,7 +505,7 @@ static void switchdev_port_obj_del_deferred(struct net_device *dev, static int switchdev_port_obj_del_defer(struct net_device *dev, const struct switchdev_obj *obj) { - return switchdev_deferred_enqueue(dev, obj, sizeof(*obj), + return switchdev_deferred_enqueue(dev, obj, switchdev_obj_size(obj), switchdev_port_obj_del_deferred); }