net: mctp: tests: create test skbs with the correct net and device

In our test skb creation functions, we're not setting up the net and
device data. This doesn't matter at the moment, but we will want to add
support for distinct net IDs in future.

Set the ->net identifier on the test MCTP device, and ensure that test
skbs are set up with the correct device-related data on creation. Create
a helper for setting skb->dev and mctp_skb_cb->net.

We have a few cases where we're calling __mctp_cb() to initialise the cb
(which we need for the above) separately, so integrate this into the skb
creation helpers.

Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/mctp/test/route-test.c b/net/mctp/test/route-test.c
index 92ea4158f7fc4d305d389b7dc92c8135284b8b35..714e5ae47629f53b8c8864417ead167ab857f16a 100644 (file)
--- a/net/mctp/test/route-test.c
+++ b/net/mctp/test/route-test.c
@@ -79,6 +79,16 @@ static void mctp_test_route_destroy(struct kunit *test,
        kfree_rcu(&rt->rt, rcu);
 }
 
+static void mctp_test_skb_set_dev(struct sk_buff *skb,
+                                 struct mctp_test_dev *dev)
+{
+       struct mctp_skb_cb *cb;
+
+       cb = mctp_cb(skb);
+       cb->net = READ_ONCE(dev->mdev->net);
+       skb->dev = dev->ndev;
+}
+
 static struct sk_buff *mctp_test_create_skb(const struct mctp_hdr *hdr,
                                            unsigned int data_len)
 {
@@ -91,6 +101,7 @@ static struct sk_buff *mctp_test_create_skb(const struct mctp_hdr *hdr,
        if (!skb)
                return NULL;
 
+       __mctp_cb(skb);
        memcpy(skb_put(skb, hdr_len), hdr, hdr_len);
 
        buf = skb_put(skb, data_len);
@@ -111,6 +122,7 @@ static struct sk_buff *__mctp_test_create_skb_data(const struct mctp_hdr *hdr,
        if (!skb)
                return NULL;
 
+       __mctp_cb(skb);
        memcpy(skb_put(skb, hdr_len), hdr, hdr_len);
        memcpy(skb_put(skb, data_len), data, data_len);
 
@@ -249,8 +261,6 @@ static void mctp_test_rx_input(struct kunit *test)
        skb = mctp_test_create_skb(&params->hdr, 1);
        KUNIT_ASSERT_NOT_ERR_OR_NULL(test, skb);
 
-       __mctp_cb(skb);
-
        mctp_pkttype_receive(skb, dev->ndev, &mctp_packet_type, NULL);
 
        KUNIT_EXPECT_EQ(test, !!rt->pkts.qlen, params->input);
@@ -344,8 +354,7 @@ static void mctp_test_route_input_sk(struct kunit *test)
        skb = mctp_test_create_skb_data(&params->hdr, &params->type);
        KUNIT_ASSERT_NOT_ERR_OR_NULL(test, skb);
 
-       skb->dev = dev->ndev;
-       __mctp_cb(skb);
+       mctp_test_skb_set_dev(skb, dev);
 
        rc = mctp_route_input(&rt->rt, skb);
 
@@ -417,8 +426,7 @@ static void mctp_test_route_input_sk_reasm(struct kunit *test)
                skb = mctp_test_create_skb_data(&params->hdrs[i], &c);
                KUNIT_ASSERT_NOT_ERR_OR_NULL(test, skb);
 
-               skb->dev = dev->ndev;
-               __mctp_cb(skb);
+               mctp_test_skb_set_dev(skb, dev);
 
                rc = mctp_route_input(&rt->rt, skb);
        }
@@ -576,8 +584,7 @@ static void mctp_test_route_input_sk_keys(struct kunit *test)
        skb = mctp_test_create_skb_data(&params->hdr, &c);
        KUNIT_ASSERT_NOT_ERR_OR_NULL(test, skb);
 
-       skb->dev = dev->ndev;
-       __mctp_cb(skb);
+       mctp_test_skb_set_dev(skb, dev);
 
        rc = mctp_route_input(&rt->rt, skb);
 

diff --git a/net/mctp/test/utils.c b/net/mctp/test/utils.c
index e03ba66bbe181990a79ba88cf771eb0a1bf80a25..565763eb02114be8fd2a097fe0fe391d8f4bd2ae 100644 (file)
--- a/net/mctp/test/utils.c
+++ b/net/mctp/test/utils.c
@@ -4,6 +4,7 @@
 #include <linux/mctp.h>
 #include <linux/if_arp.h>
 
+#include <net/mctp.h>
 #include <net/mctpdevice.h>
 #include <net/pkt_sched.h>
 
@@ -54,6 +55,7 @@ struct mctp_test_dev *mctp_test_create_dev(void)
 
        rcu_read_lock();
        dev->mdev = __mctp_dev_get(ndev);
+       dev->mdev->net = mctp_default_net(dev_net(ndev));
        rcu_read_unlock();
 
        return dev;