From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89907C00140 for ; Wed, 10 Aug 2022 12:29:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231785AbiHJM3K (ORCPT ); Wed, 10 Aug 2022 08:29:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229511AbiHJM3J (ORCPT ); Wed, 10 Aug 2022 08:29:09 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 949E97437F for ; Wed, 10 Aug 2022 05:29:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660134547; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ur0S3vxzmpV2P3Rj1K4ZEdqLq25lb9Wh81DhfR65pxA=; b=B7SMe3hznbmMRpZ6xrr0o7tKdLp25tE9UZBmE6Hh74rk9iFYY5XD7Abm1zGDV6udr8B4xh 1Xo3rzaNaAJuWqNszyjqpZf0cI8NgvdXaaOlD4TYfd/zUsPipcMMFacI/obxXRz1poexhS JqhDHovgiQSlykC6nd/diP713Uz1vrA= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-668-sx_LqB2AOH6RUpao-9rRaA-1; Wed, 10 Aug 2022 08:29:06 -0400 X-MC-Unique: sx_LqB2AOH6RUpao-9rRaA-1 Received: by mail-ed1-f69.google.com with SMTP id w17-20020a056402269100b0043da2189b71so8939603edd.6 for ; Wed, 10 Aug 2022 05:29:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc; bh=Ur0S3vxzmpV2P3Rj1K4ZEdqLq25lb9Wh81DhfR65pxA=; b=Kr9/xTvjtXJt1N/DTLUN2UYpQ2JQ7MXAHDynHRYNaeNwmP/Q+XjnjhvjCIhJLkh8su dqkq56GX0RWhmh4ir09VvbRqYmSWyvd3kQLpNvCHW7HOU7K5BUKVxGuFxFd64J31VkQ4 oh/fBOghGtejphyfdpr0+uuhSJ7uVCgLnEPDeDwgfjwqxYu9nioVAKr7JKADm1803/Qz Xy5wPdjzPnrIfN47MDLUSstEMB24z+PzIXEAh9JLmd4KwswEkehiRsHaMXKJjCRtOXgH /06+3/KouipWwSf7g6KFAFj7lDEzqU5jFHewkEEtTD9qQl7MFxIm8AiRE996PPC/rkDl 3pBw== X-Gm-Message-State: ACgBeo0fyQjrgj9ds9nB4ukHx05ghsRJp4baUNi3JdYglWngwAOPvrWQ jXIMuuJ7+XHzzsTv+pyzL+Fp7t+/4ya3yx0lJBlQm7vZnPhtG20FOpfP75BHYenXqr+fCrjXgD4 U8BjAqDQZbIuGW53mm+DGq/NtwTA2 X-Received: by 2002:a05:6402:35c3:b0:43d:f5d9:b65d with SMTP id z3-20020a05640235c300b0043df5d9b65dmr26615867edc.149.1660134545250; Wed, 10 Aug 2022 05:29:05 -0700 (PDT) X-Google-Smtp-Source: AA6agR7s6VXCgxCV5nTHcb8Km+7rgGPW/D/i9ZJCl/KMbRISRjqKSsbjTlBqkKW6TQEEF4LuJCo/9g== X-Received: by 2002:a05:6402:35c3:b0:43d:f5d9:b65d with SMTP id z3-20020a05640235c300b0043df5d9b65dmr26615846edc.149.1660134545002; Wed, 10 Aug 2022 05:29:05 -0700 (PDT) Received: from ?IPV6:2001:b07:6468:f312:9af8:e5f5:7516:fa89? ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.googlemail.com with ESMTPSA id f15-20020a50ee8f000000b0043bc4b28464sm7671006edr.34.2022.08.10.05.29.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 10 Aug 2022 05:29:04 -0700 (PDT) Message-ID: <1e41a634-0419-e0a8-364c-2e30ed2dbe4d@redhat.com> Date: Wed, 10 Aug 2022 14:29:02 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Subject: Re: [PATCH v2 1/2] KVM: selftests: Make rseq compatible with glibc-2.35 Content-Language: en-US To: Mathieu Desnoyers , Gavin Shan Cc: kvmarm , KVM list , linux-kernel , linux-kselftest , Florian Weimer , shan gavin , maz , andrew jones , yihyu , Sean Christopherson , oliver upton References: <20220810104114.6838-1-gshan@redhat.com> <20220810104114.6838-2-gshan@redhat.com> <876568572.367.1660134156963.JavaMail.zimbra@efficios.com> From: Paolo Bonzini In-Reply-To: <876568572.367.1660134156963.JavaMail.zimbra@efficios.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org On 8/10/22 14:22, Mathieu Desnoyers wrote: >> >> /* >> * Create and run a dummy VM that immediately exits to userspace via >> @@ -256,7 +244,7 @@ int main(int argc, char *argv[]) >> */ >> smp_rmb(); >> cpu = sched_getcpu(); >> - rseq_cpu = READ_ONCE(__rseq.cpu_id); >> + rseq_cpu = READ_ONCE(__rseq->cpu_id); > #include > > and use > > rseq_current_cpu_raw(). Thanks, I squashed it and queued it for -rc1 (tested on both glibc 2.34 and 2.35). diff --git a/tools/testing/selftests/kvm/rseq_test.c b/tools/testing/selftests/kvm/rseq_test.c index 84e8425edc2c..987a76674f4f 100644 --- a/tools/testing/selftests/kvm/rseq_test.c +++ b/tools/testing/selftests/kvm/rseq_test.c @@ -29,7 +29,6 @@ #define NR_TASK_MIGRATIONS 100000 static pthread_t migration_thread; -static struct rseq_abi *__rseq; static cpu_set_t possible_mask; static int min_cpu, max_cpu; static bool done; @@ -218,7 +217,6 @@ int main(int argc, char *argv[]) r = rseq_register_current_thread(); TEST_ASSERT(!r, "rseq_register_current_thread failed, errno = %d (%s)", errno, strerror(errno)); - __rseq = rseq_get_abi(); /* * Create and run a dummy VM that immediately exits to userspace via @@ -256,7 +254,7 @@ int main(int argc, char *argv[]) */ smp_rmb(); cpu = sched_getcpu(); - rseq_cpu = READ_ONCE(__rseq->cpu_id); + rseq_cpu = rseq_current_cpu_raw(); smp_rmb(); } while (snapshot != atomic_read(&seq_cnt)); Paolo