Hi,
On Fri, Sep 22, 2023 at 11:50 AM Miquel Raynal
<miquel.raynal@xxxxxxxxxxx> wrote:
>
> Introduce structures to describe peer devices in a PAN as well as a few
> related helpers. We basically care about:
> - Our unique parent after associating with a coordinator.
> - Peer devices, children, which successfully associated with us.
>
> Signed-off-by: Miquel Raynal <miquel.raynal@xxxxxxxxxxx>
> ---
> include/net/cfg802154.h | 47 ++++++++++++++++++++++++++
> net/ieee802154/Makefile | 2 +-
> net/ieee802154/core.c | 2 ++
> net/ieee802154/pan.c | 73 +++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 123 insertions(+), 1 deletion(-)
> create mode 100644 net/ieee802154/pan.c
>
> diff --git a/include/net/cfg802154.h b/include/net/cfg802154.h
> index f79ce133e51a..a89f1c9cea3f 100644
> --- a/include/net/cfg802154.h
> +++ b/include/net/cfg802154.h
> @@ -303,6 +303,22 @@ struct ieee802154_coord_desc {
> bool gts_permit;
> };
>
> +/**
> + * struct ieee802154_pan_device - PAN device information
> + * @pan_id: the PAN ID of this device
> + * @mode: the preferred mode to reach the device
> + * @short_addr: the short address of this device
> + * @extended_addr: the extended address of this device
> + * @node: the list node
> + */
> +struct ieee802154_pan_device {
> + __le16 pan_id;
> + u8 mode;
> + __le16 short_addr;
> + __le64 extended_addr;
> + struct list_head node;
> +};
> +
> /**
> * struct cfg802154_scan_request - Scan request
> *
> @@ -478,6 +494,11 @@ struct wpan_dev {
>
> /* fallback for acknowledgment bit setting */
> bool ackreq;
> +
> + /* Associations */
> + struct mutex association_lock;
> + struct ieee802154_pan_device *parent;
> + struct list_head children;
> };
>
> #define to_phy(_dev) container_of(_dev, struct wpan_phy, dev)
> @@ -529,4 +550,30 @@ static inline const char *wpan_phy_name(struct wpan_phy *phy)
> void ieee802154_configure_durations(struct wpan_phy *phy,
> unsigned int page, unsigned int channel);
>
> +/**
> + * cfg802154_device_is_associated - Checks whether we are associated to any device
> + * @wpan_dev: the wpan device
> + * @return: true if we are associated
> + */
> +bool cfg802154_device_is_associated(struct wpan_dev *wpan_dev);
> +
> +/**
> + * cfg802154_device_is_parent - Checks if a device is our coordinator
> + * @wpan_dev: the wpan device
> + * @target: the expected parent
> + * @return: true if @target is our coordinator
> + */
> +bool cfg802154_device_is_parent(struct wpan_dev *wpan_dev,
> + struct ieee802154_addr *target);
> +
> +/**
> + * cfg802154_device_is_child - Checks whether a device is associated to us
> + * @wpan_dev: the wpan device
> + * @target: the expected child
> + * @return: the PAN device
> + */
> +struct ieee802154_pan_device *
> +cfg802154_device_is_child(struct wpan_dev *wpan_dev,
> + struct ieee802154_addr *target);
> +
> #endif /* __NET_CFG802154_H */
> diff --git a/net/ieee802154/Makefile b/net/ieee802154/Makefile
> index f05b7bdae2aa..7bce67673e83 100644
> --- a/net/ieee802154/Makefile
> +++ b/net/ieee802154/Makefile
> @@ -4,7 +4,7 @@ obj-$(CONFIG_IEEE802154_SOCKET) += ieee802154_socket.o
> obj-y += 6lowpan/
>
> ieee802154-y := netlink.o nl-mac.o nl-phy.o nl_policy.o core.o \
> - header_ops.o sysfs.o nl802154.o trace.o
> + header_ops.o sysfs.o nl802154.o trace.o pan.o
> ieee802154_socket-y := socket.o
>
> CFLAGS_trace.o := -I$(src)
> diff --git a/net/ieee802154/core.c b/net/ieee802154/core.c
> index 57546e07e06a..cd69bdbfd59f 100644
> --- a/net/ieee802154/core.c
> +++ b/net/ieee802154/core.c
> @@ -276,6 +276,8 @@ static int cfg802154_netdev_notifier_call(struct notifier_block *nb,
> wpan_dev->identifier = ++rdev->wpan_dev_id;
> list_add_rcu(&wpan_dev->list, &rdev->wpan_dev_list);
> rdev->devlist_generation++;
> + mutex_init(&wpan_dev->association_lock);
> + INIT_LIST_HEAD(&wpan_dev->children);
>
> wpan_dev->netdev = dev;
> break;
> diff --git a/net/ieee802154/pan.c b/net/ieee802154/pan.c
> new file mode 100644
> index 000000000000..1677bb89c5ff
> --- /dev/null
> +++ b/net/ieee802154/pan.c
> @@ -0,0 +1,73 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * IEEE 802.15.4 PAN management
> + *
> + * Copyright (C) 2023 Qorvo US, Inc
> + * Authors:
> + * - David Girault <david.girault@xxxxxxxxx>
> + * - Miquel Raynal <miquel.raynal@xxxxxxxxxxx>
> + */
> +
> +#include <linux/kernel.h>
> +#include <net/cfg802154.h>
> +#include <net/af_ieee802154.h>
> +
> +/* Checks whether a device address matches one from the PAN list.
> + * This helper is meant to be used only during PAN management, when we expect
> + * extended addresses to be used.
> + */
> +static bool cfg802154_device_in_pan(struct ieee802154_pan_device *pan_dev,
> + struct ieee802154_addr *ext_dev)
> +{
> + if (!pan_dev || !ext_dev)
> + return false;
> +
> + if (ext_dev->mode == IEEE802154_ADDR_SHORT)
> + return false;
> +
> + switch (ext_dev->mode) {
> + case IEEE802154_ADDR_SHORT:
> + return pan_dev->short_addr == ext_dev->short_addr;
This is dead code now, it will never be reached, it's checked above
(Or I don't see it)? I want to help you here. What exactly do you try
to reach here again?
> + case IEEE802154_ADDR_LONG:
> + return pan_dev->extended_addr == ext_dev->extended_addr;
> + default:
> + return false;
> + }
> +}
> +
> +bool cfg802154_device_is_associated(struct wpan_dev *wpan_dev)
> +{
> + bool is_assoc;
> +
> + mutex_lock(&wpan_dev->association_lock);
> + is_assoc = !list_empty(&wpan_dev->children) || wpan_dev->parent;
> + mutex_unlock(&wpan_dev->association_lock);
> +
> + return is_assoc;
> +}
> +
> +bool cfg802154_device_is_parent(struct wpan_dev *wpan_dev,
> + struct ieee802154_addr *target)
> +{
> + lockdep_assert_held(&wpan_dev->association_lock);
> +
> + if (cfg802154_device_in_pan(wpan_dev->parent, target))
> + return true;
> +
> + return false;
return cfg802154_device_in_pan(...); Why isn't checkpatch warning about that?
- Alex
