Add NL80211_CMD_NAN_NDP_TERMINATE to allow userspace to tear down an established NDP session when NDP management is offloaded to firmware. Add the corresponding parameter structure, nl80211 policy, command handler, and driver callback. Reject the request if the driver has not advertised NDP offload capability. Signed-off-by: Shivani Baranwal --- include/net/cfg80211.h | 20 +++++++++++++ include/uapi/linux/nl80211.h | 5 ++++ net/wireless/nl80211.c | 58 ++++++++++++++++++++++++++++++++++++ net/wireless/rdev-ops.h | 16 ++++++++++ net/wireless/trace.h | 24 +++++++++++++++ 5 files changed, 123 insertions(+) diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 15b9c88d7ace..a79098623442 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -4421,6 +4421,21 @@ struct cfg80211_nan_ndp_respond { bool ndpe; }; +/** + * struct cfg80211_nan_ndp_terminate - NAN NDP terminate parameters + * + * @peer_nmi: peer NMI address + * @ndp_id: NDP ID to terminate + * @init_ndi: initiator NDI MAC address + * @reason: termination reason code + */ +struct cfg80211_nan_ndp_terminate { + const u8 *peer_nmi; + u8 ndp_id; + const u8 *init_ndi; + u8 reason; +}; + /** * enum cfg80211_nan_conf_changes - indicates changed fields in NAN * configuration @@ -5403,6 +5418,8 @@ struct mgmt_frame_regs { * Only valid if the driver has set %WIPHY_NAN_FLAGS_OFFLOAD_NDP. * @nan_ndp_respond: Respond to an incoming NDP request as the responder. * Only valid if the driver has set %WIPHY_NAN_FLAGS_OFFLOAD_NDP. + * @nan_ndp_terminate: Terminate an established NDP session. + * Only valid if the driver has set %WIPHY_NAN_FLAGS_OFFLOAD_NDP. * * @set_multicast_to_unicast: configure multicast to unicast conversion for BSS * @@ -5817,6 +5834,9 @@ struct cfg80211_ops { int (*nan_ndp_respond)(struct wiphy *wiphy, struct wireless_dev *wdev, struct cfg80211_nan_ndp_respond *params); + int (*nan_ndp_terminate)(struct wiphy *wiphy, + struct wireless_dev *wdev, + struct cfg80211_nan_ndp_terminate *params); int (*set_multicast_to_unicast)(struct wiphy *wiphy, struct net_device *dev, const bool enabled); diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 9eb96251f0c2..c2b81e2c4366 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -1479,6 +1479,10 @@ * interface specified in %NL80211_NAN_NDP_ATTR_RESP_NDI must already * exist as a %NL80211_IFTYPE_NAN_DATA interface. Carries * %NL80211_ATTR_NAN_NDP nested with %NL80211_NAN_NDP_ATTR_* fields. + * @NL80211_CMD_NAN_NDP_TERMINATE: Terminate an established NDP. + * Requires %WIPHY_NAN_FLAGS_OFFLOAD_NDP. Carries %NL80211_ATTR_NAN_NDP + * nested with %NL80211_NAN_NDP_ATTR_ID, %NL80211_NAN_NDP_ATTR_INIT_NDI + * and optionally %NL80211_NAN_NDP_ATTR_REASON. * * @NL80211_CMD_MAX: highest used command number * @__NL80211_CMD_AFTER_LAST: internal use @@ -1764,6 +1768,7 @@ enum nl80211_commands { NL80211_CMD_NAN_NDP_INITIATE, NL80211_CMD_NAN_NDP_RESPOND, + NL80211_CMD_NAN_NDP_TERMINATE, /* add new commands above here */ diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 7593e69c5b3e..7c2952947a84 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -18746,6 +18746,58 @@ static int nl80211_nan_ndp_respond(struct sk_buff *skb, return rdev_nan_ndp_respond(rdev, wdev, ¶ms); } +static int nl80211_nan_ndp_terminate(struct sk_buff *skb, + struct genl_info *info) +{ + struct cfg80211_registered_device *rdev = info->user_ptr[0]; + struct wireless_dev *wdev = info->user_ptr[1]; + struct nlattr *tb[NL80211_NAN_NDP_ATTR_MAX + 1]; + struct cfg80211_nan_ndp_terminate params = {}; + int err; + + if (wdev->iftype != NL80211_IFTYPE_NAN) { + NL_SET_ERR_MSG(info->extack, + "NDP terminate requires NAN interface"); + return -EOPNOTSUPP; + } + + if (!(rdev->wiphy.nan_capa.flags & WIPHY_NAN_FLAGS_OFFLOAD_NDP)) { + NL_SET_ERR_MSG(info->extack, + "NAN NDP offload not supported by driver"); + return -EOPNOTSUPP; + } + + if (!info->attrs[NL80211_ATTR_MAC] || + !info->attrs[NL80211_ATTR_NAN_NDP]) { + NL_SET_ERR_MSG(info->extack, + "NDP terminate requires peer NMI and NDP params"); + return -EINVAL; + } + + err = nla_parse_nested(tb, NL80211_NAN_NDP_ATTR_MAX, + info->attrs[NL80211_ATTR_NAN_NDP], + nl80211_nan_ndp_policy, + info->extack); + if (err) + return err; + + if (!tb[NL80211_NAN_NDP_ATTR_ID] || + !tb[NL80211_NAN_NDP_ATTR_INIT_NDI]) { + NL_SET_ERR_MSG(info->extack, + "NDP terminate requires NDP ID and INIT_NDI"); + return -EINVAL; + } + + params.peer_nmi = nla_data(info->attrs[NL80211_ATTR_MAC]); + params.ndp_id = nla_get_u8(tb[NL80211_NAN_NDP_ATTR_ID]); + params.init_ndi = nla_data(tb[NL80211_NAN_NDP_ATTR_INIT_NDI]); + + if (tb[NL80211_NAN_NDP_ATTR_REASON]) + params.reason = nla_get_u8(tb[NL80211_NAN_NDP_ATTR_REASON]); + + return rdev_nan_ndp_terminate(rdev, wdev, ¶ms); +} + static bool nl80211_nan_is_sched_empty(struct cfg80211_nan_local_sched *sched) { if (!sched->n_channels) @@ -21910,6 +21962,12 @@ static const struct genl_small_ops nl80211_small_ops[] = { .flags = GENL_ADMIN_PERM, .internal_flags = IFLAGS(NL80211_FLAG_NEED_WDEV_UP), }, + { + .cmd = NL80211_CMD_NAN_NDP_TERMINATE, + .doit = nl80211_nan_ndp_terminate, + .flags = GENL_ADMIN_PERM, + .internal_flags = IFLAGS(NL80211_FLAG_NEED_WDEV_UP), + }, }; static struct genl_family nl80211_fam __ro_after_init = { diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h index 3fbc5b701768..e4b57983d591 100644 --- a/net/wireless/rdev-ops.h +++ b/net/wireless/rdev-ops.h @@ -1215,6 +1215,22 @@ rdev_nan_ndp_respond(struct cfg80211_registered_device *rdev, return ret; } +static inline int +rdev_nan_ndp_terminate(struct cfg80211_registered_device *rdev, + struct wireless_dev *wdev, + struct cfg80211_nan_ndp_terminate *params) +{ + int ret; + + if (!rdev->ops->nan_ndp_terminate) + return -EOPNOTSUPP; + + trace_rdev_nan_ndp_terminate(&rdev->wiphy, wdev, params); + ret = rdev->ops->nan_ndp_terminate(&rdev->wiphy, wdev, params); + trace_rdev_return_int(&rdev->wiphy, ret); + return ret; +} + static inline int rdev_set_mac_acl(struct cfg80211_registered_device *rdev, struct net_device *dev, struct cfg80211_acl_data *params) diff --git a/net/wireless/trace.h b/net/wireless/trace.h index f937941c6076..fbe3eb69cd14 100644 --- a/net/wireless/trace.h +++ b/net/wireless/trace.h @@ -2598,6 +2598,30 @@ TRACE_EVENT(rdev_nan_ndp_respond, __entry->peer_nmi, __entry->ndp_id, __entry->accept) ); +TRACE_EVENT(rdev_nan_ndp_terminate, + TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev, + struct cfg80211_nan_ndp_terminate *params), + TP_ARGS(wiphy, wdev, params), + TP_STRUCT__entry( + WIPHY_ENTRY + WDEV_ENTRY + __array(u8, peer_nmi, ETH_ALEN) + __field(u8, ndp_id) + __field(u8, reason) + ), + TP_fast_assign( + WIPHY_ASSIGN; + WDEV_ASSIGN; + memcpy(__entry->peer_nmi, params->peer_nmi, ETH_ALEN); + __entry->ndp_id = params->ndp_id; + __entry->reason = params->reason; + ), + TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT + ", peer: %pM, ndp_id: %u, reason: %u", + WIPHY_PR_ARG, WDEV_PR_ARG, + __entry->peer_nmi, __entry->ndp_id, __entry->reason) +); + TRACE_EVENT(rdev_set_mac_acl, TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, struct cfg80211_acl_data *params), -- 2.34.1