net: sched: rename QDISC_DROP_FQ_* to generic names

Rename FQ-specific drop reasons to generic names:
- QDISC_DROP_FQ_BAND_LIMIT -> QDISC_DROP_BAND_LIMIT
- QDISC_DROP_FQ_HORIZON_LIMIT -> QDISC_DROP_HORIZON_LIMIT

This follows the principle that drop reasons should describe the drop
mechanism rather than being tied to a specific qdisc implementation.
These concepts (priority band limits, timestamp horizon) could apply
to other qdiscs as well.

Remove the local macro define FQDR() and instead use the
full QDISC_DROP_* name to make it easier to navigate code.

Signed-off-by: Jesper Dangaard Brouer <hawk@kernel.org>
Reviewed-by: Toke Høiland-Jørgensen <toke@redhat.com>
Link: https://patch.msgid.link/177211346902.3011628.12523261489552097455.stgit@firesoul
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/net/dropreason-qdisc.h b/include/net/dropreason-qdisc.h
index 02a9f580411b90e9b3f6553c41223640c0723ad0..a167302e79e5fb01b0571e88ac83523095ec1d26 100644 (file)
--- a/include/net/dropreason-qdisc.h
+++ b/include/net/dropreason-qdisc.h
@@ -11,8 +11,8 @@
        FN(CONGESTED)                   \
        FN(MAXFLOWS)                    \
        FN(CAKE_FLOOD)                  \
-       FN(FQ_BAND_LIMIT)               \
-       FN(FQ_HORIZON_LIMIT)            \
+       FN(BAND_LIMIT)          \
+       FN(HORIZON_LIMIT)               \
        FN(FLOW_LIMIT)                  \
        FNe(MAX)
 
@@ -74,16 +74,17 @@ enum qdisc_drop_reason {
         */
        QDISC_DROP_CAKE_FLOOD,
        /**
-        * @QDISC_DROP_FQ_BAND_LIMIT: FQ (Fair Queue) dropped packet because
-        * the priority band's packet limit was reached. Each priority band
-        * in FQ has its own limit.
+        * @QDISC_DROP_BAND_LIMIT: packet dropped because the priority band's
+        * limit was reached. Used by qdiscs with priority bands that have
+        * per-band packet limits (e.g., FQ).
         */
-       QDISC_DROP_FQ_BAND_LIMIT,
+       QDISC_DROP_BAND_LIMIT,
        /**
-        * @QDISC_DROP_FQ_HORIZON_LIMIT: FQ dropped packet because its
-        * timestamp is too far in the future (beyond the configured horizon).
+        * @QDISC_DROP_HORIZON_LIMIT: packet dropped because its timestamp
+        * is too far in the future (beyond the configured horizon).
+        * Used by qdiscs with time-based scheduling (e.g., FQ).
         */
-       QDISC_DROP_FQ_HORIZON_LIMIT,
+       QDISC_DROP_HORIZON_LIMIT,
        /**
         * @QDISC_DROP_FLOW_LIMIT: packet dropped because an individual flow
         * exceeded its per-flow packet/depth limit. Used by FQ and SFQ qdiscs

diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c
index eb5ae2b15cc0c2d65d6a7340dcf72d45cdd33cdd..9a550f832d786c858678fd87890dc8f8eacab0d1 100644 (file)
--- a/net/sched/sch_fq.c
+++ b/net/sched/sch_fq.c
@@ -539,8 +539,6 @@ static bool fq_packet_beyond_horizon(const struct sk_buff *skb,
        return unlikely((s64)skb->tstamp > (s64)(now + q->horizon));
 }
 
-#define FQDR(reason) QDISC_DROP_FQ_##reason
-
 static int fq_enqueue(struct sk_buff *skb, struct Qdisc *sch,
                      struct sk_buff **to_free)
 {
@@ -552,7 +550,7 @@ static int fq_enqueue(struct sk_buff *skb, struct Qdisc *sch,
        band = fq_prio2band(q->prio2band, skb->priority & TC_PRIO_MAX);
        if (unlikely(q->band_pkt_count[band] >= sch->limit)) {
                q->stat_band_drops[band]++;
-               return qdisc_drop_reason(skb, sch, to_free, FQDR(BAND_LIMIT));
+               return qdisc_drop_reason(skb, sch, to_free, QDISC_DROP_BAND_LIMIT);
        }
 
        now = ktime_get_ns();
@@ -564,7 +562,7 @@ static int fq_enqueue(struct sk_buff *skb, struct Qdisc *sch,
                        if (q->horizon_drop) {
                                q->stat_horizon_drops++;
                                return qdisc_drop_reason(skb, sch, to_free,
-                                                        FQDR(HORIZON_LIMIT));
+                                                        QDISC_DROP_HORIZON_LIMIT);
                        }
                        q->stat_horizon_caps++;
                        skb->tstamp = now + q->horizon;
@@ -603,7 +601,6 @@ static int fq_enqueue(struct sk_buff *skb, struct Qdisc *sch,
 
        return NET_XMIT_SUCCESS;
 }
-#undef FQDR
 
 static void fq_check_throttled(struct fq_sched_data *q, u64 now)
 {