From patchwork Thu Feb 2 14:50:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Zijlstra X-Patchwork-Id: 13126378 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EDC38C636D4 for ; Thu, 2 Feb 2023 15:29:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 56F356B0082; Thu, 2 Feb 2023 10:29:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4AA2F6B0083; Thu, 2 Feb 2023 10:29:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DD0D56B007E; Thu, 2 Feb 2023 10:29:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id B82586B007B for ; Thu, 2 Feb 2023 10:29:22 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 770F980F1E for ; Thu, 2 Feb 2023 15:29:22 +0000 (UTC) X-FDA: 80422735764.20.8E7A0F1 Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) by imf06.hostedemail.com (Postfix) with ESMTP id 2754118000B for ; Thu, 2 Feb 2023 15:29:19 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=desiato.20200630 header.b=Huq1Bblp; spf=none (imf06.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.92.199) smtp.mailfrom=peterz@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675351760; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references:references:dkim-signature; bh=3ubHXmjMHuO7YFbxrF9R90Y+YVnse9xBuEbHAitlUas=; b=IrH8OF/DFHdkY2NUgmjAmckW6VITGpH9pNQTYgpx+Jy2e+4bQqkPboqujcBn37pfMjdtrg pN512+nFuJdxvMYz4FzAGfRtw2jfYYijX8mfqeRJ4L+goVwhx6gSjra32uyBfoyS+rSzSp xh2//nxqAAxhB8VymzDFoT8hFiWMYWo= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=desiato.20200630 header.b=Huq1Bblp; spf=none (imf06.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.92.199) smtp.mailfrom=peterz@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675351760; a=rsa-sha256; cv=none; b=HCQqqIEjkhCTp5BEBGgWfjI1xcGDE43gONA2oRIXFmg6+JnveGAc1uq/B+CU9RRQDm8G6m sgOmuVGbfhHYtFKaj0Huh86W/BZlNKWFyklhRli7CQvSM2btdEzZtw3ifnekka4Spk7lWr zblM8cOggNMVsEPrpkiyssEHUBk2mF8= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:MIME-Version:References: Subject:Cc:To:From:Date:Message-ID:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To; bh=3ubHXmjMHuO7YFbxrF9R90Y+YVnse9xBuEbHAitlUas=; b=Huq1BblpHoH+3Obm8iACci5gq3 megzhmNOz8SY2lHByGtJBiuzwCZGxcMReZzqMQ4nIME6rS6KZPdBpp1dHuZ00OwNftd1HbhvcySE3 68GXZUzOIxjxl/PwuKG0UW9kglxjDzk22ad/LD6UJv9zU4ZgdkrBGLgtw+Cz/xSyQt3S1hhz17MSd 2NH8seRyMtxOnwvDrB2Z74x1Ewfp5FBvRH95zDsTzpjJKo5MKphmgIskhBW4cEQnuCCQ7WcDOGGtJ goq/K07AkOWFmKlEHfneue1iwLtuIO6jiCeUIAifHqjRKGFxknHNxxnuLwpxLHmhgTgElUSqJXVoQ hqTg8AmQ==; Received: from j130084.upc-j.chello.nl ([24.132.130.84] helo=noisy.programming.kicks-ass.net) by desiato.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1pNbVU-005CFw-21; Thu, 02 Feb 2023 15:28:12 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id 3AE0D3007C5; Thu, 2 Feb 2023 16:28:45 +0100 (CET) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id 9AAE923F31FBD; Thu, 2 Feb 2023 16:28:40 +0100 (CET) Message-ID: <20230202152655.624998774@infradead.org> User-Agent: quilt/0.66 Date: Thu, 02 Feb 2023 15:50:37 +0100 From: Peter Zijlstra To: torvalds@linux-foundation.org Cc: corbet@lwn.net, will@kernel.org, peterz@infradead.org, boqun.feng@gmail.com, mark.rutland@arm.com, catalin.marinas@arm.com, dennis@kernel.org, tj@kernel.org, cl@linux.com, hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, borntraeger@linux.ibm.com, svens@linux.ibm.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, joro@8bytes.org, suravee.suthikulpanit@amd.com, robin.murphy@arm.com, dwmw2@infradead.org, baolu.lu@linux.intel.com, Arnd Bergmann , Herbert Xu , davem@davemloft.net, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, Andrew Morton , vbabka@suse.cz, roman.gushchin@linux.dev, 42.hyeyoo@gmail.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-s390@vger.kernel.org, iommu@lists.linux.dev, linux-arch@vger.kernel.org, linux-crypto@vger.kernel.org Subject: [PATCH v2 07/10] x86,intel_iommu: Replace cmpxchg_double() References: <20230202145030.223740842@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 2754118000B X-Stat-Signature: eaazumrprq8dg4duzfeq6g18wopmp84f X-Rspam-User: X-HE-Tag: 1675351759-193980 X-HE-Meta: U2FsdGVkX188T2b71GfStdRNSQoOKkVLwb2M+NFMLJnILZVgTfxBUt8tKllehamr0Ezb6p3w/UTKbj7z6gjpGqeOjDeP8yp9JI29aq3g5+6UzY3Cad9ag+v6HChGIZg9wfHdZh7PTmxdkX8OzbnErIZpqPNHRcEZx4/y2hvGhXtD+QTyioFRhlSp1akk3My2Cy023VMu6cXmogTpuCtFyptU47uhF6+9a89UoXTpZld883DbDjtuuf7wdQLTtc7WUkSUOg5YsKeZeiEHIEBcKVvM3PKJTX/x0SA59Ym8eAbIYiDDcwYMIe+b2A5FW2IPwydt65d/c2AiIUU1lZH46gdju4paDrvR8ownP9QhfJQyd9FgG5PLZp+SU+MfZRPxASkr7ANWKN5kR+ps4zwoesANZJcCd7/1sNbp1Ef6anSUN5PoNR1g8EHWjDgblbRSD/EaD/ajWdy6wL8PjUolbAK2pR4d9GPfORvM4/JAWWeDB17SSdvFhzZdGU8eWnZ0/JG1SnhwCbZbup3/CyKQXus8Bvsk9rwlTbq63pkWNnJwubjzTjnZCBU8guexikeZ0fOTJqh7oi/FINSA0ilbw40xpk48WCJ6lRBuSy5TFBrPy1crcw8NPVkRdvt+1DMVtcEN1TuP9l+ncZ37vg3de9W22ykCpByDqYOp/G/hpmUfIx5TdYv2uS2xgQUAZxIQ0QoofnhiYanoTrmIhV948mehya6z36NMY8MheQRKPQbEzt9M5KYcfFLDJ7Futs4m0qM8z1LrxywDswAI9OOvl74+dPf4oU1noPsxP29ZdVb8o/9SH4AQbgbUWiHy3hK+VuJsKp9X2uNfn55L/Mzu5caTuP0pCrIRX5g9WLs4sZrazNKGshZcUvwZiSOBKeZQii2dHggNToKgMalYhoSSH5PI6p+zN3IiKOO8TOcQDyvarKd3u41in2grf8MugoYTCVNgP93347Wvo2iiWUO Fqfcb3G2 y+cRXHIg3buIMSSwBvhGR9BPTUV5TvXaclTPj+UcaZUzH4EdWbu41oTA3GYBJQE8dRA8grRgUcszYmtkyd6DhT8yrHLC/tBzOW5E1l7GrcW0dkSab//RXKmNsJvbJzvpAxMtFc7U/INeITPQAM0y9u9+Poezp5BlvfyTRvOgzBRU8Y+ANSZqlcu4/r+gJWY7KkBxxuR66oHujwqqc378XFKe57fRVeM0ywZwmZkWDgrluF81EUyRW+VzSriiqWIyBhbszHi7l1lg3LGJfi0G+sLb51SAd4iYWtZ9KYq+YHT8Y6CIHCScM1mAvogGpiodgazUCRa87hoNgWkQCRKJvaA5QVzAQPOkdurpez4R6erUkD2YcAPMYsFJIh0sTOh6Khq9ty5RfiJnPsjEY6Pc9B2iNZUhQYUPgToOa X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Lu Baolu --- drivers/iommu/intel/irq_remapping.c | 8 -- include/linux/dmar.h | 125 +++++++++++++++++++----------------- 2 files changed, 68 insertions(+), 65 deletions(-) --- a/drivers/iommu/intel/irq_remapping.c +++ b/drivers/iommu/intel/irq_remapping.c @@ -174,18 +174,14 @@ static int modify_irte(struct irq_2_iomm irte = &iommu->ir_table->base[index]; if ((irte->pst == 1) || (irte_modified->pst == 1)) { - bool ret; - - ret = cmpxchg_double(&irte->low, &irte->high, - irte->low, irte->high, - irte_modified->low, irte_modified->high); /* * We use cmpxchg16 to atomically update the 128-bit IRTE, * and it cannot be updated by the hardware or other processors * behind us, so the return value of cmpxchg16 should be the * same as the old value. */ - WARN_ON(!ret); + u128 old = irte->irte; + WARN_ON(!try_cmpxchg128(&irte->irte, &old, irte_modified->irte)); } else { WRITE_ONCE(irte->low, irte_modified->low); WRITE_ONCE(irte->high, irte_modified->high); --- a/include/linux/dmar.h +++ b/include/linux/dmar.h @@ -201,67 +201,74 @@ static inline void detect_intel_iommu(vo struct irte { union { - /* Shared between remapped and posted mode*/ struct { - __u64 present : 1, /* 0 */ - fpd : 1, /* 1 */ - __res0 : 6, /* 2 - 6 */ - avail : 4, /* 8 - 11 */ - __res1 : 3, /* 12 - 14 */ - pst : 1, /* 15 */ - vector : 8, /* 16 - 23 */ - __res2 : 40; /* 24 - 63 */ + union { + /* Shared between remapped and posted mode*/ + struct { + __u64 present : 1, /* 0 */ + fpd : 1, /* 1 */ + __res0 : 6, /* 2 - 6 */ + avail : 4, /* 8 - 11 */ + __res1 : 3, /* 12 - 14 */ + pst : 1, /* 15 */ + vector : 8, /* 16 - 23 */ + __res2 : 40; /* 24 - 63 */ + }; + + /* Remapped mode */ + struct { + __u64 r_present : 1, /* 0 */ + r_fpd : 1, /* 1 */ + dst_mode : 1, /* 2 */ + redir_hint : 1, /* 3 */ + trigger_mode : 1, /* 4 */ + dlvry_mode : 3, /* 5 - 7 */ + r_avail : 4, /* 8 - 11 */ + r_res0 : 4, /* 12 - 15 */ + r_vector : 8, /* 16 - 23 */ + r_res1 : 8, /* 24 - 31 */ + dest_id : 32; /* 32 - 63 */ + }; + + /* Posted mode */ + struct { + __u64 p_present : 1, /* 0 */ + p_fpd : 1, /* 1 */ + p_res0 : 6, /* 2 - 7 */ + p_avail : 4, /* 8 - 11 */ + p_res1 : 2, /* 12 - 13 */ + p_urgent : 1, /* 14 */ + p_pst : 1, /* 15 */ + p_vector : 8, /* 16 - 23 */ + p_res2 : 14, /* 24 - 37 */ + pda_l : 26; /* 38 - 63 */ + }; + __u64 low; + }; + + union { + /* Shared between remapped and posted mode*/ + struct { + __u64 sid : 16, /* 64 - 79 */ + sq : 2, /* 80 - 81 */ + svt : 2, /* 82 - 83 */ + __res3 : 44; /* 84 - 127 */ + }; + + /* Posted mode*/ + struct { + __u64 p_sid : 16, /* 64 - 79 */ + p_sq : 2, /* 80 - 81 */ + p_svt : 2, /* 82 - 83 */ + p_res3 : 12, /* 84 - 95 */ + pda_h : 32; /* 96 - 127 */ + }; + __u64 high; + }; }; - - /* Remapped mode */ - struct { - __u64 r_present : 1, /* 0 */ - r_fpd : 1, /* 1 */ - dst_mode : 1, /* 2 */ - redir_hint : 1, /* 3 */ - trigger_mode : 1, /* 4 */ - dlvry_mode : 3, /* 5 - 7 */ - r_avail : 4, /* 8 - 11 */ - r_res0 : 4, /* 12 - 15 */ - r_vector : 8, /* 16 - 23 */ - r_res1 : 8, /* 24 - 31 */ - dest_id : 32; /* 32 - 63 */ - }; - - /* Posted mode */ - struct { - __u64 p_present : 1, /* 0 */ - p_fpd : 1, /* 1 */ - p_res0 : 6, /* 2 - 7 */ - p_avail : 4, /* 8 - 11 */ - p_res1 : 2, /* 12 - 13 */ - p_urgent : 1, /* 14 */ - p_pst : 1, /* 15 */ - p_vector : 8, /* 16 - 23 */ - p_res2 : 14, /* 24 - 37 */ - pda_l : 26; /* 38 - 63 */ - }; - __u64 low; - }; - - union { - /* Shared between remapped and posted mode*/ - struct { - __u64 sid : 16, /* 64 - 79 */ - sq : 2, /* 80 - 81 */ - svt : 2, /* 82 - 83 */ - __res3 : 44; /* 84 - 127 */ - }; - - /* Posted mode*/ - struct { - __u64 p_sid : 16, /* 64 - 79 */ - p_sq : 2, /* 80 - 81 */ - p_svt : 2, /* 82 - 83 */ - p_res3 : 12, /* 84 - 95 */ - pda_h : 32; /* 96 - 127 */ - }; - __u64 high; +#ifdef CONFIG_IRQ_REMAP + __u128 irte; +#endif }; };