From patchwork Thu May 20 10:43:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Richey X-Patchwork-Id: 12269983 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89533C433B4 for ; Thu, 20 May 2021 12:09:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6AA916105A for ; Thu, 20 May 2021 12:09:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239119AbhETMK0 (ORCPT ); Thu, 20 May 2021 08:10:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237120AbhETMKD (ORCPT ); Thu, 20 May 2021 08:10:03 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D95FEC00F789; Thu, 20 May 2021 03:44:41 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id o17-20020a17090a9f91b029015cef5b3c50so5205219pjp.4; Thu, 20 May 2021 03:44:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LRY+3cJVXzz2zcOenbypgu3Wy1PZW3y4sq5PxyFROR0=; b=sx5X8GbCdxGlmtdtk6i28Qbu++UYP1OyWcUVsh1Z4P2G8nPl/BajRPrYBl6LYmbn/G 2d51AT2Mkf9nIaR87KlwB4g1DWNVA37B2MNmKD43CxxIjFoo9ugktQpMVZgace5+9D0s WasPefkQS8WqT2cKX3WTUgcpyDpzg5gVn7sS1B0J+0L0IlNzcDR+yHOEp/aeBGGx+7mx 4yWxEPkJEvuuhN7HL0nlV0qd8xbBe+W00H97ivLM/SMsYTumY+cZFpHJHDL5uKZFu6AR zMLL2DTaFPST0lbLuyZXLVumbFybcj04+sCGEP+2INQ8g5EI/KUettMabLV6qWKuHHuX etIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LRY+3cJVXzz2zcOenbypgu3Wy1PZW3y4sq5PxyFROR0=; b=SDu9KhNz1JA/99UqbtnmFjXYSeUyi4wbypBaN/dcxlLV2vapd4gjwDxeD2/F7xCz3e CMaCs3NUdCWP3WL4qY9ucLkc+5kq73mD3gRen6q3YGoUVMXqDXadOqLJ7lAHKeWcbs1+ gbMSTLcTOMYBxEFHBQfF77+nqyHM5brDXOY4SzfQGPVS9SQGskmDYBN5rQFp9z4ZV8vF JQeTzr+3QBXN2UQZ6SJSxqngg230Z1JdAgdgkTFb31x12uyVX1b/Ma4wYtMCpCtp1o+U gwt0fGU229krkRBQZDp5y1z0zv27GSmWmeyFozJx4LIZ5cAi6406Xy+sRuDWlwSdgqMO aHEg== X-Gm-Message-State: AOAM531nI+EufRPBSdnSUttd3ahnIIj51RjJea5zViHufPZDkxCfnURS y/fZbd61vDv2DmC4nFj3ia8= X-Google-Smtp-Source: ABdhPJxlZ+1aFVq5YW6UEzC3HQLJbeJXnzNN90quf3pOC74eAip1OmzI0t0O+OqTO1/BdCxiiJM9pA== X-Received: by 2002:a17:902:c409:b029:f0:d31d:4877 with SMTP id k9-20020a170902c409b02900f0d31d4877mr5064760plk.74.1621507481485; Thu, 20 May 2021 03:44:41 -0700 (PDT) Received: from pride.localdomain (c-174-61-140-56.hsd1.wa.comcast.net. [174.61.140.56]) by smtp.gmail.com with ESMTPSA id z12sm1762572pfk.45.2021.05.20.03.44.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 03:44:41 -0700 (PDT) From: Joe Richey To: trivial@kernel.org Cc: Joe Richey , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Paolo Bonzini , Mark Rutland , Lorenzo Pieralisi , Mauro Carvalho Chehab , Zhangfei Gao , Zhou Wang , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-accelerators@lists.ozlabs.org Subject: [PATCH 1/6] x86/elf: Don't use BIT() macro in UAPI headers Date: Thu, 20 May 2021 03:43:38 -0700 Message-Id: <20210520104343.317119-2-joerichey94@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520104343.317119-1-joerichey94@gmail.com> References: <20210520104343.317119-1-joerichey94@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Joe Richey A previous patch [1] used the BIT() macro to define HWCAP2_FSGSBASE. This macro is defined in the kernel but not in the UAPI headers. [1] https://lore.kernel.org/patchwork/patch/912068/ Signed-off-by: Joe Richey --- arch/x86/include/uapi/asm/hwcap2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/hwcap2.h b/arch/x86/include/uapi/asm/hwcap2.h index 5fdfcb47000f..6d2175b43710 100644 --- a/arch/x86/include/uapi/asm/hwcap2.h +++ b/arch/x86/include/uapi/asm/hwcap2.h @@ -6,6 +6,6 @@ #define HWCAP2_RING3MWAIT (1 << 0) /* Kernel allows FSGSBASE instructions available in Ring 3 */ -#define HWCAP2_FSGSBASE BIT(1) +#define HWCAP2_FSGSBASE (1 << 1) #endif From patchwork Thu May 20 10:43:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Richey X-Patchwork-Id: 12269979 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0B75C43460 for ; Thu, 20 May 2021 12:09:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D88FA6105A for ; Thu, 20 May 2021 12:09:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237416AbhETMKS (ORCPT ); Thu, 20 May 2021 08:10:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234850AbhETMKC (ORCPT ); Thu, 20 May 2021 08:10:02 -0400 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34F13C00F78A; Thu, 20 May 2021 03:44:43 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id q6so8916895pjj.2; Thu, 20 May 2021 03:44:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RFZzbSCSG3liEBFzsFBndnKLD/Fxvy9/A4lnI3gqTkk=; b=JIRPPqQQnCwSCGUt//YCjOWHq2ypvad/gMkV8o3aD7q2iXNGsOkmPuyuSearwgsQZF dBrrjWfXFgsidXWuwCdUHWdEjruWKbKlRC883fPbdU3s/ElPPKF3ZXZ/gWHCqTpIEZvh D+uTuT7SiiMX8uqyVF6zFDrCeScNYWjtipxI9AvISF9jEU+FC+bja7YGzlh0zshKSB9w uqaLECyB3jTOI6BpGLpdaYdQ/kmEOJd+E1Y05e4fQpsdyBlY2V3a8pta9xzuGIU42sn4 6lLd/A7a6q1oaC1xHBsBMNq14JwG5y8FApd0SEjIcybEYr0aJgPfW7rQQG37AU7e0WSQ DHrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RFZzbSCSG3liEBFzsFBndnKLD/Fxvy9/A4lnI3gqTkk=; b=PKS++gee56PAZd04TIFX4K+nHNcG0s3gUnuobeScL3E4IxBSfGOFIjGfXjmNoIIAv2 QT94ElMqPgjj88B9rTzd1v1IfGMxXHCGAB1L0uJm2DoKTwnK809tRQLIZkeG3feAcRH7 HKoLivjGKseXfd8kb/jyjR7VlPBAZIY3IShdeRr25HCV35qhPLBZI94+hxRip9OruJH3 DwEbIcuyVdT4MNa5pEk9QQ+yHag/V6XOO//SQ9RmOI8OUbAIESROjGmsSdxJI2cBlWO/ 9gkIDDxjcuqyN5Ix3J1LV2+mRafW3bp9Dor2P6Tahow2VaySrq3k4d6G7eAxaryUZ4zf icAg== X-Gm-Message-State: AOAM530iqjfYf86uWkkQ7BZqFo/CvKXeCNji8vgBzS5tyRauld6rQCXR MrckDt2NZqOC9kcFnOrAXhA= X-Google-Smtp-Source: ABdhPJxx1dTd0Y3Xng3m8t0IBTSlLbvNI9PVElP0v8+VI4s1saDnixJ2q3TyYoXNuylaWlJKnSm3bw== X-Received: by 2002:a17:902:8ecc:b029:ef:6471:dc08 with SMTP id x12-20020a1709028eccb02900ef6471dc08mr5094131plo.5.1621507482766; Thu, 20 May 2021 03:44:42 -0700 (PDT) Received: from pride.localdomain (c-174-61-140-56.hsd1.wa.comcast.net. [174.61.140.56]) by smtp.gmail.com with ESMTPSA id z12sm1762572pfk.45.2021.05.20.03.44.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 03:44:42 -0700 (PDT) From: Joe Richey To: trivial@kernel.org Cc: Joe Richey , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Paolo Bonzini , Mark Rutland , Lorenzo Pieralisi , Mauro Carvalho Chehab , Zhangfei Gao , Zhou Wang , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-accelerators@lists.ozlabs.org Subject: [PATCH 2/6] KVM: X86: Don't use BIT() macro in UAPI headers Date: Thu, 20 May 2021 03:43:39 -0700 Message-Id: <20210520104343.317119-3-joerichey94@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520104343.317119-1-joerichey94@gmail.com> References: <20210520104343.317119-1-joerichey94@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Joe Richey A previous patch [1] used the BIT() macro to define the KVM_DIRTY_GFN_F_* constants in KVM's UAPI header. This macro is defined in the kernel but not in the UAPI headers. [1] https://patchwork.kernel.org/patch/11854393 Signed-off-by: Joe Richey --- include/uapi/linux/kvm.h | 4 ++-- tools/include/uapi/linux/kvm.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 3fd9a7e9d90c..8f8a0fd7cd65 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -1879,8 +1879,8 @@ struct kvm_hyperv_eventfd { * conversion after harvesting an entry. Also, it must not skip any * dirty bits, so that dirty bits are always harvested in sequence. */ -#define KVM_DIRTY_GFN_F_DIRTY BIT(0) -#define KVM_DIRTY_GFN_F_RESET BIT(1) +#define KVM_DIRTY_GFN_F_DIRTY (1 << 0) +#define KVM_DIRTY_GFN_F_RESET (1 << 1) #define KVM_DIRTY_GFN_F_MASK 0x3 /* diff --git a/tools/include/uapi/linux/kvm.h b/tools/include/uapi/linux/kvm.h index 3fd9a7e9d90c..8f8a0fd7cd65 100644 --- a/tools/include/uapi/linux/kvm.h +++ b/tools/include/uapi/linux/kvm.h @@ -1879,8 +1879,8 @@ struct kvm_hyperv_eventfd { * conversion after harvesting an entry. Also, it must not skip any * dirty bits, so that dirty bits are always harvested in sequence. */ -#define KVM_DIRTY_GFN_F_DIRTY BIT(0) -#define KVM_DIRTY_GFN_F_RESET BIT(1) +#define KVM_DIRTY_GFN_F_DIRTY (1 << 0) +#define KVM_DIRTY_GFN_F_RESET (1 << 1) #define KVM_DIRTY_GFN_F_MASK 0x3 /* From patchwork Thu May 20 10:43:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Richey X-Patchwork-Id: 12269981 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F24FC43460 for ; Thu, 20 May 2021 12:09:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0589C60FDA for ; Thu, 20 May 2021 12:09:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238586AbhETMKX (ORCPT ); Thu, 20 May 2021 08:10:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237069AbhETMKD (ORCPT ); Thu, 20 May 2021 08:10:03 -0400 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A91EC00F78D; Thu, 20 May 2021 03:44:44 -0700 (PDT) Received: by mail-pj1-x102b.google.com with SMTP id j6-20020a17090adc86b02900cbfe6f2c96so5057330pjv.1; Thu, 20 May 2021 03:44:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ErpZlZtEjVnBv8JgAW5VuOM45iouE3c/zRV6fvcscso=; b=VoTCzqQ+AyfdLVTkMzITHdTK59fSm9bj0MwFlLrubCP2kn8gUFJEmiyAdY5QQ2p8jd 1VaoPdnI2d3NHqK0u8afuzQT74OP+rfUcmzVnLkWxOv8RaLJI6TxvE7eD2vTwzS77aA1 n/xlmbQ6lxgARADB0Yo0ACzkLaPUuPT+S57RfsD1PxdFfCkAqfvqBduYsE8Fd/iIV0Ch 3bjFjefjHvuOrbmZcN9OOGhq0UKcYNOTrnwZ5SuckA+/Kc/XW5s8SBsgNb7Z3jLHV6eW IVhrpOZaBlldsrHJe5wpRk3k+jnoSMViUYsdRAg/x1y6M/dOrtzXHZwwIvHgHYg01oqS SkCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ErpZlZtEjVnBv8JgAW5VuOM45iouE3c/zRV6fvcscso=; b=abrIdpNsCajJqrGvbQF9NX9RVvKQBHydwPS1MIAx8wYrKu4A31nsb+wb3PUWrmK+N2 Yg3FXDBx0BWQzroF1rCwq9IZOEQNUCJd8ZlWprj/7+KARKHcn1UZgwLs4G/wSOUXk9u3 lNX3zSpXSSzBWdI32/f5VEf152cC/FI5px8KVBKljfI9JYK6jAMRna+rh+AbX+tGhTGI 3HM4LQ1DVuGqf/LNJRx7eXzxTEsr3IYIRTryQXqKlHnJe1cpBr85k9YDdXyiYx9GS+o0 0/O5k/pXRQoQAkGlXTyly8e8LfoNrgOEo2qOaQDIu1eiKMcj5PrmdLtKjo/KKIzj6bS9 B28Q== X-Gm-Message-State: AOAM531LQGAFDhyksUro0jCfhAcKbmzJxAlqoZQ/XE77ekhfv7Ycrtt6 Sz13wkOcuhrdub7/M29fxg4= X-Google-Smtp-Source: ABdhPJzblwJWpZXmZ5nSjMydEL9hQ10+4wP8w4oFCgka/uj1HS7wzPRzVgi786Z/NZkZTjntrHYGQg== X-Received: by 2002:a17:90a:3bc6:: with SMTP id e64mr4659024pjc.156.1621507484095; Thu, 20 May 2021 03:44:44 -0700 (PDT) Received: from pride.localdomain (c-174-61-140-56.hsd1.wa.comcast.net. [174.61.140.56]) by smtp.gmail.com with ESMTPSA id z12sm1762572pfk.45.2021.05.20.03.44.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 03:44:43 -0700 (PDT) From: Joe Richey To: trivial@kernel.org Cc: Joe Richey , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Paolo Bonzini , Mark Rutland , Lorenzo Pieralisi , Mauro Carvalho Chehab , Zhangfei Gao , Zhou Wang , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-accelerators@lists.ozlabs.org Subject: [PATCH 3/6] drivers: firmware: psci: Don't use BIT() macro in UAPI headers Date: Thu, 20 May 2021 03:43:40 -0700 Message-Id: <20210520104343.317119-4-joerichey94@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520104343.317119-1-joerichey94@gmail.com> References: <20210520104343.317119-1-joerichey94@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Joe Richey A previous patch [1] used the BIT() macro to define PSCI_1_0_OS_INITIATED in the UAPI header. This macro is defined in the kernel but not in the UAPI headers. [1] https://lore.kernel.org/patchwork/patch/949966/ Signed-off-by: Joe Richey --- include/uapi/linux/psci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/psci.h b/include/uapi/linux/psci.h index 2fcad1dd0b0e..d7da8059cbbe 100644 --- a/include/uapi/linux/psci.h +++ b/include/uapi/linux/psci.h @@ -100,7 +100,7 @@ #define PSCI_1_0_FEATURES_CPU_SUSPEND_PF_MASK \ (0x1 << PSCI_1_0_FEATURES_CPU_SUSPEND_PF_SHIFT) -#define PSCI_1_0_OS_INITIATED BIT(0) +#define PSCI_1_0_OS_INITIATED (1 << 0) #define PSCI_1_0_SUSPEND_MODE_PC 0 #define PSCI_1_0_SUSPEND_MODE_OSI 1 From patchwork Thu May 20 10:43:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Richey X-Patchwork-Id: 12269989 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8894C43460 for ; Thu, 20 May 2021 12:09:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CD42C6108C for ; Thu, 20 May 2021 12:09:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236178AbhETMKf (ORCPT ); Thu, 20 May 2021 08:10:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237335AbhETMKE (ORCPT ); Thu, 20 May 2021 08:10:04 -0400 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3573C00F78E; Thu, 20 May 2021 03:44:45 -0700 (PDT) Received: by mail-pf1-x430.google.com with SMTP id c12so462511pfl.3; Thu, 20 May 2021 03:44:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7ZiFgLWMWvuZRELwo2jd+K7U5Q4HIOe8SBImsjcWPpg=; b=PEGXZmX1QZg5eZN102ymP6m47ZpJDcsahQdFjSm6a/+FEr02vOmCcLQWSAm6hZxP3r JO5wS7RX1ObsIwWuIKV7DYdVNiWMTqv7+/wwIFqBwsW505FTcwRiiOuiFJOeI/ILVjFz GoAQUrP7+2JWnX7Zt/+Cnqhkib1bkAJcHlgKmG6ozF8voutTIl2ZURlzfRvhIn2iCA/J HOtK7rSzHTX7ZuT7ynRcid8yAogEpyjHZic8qeQlDQ1Y3jRgOkosl8jAT/T/ro8FYExl QJPx1DAMTmEVxbu3/CnafFrVTODY8Q15UDAstGwLkfNLOrtbge2+C8zytnVgU2zSVJSt Btjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7ZiFgLWMWvuZRELwo2jd+K7U5Q4HIOe8SBImsjcWPpg=; b=CMTqDYDYg1b6tjffK8ckFAOf02owkiV+APFNkguhJUeMDiqBuvSnd52990I0/T5YQn 251ihEyZGiNT4y52iu0TUmqG2AD/ot4YqQTysjdBkacxWO+9CJ3ch8hT5OIF91WvnrwR wKTXcY1cU74UlpSbJlatLBUMPIWjAan68vZ/c2AuFCDIAvH7Ss88bQY84Bu5g6UCGJ5m 12HrohKX8gg1npNwiR7ODY5iOBF3iVda9dZwSmY6QCLo5KWoEtUFk9IP6Nmptgvg4k4W LvAL9oySYVWUknGDh8J+fbHjj8SbOq5362MnTZVN7eINCLGW9+OG6UMkIiTJhQG6SDgj NT4A== X-Gm-Message-State: AOAM533gJBsER3+SWE/1Pb8myDx/C+au7TpUEsxP/RdmKaN1ONzAftb0 LBTgA3Jupo7YXn1fKtqthQA= X-Google-Smtp-Source: ABdhPJxoh1IwwPMV1InzW2164Znzz0uMx6+mRF33S95Wu+6uvNRGeG1KcrO6dglWETXatjWGjDn2fA== X-Received: by 2002:a62:f24b:0:b029:2dc:9098:c14c with SMTP id y11-20020a62f24b0000b02902dc9098c14cmr3833071pfl.19.1621507485397; Thu, 20 May 2021 03:44:45 -0700 (PDT) Received: from pride.localdomain (c-174-61-140-56.hsd1.wa.comcast.net. [174.61.140.56]) by smtp.gmail.com with ESMTPSA id z12sm1762572pfk.45.2021.05.20.03.44.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 03:44:45 -0700 (PDT) From: Joe Richey To: trivial@kernel.org Cc: Joe Richey , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Paolo Bonzini , Mark Rutland , Lorenzo Pieralisi , Mauro Carvalho Chehab , Zhangfei Gao , Zhou Wang , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-accelerators@lists.ozlabs.org Subject: [PATCH 4/6] uacce: Don't use BIT() macro in UAPI headers Date: Thu, 20 May 2021 03:43:41 -0700 Message-Id: <20210520104343.317119-5-joerichey94@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520104343.317119-1-joerichey94@gmail.com> References: <20210520104343.317119-1-joerichey94@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Joe Richey A previous patch [1] used the BIT() macro to define UACCE_DEV_SVA. This macro is defined in the kernel but not in the UAPI headers. [1] https://lore.kernel.org/patchwork/patch/11334877/ Signed-off-by: Joe Richey --- include/uapi/misc/uacce/uacce.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/misc/uacce/uacce.h b/include/uapi/misc/uacce/uacce.h index cc7185678f47..a404ec40e000 100644 --- a/include/uapi/misc/uacce/uacce.h +++ b/include/uapi/misc/uacce/uacce.h @@ -23,7 +23,7 @@ * Support PASID * Support device page faults (PCI PRI or SMMU Stall) */ -#define UACCE_DEV_SVA BIT(0) +#define UACCE_DEV_SVA (1 << 0) /** * enum uacce_qfrt: queue file region type From patchwork Thu May 20 10:43:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Richey X-Patchwork-Id: 12269985 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B738C43462 for ; Thu, 20 May 2021 12:09:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0DCD76108C for ; Thu, 20 May 2021 12:09:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239944AbhETMKa (ORCPT ); Thu, 20 May 2021 08:10:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235472AbhETMKE (ORCPT ); Thu, 20 May 2021 08:10:04 -0400 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41BFEC00F603; Thu, 20 May 2021 03:44:47 -0700 (PDT) Received: by mail-pl1-x62e.google.com with SMTP id v13so8776410ple.9; Thu, 20 May 2021 03:44:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B5ZWzUeYqTQLFzLVEG/RxjgILJ2YZIhD7PbaUbwdicw=; b=Zpd70lXIV/eUnVrI8F4+xjxllQR6HyPP1iaCcElNF5O1IUn2zHjs9Ucbu1M9iZuNn/ 9YmiF6pX3Gfy9DMn/15SOarhogNZqzhqItsmjel2+dcIfIuTOW6hbplNW20GcoDWMaeF NDrqzILNelFbOlWqKcmwoNszt0Ijd7b/dVf5IqRLB9gpLgwchqOddFfoXkkvZm/XAceG gEY+3Hewfs12i/vSpcjxEmbUK4vkKFvyG9y7WnbFmlzQcY8yYImONbmRltNM9mibaX4h HsL6l9MFFh6ObQPecz8LoXNwcM8IwI2dXvU+EYXQuGPwa1hBeQo4Nzie51bb/A6McqJL O1kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=B5ZWzUeYqTQLFzLVEG/RxjgILJ2YZIhD7PbaUbwdicw=; b=B2sakbTUOvnJ7CD2UsFn9rdThvHYLc4neA4FhcfNjUrOzirpqCdHlwBCGQal1nG6e6 rIopxSXOEFaJoEnK06O52/v4OAVlaYWp5i2j70DEFrcyMUIfuprVxuSxd3XL3MP84euX kiO4lcvMQGrMPRtOT+ZwH/eLkfDk72+fzcf2gsldzM4MQEQ8ujL1fTEHuc2W11escF/x CRXnlYDk5KMkHBPoWkAHywBGT7hJApQDjgoeVyNuZq+4tISXcvkR9/cMp8qqYq5H9eZA qcYJqssq8afTTUGPU6ZiPrgKM1IftDAFyhdr5GQusnk2c2xpJw8OPSoK5i/OEzRgQLcD S2Wg== X-Gm-Message-State: AOAM531VoN/hf8aUxWI2qRgtVE77kSvOKKXoPP9wOKnuiH5X9CSHbZod lUscmKklSNt+Mw5fUvZ7w+U= X-Google-Smtp-Source: ABdhPJyLlYQXZjXviGINknEFBWgEqraOFrpfGwkNKpdsDEW6vI6pdjv2iIyooBg0qMZQiifEGrFSEQ== X-Received: by 2002:a17:90a:b382:: with SMTP id e2mr4165874pjr.171.1621507486794; Thu, 20 May 2021 03:44:46 -0700 (PDT) Received: from pride.localdomain (c-174-61-140-56.hsd1.wa.comcast.net. [174.61.140.56]) by smtp.gmail.com with ESMTPSA id z12sm1762572pfk.45.2021.05.20.03.44.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 03:44:46 -0700 (PDT) From: Joe Richey To: trivial@kernel.org Cc: Joe Richey , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Paolo Bonzini , Mark Rutland , Lorenzo Pieralisi , Mauro Carvalho Chehab , Zhangfei Gao , Zhou Wang , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-accelerators@lists.ozlabs.org Subject: [PATCH 5/6] media: vicodec: Don't use BIT() macro in UAPI headers Date: Thu, 20 May 2021 03:43:42 -0700 Message-Id: <20210520104343.317119-6-joerichey94@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520104343.317119-1-joerichey94@gmail.com> References: <20210520104343.317119-1-joerichey94@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Joe Richey A previous patch [1] used the BIT() macro to define the V4L2_FWHT_FL_* constants in the UAPI header file. This macro is defined in the kernel but not in the UAPI headers. Seems like this was caused by moving code from inside the kernel. [1] https://lore.kernel.org/patchwork/patch/11933745/ Signed-off-by: Joe Richey --- include/uapi/linux/v4l2-controls.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index d43bec5f1afd..6ecefeceba9d 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -1602,30 +1602,30 @@ struct v4l2_ctrl_h264_decode_params { #define V4L2_FWHT_VERSION 3 /* Set if this is an interlaced format */ -#define V4L2_FWHT_FL_IS_INTERLACED BIT(0) +#define V4L2_FWHT_FL_IS_INTERLACED (1 << 0) /* Set if this is a bottom-first (NTSC) interlaced format */ -#define V4L2_FWHT_FL_IS_BOTTOM_FIRST BIT(1) +#define V4L2_FWHT_FL_IS_BOTTOM_FIRST (1 << 1) /* Set if each 'frame' contains just one field */ -#define V4L2_FWHT_FL_IS_ALTERNATE BIT(2) +#define V4L2_FWHT_FL_IS_ALTERNATE (1 << 2) /* * If V4L2_FWHT_FL_IS_ALTERNATE was set, then this is set if this * 'frame' is the bottom field, else it is the top field. */ -#define V4L2_FWHT_FL_IS_BOTTOM_FIELD BIT(3) +#define V4L2_FWHT_FL_IS_BOTTOM_FIELD (1 << 3) /* Set if the Y' plane is uncompressed */ -#define V4L2_FWHT_FL_LUMA_IS_UNCOMPRESSED BIT(4) +#define V4L2_FWHT_FL_LUMA_IS_UNCOMPRESSED (1 << 4) /* Set if the Cb plane is uncompressed */ -#define V4L2_FWHT_FL_CB_IS_UNCOMPRESSED BIT(5) +#define V4L2_FWHT_FL_CB_IS_UNCOMPRESSED (1 << 5) /* Set if the Cr plane is uncompressed */ -#define V4L2_FWHT_FL_CR_IS_UNCOMPRESSED BIT(6) +#define V4L2_FWHT_FL_CR_IS_UNCOMPRESSED (1 << 6) /* Set if the chroma plane is full height, if cleared it is half height */ -#define V4L2_FWHT_FL_CHROMA_FULL_HEIGHT BIT(7) +#define V4L2_FWHT_FL_CHROMA_FULL_HEIGHT (1 << 7) /* Set if the chroma plane is full width, if cleared it is half width */ -#define V4L2_FWHT_FL_CHROMA_FULL_WIDTH BIT(8) +#define V4L2_FWHT_FL_CHROMA_FULL_WIDTH (1 << 8) /* Set if the alpha plane is uncompressed */ -#define V4L2_FWHT_FL_ALPHA_IS_UNCOMPRESSED BIT(9) +#define V4L2_FWHT_FL_ALPHA_IS_UNCOMPRESSED (1 << 9) /* Set if this is an I Frame */ -#define V4L2_FWHT_FL_I_FRAME BIT(10) +#define V4L2_FWHT_FL_I_FRAME (1 << 10) /* A 4-values flag - the number of components - 1 */ #define V4L2_FWHT_FL_COMPONENTS_NUM_MSK GENMASK(18, 16) From patchwork Thu May 20 10:43:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Richey X-Patchwork-Id: 12269987 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0541DC43603 for ; Thu, 20 May 2021 12:09:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DE8276108D for ; Thu, 20 May 2021 12:09:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242010AbhETMKi (ORCPT ); Thu, 20 May 2021 08:10:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240603AbhETMKF (ORCPT ); Thu, 20 May 2021 08:10:05 -0400 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A00AFC00F604; Thu, 20 May 2021 03:44:48 -0700 (PDT) Received: by mail-pf1-x42c.google.com with SMTP id d16so12036905pfn.12; Thu, 20 May 2021 03:44:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pvy4uR7MHK/1WKiYT47mbja8P4GqAFt1Aj7E8yW5uXM=; b=JcsM3Mc4gFSpMe75/JOFUKhOM+axazRlgWH3YUkeBTgE8AiBS+LuCEJfb9hO+Voz2Z kLibfAzceTIZxq02vD7Yg0qqD6MJfrOd+2u1hBqdCnjSPOdEJ5wp7QEPpSOy911DC9ZH B7BZnT+9aloxUh1gYNeyBN2NEl5xmIOViIwihVhoj/jAFku/rum2L/ujT0jbOFkQ4fcJ KnQ7ESBMtsXmrnSCMPkV6xOiLNNr6/QyaNukMfnvnrs1bLOpnWUovvCMfiYz56MCSqbP BCYfscGhvVPVvMk9CDCpWHhUyF15NtdTwuTy7MB3crkLyaBfbrWUf/ZpliRnWXFTBdUm h5CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pvy4uR7MHK/1WKiYT47mbja8P4GqAFt1Aj7E8yW5uXM=; b=EU9wgQaLDVbE6IzqM+5hW3kytdrjBRFFIJ31ASpSWqtjJb8mSVckAXBIDpSBGcSFqL KxjA1NovozksTHzeANiUQ8WF+cszU4tLOZ68mB6yxjUI8dUn4wZ7juXsQy0pyO69p8nt 6jmk6RJfc3gB+j7aDesTeGK4LXPd87tDGWCtW4OhzuLTcz4CasbWHKD3xh5ZDHoaZDmh pzu6txp8w19aH2U7I1h1lT6ctCrz91LyKJUSc3RVJjpXYiV+KIJrGxS1jkG+dfxXtkGF 6UPBBG2Mno7leufZlbtXZawZFaMoMvZcwd/GjhxcOEMvHzk5A+4X+uZzGmx36rn/Nfft 6bsQ== X-Gm-Message-State: AOAM531KrvguHQKGP8REEdvMmPqLrcWthtzF6XSwmLKvQZHAUImrZEZU pRR4b1ehuqHBxEVuuLamD+U= X-Google-Smtp-Source: ABdhPJy5t/g/j1Xb6rx0aCnq91cAL7FUDVsOejKnAtk169jvxK5FjehDQqaPQHtwx+97AcdMQSVyQA== X-Received: by 2002:a62:6407:0:b029:2df:b6dc:c68b with SMTP id y7-20020a6264070000b02902dfb6dcc68bmr3844877pfb.17.1621507488171; Thu, 20 May 2021 03:44:48 -0700 (PDT) Received: from pride.localdomain (c-174-61-140-56.hsd1.wa.comcast.net. [174.61.140.56]) by smtp.gmail.com with ESMTPSA id z12sm1762572pfk.45.2021.05.20.03.44.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 03:44:47 -0700 (PDT) From: Joe Richey To: trivial@kernel.org Cc: Joe Richey , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Paolo Bonzini , Mark Rutland , Lorenzo Pieralisi , Mauro Carvalho Chehab , Zhangfei Gao , Zhou Wang , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-accelerators@lists.ozlabs.org Subject: [PATCH 6/6] tools headers UAPI: Sync pkt_sched.h with the kernel sources Date: Thu, 20 May 2021 03:43:43 -0700 Message-Id: <20210520104343.317119-7-joerichey94@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520104343.317119-1-joerichey94@gmail.com> References: <20210520104343.317119-1-joerichey94@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Joe Richey It looks like this process isn't automatic for some reason. This prevents some perf tools warnings and removes use of the BIT() macro which isn't present for UAPI headers. Signed-off-by: Joe Richey --- tools/include/uapi/linux/pkt_sched.h | 122 ++++++++++++++++++++++++--- 1 file changed, 112 insertions(+), 10 deletions(-) diff --git a/tools/include/uapi/linux/pkt_sched.h b/tools/include/uapi/linux/pkt_sched.h index 5c903abc9fa5..79a699f106b1 100644 --- a/tools/include/uapi/linux/pkt_sched.h +++ b/tools/include/uapi/linux/pkt_sched.h @@ -2,6 +2,7 @@ #ifndef __LINUX_PKT_SCHED_H #define __LINUX_PKT_SCHED_H +#include #include /* Logical priority bands not depending on specific packet scheduler. @@ -255,6 +256,9 @@ enum { TCA_RED_PARMS, TCA_RED_STAB, TCA_RED_MAX_P, + TCA_RED_FLAGS, /* bitfield32 */ + TCA_RED_EARLY_DROP_BLOCK, /* u32 */ + TCA_RED_MARK_BLOCK, /* u32 */ __TCA_RED_MAX, }; @@ -267,12 +271,28 @@ struct tc_red_qopt { unsigned char Wlog; /* log(W) */ unsigned char Plog; /* log(P_max/(qth_max-qth_min)) */ unsigned char Scell_log; /* cell size for idle damping */ + + /* This field can be used for flags that a RED-like qdisc has + * historically supported. E.g. when configuring RED, it can be used for + * ECN, HARDDROP and ADAPTATIVE. For SFQ it can be used for ECN, + * HARDDROP. Etc. Because this field has not been validated, and is + * copied back on dump, any bits besides those to which a given qdisc + * has assigned a historical meaning need to be considered for free use + * by userspace tools. + * + * Any further flags need to be passed differently, e.g. through an + * attribute (such as TCA_RED_FLAGS above). Such attribute should allow + * passing both recent and historic flags in one value. + */ unsigned char flags; #define TC_RED_ECN 1 #define TC_RED_HARDDROP 2 #define TC_RED_ADAPTATIVE 4 +#define TC_RED_NODROP 8 }; +#define TC_RED_HISTORIC_FLAGS (TC_RED_ECN | TC_RED_HARDDROP | TC_RED_ADAPTATIVE) + struct tc_red_xstats { __u32 early; /* Early drops */ __u32 pdrop; /* Drops due to queue limits */ @@ -894,6 +914,12 @@ enum { TCA_FQ_CE_THRESHOLD, /* DCTCP-like CE-marking threshold */ + TCA_FQ_TIMER_SLACK, /* timer slack */ + + TCA_FQ_HORIZON, /* time horizon in us */ + + TCA_FQ_HORIZON_DROP, /* drop packets beyond horizon, or cap their EDT */ + __TCA_FQ_MAX }; @@ -913,6 +939,8 @@ struct tc_fq_qd_stats { __u32 throttled_flows; __u32 unthrottle_latency_ns; __u64 ce_mark; /* packets above ce_threshold */ + __u64 horizon_drops; + __u64 horizon_caps; }; /* Heavy-Hitter Filter */ @@ -950,19 +978,56 @@ enum { TCA_PIE_BETA, TCA_PIE_ECN, TCA_PIE_BYTEMODE, + TCA_PIE_DQ_RATE_ESTIMATOR, __TCA_PIE_MAX }; #define TCA_PIE_MAX (__TCA_PIE_MAX - 1) struct tc_pie_xstats { - __u32 prob; /* current probability */ - __u32 delay; /* current delay in ms */ - __u32 avg_dq_rate; /* current average dq_rate in bits/pie_time */ - __u32 packets_in; /* total number of packets enqueued */ - __u32 dropped; /* packets dropped due to pie_action */ - __u32 overlimit; /* dropped due to lack of space in queue */ - __u32 maxq; /* maximum queue size */ - __u32 ecn_mark; /* packets marked with ecn*/ + __u64 prob; /* current probability */ + __u32 delay; /* current delay in ms */ + __u32 avg_dq_rate; /* current average dq_rate in + * bits/pie_time + */ + __u32 dq_rate_estimating; /* is avg_dq_rate being calculated? */ + __u32 packets_in; /* total number of packets enqueued */ + __u32 dropped; /* packets dropped due to pie_action */ + __u32 overlimit; /* dropped due to lack of space + * in queue + */ + __u32 maxq; /* maximum queue size */ + __u32 ecn_mark; /* packets marked with ecn*/ +}; + +/* FQ PIE */ +enum { + TCA_FQ_PIE_UNSPEC, + TCA_FQ_PIE_LIMIT, + TCA_FQ_PIE_FLOWS, + TCA_FQ_PIE_TARGET, + TCA_FQ_PIE_TUPDATE, + TCA_FQ_PIE_ALPHA, + TCA_FQ_PIE_BETA, + TCA_FQ_PIE_QUANTUM, + TCA_FQ_PIE_MEMORY_LIMIT, + TCA_FQ_PIE_ECN_PROB, + TCA_FQ_PIE_ECN, + TCA_FQ_PIE_BYTEMODE, + TCA_FQ_PIE_DQ_RATE_ESTIMATOR, + __TCA_FQ_PIE_MAX +}; +#define TCA_FQ_PIE_MAX (__TCA_FQ_PIE_MAX - 1) + +struct tc_fq_pie_xstats { + __u32 packets_in; /* total number of packets enqueued */ + __u32 dropped; /* packets dropped due to fq_pie_action */ + __u32 overlimit; /* dropped due to lack of space in queue */ + __u32 overmemory; /* dropped due to lack of memory in queue */ + __u32 ecn_mark; /* packets marked with ecn */ + __u32 new_flow_count; /* count of new flows created by packets */ + __u32 new_flows_len; /* count of flows in new list */ + __u32 old_flows_len; /* count of flows in old list */ + __u32 memory_usage; /* total memory across all queues */ }; /* CBS */ @@ -989,8 +1054,9 @@ struct tc_etf_qopt { __s32 delta; __s32 clockid; __u32 flags; -#define TC_ETF_DEADLINE_MODE_ON BIT(0) -#define TC_ETF_OFFLOAD_ON BIT(1) +#define TC_ETF_DEADLINE_MODE_ON _BITUL(0) +#define TC_ETF_OFFLOAD_ON _BITUL(1) +#define TC_ETF_SKIP_SOCK_CHECK _BITUL(2) }; enum { @@ -1022,6 +1088,7 @@ enum { TCA_CAKE_INGRESS, TCA_CAKE_ACK_FILTER, TCA_CAKE_SPLIT_GSO, + TCA_CAKE_FWMARK, __TCA_CAKE_MAX }; #define TCA_CAKE_MAX (__TCA_CAKE_MAX - 1) @@ -1148,6 +1215,19 @@ enum { #define TCA_TAPRIO_SCHED_MAX (__TCA_TAPRIO_SCHED_MAX - 1) +/* The format for the admin sched (dump only): + * [TCA_TAPRIO_SCHED_ADMIN_SCHED] + * [TCA_TAPRIO_ATTR_SCHED_BASE_TIME] + * [TCA_TAPRIO_ATTR_SCHED_ENTRY_LIST] + * [TCA_TAPRIO_ATTR_SCHED_ENTRY] + * [TCA_TAPRIO_ATTR_SCHED_ENTRY_CMD] + * [TCA_TAPRIO_ATTR_SCHED_ENTRY_GATES] + * [TCA_TAPRIO_ATTR_SCHED_ENTRY_INTERVAL] + */ + +#define TCA_TAPRIO_ATTR_FLAG_TXTIME_ASSIST _BITUL(0) +#define TCA_TAPRIO_ATTR_FLAG_FULL_OFFLOAD _BITUL(1) + enum { TCA_TAPRIO_ATTR_UNSPEC, TCA_TAPRIO_ATTR_PRIOMAP, /* struct tc_mqprio_qopt */ @@ -1156,9 +1236,31 @@ enum { TCA_TAPRIO_ATTR_SCHED_SINGLE_ENTRY, /* single entry */ TCA_TAPRIO_ATTR_SCHED_CLOCKID, /* s32 */ TCA_TAPRIO_PAD, + TCA_TAPRIO_ATTR_ADMIN_SCHED, /* The admin sched, only used in dump */ + TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME, /* s64 */ + TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME_EXTENSION, /* s64 */ + TCA_TAPRIO_ATTR_FLAGS, /* u32 */ + TCA_TAPRIO_ATTR_TXTIME_DELAY, /* u32 */ __TCA_TAPRIO_ATTR_MAX, }; #define TCA_TAPRIO_ATTR_MAX (__TCA_TAPRIO_ATTR_MAX - 1) +/* ETS */ + +#define TCQ_ETS_MAX_BANDS 16 + +enum { + TCA_ETS_UNSPEC, + TCA_ETS_NBANDS, /* u8 */ + TCA_ETS_NSTRICT, /* u8 */ + TCA_ETS_QUANTA, /* nested TCA_ETS_QUANTA_BAND */ + TCA_ETS_QUANTA_BAND, /* u32 */ + TCA_ETS_PRIOMAP, /* nested TCA_ETS_PRIOMAP_BAND */ + TCA_ETS_PRIOMAP_BAND, /* u8 */ + __TCA_ETS_MAX, +}; + +#define TCA_ETS_MAX (__TCA_ETS_MAX - 1) + #endif