From nobody Thu Jan 20 10:09:39 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 24B8C1965036; Thu, 20 Jan 2022 10:09:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JfdXh0SStz4VDD; Thu, 20 Jan 2022 10:09:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642673380; 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; bh=WSE49ujT2EmJc713Rznq5+tKWcTKdEleXDcuR0hBTdg=; b=EFYMEHctwf01qiCCWL+JdjO4anCFCxE7emX5cjDn2qAjcTkHzjR2aYKEyThraEER+fScRN GWzIoHlSfZHmX+EH6W06XkX+UG1DE/NIwLMXsbxO6pU/tvd5gmVsa6SaUDViOCvYMw/zQo 527+Tba3t+aU+2IVmQLAMDsiRSwGOm8KZFp4S6byClIuYTN+FWW1BIi6cCwKT/ikbcTcMz Nac8ZL6CCR7xzh/ki//pBWncpqW5scWGNpcVe5a60ec0Gt7pTxGDkYbgK/N3ojCF0UYW4I 8VH0ux34H5sOJVlC/5GoKJjbSs4W9ni4OgoPMCtPCvsg6or2cLt+cng0Ys0u3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DED4B2659C; Thu, 20 Jan 2022 10:09:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20KA9dHa091213; Thu, 20 Jan 2022 10:09:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20KA9dMl091212; Thu, 20 Jan 2022 10:09:39 GMT (envelope-from git) Date: Thu, 20 Jan 2022 10:09:39 GMT Message-Id: <202201201009.20KA9dMl091212@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michal Meloun Subject: git: a3ccd06dd965 - stable/13 - intrng: Releasing interrupt source should clear interrupt table full state. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a3ccd06dd96530022d56ed59e5929874966b6ba7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642673380; 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; bh=WSE49ujT2EmJc713Rznq5+tKWcTKdEleXDcuR0hBTdg=; b=UoPfg7EF5CE5fZBIWcBh/fJqsJzuaXU6t5lMldivkf6Gv3BmGdG0N/0Zp1dT5imXP6OGpX zZIj9m5r6WSQoUt36G4+qZQR/XWBGtOmUQ8VbmTkyouixaU1uvAHzy9FtOsDIGg/TO6Qrs FWf/pOaYQVa9MwfwuOQwBHSM2bAxbYpe8Dl6OO/gDYc5q19bQGTLi9cRYdOVUmcQwFe59k mVJBU4fPbMZ4fMFm6VwbWPBT3LRNDXn+N+JY6koS9WOpnIJt7mWknJPh7DNT2DnNAa7vVS ph9g7MjZR4f42JsXZe0juG2WxOhg7733Vebo3lDbEzP9tPsYlLxWJvqhJTiSdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642673380; a=rsa-sha256; cv=none; b=cLFVNygZDAKxF0B9F/245/gQ/VHX/nbYQRrIs2xDuRFCLGXwIsff1iw7av0+OOtZXLt2++ d8HEJh4mjwGl8o5Rugzn2rzgXVgv993kDSCSiL+k8XF4bEPv7DAUfyy2OmDyMEuCzKNy7V SAME2yt+WDJIs3/dcUegQaGVJhOrsjIBnfUSsRwNoyyj08dKLGLkj/2690Egbw66P9bDDo TfmGQAYTnto+G5zjwYjsjwDwuj2PwkLru2hNRMpPlJimhbjyprlSFzXSQ5a7XSQaACNyiA tnyPqS6N5wErUiTX0OSJp4QXiec0Qt8uHl343uldSwziTLi/S8VCjFrKmSAkXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=a3ccd06dd96530022d56ed59e5929874966b6ba7 commit a3ccd06dd96530022d56ed59e5929874966b6ba7 Author: Michal Meloun AuthorDate: 2021-07-02 18:17:36 +0000 Commit: Michal Meloun CommitDate: 2022-01-20 10:07:44 +0000 intrng: Releasing interrupt source should clear interrupt table full state. The first release of an interrupt in a situation where the interrupt table is full should schedule a full table check the next time an interrupt is allocated. A full check is necessary to ensure maximum separation between the order of allocation and the order of release. Submitted by: ehem_freebsd@m5p.com (initial version) Discussed in: https://reviews.freebsd.org/D29310 MFC after: 4 weeks (cherry picked from commit a49f208d94b873b2187adbfe1d785b3bc8bdc598) --- sys/kern/subr_intr.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c index df6bf9e63ba0..d4926b2e2364 100644 --- a/sys/kern/subr_intr.c +++ b/sys/kern/subr_intr.c @@ -447,6 +447,16 @@ isrc_free_irq(struct intr_irqsrc *isrc) irq_sources[isrc->isrc_irq] = NULL; isrc->isrc_irq = INTR_IRQ_INVALID; /* just to be safe */ + + /* + * If we are recovering from the state irq_sources table is full, + * then the following allocation should check the entire table. This + * will ensure maximum separation of allocation order from release + * order. + */ + if (irq_next_free >= intr_nirq) + irq_next_free = 0; + return (0); }