From patchwork Fri Feb 17 22:22:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 58787 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp100510wrn; Fri, 17 Feb 2023 14:33:59 -0800 (PST) X-Google-Smtp-Source: AK7set8EbBfRCtkH80ejaxOFLuqOPivPTa4OdVB8vwSAAMWO8H0CK/TnRfQ9IlNobZwF02wRHMh8 X-Received: by 2002:aa7:de83:0:b0:4ab:ec2:3cd1 with SMTP id j3-20020aa7de83000000b004ab0ec23cd1mr2086286edv.25.1676673239244; Fri, 17 Feb 2023 14:33:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676673239; cv=none; d=google.com; s=arc-20160816; b=T8C0vXQO6XewN5Z0rzM9Nqs6yhBoPMymnKlDeHRKWdhRkeNM8HpPgCuAOGIsmumYKk X6HpCECVJ9GFmhAG/j1Yot+zZf4nHFSkNl9kFQSwIxtMgfOop054rgrAFkz9M5o0nvnl 4I+yD0BUyQ9D6bEKhuFql0qWWWfukvK5JyRT1Q2aZcNDkoFF4FgetsYCh6wisgZ6yyo5 JPfa4mMVGiaqBPo0SQ+mTMm5Z+DeYuPPJ2yl1yAMfTlsLHNt3ywmu3lRLJDO9/BGbFtf F7sgWY+6UrZSTWEYISntmuB7sH5wcdLtx44I2b16+2D7ZbeYHF6JMZEKcJ7vI6eaofCE FKqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+f41pgVe5xvkAd/Ki0t6NEZtUsqf2xiwTtTa3TntQds=; b=Riw74iHC/jr/GyKk0Lc7+vJuX2acTkeB1EIZz3fXIAVFFFwD5F4ur8DwLwVDCpcppn aZHZS/ShlDttUy8lODpVdF2EKH93BhVxYeIqPn8icrdnywDELEm+RhdXfrAf2G+79DWx xzuIilgbSqe70GFNOurdA37uy2KqbfjYXItXj1qfLKies/3fd8bVDH5/ZcQ45NxA5ZSD w20FT1ktnN5EC193ztkZvrMBJ6lbGL3TZ9TYiUw3+bMqSeX6Z22QaWvx9VEkUfCu3tSW CfwkCB1sSoV9SSBcpnteTFkV9cY8BzXBupJUNWOotEi16ogsPmMf+A9elId6m0MBNgby R+uQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=S4bH2giI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e16-20020a50fb90000000b004acbebbb1c1si6183695edq.262.2023.02.17.14.33.36; Fri, 17 Feb 2023 14:33:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=S4bH2giI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229862AbjBQWXJ (ORCPT + 99 others); Fri, 17 Feb 2023 17:23:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229553AbjBQWXC (ORCPT ); Fri, 17 Feb 2023 17:23:02 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6292D5CF03; Fri, 17 Feb 2023 14:23:01 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id ED2DB6207F; Fri, 17 Feb 2023 22:23:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA130C433AE; Fri, 17 Feb 2023 22:22:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676672580; bh=/+ANatHz1yxjGMA7ryG0c/Km7p/0KZLeF6+BAXFBfTI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S4bH2giIvuXGjgMxOlCrWfG7eHYRcyJ+RLkxqnp/b8gRM2nelDloLr4IUaRWuBpmW FXqUXTghpwLpCOd47jUXygi6IkGoRxW7BUtPgGElpBc3G6U/Pw5T4j59f4CHtXxYPN vDcHN8ePhyBF3Qfuu4QtqTU4gh/xe4JsMCqkXt8T1PR0L+U5RgbgYqDRkFp4+KdacG HAzPLIYts1Ss9b/VMDz3PaxrIF0ZeXgQg8dFvo17MsHPdsBm/UMSHIDN1By2JxIVow mw4KOjUpBl87uJroVqF3v4zXuhCsvc1THfNy4V+BC9i2j/0piMEd2aVCCc84NA0sM6 FuEbu1N7FQxzw== From: Josh Poimboeuf To: live-patching@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Seth Forshee , Peter Zijlstra , Song Liu , Mark Rutland , Petr Mladek , Joe Lawrence , Miroslav Benes , Jiri Kosina , Ingo Molnar , Rik van Riel Subject: [PATCH v2 3/3] vhost: Fix livepatch timeouts in vhost_worker() Date: Fri, 17 Feb 2023 14:22:56 -0800 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758119318314133361?= X-GMAIL-MSGID: =?utf-8?q?1758119318314133361?= Livepatch timeouts were reported due to busy vhost_worker() kthreads. Now that cond_resched() can do livepatch task switching, use cond_resched() in vhost_worker(). That's the better way to conditionally call schedule() anyway. Reported-by: Seth Forshee (DigitalOcean) Link: https://lkml.kernel.org/lkml/20230120-vhost-klp-switching-v1-0-7c2b65519c43@kernel.org Tested-by: Seth Forshee (DigitalOcean) Reviewed-by: Petr Mladek Signed-off-by: Josh Poimboeuf --- drivers/vhost/vhost.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 43c9770b86e5..87e3cf12da1c 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -363,8 +363,7 @@ static int vhost_worker(void *data) kcov_remote_start_common(dev->kcov_handle); work->fn(work); kcov_remote_stop(); - if (need_resched()) - schedule(); + cond_resched(); } } kthread_unuse_mm(dev->mm);