From patchwork Tue Oct 19 00:34:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 12568469 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C71AEC433FE for ; Tue, 19 Oct 2021 00:34:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A65CC61027 for ; Tue, 19 Oct 2021 00:34:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229817AbhJSAgV (ORCPT ); Mon, 18 Oct 2021 20:36:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229529AbhJSAgU (ORCPT ); Mon, 18 Oct 2021 20:36:20 -0400 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 128DDC06161C for ; Mon, 18 Oct 2021 17:34:09 -0700 (PDT) Received: by mail-pl1-x62b.google.com with SMTP id e10so7563612plh.8 for ; Mon, 18 Oct 2021 17:34:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dfltF+KdoBWysgdk4AaWUKJJEeefM25wtANwmdckgLY=; b=WY8OzPy79QUMaP7d5boNtqR0avMKYrn6noq5wILRqi8jK3o9tuaJSaPHlYsZT4xFg2 5hbrVrNQ1/KGzwudLa+M3PMvXrJ2wuJbIT8e9ia0Eavbk5to53Vept2V2XpywtmTHQBu IbHVTTNc+9BnaHsaL/Xde8YII9+YSvMH3xfPAU5vcntga/IXptjN1RuISI5kkQzTWAiM oIzMrWNVpenGDZVQBZPlO9GRg+BZeYiIebPLtqqYdxQ5zgnq2kdGDFAbA/lHJqfw9f2j GGMCIhjjy+XV4SmT6dlqk195tR6usvh+OC9ZlKGg7kfQAgdPD325dC/J7g/rc714SowN +2Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dfltF+KdoBWysgdk4AaWUKJJEeefM25wtANwmdckgLY=; b=yMUxElaJRPk5g7Gl8umpnBbSdgCqppZa8wPfGQVXagL9gStEyh1C3sCo40wFaHHs0o +OfyH/ZJvIP67PhO5Q/GZaDglmueL4kXD537pmTXBOHpQrPKzjbnNwpjZOlfnywcfFCz Cb87Ur0H7M9kbkU4twfBN+QOOEgMu0++SwRV6DHA70o5OL7764lIiHO4/c07s+rMuTva NeMW7A4lIVcXEHoGrXzJWLn4nkX9VYJSmRivmaSoNv4sY43gQpQ3aSRzFVvPXuS/4KlN Zci/Ix8MbHU/B4amkg/u27v2SzcCFSojsyrDame6x1hb13IC1ByjBCgzanrvDS7K5UGb Aj4Q== X-Gm-Message-State: AOAM530g6oGUZUPmJ93kbxhVGLmAwxRXXusOZSAbUx+FP574xz0tL9JN 7UQBPK80h47Dkrrds/S+cvk= X-Google-Smtp-Source: ABdhPJzYbBrlGiTNdKGFan2xlLORf0sdo5/WM5SzDLthX+0/QhXNs0Gf4Lqmk80KvbHLEsQTdQ51Ig== X-Received: by 2002:a17:90a:6b01:: with SMTP id v1mr2647551pjj.6.1634603648604; Mon, 18 Oct 2021 17:34:08 -0700 (PDT) Received: from edumazet1.svl.corp.google.com ([2620:15c:2c4:201:85d3:2c8e:fcea:2b1e]) by smtp.gmail.com with ESMTPSA id n22sm579675pjv.22.2021.10.18.17.34.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 17:34:08 -0700 (PDT) From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski Cc: netdev , Eric Dumazet , Eric Dumazet , "Ahmed S . Darwish" , Sebastian Andrzej Siewior Subject: [PATCH net-next 1/2] net: sched: fix logic error in qdisc_run_begin() Date: Mon, 18 Oct 2021 17:34:01 -0700 Message-Id: <20211019003402.2110017-2-eric.dumazet@gmail.com> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog In-Reply-To: <20211019003402.2110017-1-eric.dumazet@gmail.com> References: <20211019003402.2110017-1-eric.dumazet@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Eric Dumazet For non TCQ_F_NOLOCK qdisc, qdisc_run_begin() tries to set __QDISC_STATE_RUNNING and should return true if the bit was not set. test_and_set_bit() returns old bit value, therefore we need to invert. Fixes: 29cbcd858283 ("net: sched: Remove Qdisc::running sequence counter") Signed-off-by: Eric Dumazet Cc: Ahmed S. Darwish Cc: Sebastian Andrzej Siewior Tested-by: Ido Schimmel Acked-by: Sebastian Andrzej Siewior Tested-by: Toke Høiland-Jørgensen --- include/net/sch_generic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index baad2ab4d971cd3fdc8d59acdd72d39fa6230370..e0988c56dd8fd7aa3dff6bd971da3c81f1a20626 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -217,7 +217,7 @@ static inline bool qdisc_run_begin(struct Qdisc *qdisc) */ return spin_trylock(&qdisc->seqlock); } - return test_and_set_bit(__QDISC_STATE_RUNNING, &qdisc->state); + return !test_and_set_bit(__QDISC_STATE_RUNNING, &qdisc->state); } static inline void qdisc_run_end(struct Qdisc *qdisc) From patchwork Tue Oct 19 00:34:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 12568471 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 051F5C433EF for ; Tue, 19 Oct 2021 00:34:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DE80561027 for ; Tue, 19 Oct 2021 00:34:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229960AbhJSAgX (ORCPT ); Mon, 18 Oct 2021 20:36:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229529AbhJSAgW (ORCPT ); Mon, 18 Oct 2021 20:36:22 -0400 Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7248C06161C for ; Mon, 18 Oct 2021 17:34:10 -0700 (PDT) Received: by mail-pg1-x531.google.com with SMTP id t184so4777599pgd.8 for ; Mon, 18 Oct 2021 17:34:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b/jSjjS7bs3azpuJCi4HEo2XX+hkUefLN8oyIuzy4n8=; b=P2n9tkinEWVRm9T0Xn9q+bZ4m21yto/pXclxOnBRPN/9dJ7Pa47/Bqv0dOAwHZctAJ fFZbVZJIgCim+LF+C3EK/RLWtEmgnWQjL1RmowwSRduX5hUrEP35pznQr0+MTUFvPvqU AYyC3thoQSHzVbh+fv/VXNp77S1BM2KfIobycyQ3hXLPpLZV+bYj0vqBHhsRQKN/rQhp yhw3IQnGMjw3gMX7SWNKNvO3AnK9M4fit63jIIGeW63ykfq/QA4L5xBPZqSzbgXo6QYY p7ajPOXNsSPebGoXjWy0Nmo7JcHgCRJmPIAZFgMREe3FZuUDP1tgjToTFtj2ZyrQjdla 5wbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b/jSjjS7bs3azpuJCi4HEo2XX+hkUefLN8oyIuzy4n8=; b=NnyrLnPItBOYLS08+2Gj1e5NUMMfsyxA+fwkP5u50R5vj7O6SGudyVFjLjGgvOFJ2V 9LR0ekGVsXetYKUlZxtukZKQ2nP6rdIcvAVbqofzBofKQKwfxVGiNBOR4eOWB81lpkne 1ynqlsZWohBBFQ690brD8MHY2NnSvhsYIqG7QvaapAimxJFlimQQnWrSH6p0wXDAUbfx IQrColDodrKh9cBpoBKJIV6C+iM8+FvcYNGeybSDZvEVbWskuFqFDjGOyMu4G9gycL+C WKBwn1ze5Ae3WRE5DsY6PdW1Bh4zeOhESvqIrvpXpCZ25gcNp+GDMEKMZxZQzM2jeVlt Vp+w== X-Gm-Message-State: AOAM533pTQYkjQeXpeU/K3ep1N1GjRTBmhbRK8i9SebCUyarcqJ2ZjfS X1tVGSdAKrGK3T/oYX4Sbvk= X-Google-Smtp-Source: ABdhPJzca408kxaZkbo7SrsrgdwmtT0m1vRqixU837ECnqkaKEx0VJmnFcSAjjOz66wpvS4GH0OfMg== X-Received: by 2002:a05:6a00:140c:b0:447:96be:2ade with SMTP id l12-20020a056a00140c00b0044796be2ademr31445972pfu.26.1634603650382; Mon, 18 Oct 2021 17:34:10 -0700 (PDT) Received: from edumazet1.svl.corp.google.com ([2620:15c:2c4:201:85d3:2c8e:fcea:2b1e]) by smtp.gmail.com with ESMTPSA id n22sm579675pjv.22.2021.10.18.17.34.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 17:34:10 -0700 (PDT) From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski Cc: netdev , Eric Dumazet , Eric Dumazet , "Ahmed S . Darwish" , Sebastian Andrzej Siewior Subject: [PATCH net-next 2/2] net: sched: remove one pair of atomic operations Date: Mon, 18 Oct 2021 17:34:02 -0700 Message-Id: <20211019003402.2110017-3-eric.dumazet@gmail.com> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog In-Reply-To: <20211019003402.2110017-1-eric.dumazet@gmail.com> References: <20211019003402.2110017-1-eric.dumazet@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Eric Dumazet __QDISC_STATE_RUNNING is only set/cleared from contexts owning qdisc lock. Thus we can use less expensive bit operations, as we were doing before commit f9eb8aea2a1e ("net_sched: transform qdisc running bit into a seqcount") Fixes: 29cbcd858283 ("net: sched: Remove Qdisc::running sequence counter") Signed-off-by: Eric Dumazet Cc: Ahmed S. Darwish Cc: Sebastian Andrzej Siewior Acked-by: Sebastian Andrzej Siewior Tested-by: Toke Høiland-Jørgensen --- include/net/sch_generic.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index e0988c56dd8fd7aa3dff6bd971da3c81f1a20626..ada02c4a4f518b732d62561a22b1d9033516b494 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -38,10 +38,13 @@ enum qdisc_state_t { __QDISC_STATE_DEACTIVATED, __QDISC_STATE_MISSED, __QDISC_STATE_DRAINING, +}; + +enum qdisc_state2_t { /* Only for !TCQ_F_NOLOCK qdisc. Never access it directly. * Use qdisc_run_begin/end() or qdisc_is_running() instead. */ - __QDISC_STATE_RUNNING, + __QDISC_STATE2_RUNNING, }; #define QDISC_STATE_MISSED BIT(__QDISC_STATE_MISSED) @@ -114,6 +117,7 @@ struct Qdisc { struct gnet_stats_basic_sync bstats; struct gnet_stats_queue qstats; unsigned long state; + unsigned long state2; /* must be written under qdisc spinlock */ struct Qdisc *next_sched; struct sk_buff_head skb_bad_txq; @@ -154,7 +158,7 @@ static inline bool qdisc_is_running(struct Qdisc *qdisc) { if (qdisc->flags & TCQ_F_NOLOCK) return spin_is_locked(&qdisc->seqlock); - return test_bit(__QDISC_STATE_RUNNING, &qdisc->state); + return test_bit(__QDISC_STATE2_RUNNING, &qdisc->state2); } static inline bool nolock_qdisc_is_empty(const struct Qdisc *qdisc) @@ -217,7 +221,7 @@ static inline bool qdisc_run_begin(struct Qdisc *qdisc) */ return spin_trylock(&qdisc->seqlock); } - return !test_and_set_bit(__QDISC_STATE_RUNNING, &qdisc->state); + return !__test_and_set_bit(__QDISC_STATE2_RUNNING, &qdisc->state2); } static inline void qdisc_run_end(struct Qdisc *qdisc) @@ -229,7 +233,7 @@ static inline void qdisc_run_end(struct Qdisc *qdisc) &qdisc->state))) __netif_schedule(qdisc); } else { - clear_bit(__QDISC_STATE_RUNNING, &qdisc->state); + __clear_bit(__QDISC_STATE2_RUNNING, &qdisc->state2); } }