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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E18CBC433F5 for ; Fri, 14 Jan 2022 20:38:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6DEB010E221; Fri, 14 Jan 2022 20:38:59 +0000 (UTC) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam08on2078.outbound.protection.outlook.com [40.107.101.78]) by gabe.freedesktop.org (Postfix) with ESMTPS id AB20410E21A for ; Fri, 14 Jan 2022 20:38:57 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gIlBYu1ddrqYbPl8NDGUtskDi2aMfivjx/ECzMjHLFoVgMKOD6P6ImCLLZaA1XYKNYA0NVvbviPEPc5OCan7f7tPwM+JqxQr1ZJ8UZ8a3GUhByBnLmK96trQH2MS4V+KErmAFIkP4sSj53fqHYlbJSjPElv42c09QbR8+IDVM7YpnHaBbmAVnwmcBoeojYFlIQzb3ExtSdyWIQ9nmbUAvmM2Wr/BkjCaF7g6ejUgbn2ZtTUXuCMQWxAi5CZ6bomh/au02OHCNCwX1183hgT4RyP1NcEjSEWhiwW8tYWjxCiju/LKEZRmvb71/8dNX1D4THxLLK71J/14DIbaGvvT3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fFU4SKcG0ONj9N+vju8i9lkhO6yAPwxpvSZWHlv/YJ0=; b=j42r6JLRhN3g6AnFCAh4nvF2r/BWGcgM3V+ikCkd4d7O32M2kDL8M6eFNC848oS3DEYK+8ATVYz/Wmm/jcsB8WGgQNvTOBBlnGJXo5hjrt/FCJM9pYmZPLRsRqW9N9bUGWqG41JkpGMg1YNdYZWKGuZ7ib6Oi6Ut1UdSLRxmlLS9Td3blQpexf+AmSDXbNgNwgSAKoooEnkSEdKbjC7ZGRQBSRE1aav4SBkexxnw15MMZoOcQN8dCFh0xCoOpVFKYaVXwH2rGGzmy1Mp3uzPs4ZiVRsuGnsvZN8tdi/s2YarI6+IF4cUgRf5LNWmmVbCHmWJyhWaHddBtTkFzwuOgg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fFU4SKcG0ONj9N+vju8i9lkhO6yAPwxpvSZWHlv/YJ0=; b=miufSjn8rjBeApig0UWvnBQmAa3mV2epg/X6ECOlxWKXHxAMtBcqeKCIMY0mYUFPRFntwNyo72iSkb7Dk0/eJ2OXwhIT1sTz9o5Rg7rDTG1Vs43Hw9N1kNVw2SoCKJb4YmsALTVNx6hNMsHEIxajkk2ZnhKuKmZbz/eyQPxHKJQ= Received: from DS7P222CA0018.NAMP222.PROD.OUTLOOK.COM (2603:10b6:8:2e::33) by BN8PR12MB2900.namprd12.prod.outlook.com (2603:10b6:408:69::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Fri, 14 Jan 2022 20:38:55 +0000 Received: from DM6NAM11FT009.eop-nam11.prod.protection.outlook.com (2603:10b6:8:2e:cafe::5d) by DS7P222CA0018.outlook.office365.com (2603:10b6:8:2e::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9 via Frontend Transport; Fri, 14 Jan 2022 20:38:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT009.mail.protection.outlook.com (10.13.173.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4888.9 via Frontend Transport; Fri, 14 Jan 2022 20:38:54 +0000 Received: from Philip-Dev.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Fri, 14 Jan 2022 14:38:53 -0600 From: Philip Yang To: Subject: [PATCH 2/5] drm/amdkfd: enable per process SMI event Date: Fri, 14 Jan 2022 15:38:36 -0500 Message-ID: <20220114203839.21707-3-Philip.Yang@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220114203839.21707-1-Philip.Yang@amd.com> References: <20220114203839.21707-1-Philip.Yang@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 77b85be5-fb8c-429d-255f-08d9d79de1f4 X-MS-TrafficTypeDiagnostic: BN8PR12MB2900:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qlF95Rd6AIB1OfFmhor8FJ0JzGYnjUkawB8UM3V3kgOYTvqNQe3VEOHTN74Ps7Zbh76rJeLrnPCJ/WNym+nALI/uTRy1/vT8s4MkU0uKohInCkon9GCmtjcSxdPzI3T2kS/wqpQPbnyIkx59qgZ5kQyECRGywFeWTBYuecMxVZzjrYDWgoo+cdCI4X7sBNJyfnAmKxShxv86LTP3Xv/Gp5V1vECkgq3DBJhzKnmuhfVY/cUeQ8HEHoz/nrdJWpSVyxFrbBZGIJUqE7UyxB7fKgcfZx8XwSsnMEAXQ8R8sXofQEdvZX3AjpQZ2+DD/yqWLj34JjaByxNXobxjzDFgOSggAEfrtPALDXOrNcGkttpu5Syn7vXCcfWoLrnXcu3LEA9M6EJPW5fzgmMHY3DoAQQVPuOfpR2xMkboo4qYTjexT4iygCTVQfRom6S3g4dkmictnRx8g4oqaGqUmWsFc9yKTEwY7suoSCAWeZ8thhuR+Emn1t/MjQDSRIjOm34qtFl6/Ysbll8Qkjr34GPAciHaHiuYswhfLFWh2GyqAHAqn44pVtts8CnLNU9Ou9kdgagmz0Jnpxi2eUN2KoE+m24KHS03LpKkXgPxKtuMAg2LaLxkHBOGtmoCFz8RVInuiYrds2NhNCPCg3Zq17f/RJgAShD8o1+SZysgDVqKevXjjegenBjmMQ31fPp/XP1W42s+M/2kAhivkpU3S+cICnTkOXJARWldJKvnAo1HIjnvq0koNWq0bUhmE9Fr/JjDq1jjfrzkTzg4dMy6qcW2PlsRWgU7oWkCrrVEjMiRnJs= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(4636009)(36840700001)(40470700002)(46966006)(36756003)(82310400004)(8676002)(47076005)(36860700001)(70586007)(6666004)(5660300002)(7696005)(8936002)(70206006)(6916009)(2906002)(4326008)(86362001)(83380400001)(356005)(40460700001)(186003)(316002)(508600001)(426003)(1076003)(16526019)(81166007)(2616005)(54906003)(336012)(26005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2022 20:38:54.9409 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 77b85be5-fb8c-429d-255f-08d9d79de1f4 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT009.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB2900 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Philip Yang , felix.kuehling@amd.com Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" Process receive event log from same process by default. Add a flag to be able to receive event log from all processes, this requires super user permission. Event log with pid 0 send to all processes. Define new event log id, migration trigger, user queue eviction trigger, those new event log will be added in following patches. Update kfd_ioctl.h version. Signed-off-by: Philip Yang --- drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 28 +++++++++++++++------ include/uapi/linux/kfd_ioctl.h | 27 ++++++++++++++++++++ 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c b/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c index 7023fa21a0a9..5818ea8ad4ce 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c @@ -37,6 +37,8 @@ struct kfd_smi_client { uint64_t events; struct kfd_dev *dev; spinlock_t lock; + pid_t pid; + bool suser; }; #define MAX_KFIFO_SIZE 1024 @@ -150,16 +152,26 @@ static int kfd_smi_ev_release(struct inode *inode, struct file *filep) return 0; } -static void add_event_to_kfifo(struct kfd_dev *dev, unsigned int smi_event, - char *event_msg, int len) +static bool kfd_smi_ev_enabled(pid_t pid, struct kfd_smi_client *client, + unsigned int smi_event) +{ + if (pid && + !(client->suser && client->events & KFD_SMI_EVENT_MASK_FROM_INDEX(KFD_SMI_EVENT_ALL_PROCESSES)) && + client->pid != pid) + return false; + + return client->events & KFD_SMI_EVENT_MASK_FROM_INDEX(smi_event); +} + +static void add_event_to_kfifo(pid_t pid, struct kfd_dev *dev, + unsigned int smi_event, char *event_msg, int len) { struct kfd_smi_client *client; rcu_read_lock(); list_for_each_entry_rcu(client, &dev->smi_clients, list) { - if (!(READ_ONCE(client->events) & - KFD_SMI_EVENT_MASK_FROM_INDEX(smi_event))) + if (!kfd_smi_ev_enabled(pid, client, smi_event)) continue; spin_lock(&client->lock); if (kfifo_avail(&client->fifo) >= len) { @@ -202,7 +214,7 @@ void kfd_smi_event_update_gpu_reset(struct kfd_dev *dev, bool post_reset) len = snprintf(fifo_in, sizeof(fifo_in), "%x %x\n", event, dev->reset_seq_num); - add_event_to_kfifo(dev, event, fifo_in, len); + add_event_to_kfifo(0, dev, event, fifo_in, len); } void kfd_smi_event_update_thermal_throttling(struct kfd_dev *dev, @@ -225,7 +237,7 @@ void kfd_smi_event_update_thermal_throttling(struct kfd_dev *dev, KFD_SMI_EVENT_THERMAL_THROTTLE, throttle_bitmask, amdgpu_dpm_get_thermal_throttling_counter(dev->adev)); - add_event_to_kfifo(dev, KFD_SMI_EVENT_THERMAL_THROTTLE, fifo_in, len); + add_event_to_kfifo(0, dev, KFD_SMI_EVENT_THERMAL_THROTTLE, fifo_in, len); } void kfd_smi_event_update_vmfault(struct kfd_dev *dev, uint16_t pasid) @@ -250,7 +262,7 @@ void kfd_smi_event_update_vmfault(struct kfd_dev *dev, uint16_t pasid) len = snprintf(fifo_in, sizeof(fifo_in), "%x %x:%s\n", KFD_SMI_EVENT_VMFAULT, task_info.pid, task_info.task_name); - add_event_to_kfifo(dev, KFD_SMI_EVENT_VMFAULT, fifo_in, len); + add_event_to_kfifo(task_info.pid, dev, KFD_SMI_EVENT_VMFAULT, fifo_in, len); } int kfd_smi_event_open(struct kfd_dev *dev, uint32_t *fd) @@ -282,6 +294,8 @@ int kfd_smi_event_open(struct kfd_dev *dev, uint32_t *fd) spin_lock_init(&client->lock); client->events = 0; client->dev = dev; + client->pid = current->pid; + client->suser = capable(CAP_SYS_ADMIN); spin_lock(&dev->smi_lock); list_add_rcu(&client->list, &dev->smi_clients); diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h index af96af174dc4..bbbae8ad9721 100644 --- a/include/uapi/linux/kfd_ioctl.h +++ b/include/uapi/linux/kfd_ioctl.h @@ -32,6 +32,7 @@ * - 1.4 - Indicate new SRAM EDC bit in device properties * - 1.5 - Add SVM API * - 1.6 - Query clear flags in SVM get_attr API + * - 1.7 - Add SMI profiler event log */ #define KFD_IOCTL_MAJOR_VERSION 1 #define KFD_IOCTL_MINOR_VERSION 6 @@ -459,10 +460,36 @@ enum kfd_smi_event { KFD_SMI_EVENT_THERMAL_THROTTLE = 2, KFD_SMI_EVENT_GPU_PRE_RESET = 3, KFD_SMI_EVENT_GPU_POST_RESET = 4, + KFD_SMI_EVENT_MIGRATION = 5, + KFD_SMI_EVENT_PAGE_FAULT = 6, + KFD_SMI_EVENT_QUEUE_EVICTION = 7, + KFD_SMI_EVENT_QUEUE_EVICTION_RESTORE = 8, + + /* + * max event number, as a flag bit to get events from all processes, + * this requires super user permission, otherwise will not be able to + * receive events from any process. Without this flag to receive events + * from same process. + */ + KFD_SMI_EVENT_ALL_PROCESSES = 64 }; #define KFD_SMI_EVENT_MASK_FROM_INDEX(i) (1ULL << ((i) - 1)) +enum KFD_MIGRATION_TRIGGER { + MIGRATION_TRIGGER_PREFETCH = 1, + MIGRATION_TRIGGER_PAGEFAULT, + MIGRATION_TRIGGER_PAGEFAULT_CPU, + MIGRATION_TRIGGER_TTM_EVICTION +}; + +enum KFD_USER_QUEUE_EVICTION_TRIGGER { + SVM_RANGE_EVICTION = 1, + USERPTR_EVICTION, + TTM_EVICTION, + SUSPEND_EVICTION +}; + struct kfd_ioctl_smi_events_args { __u32 gpuid; /* to KFD */ __u32 anon_fd; /* from KFD */ -- 2.17.1