From patchwork Fri Feb 24 16:50:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 61403 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1025697wrd; Fri, 24 Feb 2023 09:03:14 -0800 (PST) X-Google-Smtp-Source: AK7set/ix1pf8UoW35vTvfNXZ85IgEKieuFvM5KunETzROkrAf3N2W73Lkq6lLueqgPvhog085rS X-Received: by 2002:a50:fc18:0:b0:4af:8436:2f5d with SMTP id i24-20020a50fc18000000b004af84362f5dmr1561357edr.40.1677258194811; Fri, 24 Feb 2023 09:03:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677258194; cv=none; d=google.com; s=arc-20160816; b=M/dR6XObcHecl1jukG84PnkL5BCBqAv1qB1hnF3CpckEeuaLRPAmGtdzLA+ESfFd0q e97INhy6FO8hxYujjbGwZ02GZSjLm1hmirS46tipo+YbqoBSxNFkvQf9T9oFVoCKfdIW JT+xFz9k2a3Vpj0OqFucvosVGz0q5hzpbIpkWGtbUxFDnLAWye+f7AyI+oT0WAjNtpoO XrzJN527xp7GVismLocx5lKnveA7FFiSFO4cvU1gY5lcNG5Czhtm9eKiKBfrB6ivGcqY UrW/Zd4WaVkfJ13wWrR4AebpGUywgtkacSGhUjiXjhbTEgAGXUaroEtE6Z4adpVrvYkg QgDQ== 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=VtBNVBDvXj5ctagFhNcOKgHp8hbFxX0ZDb/K15Bq0BCkkh23JwUrW9hX1SGJGikR9R sizdDWKsMa1eACsNkpleiQyHe6ziR3ZBgbPm5LQ6AVZFvT8kMQEyh59ka6PGMPOl/ZzQ gF35Sm2jqREfrhbNeUCveQCRhzKI//XkrnDVtb+U2jyzPQj0mxCtsG575sxWTdVYu4Gd ckpQIi7LUTNL2SqQfa3YmQm1+VgJDvxmoD0SjmstHMZzvmngyDDuvypX81evSIfApa0u ODsIeOyEAPhAiMkf0P4mFfFcxSFjrR6bDJtjo4BlvboluqENJM4qG5KkE9HfJOvL7TMQ oPzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KNED18r3; 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 k16-20020aa7d8d0000000b004b00f336555si418084eds.368.2023.02.24.09.02.39; Fri, 24 Feb 2023 09:03:14 -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=KNED18r3; 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 S230048AbjBXQuV (ORCPT + 99 others); Fri, 24 Feb 2023 11:50:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230038AbjBXQuT (ORCPT ); Fri, 24 Feb 2023 11:50:19 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 135753BDA0; Fri, 24 Feb 2023 08:50:15 -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 8B10561948; Fri, 24 Feb 2023 16:50:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78DFFC4339B; Fri, 24 Feb 2023 16:50:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677257415; bh=/+ANatHz1yxjGMA7ryG0c/Km7p/0KZLeF6+BAXFBfTI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KNED18r35Unvo+Qk0w/kUt4niIy+qGdq7n1WVYiFX8mYQr2zorPEDVvNDAVDWoe+c 5mZUrQaTmP02Iw8M7rLdZcskZisWBbCmhGDqJYQKbrNztHpK997MnXF4an8vO4KPBS swLEUfOGaLQs5qEDFjkT2Bb+47nGCUFSrLipv8EWdVfUK2Ra7ExpuGMmNetJOHC/nV 5OrL4kgoeJ75Rpk+B7KlR6axpuuMupEUjsSOtu1F9PP16R0BEUDPqotDDrx/ZooKEO V3n6C77MJccDDfp1xu98Gyd/U9hTJJzziFAyXzYtdWsGyUVGKvrR7HqyGzz4SAgkLU j34oE4YW78mgg== 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 v3 3/3] vhost: Fix livepatch timeouts in vhost_worker() Date: Fri, 24 Feb 2023 08:50:01 -0800 Message-Id: <509f6ea6fe6505f0a75a66026ba531c765ef922f.1677257135.git.jpoimboe@kernel.org> 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?1758732688673003607?= X-GMAIL-MSGID: =?utf-8?q?1758732688673003607?= 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);