Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 64AEF44B69C for ; Tue, 16 Jun 2026 15:54:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781625287; cv=none; b=t0kIqU8TEEQgT1lgP4tPgJHek6eJgzcC+3dC1EHgl51WeonzkPQ+rDxlrP48TT/qhZPtKTc7+qOE+M8jZq87hjvmo0HW1OR9YmV6FkJTeFhz1g9IXqoK/qQZJOGSYKrpObvrpSjFJE+osk2PCavUALF8p6jWK1jbYu5FT4YsXqo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781625287; c=relaxed/simple; bh=lt7KJWxHanlC3JXGy1d9pRqJflP/ZJUOJYyG6HzY9II=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=TLKqnjGa0Eo7UIqLtDdyWAA5itzjogjL5MLwJNxRMdmel97Wg2V2EZDknOQtpBUQsCqZrlcuid/uRQrx5tZy64kQVKYVWQLrOU1Tv1BetrFpSZa3NK1glmn/QPVzLojqEkEEx31tAaTuXXbsBcf64o9zUnz8DMgbbLIA7QduUvA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--kpberry.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=h7EEI9MI; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--kpberry.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="h7EEI9MI" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2bd04e4fe3dso119171265ad.3 for ; Tue, 16 Jun 2026 08:54:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781625286; x=1782230086; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=eB2+P3x9rTTEifWl/2rNhxGcg9EpjrZ/39h+Dy5yLtg=; b=h7EEI9MIazZBmwH6U7yrPQXgLk0OxB6bV6wPVRYuZpABDC7VJVgfJkHAc7f3UvBqTH DGIiRNTbrxQz/LqtfLwysu2p0df0vA504aoYaCq9SpBDPycZJJny+IFsU6Z1XWHC2iT2 pV3yQHVopVkcxJZX0KuII9XJdWdX+/j3vLiFpgInGvxxQgWUL61iAPTmY1nFzKMOQqRK 6QDMKdDrNZ2XUvKZtn3ZTJ+rx0255biQqUvBhTMnbLsbrfkJ34gOaOsFyI2DWnEE0zth 5cCW10H8XdE0d9+6mjLpabwWuvI55gNGQGc34MuMBszmbGav6vWm3k6yVXUHy7KnZpyt yk7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781625286; x=1782230086; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=eB2+P3x9rTTEifWl/2rNhxGcg9EpjrZ/39h+Dy5yLtg=; b=OwAFErOhv2S6qUXCST4Lt+Pn50kCWr1SfpofYCdJWSNp4Q6McHkfeKHprVeL4NcIUo sr8Y0P6QUHfyCqrgZV+wMc3OezjokM/z6E4UMXAH4IScxB59bd3EtNUgfJR4LXgSDO97 TUpDzJrTYxmYsxIg3XBG3n9lPphvzjHY84RwiGas/0g+F1VYAAzi1b2p/PFp1lBOysCb 37nUBA72XVpwuN/kqOEAjKp/yRqiY5JKHaNcuHQCF1CECnKHPDkwZd4xfwh/whHHNiju 64zqq61Tggx3bV5WBQ+1MaJvzr7W342Z9VNibcr9gklTC/G9/958fD7A9RTYGnb0fJPM Xt6A== X-Gm-Message-State: AOJu0Ywq5iBZubojd4ryxMOeGhxMQ0AJ6ayG2ANRavGTGOjtgEZhl/oY 5pIA5g1UjQi4VYjhBAbsY+5rDO7hX9eeLmdK4RM+wOtcvRiXhuTroitZUKh19aDubPqBS4sCg7A 4RbR8sUFJ6+PGfNxepa9zZvVsVWw1qgmXU4RucCxoazsRIb620kbuaGk1UgPTOk2zLucQ4d1Cfj pAYSwjOFR72FGQn75lMgXF1GVzEnDaNNZ/kXdivW/Zmg== X-Received: from pgac28.prod.google.com ([2002:a05:6a02:295c:b0:c85:9a33:baf4]) (user=kpberry job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:6d9d:b0:3b4:7e2d:a3bc with SMTP id adf61e73a8af0-3b8b3146d8bmr3842637.0.1781625285236; Tue, 16 Jun 2026 08:54:45 -0700 (PDT) Date: Tue, 16 Jun 2026 15:54:27 +0000 In-Reply-To: <20260616155432.2093908-1-kpberry@google.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260616155432.2093908-1-kpberry@google.com> X-Mailer: git-send-email 2.54.0.1136.gdb2ca164c4-goog Message-ID: <20260616155432.2093908-5-kpberry@google.com> Subject: [PATCH 6.12 4/7] bonding: print churn state via netlink From: Kevin Berry To: stable@vger.kernel.org Cc: gregkh@linuxfoundation.org, bestswngs@gmail.com, chenglongtang@google.com, joneslee@google.com, kpberry@google.com, pabeni@redhat.com, rnj@google.com, sashal@kernel.org, xmei5@asu.edu, Hangbin Liu Content-Type: text/plain; charset="UTF-8" From: Hangbin Liu [ Upstream commit 4916f2e2f3fc9aef289fcd07949301e5c29094c2 ] Currently, the churn state is printed only in sysfs. Add netlink support so users could get the state via netlink. Signed-off-by: Hangbin Liu Link: https://patch.msgid.link/20260224020215.6012-1-liuhangbin@gmail.com Signed-off-by: Paolo Abeni Signed-off-by: Kevin Berry --- drivers/net/bonding/bond_netlink.c | 9 +++++++++ include/uapi/linux/if_link.h | 2 ++ 2 files changed, 11 insertions(+) diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c index f8fc6e5fd803..98e635717364 100644 --- a/drivers/net/bonding/bond_netlink.c +++ b/drivers/net/bonding/bond_netlink.c @@ -29,6 +29,8 @@ static size_t bond_get_slave_size(const struct net_device *bond_dev, nla_total_size(sizeof(u16)) + /* IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE */ nla_total_size(sizeof(s32)) + /* IFLA_BOND_SLAVE_PRIO */ nla_total_size(sizeof(u16)) + /* IFLA_BOND_SLAVE_ACTOR_PORT_PRIO */ + nla_total_size(sizeof(u8)) + /* IFLA_BOND_SLAVE_AD_CHURN_ACTOR_STATE */ + nla_total_size(sizeof(u8)) + /* IFLA_BOND_SLAVE_AD_CHURN_PARTNER_STATE */ 0; } @@ -77,6 +79,13 @@ static int bond_fill_slave_info(struct sk_buff *skb, IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE, ad_port->partner_oper.port_state)) goto nla_put_failure; + + if (nla_put_u8(skb, IFLA_BOND_SLAVE_AD_CHURN_ACTOR_STATE, + ad_port->sm_churn_actor_state)) + goto nla_put_failure; + if (nla_put_u8(skb, IFLA_BOND_SLAVE_AD_CHURN_PARTNER_STATE, + ad_port->sm_churn_partner_state)) + goto nla_put_failure; } if (nla_put_u16(skb, IFLA_BOND_SLAVE_ACTOR_PORT_PRIO, diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index 1609450e5eaa..087048d620f3 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -1552,6 +1552,8 @@ enum { IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE, IFLA_BOND_SLAVE_PRIO, IFLA_BOND_SLAVE_ACTOR_PORT_PRIO, + IFLA_BOND_SLAVE_AD_CHURN_ACTOR_STATE, + IFLA_BOND_SLAVE_AD_CHURN_PARTNER_STATE, __IFLA_BOND_SLAVE_MAX, }; -- 2.54.0.1136.gdb2ca164c4-goog