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 X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87685C2BA2B for ; Wed, 8 Apr 2020 10:48:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5529C20747 for ; Wed, 8 Apr 2020 10:48:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="U1KWFPe3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728351AbgDHKsQ (ORCPT ); Wed, 8 Apr 2020 06:48:16 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:31400 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726980AbgDHKsQ (ORCPT ); Wed, 8 Apr 2020 06:48:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586342895; 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=MZtYtcreRWdnZo6HGx0Gzr9jVhTfvPPlSZqe9ZZdt4Q=; b=U1KWFPe3Uwr3m000Lv0aRgvZPrUzo3a2yfJ1MzsWMu1Q6YBP7kk2KpsYF0joMHUuXlvQ6Y h0iqrK5WEXnchQo17HfHm33E1OhwNps4yc4TsRlmWetCYknxIu0yfxrTcul3gkGuGMRT7Q O1CNgqWAJC3ENhp1DZWDRW9WUm5GQ2I= 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-481-nMvS2XNPMQ2eYTcYJXs3qA-1; Wed, 08 Apr 2020 06:48:11 -0400 X-MC-Unique: nMvS2XNPMQ2eYTcYJXs3qA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 20813800D4E; Wed, 8 Apr 2020 10:48:09 +0000 (UTC) Received: from gondolin (ovpn-113-103.ams2.redhat.com [10.36.113.103]) by smtp.corp.redhat.com (Postfix) with ESMTP id B306B5D9CD; Wed, 8 Apr 2020 10:48:03 +0000 (UTC) Date: Wed, 8 Apr 2020 12:48:01 +0200 From: Cornelia Huck To: Tony Krowiak Cc: linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, freude@linux.ibm.com, borntraeger@de.ibm.com, mjrosato@linux.ibm.com, pmorel@linux.ibm.com, pasic@linux.ibm.com, alex.williamson@redhat.com, kwankhede@nvidia.com, jjherne@linux.ibm.com, fiuczy@linux.ibm.com Subject: Re: [PATCH v7 01/15] s390/vfio-ap: store queue struct in hash table for quick access Message-ID: <20200408124801.2d61bc5b.cohuck@redhat.com> In-Reply-To: <20200407192015.19887-2-akrowiak@linux.ibm.com> References: <20200407192015.19887-1-akrowiak@linux.ibm.com> <20200407192015.19887-2-akrowiak@linux.ibm.com> Organization: Red Hat GmbH MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 7 Apr 2020 15:20:01 -0400 Tony Krowiak wrote: > Rather than looping over potentially 65535 objects, let's store the > structures for caching information about queue devices bound to the > vfio_ap device driver in a hash table keyed by APQN. This also looks like a nice code simplification. > > Signed-off-by: Tony Krowiak > --- > drivers/s390/crypto/vfio_ap_drv.c | 28 +++------ > drivers/s390/crypto/vfio_ap_ops.c | 90 ++++++++++++++------------- > drivers/s390/crypto/vfio_ap_private.h | 10 ++- > 3 files changed, 60 insertions(+), 68 deletions(-) > (...) > diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c > index 5c0f53c6dde7..134860934fe7 100644 > --- a/drivers/s390/crypto/vfio_ap_ops.c > +++ b/drivers/s390/crypto/vfio_ap_ops.c > @@ -26,45 +26,16 @@ > > static int vfio_ap_mdev_reset_queues(struct mdev_device *mdev); > > -static int match_apqn(struct device *dev, const void *data) > -{ > - struct vfio_ap_queue *q = dev_get_drvdata(dev); > - > - return (q->apqn == *(int *)(data)) ? 1 : 0; > -} > - > -/** > - * vfio_ap_get_queue: Retrieve a queue with a specific APQN from a list > - * @matrix_mdev: the associated mediated matrix > - * @apqn: The queue APQN > - * > - * Retrieve a queue with a specific APQN from the list of the > - * devices of the vfio_ap_drv. > - * Verify that the APID and the APQI are set in the matrix. > - * > - * Returns the pointer to the associated vfio_ap_queue Any reason you're killing this comment, instead of adapting it? The function is even no longer static... > - */ > -static struct vfio_ap_queue *vfio_ap_get_queue( > - struct ap_matrix_mdev *matrix_mdev, > - int apqn) > +struct vfio_ap_queue *vfio_ap_get_queue(unsigned long apqn) > { > struct vfio_ap_queue *q; > - struct device *dev; > - > - if (!test_bit_inv(AP_QID_CARD(apqn), matrix_mdev->matrix.apm)) > - return NULL; > - if (!test_bit_inv(AP_QID_QUEUE(apqn), matrix_mdev->matrix.aqm)) > - return NULL; These were just optimizations and therefore can be dropped now? > - > - dev = driver_find_device(&matrix_dev->vfio_ap_drv->driver, NULL, > - &apqn, match_apqn); > - if (!dev) > - return NULL; > - q = dev_get_drvdata(dev); > - q->matrix_mdev = matrix_mdev; > - put_device(dev); > > - return q; > + hash_for_each_possible(matrix_dev->qtable, q, qnode, apqn) { > + if (q && (apqn == q->apqn)) > + return q; > + } Do we need any serialization here? Previously, the driver core made sure we could get a reference only if the device was still registered; not sure if we need any further guarantees now. > + > + return NULL; > } > > /** (...)