Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp1298655pxu; Sat, 5 Dec 2020 10:36:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJzB2nkkYEg+gqq5vwHPI8Nsc55L+klPlzif1nwKB41GhXtXvkKoziflHbn0k5TRm5ZJXAZy X-Received: by 2002:a17:906:3b4d:: with SMTP id h13mr12304860ejf.289.1607193407318; Sat, 05 Dec 2020 10:36:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607193407; cv=none; d=google.com; s=arc-20160816; b=B3dT4eFPed6Zi2RXCliBsnruBdDoyy11oav3rAtZUSS6YIxLxsgC196/Cl6Uea4uYo mn7TIqnCDJ9v3gYhWLGXNZulAaKAemG+zeV3Qlllf4C9keD52H+/5sL6eZ+8sYP307kV MC4KL06KUylNsF2YnEBi2fw79lbLx2CQ0uqiUoIxzNU/gU3vl22yT4cGT5Mr3ns2eUib zJLQh3pB7OkTx2PZ7NnqhTIc+AUPoo5C+sTXrJXxycEWn41PJXzmYZLRZnEpx1V/BA1w xMrUYcjxIzi6GsGBJjSA1Lnj39ViYnWw3Kwnxz01uW5YlCNaeiUasOH1cpBnvjYzNxCC q+iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=f/gLGPmePhuO2f+EARH9bT98ZpjrYraDFm24BynZYug=; b=j7UfdClWFQFIR65RpZH5XeLWTMREz3SLlR4rLQ992ZQ+MTDHrbiCyBB12L8V+Umeii ZI4VX516QK3SASKM67QVLwpgFdaXn9ViUQZlLCrfryc8Zv+bSFUCQdR6d/0WdHf/BKUJ qqoBs6lmExg4KfI+9OfZD0tWvZgUmDwPe7ce3EA6nEUCMoHd8naQ5mx5Ma5o2N9ZHsgD U0m98ElR0/j3maDuYwrvlYggv4QHcdlp2VBfJKlxTSEoRRRXLvoz76PlXTEWCswnKw5W ziOoX+EREdVH6J7JZkTBnfKsBSd9ydKiIp/qGbIhEQzjU50OQbDuAbk2OzyXfY3BBBu0 dw1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Z2k7rQml; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b16si3691011eju.94.2020.12.05.10.36.24; Sat, 05 Dec 2020 10:36:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Z2k7rQml; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729978AbgLESTt (ORCPT + 99 others); Sat, 5 Dec 2020 13:19:49 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:57960 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727868AbgLERra (ORCPT ); Sat, 5 Dec 2020 12:47:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607190361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f/gLGPmePhuO2f+EARH9bT98ZpjrYraDFm24BynZYug=; b=Z2k7rQmlQZN5GfKq1fMxsOExRscmOPMzn59gKZ1uVAPioSxq9OdBnAEUb4zI4dHeV1WiIP LB9akMCltOAkBEKDv2WD7dG9WeHfIqGQ/buVCX4X2uCR+U+ofVwhtnwqwgeZVw8eoKnhYo czGOehuv+qCbbCzaQ3NqN7+vJatFGZ8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-133-7Uinrg3KOaSUE9_ZDuhMHQ-1; Sat, 05 Dec 2020 12:22:42 -0500 X-MC-Unique: 7Uinrg3KOaSUE9_ZDuhMHQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 10EA1107ACE4; Sat, 5 Dec 2020 17:22:41 +0000 (UTC) Received: from f33vm.wilsonet.com (dhcp-17-185.bos.redhat.com [10.18.17.185]) by smtp.corp.redhat.com (Postfix) with ESMTP id 46DE35D6D5; Sat, 5 Dec 2020 17:22:36 +0000 (UTC) From: Jarod Wilson To: linux-kernel@vger.kernel.org Cc: Jarod Wilson , Ivan Vecera , Jay Vosburgh , Veaceslav Falico , Andy Gospodarek , "David S. Miller" , Jakub Kicinski , Thomas Davis , netdev@vger.kernel.org Subject: [PATCH net v4] bonding: fix feature flag setting at init time Date: Sat, 5 Dec 2020 12:22:29 -0500 Message-Id: <20201205172229.576587-1-jarod@redhat.com> In-Reply-To: <20201203004357.3125-1-jarod@redhat.com> References: <20201203004357.3125-1-jarod@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Don't try to adjust XFRM support flags if the bond device isn't yet registered. Bad things can currently happen when netdev_change_features() is called without having wanted_features fully filled in yet. This code runs both on post-module-load mode changes, as well as at module init time, and when run at module init time, it is before register_netdevice() has been called and filled in wanted_features. The empty wanted_features led to features also getting emptied out, which was definitely not the intended behavior, so prevent that from happening. Originally, I'd hoped to stop adjusting wanted_features at all in the bonding driver, as it's documented as being something only the network core should touch, but we actually do need to do this to properly update both the features and wanted_features fields when changing the bond type, or we get to a situation where ethtool sees: esp-hw-offload: off [requested on] I do think we should be using netdev_update_features instead of netdev_change_features here though, so we only send notifiers when the features actually changed. Fixes: a3b658cfb664 ("bonding: allow xfrm offload setup post-module-load") Reported-by: Ivan Vecera Suggested-by: Ivan Vecera Cc: Jay Vosburgh Cc: Veaceslav Falico Cc: Andy Gospodarek Cc: "David S. Miller" Cc: Jakub Kicinski Cc: Thomas Davis Cc: netdev@vger.kernel.org Signed-off-by: Jarod Wilson --- v2: rework based on further testing and suggestions from ivecera v3: add helper function, remove goto v4: drop hunk not directly related to fix, clean up ifdeffery drivers/net/bonding/bond_options.c | 22 +++++++++++++++------- include/net/bonding.h | 2 -- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c index 9abfaae1c6f7..a4e4e15f574d 100644 --- a/drivers/net/bonding/bond_options.c +++ b/drivers/net/bonding/bond_options.c @@ -745,6 +745,19 @@ const struct bond_option *bond_opt_get(unsigned int option) return &bond_opts[option]; } +static void bond_set_xfrm_features(struct net_device *bond_dev, u64 mode) +{ + if (!IS_ENABLED(CONFIG_XFRM_OFFLOAD)) + return; + + if (mode == BOND_MODE_ACTIVEBACKUP) + bond_dev->wanted_features |= BOND_XFRM_FEATURES; + else + bond_dev->wanted_features &= ~BOND_XFRM_FEATURES; + + netdev_update_features(bond_dev); +} + static int bond_option_mode_set(struct bonding *bond, const struct bond_opt_value *newval) { @@ -767,13 +780,8 @@ static int bond_option_mode_set(struct bonding *bond, if (newval->value == BOND_MODE_ALB) bond->params.tlb_dynamic_lb = 1; -#ifdef CONFIG_XFRM_OFFLOAD - if (newval->value == BOND_MODE_ACTIVEBACKUP) - bond->dev->wanted_features |= BOND_XFRM_FEATURES; - else - bond->dev->wanted_features &= ~BOND_XFRM_FEATURES; - netdev_change_features(bond->dev); -#endif /* CONFIG_XFRM_OFFLOAD */ + if (bond->dev->reg_state == NETREG_REGISTERED) + bond_set_xfrm_features(bond->dev, newval->value); /* don't cache arp_validate between modes */ bond->params.arp_validate = BOND_ARP_VALIDATE_NONE; diff --git a/include/net/bonding.h b/include/net/bonding.h index d9d0ff3b0ad3..adc3da776970 100644 --- a/include/net/bonding.h +++ b/include/net/bonding.h @@ -86,10 +86,8 @@ #define bond_for_each_slave_rcu(bond, pos, iter) \ netdev_for_each_lower_private_rcu((bond)->dev, pos, iter) -#ifdef CONFIG_XFRM_OFFLOAD #define BOND_XFRM_FEATURES (NETIF_F_HW_ESP | NETIF_F_HW_ESP_TX_CSUM | \ NETIF_F_GSO_ESP) -#endif /* CONFIG_XFRM_OFFLOAD */ #ifdef CONFIG_NET_POLL_CONTROLLER extern atomic_t netpoll_block_tx; -- 2.28.0