From patchwork Wed Dec 2 08:08:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 335943 Delivered-To: patch@linaro.org Received: by 2002:a92:5e16:0:0:0:0:0 with SMTP id s22csp874488ilb; Wed, 2 Dec 2020 01:23:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJwttTsuKRH/V/9/ZupiPVmbutRfWZGRhjaUD4WyiFpVPfRrvixZ87kkTXFTvJl/Qpqurzyi X-Received: by 2002:a25:5689:: with SMTP id k131mr2910211ybb.257.1606901013016; Wed, 02 Dec 2020 01:23:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606901013; cv=none; d=google.com; s=arc-20160816; b=VQlXAqXjKYuBk+g32faesMXqmMC9UjCDKipX5K6tMCNJ33U1YuNJKtEzT8inhS61Mp 2p/RwWRe1GO3RVa+gWTeKilsSVlsC9F8xwyTZrbRzvbJ7GHfHh1qUs+239S8T1/J8W2g qI1aVDRBCfb/0QYUKscJm/L9Po5vFWUi7IDrlc0eS8dc5YioW1jM622VBRurO4BjxNxo t1Hd/ZziYei3rhVJZqRyD3GFsElidHyP92tef/I4fcfrqzef8NK2Ri/4p3UQbtkDWVpv /Rx78h4Ubcb3BxGw5p/Ls0V8yRy4AxvQS7PfpkWao5yOQol4vMQDceCWYI5Q34VmcFeO LNgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Cu74eGbX1Pzti3T+9FIBrGUXU++sBJFK1SRMc5dwyjo=; b=JbcIEx+imZPHaZ9TRc7gTCnDtartVg6oJN4c2+R9cQFJDkVYU+LpChGMZvRuPL4aCd N0iC3rsbappTQ1MPtgz+qDlsH9bYTX6lW/Xm6NciwGLb/WMfHekYjjk4EL1JJv3hZWXM oNJmOANbvxp2007inHDTb9DH/eBQ8hJNX7tMPnS+PXAA9edTugbM5psYsVKDcC/oE0yx LwknsU9s1ICFNzzzO+SZn20F+MkwQcy0jiFQbjxT7DeQc2SlwLbbA6u5EMZW20Tq9F7E eXs0vusOTOJ+VVkNiujwsiBFlnkc6HP2tLYsTJ+ML3SQ8hiPVhlwjzjjk0fEcTwoRDuC EDJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=EbvboEdQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t7si1955516ybl.108.2020.12.02.01.23.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 02 Dec 2020 01:23:33 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=EbvboEdQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:53430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkOMG-0001g1-DL for patch@linaro.org; Wed, 02 Dec 2020 04:23:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkNDL-0003qR-LT for qemu-devel@nongnu.org; Wed, 02 Dec 2020 03:10:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:53513) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kkNCa-0003pq-Ng for qemu-devel@nongnu.org; Wed, 02 Dec 2020 03:10:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606896567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Cu74eGbX1Pzti3T+9FIBrGUXU++sBJFK1SRMc5dwyjo=; b=EbvboEdQWBafo8hkIVPmvk1+4R1KeCshW5QWsLLp4IGkFGPgx8QyC8E+DYCUIun/V8HU44 vxaXngZAGVRPsO0Ggg6eDntRAoT0j0+aVOFbCiodxU34I7Nd2DqUKdF6piPbm9iyPyGPmb WTXgrVAKlA4X7y9h76i1u2dbCJPp6Kk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-33-mwYJXPnSOLCyd_0V-RY1sA-1; Wed, 02 Dec 2020 03:09:26 -0500 X-MC-Unique: mwYJXPnSOLCyd_0V-RY1sA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0A2411074642 for ; Wed, 2 Dec 2020 08:09:25 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id C35455C1B4 for ; Wed, 2 Dec 2020 08:09:24 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 094/113] kernel-doc: add support for ____cacheline_aligned attribute Date: Wed, 2 Dec 2020 03:08:30 -0500 Message-Id: <20201202080849.4125477-95-pbonzini@redhat.com> In-Reply-To: <20201202080849.4125477-1-pbonzini@redhat.com> References: <20201202080849.4125477-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.497, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Jonathan Cameron Subroutine dump_struct uses type attributes to check if the struct syntax is valid. Then, it removes all attributes before using it for output. `____cacheline_aligned` is an attribute that is not included in both steps. Add it, since it is used by kernel structs. Based on previous patch to add ____cacheline_aligned_in_smp. Motivated by patches to reorder this attribute to before the variable name. Whilst we could do that in all cases, that would be a massive change and it is more common in the kernel to place this particular attribute after the variable name. A quick grep suggests approximately 400 instances of which 341 have this attribute just before a semicolon and hence after the variable name. Signed-off-by: Jonathan Cameron Cc: Lee Jones Link: https://lore.kernel.org/r/20200910185415.653139-1-jic23@kernel.org Signed-off-by: Jonathan Corbet Signed-off-by: Paolo Bonzini Message-Id: <20201117165312.118257-13-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- scripts/kernel-doc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.26.2 diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 3fd6f3925e..c4c5640ded 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -1113,7 +1113,7 @@ sub dump_struct($$) { my $x = shift; my $file = shift; - if ($x =~ /(struct|union)\s+(\w+)\s*\{(.*)\}(\s*(__packed|__aligned|____cacheline_aligned_in_smp|__attribute__\s*\(\([a-z0-9,_\s\(\)]*\)\)))*/) { + if ($x =~ /(struct|union)\s+(\w+)\s*\{(.*)\}(\s*(__packed|__aligned|____cacheline_aligned_in_smp|____cacheline_aligned|__attribute__\s*\(\([a-z0-9,_\s\(\)]*\)\)))*/) { my $decl_type = $1; $declaration_name = $2; my $members = $3; @@ -1129,6 +1129,7 @@ sub dump_struct($$) { $members =~ s/\s*__packed\s*/ /gos; $members =~ s/\s*CRYPTO_MINALIGN_ATTR/ /gos; $members =~ s/\s*____cacheline_aligned_in_smp/ /gos; + $members =~ s/\s*____cacheline_aligned/ /gos; # replace DECLARE_BITMAP $members =~ s/__ETHTOOL_DECLARE_LINK_MODE_MASK\s*\(([^\)]+)\)/DECLARE_BITMAP($1, __ETHTOOL_LINK_MODE_MASK_NBITS)/gos;