From patchwork Fri Aug 16 03:55:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hangbin Liu X-Patchwork-Id: 13765391 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4B6754F87 for ; Fri, 16 Aug 2024 03:55:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723780534; cv=none; b=BU2tuwsFMNP8i/UGetfYS266b40yBdFthNjR/qvPGB1fuqVXyoYtTebbbfUfTsj1NPf8nr4WEbl42jedlaps1XotIc1WgvZOlh1gxbp8DgYf1wSHsxfpnuj8U/O62xeom64R8N5SnV9ftwlvovTM12syUnmrYKMoEAnh2XD2BCs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723780534; c=relaxed/simple; bh=/SCSfYCiqVONLw677BN/ybQPhGeQWUJHvAar0f4hd0c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FaGE+EVheopr1HgJ0+5GxWsTn4TkEvZOGljlZbEhL6r6JcnpaPuXGxKLwDv2RG7ZqbmwHVVXAVhNxab+i10320H0WfMhwDnfA9cfa6SM4vnIa+q001Kyhtw3lMvacoWf2r9XHVIUoZfP21yCDPui6CGb4UV3tW5bUU3llTfOSb4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=chz464Sr; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="chz464Sr" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-201f2b7fe0dso10606665ad.1 for ; Thu, 15 Aug 2024 20:55:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723780532; x=1724385332; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=X29KUg7v3bdgkh3yCqFBDEscioym2OEzSDPA/5CisPA=; b=chz464SrLyQb2bi98xR0wRTpbx7tn5G8ngR3WDmLKmnH6GbivJ+cXhTccF1BDnnlNV UqSBP5AdAlZbOF26yAC029LKJWiYnsxRulCqjlz6sE8JOsZubsWvvf6B2OGgVIzElGyr sc09RVcgBMtpk2bFXLkNmcMUNxtEUF6HMFnGnvLWJ3Dj/iDggPvZIuqKxfpUCYRz2Vgm 6la+inc6Ysm+k1Ptz8dez0kPq8vjgx6lXPI7ST45rXz9twTbZSXLD466D/8G1/Lzv/Fe av6RhINBMQXyUY6PkKKP4sjiLx1QIF2GF8hnv2qt9/R1ZclMryTderAI4UEE055SzBtt /9vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723780532; x=1724385332; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X29KUg7v3bdgkh3yCqFBDEscioym2OEzSDPA/5CisPA=; b=HyG4v5c18GexpzYyhY9LVaNCGFbTDKOZkp6xNJo6S0j0h0PkOzJtTOxkKVP4wQ0GVB /45QcjnDzEWY50/eJV9xVpg/7sgNn1fOXv6kuZ0tKCdQjS3eGTsGly8u1Zca5LQL+izF /RupstRt2QTiMHDUe0zzD08U+uU821mdvhEBslPyjCXskD/5XESq1Zuu4+AxXAXjqbdH UX7eBDhpzqIzS7/sIRKRYCXG4aZLJZSL/EtFS7dMhdDx4I7Jsy7rH7VavTgS+G7iLzR8 jy5URvdpgIKsGlox1pISS3MYJRIMrMKGQPxXB0JS9CMPQrPcs+9IkWFsau1jK7mLQSrs H4fQ== X-Gm-Message-State: AOJu0YyiUEIZsmOjnyHf2IH2fmdLvRLU1iPxGd26w8R0LEq9d5RpDTuX fxD9/F0CfeSC/NWAPwjrAljg87DX2vNA5oP4qUXhQZQAZP4dhznVPnY7v19cNTs= X-Google-Smtp-Source: AGHT+IG8D4DZyVNCUEJZgYHjCyiLCnjZRKx7EYkFiVxWi9LONxlrnib28892ZQdPvXwWUxX99QrHew== X-Received: by 2002:a17:902:8685:b0:1fd:6c5b:afbc with SMTP id d9443c01a7336-20203f31ec6mr16364115ad.49.1723780531712; Thu, 15 Aug 2024 20:55:31 -0700 (PDT) Received: from Laptop-X1.redhat.com ([43.228.180.230]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-201f037563dsm17112105ad.131.2024.08.15.20.55.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Aug 2024 20:55:31 -0700 (PDT) From: Hangbin Liu To: netdev@vger.kernel.org Cc: Jay Vosburgh , "David S . Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , Nikolay Aleksandrov , Tariq Toukan , Jianbo Liu , Sabrina Dubroca , Hangbin Liu Subject: [PATCH net-next 1/2] bonding: Add ESN support to IPSec HW offload Date: Fri, 16 Aug 2024 11:55:17 +0800 Message-ID: <20240816035518.203704-2-liuhangbin@gmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240816035518.203704-1-liuhangbin@gmail.com> References: <20240816035518.203704-1-liuhangbin@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Currently, users can see that bonding supports IPSec HW offload via ethtool. However, this functionality does not work with NICs like Mellanox cards when ESN (Extended Sequence Numbers) is enabled, as ESN functions are not yet supported. This patch adds ESN support to the bonding IPSec device offload, ensuring proper functionality with NICs that support ESN. Signed-off-by: Hangbin Liu --- drivers/net/bonding/bond_main.c | 38 +++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index f9633a6f8571..4e3d7979fe01 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -629,10 +629,48 @@ static bool bond_ipsec_offload_ok(struct sk_buff *skb, struct xfrm_state *xs) return err; } +/** + * bond_advance_esn_state - ESN support for IPSec HW offload + * @xs: pointer to transformer state struct + **/ +static void bond_advance_esn_state(struct xfrm_state *xs) +{ + struct net_device *bond_dev = xs->xso.dev; + struct bond_ipsec *ipsec; + struct bonding *bond; + struct slave *slave; + + if (!bond_dev) + return; + + rcu_read_lock(); + bond = netdev_priv(bond_dev); + slave = rcu_dereference(bond->curr_active_slave); + + if (!slave) + goto out; + + if (!xs->xso.real_dev) + goto out; + + WARN_ON(xs->xso.real_dev != slave->dev); + + if (!slave->dev->xfrmdev_ops || + !slave->dev->xfrmdev_ops->xdo_dev_state_advance_esn) { + slave_warn(bond_dev, slave->dev, "%s: no slave xdo_dev_state_advance_esn\n", __func__); + goto out; + } + + slave->dev->xfrmdev_ops->xdo_dev_state_advance_esn(xs); +out: + rcu_read_unlock(); +} + static const struct xfrmdev_ops bond_xfrmdev_ops = { .xdo_dev_state_add = bond_ipsec_add_sa, .xdo_dev_state_delete = bond_ipsec_del_sa, .xdo_dev_offload_ok = bond_ipsec_offload_ok, + .xdo_dev_state_advance_esn = bond_advance_esn_state, }; #endif /* CONFIG_XFRM_OFFLOAD */ From patchwork Fri Aug 16 03:55:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hangbin Liu X-Patchwork-Id: 13765392 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C24A854F87 for ; Fri, 16 Aug 2024 03:55:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723780539; cv=none; b=dkgsjKpKuShwxaYstC1pXOdWUQJX+mKShQI0qM1TPDjt4dP+B7IRvUSghNBCpPvLtxFSxoZVUf+wAY2EHRZg7L5oQ4Pudrpr2l5dI0SjYY/EFewiCpgzlHgMqJpNsSEoBj5R2R7Mi5MVEx5/boHR62H4+FM91zujd7M85An6WPI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723780539; c=relaxed/simple; bh=LXAZQo2Mpd4m8GHlXw7MBZ9cu3lIUt4NTOdwiXQOnNE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YV1KQSI3XvGa+1wfa4CjSyrU+5YrcmxQew4tITdcrJ9E2A1TqULb5Bqlr542FJM+poYHObjUr9uYnQACNQDsg/WCT/M7Tc/7nIQXgvfuyp/RF08uh7AwW42yE2dwohpAC4UbLk3gYHdriBuoLz/IAvxMKzuaRC9lLxel/pKK6Hs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eOD9K73N; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eOD9K73N" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-201f7fb09f6so9025125ad.2 for ; Thu, 15 Aug 2024 20:55:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723780537; x=1724385337; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xEPcBqspktezhJ1h6WlEqbKQAI755uIbjlu43rGDgEA=; b=eOD9K73Nkv7Hv8CWhx/mao0Uf0iB9dr5pMxZZQy9kCtAVkT+UF6Z6vGy49mBZMy1UJ ykbyYFq/P+xaKcRrHhLE0WshGbf8WIsgJQUWg+8PnvboCSAopNCBpioij7h7N/O+LUbp WV1wxvoP11i54lnsnwqe0230ryn42JaCrQcg/kSSHyUNO5upwn3+njzAP31cB0RH6DG/ A29ER2DNbCFQLZ0tSn6DuMACrsv62ns728Xtsuz5sAs0RlUkv3bRumYRNx7uTPvMXXmH Kdz9IB9qMtKnOAlkWa7jCLa2bup7GrIIq526MVELQUJURea/gUmmgat2eePyARdls9u+ iJ5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723780537; x=1724385337; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xEPcBqspktezhJ1h6WlEqbKQAI755uIbjlu43rGDgEA=; b=KjUTnJdIX5PEmVXDRKd8YYtkwz9DJCeg9Jq01bYkWNPLt6fd8h4+VsHJkO4b7hnXLu or6tB5UcqEE/xkDnYPTnkKk7Y/2LD8n01VzeuEanwUsNA3/b2/nuDMim29BYm5FBalE8 SItGYJRD9HOt8OiCpuzMeRce1yh8MFc6oYG+vLROPt/as+bOSYQBr+1jrUh7L3mMVY7b MItozVakrKLQG9Wfq5LDF9UWhJPkixkqGrD62wWgo/srH1UJvnXm2r8kaiazLhtis/ff JPgI5FQJqJX9Kboe6FJkGs6kLfr1TZ7Iwsdrp8FlvwNIjMAuljiHZv/3+z9xfyAf0QLw ac3A== X-Gm-Message-State: AOJu0YzHzb/kc0zUih1PvQJLQRt633X0BlSTJ1RYu0mcJ8Y2SUdHVYYW CdWLaq8AoAzoktnyKgzre3vF6R/+c9zlq3EzIoxRvgfaQZMc/B+TL5MSiobW2EQ= X-Google-Smtp-Source: AGHT+IEOurbOFyB7ZeTtD9GzuxDIERE/apYiIKxJex3pOsvSoV650qqOi1fXpq9RQWFYxFCm35KgPQ== X-Received: by 2002:a17:902:fa03:b0:201:e49e:aaf6 with SMTP id d9443c01a7336-20203ea82fdmr15644435ad.19.1723780536876; Thu, 15 Aug 2024 20:55:36 -0700 (PDT) Received: from Laptop-X1.redhat.com ([43.228.180.230]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-201f037563dsm17112105ad.131.2024.08.15.20.55.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Aug 2024 20:55:36 -0700 (PDT) From: Hangbin Liu To: netdev@vger.kernel.org Cc: Jay Vosburgh , "David S . Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , Nikolay Aleksandrov , Tariq Toukan , Jianbo Liu , Sabrina Dubroca , Hangbin Liu Subject: [PATCH net-next 2/2] bonding: support xfrm state update Date: Fri, 16 Aug 2024 11:55:18 +0800 Message-ID: <20240816035518.203704-3-liuhangbin@gmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240816035518.203704-1-liuhangbin@gmail.com> References: <20240816035518.203704-1-liuhangbin@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org The patch add xfrm statistics update for bonding IPsec offload. Signed-off-by: Hangbin Liu --- drivers/net/bonding/bond_main.c | 38 +++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 4e3d7979fe01..9a7caf677c71 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -666,11 +666,49 @@ static void bond_advance_esn_state(struct xfrm_state *xs) rcu_read_unlock(); } +/** + * bond_xfrm_update_stats - Update xfrm state + * @xs: pointer to transformer state struct + **/ +static void bond_xfrm_update_stats(struct xfrm_state *xs) +{ + struct net_device *bond_dev = xs->xso.dev; + struct bond_ipsec *ipsec; + struct bonding *bond; + struct slave *slave; + + if (!bond_dev) + return; + + rcu_read_lock(); + bond = netdev_priv(bond_dev); + slave = rcu_dereference(bond->curr_active_slave); + + if (!slave) + goto out; + + if (!xs->xso.real_dev) + goto out; + + WARN_ON(xs->xso.real_dev != slave->dev); + + if (!slave->dev->xfrmdev_ops || + !slave->dev->xfrmdev_ops->xdo_dev_state_update_stats) { + slave_warn(bond_dev, slave->dev, "%s: no slave xdo_dev_state_update_stats\n", __func__); + goto out; + } + + slave->dev->xfrmdev_ops->xdo_dev_state_update_stats(xs); +out: + rcu_read_unlock(); +} + static const struct xfrmdev_ops bond_xfrmdev_ops = { .xdo_dev_state_add = bond_ipsec_add_sa, .xdo_dev_state_delete = bond_ipsec_del_sa, .xdo_dev_offload_ok = bond_ipsec_offload_ok, .xdo_dev_state_advance_esn = bond_advance_esn_state, + .xdo_dev_state_update_stats = bond_xfrm_update_stats, }; #endif /* CONFIG_XFRM_OFFLOAD */