net: ipa: properly limit modem routing table use

[ Upstream commit cf412ec333250cb82bafe57169204e14a9f1c2ac ]

IPA can route packets between IPA-connected entities.  The AP and
modem are currently the only such entities supported, and no routing
is required to transfer packets between them.

The number of entries in each routing table is fixed, and defined at
initialization time.  Some of these entries are designated for use
by the modem, and the rest are available for the AP to use.  The AP
sends a QMI message to the modem which describes (among other
things) information about routing table memory available for the
modem to use.

Currently the QMI initialization packet gives wrong information in
its description of routing tables.  What *should* be supplied is the
maximum index that the modem can use for the routing table memory
located at a given location.  The current code instead supplies the
total *number* of routing table entries.  Furthermore, the modem is
granted the entire table, not just the subset it's supposed to use.

This patch fixes this.  First, the ipa_mem_bounds structure is
generalized so its "end" field can be interpreted either as a final
byte offset, or a final array index.  Second, the IPv4 and IPv6
(non-hashed and hashed) table information fields in the QMI
ipa_init_modem_driver_req structure are changed to be ipa_mem_bounds
rather than ipa_mem_array structures.  Third, we set the "end" value
for each routing table to be the last index, rather than setting the
"count" to be the number of indices.  Finally, instead of allowing
the modem to use all of a routing table's memory, it is limited to
just the portion meant to be used by the modem.  In all versions of
IPA currently supported, that is IPA_ROUTE_MODEM_COUNT (8) entries.

Update a few comments for clarity.

Fixes: 530f9216a9537 ("soc: qcom: ipa: AP/modem communications")
Signed-off-by: Alex Elder <elder@linaro.org>
Link: https://lore.kernel.org/r/20220913204602.1803004-1-elder@linaro.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ipa/ipa_qmi.c b/drivers/net/ipa/ipa_qmi.c
index ec010cf2e816a9f46336a66a3d52f4bb827c20fd..6f874f99b910cd65805b62cc73c868204a23f58b 100644 (file)
--- a/drivers/net/ipa/ipa_qmi.c
+++ b/drivers/net/ipa/ipa_qmi.c
@@ -308,12 +308,12 @@ init_modem_driver_req(struct ipa_qmi *ipa_qmi)
        mem = ipa_mem_find(ipa, IPA_MEM_V4_ROUTE);
        req.v4_route_tbl_info_valid = 1;
        req.v4_route_tbl_info.start = ipa->mem_offset + mem->offset;
        mem = ipa_mem_find(ipa, IPA_MEM_V4_ROUTE);
        req.v4_route_tbl_info_valid = 1;
        req.v4_route_tbl_info.start = ipa->mem_offset + mem->offset;

-       req.v4_route_tbl_info.count = mem->size / sizeof(__le64);
+       req.v4_route_tbl_info.end = IPA_ROUTE_MODEM_COUNT - 1;

 
        mem = ipa_mem_find(ipa, IPA_MEM_V6_ROUTE);
        req.v6_route_tbl_info_valid = 1;
        req.v6_route_tbl_info.start = ipa->mem_offset + mem->offset;
 
        mem = ipa_mem_find(ipa, IPA_MEM_V6_ROUTE);
        req.v6_route_tbl_info_valid = 1;
        req.v6_route_tbl_info.start = ipa->mem_offset + mem->offset;

-       req.v6_route_tbl_info.count = mem->size / sizeof(__le64);
+       req.v6_route_tbl_info.end = IPA_ROUTE_MODEM_COUNT - 1;

 
        mem = ipa_mem_find(ipa, IPA_MEM_V4_FILTER);
        req.v4_filter_tbl_start_valid = 1;
 
        mem = ipa_mem_find(ipa, IPA_MEM_V4_FILTER);
        req.v4_filter_tbl_start_valid = 1;


@@ -352,7 +352,7 @@ init_modem_driver_req(struct ipa_qmi *ipa_qmi)
                req.v4_hash_route_tbl_info_valid = 1;
                req.v4_hash_route_tbl_info.start =
                                ipa->mem_offset + mem->offset;
                req.v4_hash_route_tbl_info_valid = 1;
                req.v4_hash_route_tbl_info.start =
                                ipa->mem_offset + mem->offset;

-               req.v4_hash_route_tbl_info.count = mem->size / sizeof(__le64);
+               req.v4_hash_route_tbl_info.end = IPA_ROUTE_MODEM_COUNT - 1;

        }
 
        mem = ipa_mem_find(ipa, IPA_MEM_V6_ROUTE_HASHED);
        }
 
        mem = ipa_mem_find(ipa, IPA_MEM_V6_ROUTE_HASHED);


@@ -360,7 +360,7 @@ init_modem_driver_req(struct ipa_qmi *ipa_qmi)
                req.v6_hash_route_tbl_info_valid = 1;
                req.v6_hash_route_tbl_info.start =
                        ipa->mem_offset + mem->offset;
                req.v6_hash_route_tbl_info_valid = 1;
                req.v6_hash_route_tbl_info.start =
                        ipa->mem_offset + mem->offset;

-               req.v6_hash_route_tbl_info.count = mem->size / sizeof(__le64);
+               req.v6_hash_route_tbl_info.end = IPA_ROUTE_MODEM_COUNT - 1;

        }
 
        mem = ipa_mem_find(ipa, IPA_MEM_V4_FILTER_HASHED);
        }
 
        mem = ipa_mem_find(ipa, IPA_MEM_V4_FILTER_HASHED);

diff --git a/drivers/net/ipa/ipa_qmi_msg.c b/drivers/net/ipa/ipa_qmi_msg.c
index 6838e8065072ba7afe3fecd5abbab92b825a098f..75d3fc0092e9233e4fc83c213a69dd64eff405be 100644 (file)
--- a/drivers/net/ipa/ipa_qmi_msg.c
+++ b/drivers/net/ipa/ipa_qmi_msg.c
@@ -311,7 +311,7 @@ struct qmi_elem_info ipa_init_modem_driver_req_ei[] = {
                .tlv_type       = 0x12,
                .offset         = offsetof(struct ipa_init_modem_driver_req,
                                           v4_route_tbl_info),
                .tlv_type       = 0x12,
                .offset         = offsetof(struct ipa_init_modem_driver_req,
                                           v4_route_tbl_info),

-               .ei_array       = ipa_mem_array_ei,
+               .ei_array       = ipa_mem_bounds_ei,

        },
        {
                .data_type      = QMI_OPT_FLAG,
        },
        {
                .data_type      = QMI_OPT_FLAG,


@@ -332,7 +332,7 @@ struct qmi_elem_info ipa_init_modem_driver_req_ei[] = {
                .tlv_type       = 0x13,
                .offset         = offsetof(struct ipa_init_modem_driver_req,
                                           v6_route_tbl_info),
                .tlv_type       = 0x13,
                .offset         = offsetof(struct ipa_init_modem_driver_req,
                                           v6_route_tbl_info),

-               .ei_array       = ipa_mem_array_ei,
+               .ei_array       = ipa_mem_bounds_ei,

        },
        {
                .data_type      = QMI_OPT_FLAG,
        },
        {
                .data_type      = QMI_OPT_FLAG,


@@ -496,7 +496,7 @@ struct qmi_elem_info ipa_init_modem_driver_req_ei[] = {
                .tlv_type       = 0x1b,
                .offset         = offsetof(struct ipa_init_modem_driver_req,
                                           v4_hash_route_tbl_info),
                .tlv_type       = 0x1b,
                .offset         = offsetof(struct ipa_init_modem_driver_req,
                                           v4_hash_route_tbl_info),

-               .ei_array       = ipa_mem_array_ei,
+               .ei_array       = ipa_mem_bounds_ei,

        },
        {
                .data_type      = QMI_OPT_FLAG,
        },
        {
                .data_type      = QMI_OPT_FLAG,


@@ -517,7 +517,7 @@ struct qmi_elem_info ipa_init_modem_driver_req_ei[] = {
                .tlv_type       = 0x1c,
                .offset         = offsetof(struct ipa_init_modem_driver_req,
                                           v6_hash_route_tbl_info),
                .tlv_type       = 0x1c,
                .offset         = offsetof(struct ipa_init_modem_driver_req,
                                           v6_hash_route_tbl_info),

-               .ei_array       = ipa_mem_array_ei,
+               .ei_array       = ipa_mem_bounds_ei,

        },
        {
                .data_type      = QMI_OPT_FLAG,
        },
        {
                .data_type      = QMI_OPT_FLAG,

diff --git a/drivers/net/ipa/ipa_qmi_msg.h b/drivers/net/ipa/ipa_qmi_msg.h
index 495e85abe50bdb8a0e5b7f7dd3fc022449b73469..9651aa59b59685fabe0e11895c5dec10b1a713eb 100644 (file)
--- a/drivers/net/ipa/ipa_qmi_msg.h
+++ b/drivers/net/ipa/ipa_qmi_msg.h
@@ -86,9 +86,11 @@ enum ipa_platform_type {
        IPA_QMI_PLATFORM_TYPE_MSM_QNX_V01       = 0x5,  /* QNX MSM */
 };
 
        IPA_QMI_PLATFORM_TYPE_MSM_QNX_V01       = 0x5,  /* QNX MSM */
 };
 

-/* This defines the start and end offset of a range of memory.  Both
- * fields are offsets relative to the start of IPA shared memory.
- * The end value is the last addressable byte *within* the range.
+/* This defines the start and end offset of a range of memory.  The start
+ * value is a byte offset relative to the start of IPA shared memory.  The
+ * end value is the last addressable unit *within* the range.  Typically
+ * the end value is in units of bytes, however it can also be a maximum
+ * array index value.

  */
 struct ipa_mem_bounds {
        u32 start;
  */
 struct ipa_mem_bounds {
        u32 start;


@@ -129,18 +131,19 @@ struct ipa_init_modem_driver_req {
        u8                      hdr_tbl_info_valid;
        struct ipa_mem_bounds   hdr_tbl_info;
 
        u8                      hdr_tbl_info_valid;
        struct ipa_mem_bounds   hdr_tbl_info;
 

-       /* Routing table information.  These define the location and size of
-        * non-hashable IPv4 and IPv6 filter tables.  The start values are
-        * offsets relative to the start of IPA shared memory.
+       /* Routing table information.  These define the location and maximum
+        * *index* (not byte) for the modem portion of non-hashable IPv4 and
+        * IPv6 routing tables.  The start values are byte offsets relative
+        * to the start of IPA shared memory.

         */
        u8                      v4_route_tbl_info_valid;
         */
        u8                      v4_route_tbl_info_valid;

-       struct ipa_mem_array    v4_route_tbl_info;
+       struct ipa_mem_bounds   v4_route_tbl_info;

        u8                      v6_route_tbl_info_valid;
        u8                      v6_route_tbl_info_valid;

-       struct ipa_mem_array    v6_route_tbl_info;
+       struct ipa_mem_bounds   v6_route_tbl_info;

 
        /* Filter table information.  These define the location of the
         * non-hashable IPv4 and IPv6 filter tables.  The start values are
 
        /* Filter table information.  These define the location of the
         * non-hashable IPv4 and IPv6 filter tables.  The start values are

-        * offsets relative to the start of IPA shared memory.
+        * byte offsets relative to the start of IPA shared memory.

         */
        u8                      v4_filter_tbl_start_valid;
        u32                     v4_filter_tbl_start;
         */
        u8                      v4_filter_tbl_start_valid;
        u32                     v4_filter_tbl_start;


@@ -181,18 +184,20 @@ struct ipa_init_modem_driver_req {
        u8                      zip_tbl_info_valid;
        struct ipa_mem_bounds   zip_tbl_info;
 
        u8                      zip_tbl_info_valid;
        struct ipa_mem_bounds   zip_tbl_info;
 

-       /* Routing table information.  These define the location and size
-        * of hashable IPv4 and IPv6 filter tables.  The start values are
-        * offsets relative to the start of IPA shared memory.
+       /* Routing table information.  These define the location and maximum
+        * *index* (not byte) for the modem portion of hashable IPv4 and IPv6
+        * routing tables (if supported by hardware).  The start values are
+        * byte offsets relative to the start of IPA shared memory.

         */
        u8                      v4_hash_route_tbl_info_valid;
         */
        u8                      v4_hash_route_tbl_info_valid;

-       struct ipa_mem_array    v4_hash_route_tbl_info;
+       struct ipa_mem_bounds   v4_hash_route_tbl_info;

        u8                      v6_hash_route_tbl_info_valid;
        u8                      v6_hash_route_tbl_info_valid;

-       struct ipa_mem_array    v6_hash_route_tbl_info;
+       struct ipa_mem_bounds   v6_hash_route_tbl_info;

 
        /* Filter table information.  These define the location and size
 
        /* Filter table information.  These define the location and size

-        * of hashable IPv4 and IPv6 filter tables.  The start values are
-        * offsets relative to the start of IPA shared memory.
+        * of hashable IPv4 and IPv6 filter tables (if supported by hardware).
+        * The start values are byte offsets relative to the start of IPA
+        * shared memory.

         */
        u8                      v4_hash_filter_tbl_start_valid;
        u32                     v4_hash_filter_tbl_start;
         */
        u8                      v4_hash_filter_tbl_start_valid;
        u32                     v4_hash_filter_tbl_start;

diff --git a/drivers/net/ipa/ipa_table.c b/drivers/net/ipa/ipa_table.c
index 2f5a58bfc529a3148bce114b1fcf4f32f0db07bc..69efe672ca52871c18c0a58b09c6d96485b5ae0b 100644 (file)
--- a/drivers/net/ipa/ipa_table.c
+++ b/drivers/net/ipa/ipa_table.c
@@ -108,8 +108,6 @@
 
 /* Assignment of route table entries to the modem and AP */
 #define IPA_ROUTE_MODEM_MIN            0
 
 /* Assignment of route table entries to the modem and AP */
 #define IPA_ROUTE_MODEM_MIN            0

-#define IPA_ROUTE_MODEM_COUNT          8
-

 #define IPA_ROUTE_AP_MIN               IPA_ROUTE_MODEM_COUNT
 #define IPA_ROUTE_AP_COUNT \
                (IPA_ROUTE_COUNT_MAX - IPA_ROUTE_MODEM_COUNT)
 #define IPA_ROUTE_AP_MIN               IPA_ROUTE_MODEM_COUNT
 #define IPA_ROUTE_AP_COUNT \
                (IPA_ROUTE_COUNT_MAX - IPA_ROUTE_MODEM_COUNT)

diff --git a/drivers/net/ipa/ipa_table.h b/drivers/net/ipa/ipa_table.h
index b6a9a0d79d68e9669b50ca9079bbf6e0d8ad1df5..1538e2e1732fe040c139f320ded2734c8c7f4ca5 100644 (file)
--- a/drivers/net/ipa/ipa_table.h
+++ b/drivers/net/ipa/ipa_table.h
@@ -13,6 +13,9 @@ struct ipa;
 /* The maximum number of filter table entries (IPv4, IPv6; hashed or not) */
 #define IPA_FILTER_COUNT_MAX   14
 
 /* The maximum number of filter table entries (IPv4, IPv6; hashed or not) */
 #define IPA_FILTER_COUNT_MAX   14
 

+/* The number of route table entries allotted to the modem */
+#define IPA_ROUTE_MODEM_COUNT  8
+

 /* The maximum number of route table entries (IPv4, IPv6; hashed or not) */
 #define IPA_ROUTE_COUNT_MAX    15
 
 /* The maximum number of route table entries (IPv4, IPv6; hashed or not) */
 #define IPA_ROUTE_COUNT_MAX    15